r72441 - in /trunk/libtest-checkmanifest-perl: Changes MANIFEST META.yml Makefile.PL README debian/changelog lib/Test/CheckManifest.pm t/file with whitespaces.txt

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Sun Apr 10 08:50:53 UTC 2011


Author: periapt-guest
Date: Sun Apr 10 08:50:36 2011
New Revision: 72441

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72441
Log:
New upstream release

Added:
    trunk/libtest-checkmanifest-perl/t/file with whitespaces.txt
      - copied unchanged from r72440, branches/upstream/libtest-checkmanifest-perl/current/t/file with whitespaces.txt
Modified:
    trunk/libtest-checkmanifest-perl/Changes
    trunk/libtest-checkmanifest-perl/MANIFEST
    trunk/libtest-checkmanifest-perl/META.yml
    trunk/libtest-checkmanifest-perl/Makefile.PL
    trunk/libtest-checkmanifest-perl/README
    trunk/libtest-checkmanifest-perl/debian/changelog
    trunk/libtest-checkmanifest-perl/lib/Test/CheckManifest.pm

Modified: trunk/libtest-checkmanifest-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/Changes?rev=72441&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/Changes (original)
+++ trunk/libtest-checkmanifest-perl/Changes Sun Apr 10 08:50:36 2011
@@ -1,4 +1,8 @@
 Revision history for Perl extension Test::CheckManifest.
