r2835 - in
/packages/libfile-find-rule-perl/branches/upstream/current:
Changes META.yml Makefile.PL README lib/File/Find/Rule.pm t/File-Find-Rule.t
ntyni-guest at users.alioth.debian.org
ntyni-guest at users.alioth.debian.org
Thu Jun 1 18:42:30 UTC 2006
Author: ntyni-guest
Date: Thu Jun 1 18:42:24 2006
New Revision: 2835
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=2835
Log:
Load /tmp/tmp.DdoiHZ5353/libfile-find-rule-perl-0.30 into
packages/libfile-find-rule-perl/branches/upstream/current.
Modified:
packages/libfile-find-rule-perl/branches/upstream/current/Changes
packages/libfile-find-rule-perl/branches/upstream/current/META.yml
packages/libfile-find-rule-perl/branches/upstream/current/Makefile.PL
packages/libfile-find-rule-perl/branches/upstream/current/README
packages/libfile-find-rule-perl/branches/upstream/current/lib/File/Find/Rule.pm
packages/libfile-find-rule-perl/branches/upstream/current/t/File-Find-Rule.t
Modified: packages/libfile-find-rule-perl/branches/upstream/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfile-find-rule-perl/branches/upstream/current/Changes?rev=2835&op=diff
==============================================================================
--- packages/libfile-find-rule-perl/branches/upstream/current/Changes (original)
+++ packages/libfile-find-rule-perl/branches/upstream/current/Changes Thu Jun 1 18:42:24 2006
@@ -1,3 +1,11 @@
+0.30 Wednesday 1st June, 2006
+ Made './//././././///.//././/////./blah' be treated the same
+ as './blah' (it gets turned into 'blah')
+
+0.29 Tuesday 16th May, 2006
+ Kludged around {min,max}depth and trailing slashes in path
+ names.
+
0.28 Tuesday 18th May, 2004
exposed %X_tests and @stat_tests as package variables, and make a
_call_find method for File::Find::Rule::Filesys::Virtual
Modified: packages/libfile-find-rule-perl/branches/upstream/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfile-find-rule-perl/branches/upstream/current/META.yml?rev=2835&op=diff
==============================================================================
--- packages/libfile-find-rule-perl/branches/upstream/current/META.yml (original)
+++ packages/libfile-find-rule-perl/branches/upstream/current/META.yml Thu Jun 1 18:42:24 2006
@@ -1,10 +1,13 @@
---- #YAML:1.0
+---
name: File-Find-Rule
-version: 0.28
+version: 0.30
author:
- |-
Richard Clamp <richardc at unixbeard.net> with input gained from this
use.perl discussion: http://use.perl.org/~richardc/journal/6467
+ - |-
+ Additional proofreading and input provided by Kake, Greg McCarroll,
+ and Andy Lester andy at petdance.com.
abstract: Alternative interface to File::Find
license: perl
requires:
@@ -17,5 +20,5 @@
provides:
File::Find::Rule:
file: lib/File/Find/Rule.pm
- version: 0.28
-generated_by: Module::Build version 0.24
+ version: 0.30
+generated_by: Module::Build version 0.25
Modified: packages/libfile-find-rule-perl/branches/upstream/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfile-find-rule-perl/branches/upstream/current/Makefile.PL?rev=2835&op=diff
==============================================================================
--- packages/libfile-find-rule-perl/branches/upstream/current/Makefile.PL (original)
+++ packages/libfile-find-rule-perl/branches/upstream/current/Makefile.PL Thu Jun 1 18:42:24 2006
@@ -5,12 +5,12 @@
'NAME' => 'File::Find::Rule',
'VERSION_FROM' => 'lib/File/Find/Rule.pm',
'PREREQ_PM' => {
- 'Test::More' => 0,
- 'File::Find' => 0,
- 'File::Spec' => 0,
- 'Text::Glob' => 0,
- 'Number::Compare' => 0,
- 'Cwd' => 0
+ 'Cwd' => '0',
+ 'File::Find' => '0',
+ 'File::Spec' => '0',
+ 'Number::Compare' => '0',
+ 'Test::More' => '0',
+ 'Text::Glob' => '0'
},
'INSTALLDIRS' => 'site',
'EXE_FILES' => [
Modified: packages/libfile-find-rule-perl/branches/upstream/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfile-find-rule-perl/branches/upstream/current/README?rev=2835&op=diff
==============================================================================
--- packages/libfile-find-rule-perl/branches/upstream/current/README (original)
+++ packages/libfile-find-rule-perl/branches/upstream/current/README Thu Jun 1 18:42:24 2006
@@ -1,4 +1,4 @@
-README for File::Find::Rule 0.28
+README for File::Find::Rule 0.30
=head1 NAME
@@ -48,26 +48,22 @@
=over
+=item 0.30 Wednesday 1st June, 2006
+
+ Made './//././././///.//././/////./blah' be treated the same
+ as './blah' (it gets turned into 'blah')
+
+
+=item 0.29 Tuesday 16th May, 2006
+
+ Kludged around {min,max}depth and trailing slashes in path
+ names.
+
+
=item 0.28 Tuesday 18th May, 2004
exposed %X_tests and @stat_tests as package variables, and make a
_call_find method for File::Find::Rule::Filesys::Virtual
-
-
-=item 0.27 Wednesday 25th February, 2004
-
- Changed to write_makefile_pl to 'traditional' from
- 'passthrough'. Fixes INDIRECTLY REPORTED install problems
- caused by new Module::Build being backwards incompatible.
-
-
-=item 0.26 Monday 10th November, 2003
-
- Typo/thinko in File::Find::Rule::Extending corrected (spotted
- by Jim Cromie)
-
- Optimization to the stat-based tests. They now compile to code
- fragments saving much subroutine dispatch.
=back
@@ -81,7 +77,7 @@
=head1 COPYRIGHT
-Copyright (C) 2002,2003 Richard Clamp. All Rights Reserved.
+Copyright (C) 2002, 2003, 2004, 2006 Richard Clamp. All Rights Reserved.
This module is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: packages/libfile-find-rule-perl/branches/upstream/current/lib/File/Find/Rule.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfile-find-rule-perl/branches/upstream/current/lib/File/Find/Rule.pm?rev=2835&op=diff
==============================================================================
--- packages/libfile-find-rule-perl/branches/upstream/current/lib/File/Find/Rule.pm (original)
+++ packages/libfile-find-rule-perl/branches/upstream/current/lib/File/Find/Rule.pm Thu Jun 1 18:42:24 2006
@@ -1,4 +1,4 @@
-# $Id: Rule.pm 2482 2004-05-18 20:34:31Z richardc $
+# $Id: /mirror/lab/perl/File-Find-Rule/lib/File/Find/Rule.pm 2102 2006-06-01T15:39:03.942922Z richardc $
package File::Find::Rule;
use strict;
@@ -10,7 +10,7 @@
use File::Find (); # we're only wrapping for now
use Cwd; # 5.00503s File::Find goes screwy with max_depth == 0
-$VERSION = '0.28';
+$VERSION = '0.30';
# we'd just inherit from Exporter, but I want the colon
sub import {
@@ -540,7 +540,7 @@
my $topdir;
my $code = 'sub {
- (my $path = $File::Find::name) =~ s#^\./##;
+ (my $path = $File::Find::name) =~ s#^(?:\./+)+##;
my @args = ($_, $File::Find::dir, $path);
my $maxdepth = $self->{maxdepth};
my $mindepth = $self->{mindepth};
@@ -581,6 +581,10 @@
for my $path (@_) {
# $topdir is used for relative and maxdepth
$topdir = $path;
+ # slice off the trailing slash if there is one (the
+ # maxdepth/mindepth code is fussy)
+ $topdir =~ s{/?$}{}
+ unless $topdir eq '/';
$self->_call_find( { %{ $self->{extras} }, wanted => $sub }, $path );
}
chdir $cwd;
@@ -732,7 +736,7 @@
=head1 COPYRIGHT
-Copyright (C) 2002,2003 Richard Clamp. All Rights Reserved.
+Copyright (C) 2002, 2003, 2004, 2006 Richard Clamp. All Rights Reserved.
This module is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: packages/libfile-find-rule-perl/branches/upstream/current/t/File-Find-Rule.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfile-find-rule-perl/branches/upstream/current/t/File-Find-Rule.t?rev=2835&op=diff
==============================================================================
--- packages/libfile-find-rule-perl/branches/upstream/current/t/File-Find-Rule.t (original)
+++ packages/libfile-find-rule-perl/branches/upstream/current/t/File-Find-Rule.t Thu Jun 1 18:42:24 2006
@@ -1,8 +1,8 @@
#!perl -w
-# $Id: File-Find-Rule.t 1735 2003-10-22 17:00:23Z richardc $
+# $Id: /mirror/lab/perl/File-Find-Rule/t/File-Find-Rule.t 2100 2006-05-28T16:06:50.725367Z richardc $
use strict;
-use Test::More tests => 38;
+use Test::More tests => 41;
my $class;
my @tests = qw( t/File-Find-Rule.t t/findrule.t );
@@ -202,15 +202,26 @@
"maxdepth == 0" );
-is_deeply( [ sort +find( or => [ find( name => qr/(\.svn|CVS)/,
- discard =>),
- find(),
- ],
- maxdepth => 1,
- in => 't' ) ],
+
+my $rule = find( or => [ find( name => qr/(\.svn|CVS)/,
+ discard =>),
+ find(),
+ ],
+ maxdepth => 1 );
+
+is_deeply( [ sort $rule->in( 't' ) ],
[ 't', @tests, 't/foobar', 't/lib' ],
"maxdepth == 1" );
-
+is_deeply( [ sort $rule->in( 't/' ) ],
+ [ 't', @tests, 't/foobar', 't/lib' ],
+ "maxdepth == 1, trailing slash on the path" );
+
+is_deeply( [ sort $rule->in( './t' ) ],
+ [ 't', @tests, 't/foobar', 't/lib' ],
+ "maxdepth == 1, ./t" );
+is_deeply( [ sort $rule->in( './././///./t' ) ],
+ [ 't', @tests, 't/foobar', 't/lib' ],
+ "maxdepth == 1, ./././///./t" );
my @ateam_path = qw( t/lib
t/lib/File
More information about the Pkg-perl-cvs-commits
mailing list