Item12492: expose test output while running tests Item11851: minor bu…

…gfixes git-svn-id: http://svn.foswiki.org/trunk@16710 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 8, 2013 · 7d42011 · 7d42011
1 parent da8a05d
commit 7d42011
Show file tree

Hide file tree

Showing 19 changed files with 85 additions and 27 deletions.
diff --git a/BuildContrib/create_new_extension.pl b/BuildContrib/create_new_extension.pl
@@ -55,7 +55,9 @@
 }
 
 unless ( $templateModule && -d $templateModule ) {
-    usage( error => "Template directory ($templateModule) does not exist" );
+    usage( error =>
+"Template directory (./$templateModule) does not exist; it must be present in the current directory"
+    );
 }
 
 print "Creating $def{MODULE} from templates in $templateModule\n";
@@ -446,7 +448,9 @@ sub usage {
 Usage: $0 <name of new extension> [ existing extension ]
 
 This script will generate a new extension in a directory under the
-current directory, suitable for building using the BuildContrib.
+current directory, suitable for building using the BuildContrib. It
+is normally run at the root of a Foswiki checkout, where existing
+extensions are found in subdirectories.
 
 You pass the name of your new extension - which must end in Skin,
 JQueryPlugin, Plugin, or Contrib - to the script. For example,

diff --git a/BuildContrib/data/System/BuildContrib.txt b/BuildContrib/data/System/BuildContrib.txt
@@ -582,6 +582,7 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 | Change&nbsp;History: | |
+|  1.7.1 (8 May 2013) | Foswikitask:Item12492: expose test output while running tests Foswikitask:Item11851: minor bugfixes |
 |  1.7.0 (11 May 2012) | Foswikitask:Item11716: correct paths in generated MANIFEST; Foswikitask:Item11851: internal maintenance |
 |  1.6.3 (18 Aug 2011) | Foswikitask:Item11014: Improve error message if installer not run from Foswiki root. |
 |  1.6.2 (13 Jul 2011) | Foswikitask:Item10963: Perl cleanup of qw() quoting |

diff --git a/BuildContrib/lib/Foswiki/Contrib/Build.pm b/BuildContrib/lib/Foswiki/Contrib/Build.pm
@@ -395,8 +395,8 @@ sub new {
         }
         print STDERR <<ERROR;
 
-SVN keword based version string detected.  \$Date or \$Rev detected.
-SVN revision strings are no longer supported.
+\$VERSION string containing \$Date or \$Rev detected.
+Keyword-based \$VERSION strings are no longer supported.
 Please update to a real Perl version string.
 
 ERROR

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm
@@ -1,8 +1,8 @@
 package Foswiki::Contrib::BuildContrib;
 use strict;
 
-use version 0.77; our $VERSION = version->declare("v2.0.0");
-our $RELEASE = '2.0.0';
+use version 0.77; our $VERSION = version->declare("v1.7.1");
+our $RELEASE = '8 May 2013';
 
 our $SHORTDESCRIPTION =
 'Automates build and packaging process, including installer generation, for extension modules.';

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/POD.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/POD.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 # Build POD documentation. This target defines =%$POD%= - it
 # does not generate any output. The target will be invoked
 # automatically if =%$POD%= is used in a .txt file. POD documentation

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/compress.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/compress.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 my %minifiers;    # functions used to minify
 
 my @compressFilters = (
@@ -281,7 +283,8 @@ sub _yuiMinify {
     my $cmd;
 
     if ( $cmdtype == 2 ) {
-        $cmd = "java -jar $basedir/tools/yuicompressor.jar --type $type $from";
+        $cmd =
+"java -jar $Foswiki::Contrib::Build::basedir/tools/yuicompressor.jar --type $type $from";
     }
     else {
         $cmd = "yui-compressor --type $type $from";
@@ -311,7 +314,7 @@ sub _haveYUI {
     if ( not $? ) {
         $result = 1;
     }
-    elsif ( -e "$basedir/tools/yuicompressor.jar" ) {
+    elsif ( -e "$Foswiki::Contrib::Build::basedir/tools/yuicompressor.jar" ) {
 
         # Do we have java?
         $info = `java -version 2>&1` || '';

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/dependencies.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/dependencies.pm
@@ -15,6 +15,7 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
 use B::PerlReq;
 
 =begin TML

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/handsoff_install.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/handsoff_install.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 =begin TML
 
 ---++++ target_handsoff_install

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/history.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/history.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 =begin TML
 
 #HistoryTarget

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/install.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/install.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 =begin TML
 
 ---++++ target_install

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/installer.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/installer.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 =begin TML
 
 ---++++ target_installer
@@ -76,7 +78,7 @@ sub target_installer {
     # Find the template on @INC
     my $template;
     foreach my $d (@INC) {
-        my $dir = `dirname $d`;
+        my $dir = `dirname "$d"`;
         chop($dir);
         my $file =
           $dir . '/lib/Foswiki/Contrib/BuildContrib/TEMPLATE_installer.pl';

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/manifest.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/manifest.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 my $collector;
 
 =begin TML
@@ -28,7 +30,8 @@ sub target_manifest {
     my $this = shift;
 
     $collector = $this;
-    my $manifest = findRelative( $buildpldir, 'MANIFEST' );
+    my $manifest =
+      findRelative( $Foswiki::Contrib::Build::buildpldir, 'MANIFEST' );
     if ( $manifest && -e $manifest ) {
         open( F, '<', $manifest )
           || die 'Could not open existing ' . $manifest;
@@ -38,7 +41,7 @@ sub target_manifest {
         close(F);
     }
     else {
-        $manifest = $buildpldir . '/MANIFEST';
+        $manifest = $Foswiki::Contrib::Build::buildpldir . '/MANIFEST';
     }
     require File::Find;
     $collector->{manilist} = ();
@@ -70,10 +73,10 @@ sub _manicollect {
         && !/\.bak$/
         && !/^$collector->{project}_installer(\.pl)?$/
 
-        # Item10188: Ignore build output, but still want data/System/Project.txt
-        # $basedir in \Q...\E makes it a literal string (ignore regex chars)
+# Item10188: Ignore build output, but still want data/System/Project.txt
+# $Foswiki::Contrib::Build::basedir in \Q...\E makes it a literal string (ignore regex chars)
         && not $File::Find::name =~
-        /\Q$basedir\E\W$collector->{project}\.(md5|zip|tgz|txt|sha1)$/
+/\Q$Foswiki::Contrib::Build::basedir\E\W$collector->{project}\.(md5|zip|tgz|txt|sha1)$/
       )
     {
         my $n     = $File::Find::name;

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/release.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/release.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 =begin TML
 
 ---++++ target_release

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/stage.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/stage.pm
@@ -15,10 +15,9 @@
 #
 package Foswiki::Contrib::Build;
 
-my @stageFilters = (
-    { RE => qr/\.txt$/, filter => 'filter_txt' },
-    { RE => qr/\.pm$/,  filter => 'filter_pm' },
-);
+use strict;
+
+our @stageFilters;
 
 =begin TML
 
@@ -31,6 +30,9 @@ sub target_stage {
     my $this    = shift;
     my $project = $this->{project};
 
+    push( @stageFilters, { RE => qr/\.txt$/, filter => 'filter_txt' } );
+    push( @stageFilters, { RE => qr/\.pm$/,  filter => 'filter_pm' } );
+
     $this->{tmpDir} ||= File::Temp::tempdir( CLEANUP => 1 );
     File::Path::mkpath( $this->{tmpDir} );
 
@@ -39,6 +41,8 @@ sub target_stage {
     foreach my $file ( @{ $this->{files} } ) {
         foreach my $filter (@stageFilters) {
             if ( $file->{name} =~ /$filter->{RE}/ ) {
+
+                #print "FILTER $file->{name} $filter->{RE} $filter->{filter}\n";
                 my $fn = $filter->{filter};
                 $this->$fn(
                     $this->{basedir} . '/' . $file->{name},
@@ -59,14 +63,15 @@ sub target_stage {
         my $libs = join( ':', @INC );
         foreach my $module ( @{ $this->{other_modules} } ) {
 
-            die "$basedir / $module does not exist, cannot build $module\n"
-              unless ( -e "$basedir/$module" );
+            die
+"$Foswiki::Contrib::Build::basedir / $module does not exist, cannot build $module\n"
+              unless ( -e "$Foswiki::Contrib::Build::basedir/$module" );
 
             warn "Installing $module in $this->{tmpDir}\n";
 
             #SMELL: uses legacy TWIKI_ exports
             my $cmd =
-"export FOSWIKI_HOME=$this->{tmpDir}; export FOSWIKI_LIBS=$libs; export TWIKI_HOME=$this->{tmpDir}; export TWIKI_LIBS=$libs; cd $basedir/$module; perl build.pl handsoff_install";
+"export FOSWIKI_HOME=$this->{tmpDir}; export FOSWIKI_LIBS=$libs; export TWIKI_HOME=$this->{tmpDir}; export TWIKI_LIBS=$libs; cd $Foswiki::Contrib::Build::basedir/$module; perl build.pl handsoff_install";
 
             #warn "***** running $cmd \n";
             print `$cmd`;

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/test.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/test.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 =begin TML
 
 ---++++ target_test
@@ -56,7 +58,16 @@ MESSY
     print "Running tests in $tests\n";
     $this->pushd($testdir);
     $this->{-v} = 1;    # to get the command printed
-    $this->sys_action( 'perl', '-w', @inc, $testrunner, $tests );
+
+    # $this->sys_action( 'perl', '-w', @inc, $testrunner, $tests );
+    # sys_action hides the output, so we use system() instead.
+    # exec() never returns, but that's OK in this case.
+    my @cmd = ( 'perl', '-w', @inc, $testrunner, $tests );
+    if ( $this->{-v} || $this->{-n} ) {
+        my $cmd = join( ' ', map { /\s/ ? "\"$_\"" : $_ } @cmd );
+        print "Running: $cmd\n";
+    }
+    system(@cmd);
     $this->popd();
 }
 

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/tidy.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/tidy.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 my @tidyFilters = ( { RE => qr/\.pl$/ }, { RE => qr/\.pm$/ }, );
 my $collector;
 

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/tracked.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/tracked.pm
@@ -15,14 +15,20 @@
 #
 package Foswiki::Contrib::Build;
 
-sub _filter_tracked_pm {
+use strict;
+
+our $DEFAULTCUSTOMERDB = "$ENV{HOME}/customerDB";
+
+sub _tracked_filter_file {
     my ( $this, $from, $to ) = @_;
     $this->filter_file(
         $from, $to,
         sub {
             my ( $this, $text ) = @_;
             $text =~ s/%\$RELEASE%/$this->{RELEASE}/gm;
-            $text =~ s/%\$TRACKINGCODE%/$this->{TRACKINGCODE}/gm;
+            if ( $text =~ s/%\$TRACKINGCODE%/$this->{TRACKINGCODE}/gm ) {
+                print "TRACKINGCODE expanded in $to\n";
+            }
             return $text;
         }
     );
@@ -72,10 +78,16 @@ sub target_tracked {
         close(F);
     }
 
-    warn "$customer tracking code $customers{$customer}\n";
-
-    push( @stageFilters, { RE => qr/\.pm$/, filter => '_filter_tracked_pm' } );
+    print STDERR "$customer tracking code $customers{$customer}\n";
+    $this->{RELEASE} =~ s/%\$TRACKINGCODE%/$this->{TRACKINGCODE}/g;
 
+    # Assume that target_stage is going to be run, and push new filters
+    push( @Foswiki::Contrib::Build::stageFilters,
+        { RE => qr/\.pm$/, filter => '_tracked_filter_file' } );
+    push( @Foswiki::Contrib::Build::stageFilters,
+        { RE => qr/\.txt$/, filter => '_tracked_filter_file' } );
+    push( @Foswiki::Contrib::Build::stageFilters,
+        { RE => qr/\.(css|js)$/, filter => '_tracked_filter_file' } );
     $this->build('release');
 }
 

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/twiki.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/twiki.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 our @twikiFilters = (
     { RE => qr/\.pm$/,          filter => '_twikify_perl' },
     { RE => qr/\.pm$/,          filter => '_twikify_txt' },

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/uninstall.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/uninstall.pm
@@ -15,6 +15,8 @@
 #
 package Foswiki::Contrib::Build;
 
+use strict;
+
 =begin TML
 
 ---++++ target_uninstall