+
+1.24  Sat Apr 09 2011
+      + MANIFEST spec allows whitespaces in filenames (when enclosed in single quotes)
+      this was not parsed correctly (see [#67334]). Fixed now - Thanks to JWEIGEL
 
 1.23  Mon Mar 28 2011
       + CPAN toolchain now creates MYMETA.yml and META.json. These files are in
@@ -19,22 +23,22 @@
       + added support for MANIFEST.SKIP
       + small code improvements
 
-1.1   Sun Nov 22 13:18:12 2009
+1.1   Sun Nov 22 2009
       - CHECK as a label is not allowed in Perl > 5.11.x, so replace it
       + switched license to Artistic 2.0
       + bugfix in 01_selftest.t
 
-1.01  Sat Dec 29 00:28:13 2007
+1.01  Sat Dec 29 2007
       - fixes in test scripts
         - require 5.006001
         - allow more characters in path
       + added license to Makefile.PL
       + changed META.yml
 
-1.0   Wed Dec 27 12:15:39 2006
+1.0   Wed Dec 27 2006
       - bugfix: ok_manifest excludes files created by Module::Build
 
-0.9   Mon Nov 27 09:35:26 2006
+0.9   Mon Nov 27 2006
       - bugfix: ok_manifest files without blib (http://rt.cpan.org/Public/Bug/Display.html?id=23580)
       - bugfix: Test-CheckManifest.t  -- added ':' in character group (untaint $home)
       - bugfix: 99_pod_coverage.t -- removed all_modules and now T::P::C 1.08 or higher is required
@@ -43,33 +47,33 @@
                 (http://rt.cpan.org/Public/Bug/Display.html?id=23529)
       + added:  00_load.t
 
-0.8   Fri Nov 24 09:17:10 2006
+0.8   Fri Nov 24 2006
       + added: T::CM now tests also on files that are not part of the distro but named in the MANIFEST
 
-0.7   Thu Nov 23 12:58:54 2006
+0.7   Thu Nov 23 2006
       + added: "filter" to exclude files that match on specific regexp from test
                (http://rt.cpan.org/Public/Bug/Display.html?id=23529)
       + added: "bool" to combine "filter" and "exclude"
       + added: boilerplate.t
 
-0.6   Tue Nov 21 22:22:22 2006
+0.6   Tue Nov 21 2006
         Test scripts improved
       
-0.5   Sat Nov 18 18:00:00
+0.5   Sat Nov 18 2006
       - bugfix: T::CM now works under taint mode (http://rt.cpan.org/Public/Bug/Display.html?id=22927)
       + added : ok_manifest accepts hashref where specific dirs can be excluded
                 from test
 
-0.4   Thu Oct 19 10:47:27
+0.4   Thu Oct 19 2006
       - bugfix: handles different newlines (mac, win, *nix)
 
-0.3   Wed Oct 18 21:36:32
+0.3   Wed Oct 18 2006
       - bugfix: CheckManifest works under Solaris now
 
 0.2  
       - bugfix: some files excluded from test
 
-0.1   Fri Sep 29 09:18:09 2006
+0.1   Fri Sep 29 2006
       - original version; created by h2xs 1.23 with options
         -XA -n Test::CheckManifest
       + added tests for Pod coverage, Pod, Manifest

Modified: trunk/libtest-checkmanifest-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/MANIFEST?rev=72441&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/MANIFEST (original)
+++ trunk/libtest-checkmanifest-perl/MANIFEST Sun Apr 10 08:50:36 2011
@@ -7,6 +7,7 @@
 t/00_load.t
 t/01_selftest.t
 t/98_boilerplate.t
+'t/file with whitespaces.txt'
 
 xt/release/pod-syntax.t
 xt/release/pod-coverage.t

Modified: trunk/libtest-checkmanifest-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/META.yml?rev=72441&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/META.yml (original)
+++ trunk/libtest-checkmanifest-perl/META.yml Sun Apr 10 08:50:36 2011
@@ -19,4 +19,4 @@
   File::Find: 0
   File::Spec: 0
   Test::Builder: 0
-version: 1.23
+version: 1.24

Modified: trunk/libtest-checkmanifest-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/Makefile.PL?rev=72441&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/Makefile.PL (original)
+++ trunk/libtest-checkmanifest-perl/Makefile.PL Sun Apr 10 08:50:36 2011
@@ -27,7 +27,7 @@
     'File::Spec' => '0',
     'Test::Builder' => '0'
   },
-  'VERSION' => '1.23',
+  'VERSION' => '1.24',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: trunk/libtest-checkmanifest-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/README?rev=72441&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/README (original)
+++ trunk/libtest-checkmanifest-perl/README Sun Apr 10 08:50:36 2011
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution Test-CheckManifest,
-version 1.23:
+version 1.24:
 
   Check if your Manifest matches your distro
 

Modified: trunk/libtest-checkmanifest-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/debian/changelog?rev=72441&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/debian/changelog (original)
+++ trunk/libtest-checkmanifest-perl/debian/changelog Sun Apr 10 08:50:36 2011
@@ -1,3 +1,9 @@
+libtest-checkmanifest-perl (1.24-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk>  Sun, 10 Apr 2011 09:32:32 +0100
+
 libtest-checkmanifest-perl (1.23-1) unstable; urgency=low
 
   [ Ansgar Burchardt ]

Modified: trunk/libtest-checkmanifest-perl/lib/Test/CheckManifest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/lib/Test/CheckManifest.pm?rev=72441&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/lib/Test/CheckManifest.pm (original)
+++ trunk/libtest-checkmanifest-perl/lib/Test/CheckManifest.pm Sun Apr 10 08:50:36 2011
@@ -10,7 +10,7 @@
 use Test::Builder;
 use File::Find;
 
-our $VERSION = '1.23';
+our $VERSION = '1.24';
 
 my $test      = Test::Builder->new();
 my $test_bool = 1;
@@ -84,13 +84,7 @@
         my $files_in_skip = _read_skip( $skip, \$msg, \$bool );
         last unless $files_in_skip;
             
-        my @files;
-        while( my $fh_line = <$fh> ){
-            if( $fh_line =~ /^\s*([^\s#]\S*)/ and $fh_line !~ /^META\.yml/ ){
-                push @files, $1;
-            }
-        }
-        #my @files = grep{!/^\s*$/ and !/^META\.yml/}<$fh>;
+        my @files = _read_file( $fh );
         close $fh;
     
         chomp @files;
@@ -158,6 +152,32 @@
     $test->diag($plus) if scalar @files_plus    >= 1 and $test_bool == 1;
 }
 
+sub _read_file {
+    my ($fh) = @_;
+    
+    my @files;
+    while( my $fh_line = <$fh> ){
+        chomp $fh_line;
+        
+        next if $fh_line =~ m{ \A \s* \# }x;
+        
+        my ($file);
+        
+        if ( ($file) = $fh_line =~ /^'(\\[\\']|.+)+'\s*(.*)/) {
+            $file =~ s/\\([\\'])/$1/g;
+        }
+        else {
+            ($file) = $fh_line =~ /^(\S+)\s*(.*)/;
+        }
+
+        next unless $file;
+        
+        push @files, $file;
+    }
+    
+    return @files;
+}
+
 sub _not_ok_manifest{
     $test_bool = 0;
     ok_manifest(@_);
@@ -205,24 +225,7 @@
         return;
     }
     else {
-        while ( my $line = <$skip_fh> ) {
-            chomp $line;
-            
-            next if $line =~ m{ \A \s* \# }x;
-            
-            my ($file,$comment);
-            
-            if (($file, $comment) = $line =~ /^'(\\[\\']|.+)+'\s*(.*)/) {
-                $file =~ s/\\([\\'])/$1/g;
-            }
-            else {
-                ($file, $comment) = $line =~ /^(\S+)\s*(.*)/;
-            }
-
-            next unless $file;
-            
-            push @files, $file;
-        }
+        @files = _read_file( $skip_fh );
     }
 
     return \@files;
@@ -239,7 +242,7 @@
 
 =head1 VERSION
 
-version 1.23
+version 1.24
 
 =head1 SYNOPSIS
 




More information about the Pkg-perl-cvs-commits mailing list