openguides-commits January 2008

openguides-commits@lists.openguides.org

1 participants
26 discussions

r1152 - status/templates
by svnadmin＠urchin.earth.li 31 Jan '08

31 Jan '08

Author: earle Date: 2008-01-31 12:20:27 +0000 (Thu, 31 Jan 2008) New Revision: 1152 Modified: status/templates/ status/templates/tests.tt Log: Colouring for report cells. Property changes on: status/templates ___________________________________________________________________ Name: svn:ignore + test-results-*.txt Modified: status/templates/tests.tt =================================================================== --- status/templates/tests.tt 2008-01-31 01:53:58 UTC (rev 1151) +++ status/templates/tests.tt 2008-01-31 12:20:27 UTC (rev 1152) @@ -11,7 +11,7 @@ } .pass { - background: #3c3; + background: #3f3; } </style> </head> @@ -30,7 +30,15 @@ <tr> <td>[% test_name.replace('_', ' ') %]</td> [% FOREACH datum IN test_results.keys.sort %] - <td>[% test_results.$datum %]%</td> + <td +[%- IF (test_results.$datum == 100) -%] +class="pass" +[%- ELSIF (test_results.$datum > 80) -%] +class="fail_minor" +[%- ELSE -%] +class="fail_serious"> +[%- END -%] +>[% test_results.$datum %]%</td> [% END %] </tr> [%- END %]

1 0

r1151 - in status: . templates
by svnadmin＠urchin.earth.li 31 Jan '08

31 Jan '08

Author: earle Date: 2008-01-31 01:53:58 +0000 (Thu, 31 Jan 2008) New Revision: 1151 Modified: status/report.pl status/templates/tests.tt Log: Put time on the horizontal axis at perigrin's request. Modified: status/report.pl =================================================================== --- status/report.pl 2008-01-30 18:16:57 UTC (rev 1150) +++ status/report.pl 2008-01-31 01:53:58 UTC (rev 1151) @@ -6,17 +6,25 @@ use Data::Dumper; use Template; -my (%results, %test_names); +my (%results_by_date, %results_by_test); foreach (glob "reports/*") { my ($report_name) = $_ =~ m{reports/test-results-(.*)\.txt}; - $results{$report_name} = load_report($_); + $results_by_date{$report_name} = load_report($_); } +# Turn sorted-by-date structure inside out. +foreach my $date (keys %results_by_date) { + my $date_result = $results_by_date{$date}; + foreach my $test_name (keys %$date_result) { + $results_by_test{$test_name}{$date} = $date_result->{$test_name}; + } +} + my %report_data = ( - 'results' => \%results, - 'test_names' => [ sort keys %test_names ], + 'results' => \%results_by_test, + 'test_dates' => [ sort keys %results_by_date ], ); my $tt = Template->new({ @@ -49,7 +57,6 @@ if (m{^t/(.*?)\.}) { $current_test = $1; - $test_names{$current_test} = 1; } elsif (/^ok$/) { $tests{$current_test} = 100; } elsif (/Failed .*? tests, (.*?)% okay/) { Modified: status/templates/tests.tt =================================================================== --- status/templates/tests.tt 2008-01-30 18:16:57 UTC (rev 1150) +++ status/templates/tests.tt 2008-01-31 01:53:58 UTC (rev 1151) @@ -21,16 +21,16 @@ <table border="1"> <tr> <td></td> -[% FOREACH test_name IN data.test_names %] - <th>[% test_name.replace('_', ' ') %]</th> +[% FOREACH test_date IN data.test_dates %] + <th>[% test_date %]</th> [%- END %] </tr> -[% FOREACH test_date IN data.results.keys %] -[% day_results = data.results.$test_date %] +[% FOREACH test_name IN data.results.keys.sort %] +[% test_results = data.results.$test_name %] <tr> - <td>[% test_date %]</td> - [% FOREACH datum IN day_results.keys.sort %] - <td>[% day_results.$datum %]%</td> + <td>[% test_name.replace('_', ' ') %]</td> + [% FOREACH datum IN test_results.keys.sort %] + <td>[% test_results.$datum %]%</td> [% END %] </tr> [%- END %]

1 0

r1150 - in status: . templates
by svnadmin＠urchin.earth.li 30 Jan '08

30 Jan '08

Author: earle Date: 2008-01-30 18:16:57 +0000 (Wed, 30 Jan 2008) New Revision: 1150 Modified: status/report.pl status/templates/tests.tt Log: Tabular output. Modified: status/report.pl =================================================================== --- status/report.pl 2008-01-30 17:06:49 UTC (rev 1149) +++ status/report.pl 2008-01-30 18:16:57 UTC (rev 1150) @@ -6,33 +6,56 @@ use Data::Dumper; use Template; -my $file = $ARGV[0]; +my (%results, %test_names); -die 'No input file specified' unless $file; -die "That file doesn't exist" unless -e $file; -die "That isn't a plain file" unless -f _; -die "That file isn't readable" unless -r _; +foreach (glob "reports/*") { + my ($report_name) = $_ =~ m{reports/test-results-(.*)\.txt}; + + $results{$report_name} = load_report($_); +} -open (my $RESULTS, '<', $file) or die "Can't open $file: $!"; -my @lines = <$RESULTS>; -close $RESULTS; +my %report_data = ( + 'results' => \%results, + 'test_names' => [ sort keys %test_names ], +); -my (%tests, $current_test); - -foreach (@lines) { - chomp; - - if (m{^t/(.*?)\.}) { - $current_test = $1; - } elsif (/^ok$/) { - $tests{$current_test} = 100; - } elsif (/Failed .*? tests, (.*?)% okay/) { - $tests{$current_test} = $1; - } -} - my $tt = Template->new({ INCLUDE_PATH => 'templates', }); -$tt->process('tests.tt', { 'tests' => \%tests }) or die $tt->error; \ No newline at end of file +$tt->process('tests.tt', { 'data' => \%report_data }) or die $tt->error; + +# ---------------------------------------------------------------------------- + +sub load_report { + my $file = shift; + + die 'No input file specified' unless $file; + die "That file doesn't exist" unless -e $file; + die "That isn't a plain file" unless -f _; + die "That file isn't readable" unless -r _; + + open (my $RESULTS, '<', $file) or die "Can't open $file: $!"; + my @lines = <$RESULTS>; + close $RESULTS; + + my (%tests, $current_test); + + # XXX: Test files get added, removed, renamed, etc. A mechanism is necessary + # here to cope with this. + + foreach (@lines) { + chomp; + + if (m{^t/(.*?)\.}) { + $current_test = $1; + $test_names{$current_test} = 1; + } elsif (/^ok$/) { + $tests{$current_test} = 100; + } elsif (/Failed .*? tests, (.*?)% okay/) { + $tests{$current_test} = $1; + } + } + + \%tests; +} Modified: status/templates/tests.tt =================================================================== --- status/templates/tests.tt 2008-01-30 17:06:49 UTC (rev 1149) +++ status/templates/tests.tt 2008-01-30 18:16:57 UTC (rev 1150) @@ -13,16 +13,28 @@ .pass { background: #3c3; } +</style> </head> <body> <h1>Test Results</h1> -<table> -[% FOREACH test IN tests.keys.sort %] + +<table border="1"> <tr> - <td>[% test %]</td> - <td>[% tests.$test %]%</td> + <td></td> +[% FOREACH test_name IN data.test_names %] + <th>[% test_name.replace('_', ' ') %]</th> +[%- END %] </tr> -[% END %] +[% FOREACH test_date IN data.results.keys %] +[% day_results = data.results.$test_date %] + <tr> + <td>[% test_date %]</td> + [% FOREACH datum IN day_results.keys.sort %] + <td>[% day_results.$datum %]%</td> + [% END %] + </tr> +[%- END %] </table> + </body> </html> \ No newline at end of file

1 0

r1149 - status
by svnadmin＠urchin.earth.li 30 Jan '08

30 Jan '08

Author: earle Date: 2008-01-30 17:06:49 +0000 (Wed, 30 Jan 2008) New Revision: 1149 Added: status/report.pl Removed: status/parse.pl Log: Rename script. Deleted: status/parse.pl =================================================================== --- status/parse.pl 2008-01-30 16:20:52 UTC (rev 1148) +++ status/parse.pl 2008-01-30 17:06:49 UTC (rev 1149) @@ -1,38 +0,0 @@ -#!/usr/bin/perl - -use warnings; -use strict; - -use Data::Dumper; -use Template; - -my $file = $ARGV[0]; - -die 'No input file specified' unless $file; -die "That file doesn't exist" unless -e $file; -die "That isn't a plain file" unless -f _; -die "That file isn't readable" unless -r _; - -open (my $RESULTS, '<', $file) or die "Can't open $file: $!"; -my @lines = <$RESULTS>; -close $RESULTS; - -my (%tests, $current_test); - -foreach (@lines) { - chomp; - - if (m{^t/(.*?)\.}) { - $current_test = $1; - } elsif (/^ok$/) { - $tests{$current_test} = 100; - } elsif (/Failed .*? tests, (.*?)% okay/) { - $tests{$current_test} = $1; - } -} - -my $tt = Template->new({ - INCLUDE_PATH => 'templates', -}); - -$tt->process('tests.tt', { 'tests' => \%tests }) or die $tt->error; \ No newline at end of file Copied: status/report.pl (from rev 1147, status/parse.pl) =================================================================== --- status/report.pl (rev 0) +++ status/report.pl 2008-01-30 17:06:49 UTC (rev 1149) @@ -0,0 +1,38 @@ +#!/usr/bin/perl + +use warnings; +use strict; + +use Data::Dumper; +use Template; + +my $file = $ARGV[0]; + +die 'No input file specified' unless $file; +die "That file doesn't exist" unless -e $file; +die "That isn't a plain file" unless -f _; +die "That file isn't readable" unless -r _; + +open (my $RESULTS, '<', $file) or die "Can't open $file: $!"; +my @lines = <$RESULTS>; +close $RESULTS; + +my (%tests, $current_test); + +foreach (@lines) { + chomp; + + if (m{^t/(.*?)\.}) { + $current_test = $1; + } elsif (/^ok$/) { + $tests{$current_test} = 100; + } elsif (/Failed .*? tests, (.*?)% okay/) { + $tests{$current_test} = $1; + } +} + +my $tt = Template->new({ + INCLUDE_PATH => 'templates', +}); + +$tt->process('tests.tt', { 'tests' => \%tests }) or die $tt->error; \ No newline at end of file

1 0

r1148 - in status: . templates
by svnadmin＠urchin.earth.li 30 Jan '08

30 Jan '08

Author: earle Date: 2008-01-30 16:20:52 +0000 (Wed, 30 Jan 2008) New Revision: 1148 Added: status/reports/ Modified: status/runbuild.pl status/templates/tests.tt Log: Store test results in a directory, files named by day. Modified: status/runbuild.pl =================================================================== --- status/runbuild.pl 2008-01-30 14:00:29 UTC (rev 1147) +++ status/runbuild.pl 2008-01-30 16:20:52 UTC (rev 1148) @@ -4,6 +4,7 @@ use strict; use Config::Tiny; +use Cwd; use SVN::Agent; my $config_file = Config::Tiny->new->read('status.conf'); @@ -22,6 +23,8 @@ my $sa = SVN::Agent->load({ path => $config{'trunk'} }); $sa->update; +my $program_dir = cwd; + chdir $config{'trunk'}; system("perl Build.PL --force \ install_path=lib=$config{'lib'} \ @@ -30,5 +33,9 @@ install_path=libdoc=$config{'libdoc'} \ install_path=bindoc=$config{'bindoc'}"); +my (undef, undef, undef, $day, $month, $year) = localtime(time); +$year += 1900; +$month = sprintf("%02d", ++$month); + system("perl Build"); -system("perl Build test verbose=1 2>&1 > output.txt"); \ No newline at end of file +system("perl Build test verbose=1 2>&1 > $program_dir/reports/test-results-$year-$month-$day.txt"); \ No newline at end of file Modified: status/templates/tests.tt =================================================================== --- status/templates/tests.tt 2008-01-30 14:00:29 UTC (rev 1147) +++ status/templates/tests.tt 2008-01-30 16:20:52 UTC (rev 1148) @@ -1,6 +1,18 @@ <html> <head> <title>Test Results</title> +<style type="text/css"> +.fail_serious { + background: #c00; +} + +.fail_minor { + background: #f33; +} + +.pass { + background: #3c3; +} </head> <body> <h1>Test Results</h1>

1 0

r1147 - in status: . templates
by svnadmin＠urchin.earth.li 30 Jan '08

30 Jan '08

Author: earle Date: 2008-01-30 14:00:29 +0000 (Wed, 30 Jan 2008) New Revision: 1147 Added: status/parse.pl status/templates/ status/templates/tests.tt Modified: status/runbuild.pl Log: First stab at test output parsing. Added: status/parse.pl =================================================================== --- status/parse.pl (rev 0) +++ status/parse.pl 2008-01-30 14:00:29 UTC (rev 1147) @@ -0,0 +1,38 @@ +#!/usr/bin/perl + +use warnings; +use strict; + +use Data::Dumper; +use Template; + +my $file = $ARGV[0]; + +die 'No input file specified' unless $file; +die "That file doesn't exist" unless -e $file; +die "That isn't a plain file" unless -f _; +die "That file isn't readable" unless -r _; + +open (my $RESULTS, '<', $file) or die "Can't open $file: $!"; +my @lines = <$RESULTS>; +close $RESULTS; + +my (%tests, $current_test); + +foreach (@lines) { + chomp; + + if (m{^t/(.*?)\.}) { + $current_test = $1; + } elsif (/^ok$/) { + $tests{$current_test} = 100; + } elsif (/Failed .*? tests, (.*?)% okay/) { + $tests{$current_test} = $1; + } +} + +my $tt = Template->new({ + INCLUDE_PATH => 'templates', +}); + +$tt->process('tests.tt', { 'tests' => \%tests }) or die $tt->error; \ No newline at end of file Modified: status/runbuild.pl =================================================================== --- status/runbuild.pl 2008-01-29 18:36:29 UTC (rev 1146) +++ status/runbuild.pl 2008-01-30 14:00:29 UTC (rev 1147) @@ -28,4 +28,7 @@ install_path=script=$config{'script'} \ install_path=arch=$config{'arch'} \ install_path=libdoc=$config{'libdoc'} \ - install_path=bindoc=$config{'bindoc'}"); \ No newline at end of file + install_path=bindoc=$config{'bindoc'}"); + +system("perl Build"); +system("perl Build test verbose=1 2>&1 > output.txt"); \ No newline at end of file Added: status/templates/tests.tt =================================================================== --- status/templates/tests.tt (rev 0) +++ status/templates/tests.tt 2008-01-30 14:00:29 UTC (rev 1147) @@ -0,0 +1,16 @@ +<html> +<head> + <title>Test Results</title> +</head> +<body> +<h1>Test Results</h1> +<table> +[% FOREACH test IN tests.keys.sort %] + <tr> + <td>[% test %]</td> + <td>[% tests.$test %]%</td> + </tr> +[% END %] +</table> +</body> +</html> \ No newline at end of file

1 0

r1146 - / status
by svnadmin＠urchin.earth.li 29 Jan '08

29 Jan '08

Author: earle Date: 2008-01-29 18:36:29 +0000 (Tue, 29 Jan 2008) New Revision: 1146 Added: status/ status/runbuild.pl Log: Beginnings of new nightly build status/test coverage monitor. Property changes on: status ___________________________________________________________________ Name: svn:ignore + status.conf Added: status/runbuild.pl =================================================================== --- status/runbuild.pl (rev 0) +++ status/runbuild.pl 2008-01-29 18:36:29 UTC (rev 1146) @@ -0,0 +1,31 @@ +#!/usr/bin/perl + +use warnings; +use strict; + +use Config::Tiny; +use SVN::Agent; + +my $config_file = Config::Tiny->new->read('status.conf'); + +my %config; + +foreach (qw(domain trunk lib script arch libdoc bindoc)) { + $config{$_} = $config_file->{_}->{$_} || die "No '$_' specified in status.conf"; +} + +die "trunk dir doesn't exist" unless -e $config{'trunk'}; +die "trunk dir isn't a directory" unless -d _; +die "trunk dir isn't readable" unless -r _; +die "trunk dir isn't writable" unless -w _; + +my $sa = SVN::Agent->load({ path => $config{'trunk'} }); +$sa->update; + +chdir $config{'trunk'}; +system("perl Build.PL --force \ + install_path=lib=$config{'lib'} \ + install_path=script=$config{'script'} \ + install_path=arch=$config{'arch'} \ + install_path=libdoc=$config{'libdoc'} \ + install_path=bindoc=$config{'bindoc'}"); \ No newline at end of file Property changes on: status/runbuild.pl ___________________________________________________________________ Name: svn:executable + *

1 0

r1145 - trunk
by svnadmin＠urchin.earth.li 28 Jan '08

28 Jan '08

Author: earle Date: 2008-01-28 15:08:26 +0000 (Mon, 28 Jan 2008) New Revision: 1145 Modified: trunk/Build.PL trunk/INSTALL Log: Add '--force' option to Build.PL to skip all questioning. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-01-24 10:03:23 UTC (rev 1144) +++ trunk/Build.PL 2008-01-28 15:08:26 UTC (rev 1145) @@ -1,6 +1,7 @@ use strict; use lib "lib"; use Data::Dumper; +use Getopt::Long; eval { require Config::Tiny; @@ -11,8 +12,13 @@ die "Problem loading OpenGuides module or a missing module\n\n$@.\n" if $@; -print <<EOF; +my $force; +GetOptions('force' => \$force); + +unless ($force) { + print <<EOF; + Beginning install process... if you already have an OpenGuides configuration file and you don't want to have to type in all your config parameters over again, abort this process now, copy that file to this @@ -22,6 +28,7 @@ my $continue = Module::Build->y_n("Continue with install?", "y"); exit 0 unless $continue; +} my $existing_config_file = 'wiki.conf'; my $existing_config; @@ -45,7 +52,7 @@ content_above_navbar_in_html show_gmap_in_node_display send_moderation_notifications); -my $skip_config = Module::Build->y_n("Skip OpenGuides configuration?", "n"); +my $skip_config = $force ? 'y' : Module::Build->y_n("Skip OpenGuides configuration?", "n"); if ( $skip_config ) { print <<EOF; =========================================================================== Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2008-01-24 10:03:23 UTC (rev 1144) +++ trunk/INSTALL 2008-01-28 15:08:26 UTC (rev 1145) @@ -32,7 +32,10 @@ "Skip OpenGuides configuration?" Answer "n" to this question unless you really know what you're doing. -It's mainly there for developers. +It's mainly there for developers. (If you already have a configuration +file, and wish to use it without the build script asking you this +question, run Build.PL with the option --force. This will also skip +the "Continue with install?" question.) "What type of database do you want the site to run on?"

1 0

r1144 - utils
by svnadmin＠urchin.earth.li 24 Jan '08

24 Jan '08

Author: dom Date: 2008-01-24 10:03:23 +0000 (Thu, 24 Jan 2008) New Revision: 1144 Modified: utils/get-guide-versions Log: add more guides Modified: utils/get-guide-versions =================================================================== --- utils/get-guide-versions 2008-01-24 10:01:26 UTC (rev 1143) +++ utils/get-guide-versions 2008-01-24 10:03:23 UTC (rev 1144) @@ -10,6 +10,7 @@ my $out = "/srv/www/dev.openguides.org/html/static/versions.html"; my %guides = ( Birmingham => 'http://birmingham.openguides.org/', + Cambridge => 'http://cambridge.openguides.org/', Cotswolds => 'http://cotswolds.openguides.org/', Glasgow => 'http://glasgow.openguides.org/', Lancaster => 'http://lancaster.openguides.org/', @@ -21,13 +22,15 @@ Nottingham => 'http://nottingham.openguides.org/', Oxford => 'http://oxford.openguides.org/', 'Vegan Oxford' => 'http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi', + 'Reading' => 'http://reading.openguides.org/', Southampton => 'http://southampton.openguides.org/', Vienna => 'http://vienna.openguides.org/', + Brussels => 'http://www.justbiit.com/cgi-bin/openguides/', 'Montreal, QC' => 'http://montreal.openguides.org/', 'Victoria, BC' => 'http://victoria.openguides.org/', 'Boston, MA' => 'http://boston.openguides.org/', 'Saint Paul, MN' => 'http://saintpaul.openguides.org/', - 'New York' => 'http://newyork.openguides.org/', + 'New York' => 'http://newyork.openguides.org/myguide/wiki.cgi', 'The Tourist Engineer' => 'http://engineer.openguides.org/', );

1 0

r1143 - website/templates
by svnadmin＠urchin.earth.li 24 Jan '08

24 Jan '08

Author: dom Date: 2008-01-24 10:01:26 +0000 (Thu, 24 Jan 2008) New Revision: 1143 Modified: website/templates/cities_list Log: add North Devon guide Modified: website/templates/cities_list =================================================================== --- website/templates/cities_list 2008-01-22 16:53:31 UTC (rev 1142) +++ website/templates/cities_list 2008-01-24 10:01:26 UTC (rev 1143) @@ -12,29 +12,30 @@ </tr> <tr> <td><a href="http://cambridge.openguides.org/">Cambridge</a></td> - <td><a href="http://norwich.openguides.org/">Norwich</a></td> + <td><a href="http://north-devon.openguides.org/">North Devon</a></td> <tr> <td><a href="http://cotswolds.openguides.org/">Cotswolds</a></td> - <td><a href="http://nottingham.openguides.org/">Nottingham</a></td> + <td><a href="http://norwich.openguides.org/">Norwich</a></td> </tr> <tr> <td><a href="http://glasgow.openguides.org/">Glasgow</a></td> - <td><a href="http://oxford.openguides.org/">Oxford</a></td> + <td><a href="http://nottingham.openguides.org/">Nottingham</a></td> </tr> <tr> <td><a href="http://lancaster.openguides.org/">Lancaster</a></td> - <td><a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi">Vegan Oxford</a></td> + <td><a href="http://oxford.openguides.org/">Oxford</a></td> </tr> <tr> <td><a href="http://london.openguides.org/">London</a></td> - <td><a href="http://reading.openguides.org/">Reading</a></td> + <td><a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi">Vegan Oxford</a></td> </tr> <tr> <td><a href="http://london.randomness.org.uk/">Randomness (London)</a></td> - <td><a href="http://southampton.openguides.org/">Southampton</a></td> + <td><a href="http://reading.openguides.org/">Reading</a></td> </tr> <tr> <td><a href="http://manchester.openguides.org/">Manchester</a></td> + <td><a href="http://southampton.openguides.org/">Southampton</a></td> <td></td> </tr> <tr>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits January 2008