r25992 - in /branches/upstream/libfile-find-rule-vcs-perl/current: ./ inc/Module/ inc/Module/Install/ lib/File/Find/Rule/ t/
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Sun Oct 12 23:45:01 UTC 2008
Author: gwolf
Date: Sun Oct 12 23:44:58 2008
New Revision: 25992
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25992
Log:
[svn-upgrade] Integrating new upstream version, libfile-find-rule-vcs-perl (1.05)
Modified:
branches/upstream/libfile-find-rule-vcs-perl/current/Changes
branches/upstream/libfile-find-rule-vcs-perl/current/META.yml
branches/upstream/libfile-find-rule-vcs-perl/current/Makefile.PL
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install.pm
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Base.pm
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Can.pm
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libfile-find-rule-vcs-perl/current/lib/File/Find/Rule/VCS.pm
branches/upstream/libfile-find-rule-vcs-perl/current/t/01_compile.t
branches/upstream/libfile-find-rule-vcs-perl/current/t/97_meta.t
branches/upstream/libfile-find-rule-vcs-perl/current/t/98_pod.t
branches/upstream/libfile-find-rule-vcs-perl/current/t/99_pmv.t
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/Changes?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/Changes (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/Changes Sun Oct 12 23:44:58 2008
@@ -1,4 +1,9 @@
Revision history for Perl extension File::Find::Rule::VCS
+
+1.05 Mon 29 Sep 2008
+ - Updated to Module::Install 0.77
+ - Updated tests to new style
+ - Adding support for _svn (closes bug #32030)
1.04 Sat 10 May 2008
- Support ->ignore_vcs() for ignoring all supported VCS
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/META.yml?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/META.yml (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/META.yml Sun Oct 12 23:44:58 2008
@@ -6,11 +6,11 @@
File::Spec: 0.82
Test::More: 0.47
distribution_type: module
-generated_by: 'Module::Install version 0.73'
+generated_by: 'Module::Install version 0.77'
license: perl
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
module_name: File::Find::Rule::VCS
name: File-Find-Rule-VCS
no_index:
@@ -19,5 +19,7 @@
- t
requires:
File::Find::Rule: 0.20
- perl: 5.005
-version: 1.04
+ perl: 5.00503
+resources:
+ license: http://dev.perl.org/licenses/
+version: 1.05
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/Makefile.PL?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/Makefile.PL (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/Makefile.PL Sun Oct 12 23:44:58 2008
@@ -1,4 +1,4 @@
-use inc::Module::Install;
+use inc::Module::Install 0.77;
all_from 'lib/File/Find/Rule/VCS.pm';
requires 'File::Find::Rule' => '0.20';
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install.pm Sun Oct 12 23:44:58 2008
@@ -30,7 +30,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.73';
+ $VERSION = '0.77';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -85,7 +85,7 @@
# Build.PL was formerly supported, but no longer is due to excessive
# difficulty in implementing every single feature twice.
-if ( $0 =~ /Build.PL$/i or -f 'Build.PL' ) { die <<"END_DIE" }
+if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
Module::Install no longer supports Build.PL.
@@ -125,8 +125,10 @@
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')} unless uc($1) eq $1;
+ unless ( uc($1) eq $1 ) {
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')};
+ }
};
}
@@ -339,7 +341,10 @@
close FH or die "close($_[0]): $!";
}
-sub _version {
+# _version is for processing module versions (eg, 1.03_05) not
+# Perl versions (eg, 5.8.1).
+
+sub _version ($) {
my $s = shift || 0;
$s =~ s/^(\d+)\.?//;
my $l = $1 || 0;
@@ -348,6 +353,17 @@
return $l + 0;
}
+# Cloned from Params::Util::_CLASS
+sub _CLASS ($) {
+ (
+ defined $_[0]
+ and
+ ! ref $_[0]
+ and
+ $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*$/s
+ ) ? $_[0] : undef;
+}
+
1;
# Copyright 2008 Adam Kennedy.
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Base.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Base.pm Sun Oct 12 23:44:58 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.73';
+$VERSION = '0.77';
# Suspend handler for "redefined" warnings
BEGIN {
@@ -45,6 +45,8 @@
$_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
+#line 101
+
sub is_admin {
$_[0]->admin->VERSION;
}
@@ -67,4 +69,4 @@
1;
-#line 138
+#line 146
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Can.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Can.pm Sun Oct 12 23:44:58 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -39,6 +39,7 @@
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+ next if $dir eq '';
my $abs = File::Spec->catfile($dir, $_[1]);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
@@ -79,4 +80,4 @@
__END__
-#line 157
+#line 158
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Fetch.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Fetch.pm Sun Oct 12 23:44:58 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Makefile.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Makefile.pm Sun Oct 12 23:44:58 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -36,9 +36,9 @@
sub makemaker_args {
my $self = shift;
- my $args = ($self->{makemaker_args} ||= {});
- %$args = ( %$args, @_ ) if @_;
- $args;
+ my $args = ( $self->{makemaker_args} ||= {} );
+ %$args = ( %$args, @_ );
+ return $args;
}
# For mm args that take multiple space-seperated args,
@@ -116,7 +116,13 @@
# Make sure we have a new enough
require ExtUtils::MakeMaker;
- $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION );
+
+ # MakeMaker can complain about module versions that include
+ # an underscore, even though its own version may contain one!
+ # Hence the funny regexp to get rid of it. See RT #35800
+ # for details.
+
+ $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
# Generate the
my $args = $self->makemaker_args;
@@ -175,7 +181,9 @@
my $user_preop = delete $args{dist}->{PREOP};
if (my $preop = $self->admin->preop($user_preop)) {
- $args{dist} = $preop;
+ foreach my $key ( keys %$preop ) {
+ $args{dist}->{$key} = $preop->{$key};
+ }
}
my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -242,4 +250,4 @@
__END__
-#line 371
+#line 379
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Metadata.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Metadata.pm Sun Oct 12 23:44:58 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -17,9 +17,7 @@
abstract
author
version
- license
distribution_type
- perl_version
tests
installdirs
};
@@ -30,13 +28,21 @@
requires
recommends
bundles
+ resources
};
-sub Meta { shift }
-sub Meta_ScalarKeys { @scalar_keys }
-sub Meta_TupleKeys { @tuple_keys }
-
-foreach my $key (@scalar_keys) {
+my @resource_keys = qw{
+ homepage
+ bugtracker
+ repository
+};
+
+sub Meta { shift }
+sub Meta_ScalarKeys { @scalar_keys }
+sub Meta_TupleKeys { @tuple_keys }
+sub Meta_ResourceKeys { @resource_keys }
+
+foreach my $key ( @scalar_keys ) {
*$key = sub {
my $self = shift;
return $self->{values}{$key} if defined wantarray and !@_;
@@ -45,12 +51,30 @@
};
}
+foreach my $key ( @resource_keys ) {
+ *$key = sub {
+ my $self = shift;
+ unless ( @_ ) {
+ return () unless $self->{values}{resources};
+ return map { $_->[1] }
+ grep { $_->[0] eq $key }
+ @{ $self->{values}{resources} };
+ }
+ return $self->{values}{resources}{$key} unless @_;
+ my $uri = shift or die(
+ "Did not provide a value to $key()"
+ );
+ $self->resources( $key => $uri );
+ return 1;
+ };
+}
+
sub requires {
my $self = shift;
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{requires} }, [ $module, $version ];
+ push @{ $self->{values}{requires} }, [ $module, $version ];
}
$self->{values}{requires};
}
@@ -60,7 +84,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{build_requires} }, [ $module, $version ];
+ push @{ $self->{values}{build_requires} }, [ $module, $version ];
}
$self->{values}{build_requires};
}
@@ -70,7 +94,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{configure_requires} }, [ $module, $version ];
+ push @{ $self->{values}{configure_requires} }, [ $module, $version ];
}
$self->{values}{configure_requires};
}
@@ -80,7 +104,7 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{recommends} }, [ $module, $version ];
+ push @{ $self->{values}{recommends} }, [ $module, $version ];
}
$self->{values}{recommends};
}
@@ -90,9 +114,31 @@
while ( @_ ) {
my $module = shift or last;
my $version = shift || 0;
- push @{ $self->{values}->{bundles} }, [ $module, $version ];
+ push @{ $self->{values}{bundles} }, [ $module, $version ];
}
$self->{values}{bundles};
+}
+
+# Resource handling
+my %lc_resource = map { $_ => 1 } qw{
+ homepage
+ license
+ bugtracker
+ repository
+};
+
+sub resources {
+ my $self = shift;
+ while ( @_ ) {
+ my $name = shift or last;
+ my $value = shift or next;
+ if ( $name eq lc $name and ! $lc_resource{$name} ) {
+ die("Unsupported reserved lowercase resource '$name'");
+ }
+ $self->{values}{resources} ||= [];
+ push @{ $self->{values}{resources} }, [ $name, $value ];
+ }
+ $self->{values}{resources};
}
# Aliases for build_requires that will have alternative
@@ -108,30 +154,73 @@
sub sign {
my $self = shift;
- return $self->{'values'}{'sign'} if defined wantarray and ! @_;
- $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
+ return $self->{values}{sign} if defined wantarray and ! @_;
+ $self->{values}{sign} = ( @_ ? $_[0] : 1 );
return $self;
}
sub dynamic_config {
my $self = shift;
unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
+ warn "You MUST provide an explicit true/false value to dynamic_config\n";
return $self;
}
$self->{values}{dynamic_config} = $_[0] ? 1 : 0;
- return $self;
+ return 1;
+}
+
+sub perl_version {
+ my $self = shift;
+ return $self->{values}{perl_version} unless @_;
+ my $version = shift or die(
+ "Did not provide a value to perl_version()"
+ );
+
+ # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
+ # numbers (eg, 5.006001 or 5.008009).
+
+ $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
+
+ $version =~ s/_.+$//;
+ $version = $version + 0; # Numify
+ unless ( $version >= 5.005 ) {
+ die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
+ }
+ $self->{values}{perl_version} = $version;
+ return 1;
+}
+
+sub license {
+ my $self = shift;
+ return $self->{values}{license} unless @_;
+ my $license = shift or die(
+ 'Did not provide a value to license()'
+ );
+ $self->{values}{license} = $license;
+
+ # Automatically fill in license URLs
+ if ( $license eq 'perl' ) {
+ $self->resources( license => 'http://dev.perl.org/licenses/' );
+ }
+
+ return 1;
}
sub all_from {
my ( $self, $file ) = @_;
unless ( defined($file) ) {
- my $name = $self->name
- or die "all_from called with no args without setting name() first";
+ my $name = $self->name or die(
+ "all_from called with no args without setting name() first"
+ );
$file = join('/', 'lib', split(/-/, $name)) . '.pm';
$file =~ s{.*/}{} unless -e $file;
- die "all_from: cannot find $file from $name" unless -e $file;
+ unless ( -e $file ) {
+ die("all_from cannot find $file from $name");
+ }
+ }
+ unless ( -f $file ) {
+ die("The path '$file' does not exist, or is not a file");
}
# Some methods pull from POD instead of code.
@@ -210,8 +299,8 @@
while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
$self->feature( $name, @$mods );
}
- return $self->{values}->{features}
- ? @{ $self->{values}->{features} }
+ return $self->{values}{features}
+ ? @{ $self->{values}{features} }
: ();
}
@@ -285,7 +374,7 @@
$self->module_name($module_name);
}
} else {
- die "Cannot determine name from $file\n";
+ die("Cannot determine name from $file\n");
}
}
@@ -294,7 +383,7 @@
if (
Module::Install::_read($_[0]) =~ m/
^
- use \s*
+ (?:use|require) \s*
v?
([\d_\.]+)
\s* ;
@@ -344,8 +433,12 @@
my $license_text = $1;
my @phrases = (
'under the same (?:terms|license) as perl itself' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
'BSD license' => 'bsd', 1,
'Artistic license' => 'artistic', 1,
'GPL' => 'gpl', 1,
@@ -371,6 +464,24 @@
return 'unknown';
}
+sub bugtracker_from {
+ my $self = shift;
+ my $content = Module::Install::_read($_[0]);
+ my @links = $content =~ m/L\<(http\:\/\/rt\.cpan\.org\/[^>]+)\>/g;
+ unless ( @links ) {
+ warn "Cannot determine bugtracker info from $_[0]\n";
+ return 0;
+ }
+ if ( @links > 1 ) {
+ warn "Found more than on rt.cpan.org link in $_[0]\n";
+ return 0;
+ }
+
+ # Set the bugtracker
+ bugtracker( $links[0] );
+ return 1;
+}
+
sub install_script {
my $self = shift;
my $args = $self->makemaker_args;
@@ -381,7 +492,7 @@
} elsif ( -d 'script' and -f "script/$_" ) {
push @$exe, "script/$_";
} else {
- die "Cannot find script '$_'";
+ die("Cannot find script '$_'");
}
}
}
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Win32.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/Win32.pm Sun Oct 12 23:44:58 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/WriteAll.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/inc/Module/Install/WriteAll.pm Sun Oct 12 23:44:58 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/lib/File/Find/Rule/VCS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/lib/File/Find/Rule/VCS.pm?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/lib/File/Find/Rule/VCS.pm (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/lib/File/Find/Rule/VCS.pm Sun Oct 12 23:44:58 2008
@@ -54,7 +54,7 @@
=cut
-use 5.005;
+use 5.00503;
use strict;
use UNIVERSAL;
use Carp ();
@@ -63,9 +63,13 @@
use vars qw{$VERSION @EXPORT};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.05';
@EXPORT = @File::Find::Rule::EXPORT;
}
+
+# In some Windows SVN implementations, it uses _svn instead of
+# .svn, so use both on Win32.
+my @svn = ($^O eq 'MSWin32') ? ('.svn', '_svn') : ('.svn');
@@ -117,7 +121,7 @@
# Logically combine all the ignores. This will be much
# faster than just calling them all one after the other.
return $find->or(
- FFR->name('.svn', '.bzr', 'CVS')->directory->prune->discard,
+ FFR->name(@svn, '.bzr', 'CVS')->directory->prune->discard,
FFR->name(qr/^\.\#/)->file->discard,
FFR->new,
);
@@ -174,7 +178,7 @@
sub File::Find::Rule::ignore_svn {
my $find = $_[0]->_force_object;
return $find->or(
- FFR->name('.svn')->directory->prune->discard,
+ FFR->name(@svn)->directory->prune->discard,
FFR->new,
);
}
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/t/01_compile.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/t/01_compile.t?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/t/01_compile.t (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/t/01_compile.t Sun Oct 12 23:44:58 2008
@@ -1,30 +1,17 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
# Load testing for File::Find::Rule::VCS
use strict;
-use lib ();
-use File::Spec::Functions ':ALL';
BEGIN {
- $| = 1;
- unless ( $ENV{HARNESS_ACTIVE} ) {
- require FindBin;
- $FindBin::Bin = $FindBin::Bin; # Avoid a warning
- chdir catdir( $FindBin::Bin, updir() );
- lib->import(
- catdir('blib', 'arch'),
- catdir('blib', 'lib' ),
- catdir('lib'),
- );
- }
+ $| = 1;
+ $^W = 1;
}
use Test::More tests => 2;
# Check their perl version
-ok( $] >= 5.005, "Your perl is new enough" );
+ok( $] >= 5.00503, "Your perl is new enough" );
# Load the modules
use_ok( 'File::Find::Rule::VCS' );
-
-exit(0);
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/t/97_meta.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/t/97_meta.t?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/t/97_meta.t (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/t/97_meta.t Sun Oct 12 23:44:58 2008
@@ -8,7 +8,7 @@
$^W = 1;
}
-my $MODULE = 'Test::CPAN::Meta 0.07';
+my $MODULE = 'Test::CPAN::Meta 0.12';
# Don't run tests for installs
use Test::More;
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/t/98_pod.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/t/98_pod.t?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/t/98_pod.t (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/t/98_pod.t Sun Oct 12 23:44:58 2008
@@ -8,7 +8,10 @@
$^W = 1;
}
-my $MODULE = 'Test::Pod 1.00';
+my @MODULES = (
+ 'Pod::Simple 3.07',
+ 'Test::Pod 1.26',
+);
# Don't run tests for installs
use Test::More;
@@ -16,57 +19,14 @@
plan( skip_all => "Author tests not required for installation" );
}
-# Load the testing module
-eval "use $MODULE";
-if ( $@ ) {
- $ENV{RELEASE_TESTING}
- ? die( "Failed to load required release-testing module $MODULE" )
- : plan( skip_all => "$MODULE not available for testing" );
+# Load the testing modules
+foreach my $MODULE ( @MODULES ) {
+ eval "use $MODULE";
+ if ( $@ ) {
+ $ENV{RELEASE_TESTING}
+ ? die( "Failed to load required release-testing module $MODULE" )
+ : plan( skip_all => "$MODULE not available for testing" );
+ }
}
all_pod_files_ok();
-
-
-
-
-
-
-#####################################################################
-# WARNING: INSANE BLACK MAGIC
-#####################################################################
-
-# Hack Pod::Simple::BlackBox to ignore the Test::Inline
-# "Extended Begin" syntax.
-# For example, "=begin has more than one word errors"
-my $begin;
-if ( $Test::Pod::VERSION ) {
- $begin = \&Pod::Simple::BlackBox::_ponder_begin;
-}
-sub mybegin {
- my $para = $_[1];
- my $content = join ' ', splice @$para, 2;
- $content =~ s/^\s+//s;
- $content =~ s/\s+$//s;
- my @words = split /\s+/, $content;
- if ( $words[0] =~ /^test(?:ing)?\z/s ) {
- foreach ( 2 .. $#$para ) {
- $para->[$_] = '';
- }
- $para->[2] = $words[0];
- }
-
- # Continue as normal
- push @$para, @words;
- return &$begin(@_);
-}
-
-SCOPE: {
- local $^W = 0;
- if ( $Test::Pod::VERSION ) {
- *Pod::Simple::BlackBox::_ponder_begin = \&mybegin;
- }
-}
-
-#####################################################################
-# END BLACK MAGIC
-#####################################################################
Modified: branches/upstream/libfile-find-rule-vcs-perl/current/t/99_pmv.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-find-rule-vcs-perl/current/t/99_pmv.t?rev=25992&op=diff
==============================================================================
--- branches/upstream/libfile-find-rule-vcs-perl/current/t/99_pmv.t (original)
+++ branches/upstream/libfile-find-rule-vcs-perl/current/t/99_pmv.t Sun Oct 12 23:44:58 2008
@@ -8,7 +8,7 @@
$^W = 1;
}
-my $MODULE = 'Test::MinimumVersion 0.007';
+my $MODULE = 'Test::MinimumVersion 0.008';
# Don't run tests for installs
use Test::More;
More information about the Pkg-perl-cvs-commits
mailing list