[Yapcom-commit] rev 429 - in yapcom/trunk: . bin lib/YAPC t/cli

[svn at pti.co.il]

Author: gabor
Date: 2006-09-29 06:00:20 -0400 (Fri, 29 Sep 2006)
New Revision: 429

Modified:
   yapcom/trunk/
   yapcom/trunk/MANIFEST
   yapcom/trunk/bin/upgrade.pl
   yapcom/trunk/lib/YAPC/Tools.pm
   yapcom/trunk/t/cli/cli.t
Log:
patch from Shlomi Fish fixing MANIFEST and some other small fixes



Property changes on: yapcom/trunk
___________________________________________________________________
Name: svk:merge
   - 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:11386
   + 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/yapcom:11387

Modified: yapcom/trunk/MANIFEST
===================================================================
--- yapcom/trunk/MANIFEST	2006-09-29 10:00:08 UTC (rev 428)
+++ yapcom/trunk/MANIFEST	2006-09-29 10:00:20 UTC (rev 429)
@@ -17,11 +17,14 @@
 html/yapsi.gif
 html/schedule.html
 
+lib/YAPC/Conf.pm
 lib/YAPC/DBI.pm
 lib/YAPC/Organizer.pm
 lib/YAPC/Error.pm
 lib/YAPC/Tools.pm
+lib/YAPC/SiteAdmin.pm
 
+lib/YAPC/DB/Categories.pm
 lib/YAPC/DB/Conferences.pm
 lib/YAPC/DB/Keywords.pm
 lib/YAPC/DB/Login.pm
@@ -61,6 +64,8 @@
 templates/bofs.tmpl
 templates/call_for_paper.tmpl
 templates/change_password.tmpl
+templates/configuration.tmpl
+templates/db_closed.tmpl
 templates/email_sent.tmpl
 templates/error.tmpl
 templates/feedback.tmpl
@@ -80,26 +85,34 @@
 templates/news.tmpl
 templates/organizers.tmpl
 templates/other_conferences.tmpl
+templates/personal_info.tmpl
 templates/person.tmpl
-templates/personal_info.tmpl
 templates/pictures.tmpl
 templates/presentations.tmpl
 templates/proposal.tmpl
+templates/registration_header.tmpl
 templates/registration.tmpl
-templates/registration_header.tmpl
+templates/site_admin_add_conference.tmpl
+templates/site_admin_edit_conference_admins.tmpl
+templates/site_admin_edit_conference_urls.tmpl
+templates/site_admin_error.tmpl
+templates/site_admin_list_conferences.tmpl
+templates/site_admin_message.tmpl
+templates/site_admin_pw_changed.tmpl
 templates/slides.tmpl
 templates/speakers.tmpl
+templates/sponsorship.tmpl
 templates/sponsors.tmpl
-templates/sponsorship.tmpl
 templates/talk.tmpl
+templates/thank_proposal.tmpl
 templates/thankyou.tmpl
-templates/thank_proposal.tmpl
 templates/user_account.tmpl
 templates/validation.tmpl
 
+templates/email/password_subject.tmpl
 templates/email/password.tmpl
+templates/email/register_subject.tmpl
 templates/email/register.tmpl
-templates/email/register_subject.tmpl
 
 templates/site_admin_login.tmpl
 templates/site_admin_change_pw.tmpl

Modified: yapcom/trunk/bin/upgrade.pl
===================================================================
--- yapcom/trunk/bin/upgrade.pl	2006-09-29 10:00:08 UTC (rev 428)
+++ yapcom/trunk/bin/upgrade.pl	2006-09-29 10:00:20 UTC (rev 429)
@@ -5,7 +5,7 @@
 
 my $insert = "(id, fname, lname, email, password, authcode, acked,  company, country, state, city, street, zip, phone, pauseid, url,   mongers, bio,   photo, other)";
 
-system "/usr/bin/sqlite old.db .dump > old.txt";
+system "/usr/bin/sqlite3 old.db .dump > old.txt";
 open my $in,  '<', "old.txt" or die $!;
 open my $out, '>', "new.txt" or die $!;
 while (my $line = <$in>) {

Modified: yapcom/trunk/lib/YAPC/Tools.pm
===================================================================
--- yapcom/trunk/lib/YAPC/Tools.pm	2006-09-29 10:00:08 UTC (rev 428)
+++ yapcom/trunk/lib/YAPC/Tools.pm	2006-09-29 10:00:20 UTC (rev 429)
@@ -5,6 +5,7 @@
 # various helper functions that do not need Database access
 use Carp;
 use Cwd qw(abs_path);
+use FindBin;
 
 
 my $db_file;

Modified: yapcom/trunk/t/cli/cli.t
===================================================================
--- yapcom/trunk/t/cli/cli.t	2006-09-29 10:00:08 UTC (rev 428)
+++ yapcom/trunk/t/cli/cli.t	2006-09-29 10:00:20 UTC (rev 429)
@@ -4,6 +4,8 @@
 use warnings;
 
 use Test::More;
+use File::Copy;
+
 my $tests;
 
 plan tests => $tests;
@@ -13,7 +15,10 @@
 my $cmd = "./cgi/yapcom";
 
 {
+    copy("db/yapc.db", "db/yapc.db.save");
+    system "$^X ./bin/setup.pl >$out 2>$err";
     system "$cmd >$out 2>$err";
     ok(!-s $err, "STDERR was empty");
     BEGIN { $tests += 1; }
+    copy("db/yapc.db.save", "db/yapc.db");
 }