r25211 - in /branches/upstream/libperl-minimumversion-perl/current: Changes META.yml Makefile.PL lib/Perl/MinimumVersion.pm script/perlver t/01_compile.t
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Tue Sep 16 14:01:58 UTC 2008
Author: dmn
Date: Tue Sep 16 14:01:53 2008
New Revision: 25211
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25211
Log:
[svn-upgrade] Integrating new upstream version, libperl-minimumversion-perl (1.19)
Modified:
branches/upstream/libperl-minimumversion-perl/current/Changes
branches/upstream/libperl-minimumversion-perl/current/META.yml
branches/upstream/libperl-minimumversion-perl/current/Makefile.PL
branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm
branches/upstream/libperl-minimumversion-perl/current/script/perlver
branches/upstream/libperl-minimumversion-perl/current/t/01_compile.t
Modified: branches/upstream/libperl-minimumversion-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/Changes?rev=25211&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/Changes (original)
+++ branches/upstream/libperl-minimumversion-perl/current/Changes Tue Sep 16 14:01:53 2008
@@ -1,4 +1,12 @@
Revision history for Perl extension Perl::MinimumVersion
+
+1.19 Sun 14 Sep 2008
+ - Updating PPI and several other dependencies to get a more
+ accurate parse on which to run the analysis.
+ - Add a dependency on File::Find::Rule::Perl instead of using
+ a deplicate (worse) copy of the code for it.
+ - If perlver is run in a CPAN-style distribution don't parse
+ blib or _build directories (but DO parse inc)
1.18 Sat 23 Aug 2008
- Moving bin/perlver to more correct script/perlver
Modified: branches/upstream/libperl-minimumversion-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/META.yml?rev=25211&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/META.yml (original)
+++ branches/upstream/libperl-minimumversion-perl/current/META.yml Tue Sep 16 14:01:53 2008
@@ -19,13 +19,13 @@
- inc
- t
requires:
- Carp: 0
- File::Find::Rule: 0
+ File::Find::Rule: 0.30
+ File::Find::Rule::Perl: 1.04
List::Util: 1.19
- PPI: 1.118
+ PPI: 1.201
Params::Util: 0.25
perl: 5.005
version: 0.76
resources:
license: http://dev.perl.org/licenses/
-version: 1.18
+version: 1.19
Modified: branches/upstream/libperl-minimumversion-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/Makefile.PL?rev=25211&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/Makefile.PL (original)
+++ branches/upstream/libperl-minimumversion-perl/current/Makefile.PL Tue Sep 16 14:01:53 2008
@@ -1,17 +1,18 @@
use inc::Module::Install 0.77;
all_from 'lib/Perl/MinimumVersion.pm';
-requires 'Carp' => 0;
+
# Push the versioning for version.pm heavily,
# as it has been through flaky periods
-requires 'version' => '0.76';
-requires 'List::Util' => '1.19';
-requires 'Params::Util' => '0.25';
-requires 'File::Find::Rule' => 0;
-requires 'PPI' => '1.118';
-test_requires 'File::Spec' => '0.80';
-test_requires 'Test::More' => '0.47';
-test_requires 'Test::Script' => '1.02';
+requires 'version' => '0.76';
+requires 'List::Util' => '1.19';
+requires 'Params::Util' => '0.25';
+requires 'File::Find::Rule' => '0.30';
+requires 'File::Find::Rule::Perl' => '1.04';
+requires 'PPI' => '1.201';
+test_requires 'File::Spec' => '0.80';
+test_requires 'Test::More' => '0.47';
+test_requires 'Test::Script' => '1.02';
install_script 'perlver';
WriteAll;
Modified: branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm?rev=25211&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm Tue Sep 16 14:01:53 2008
@@ -46,7 +46,7 @@
use vars qw{$VERSION @ISA @EXPORT_OK %CHECKS %MATCHES};
BEGIN {
- $VERSION = '1.18';
+ $VERSION = '1.19';
# Export the PMV convenience constant
@ISA = 'Exporter';
Modified: branches/upstream/libperl-minimumversion-perl/current/script/perlver
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/script/perlver?rev=25211&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/script/perlver (original)
+++ branches/upstream/libperl-minimumversion-perl/current/script/perlver Tue Sep 16 14:01:53 2008
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+
+package perlver;
=pod
@@ -36,26 +38,26 @@
=cut
-package perlver;
-
use 5.005;
use strict;
-use version 'qv';
-use Getopt::Long 'GetOptions';
-use Params::Util '_INSTANCE';
-use File::Find::Rule ();
-use constant 'FFR' => 'File::Find::Rule';
-use Perl::MinimumVersion 'PMV';
+use version 'qv';
+use File::Spec ();
+use Getopt::Long 'GetOptions';
+use Params::Util '_INSTANCE';
+use File::Find::Rule ();
+use File::Find::Rule::Perl ();
+use Perl::MinimumVersion 'PMV';
# Define prototypes
sub verbose ($);
sub message ($);
sub error (@);
sub format_version ($);
+sub dist ($);
use vars qw{$VERSION $VERBOSE $BLAME};
BEGIN {
- $VERSION = '1.18';
+ $VERSION = '1.19';
# Configuration globals
$VERBOSE = '';
@@ -64,14 +66,6 @@
# Unbuffer output
$| = 1;
}
-
-# Perl file searcher
-my $FIND_PERL = FFR->file
- ->or(
- FFR->name( qr/\.(?:pm|pl|t)$/i ),
- FFR->name( qr/^[^\.]$/ )
- ->grep( qr/^#!.*\bperl/, [ sub { 1 } ] )
- );
@@ -113,7 +107,7 @@
if ( -d $target ) {
verbose "Found directory '$target'\n";
verbose "Searching for Perl files... ";
- @files = $FIND_PERL->in( $target );
+ @files = find($target);
verbose "found " . scalar(@files) . " file(s)\n";
} elsif ( -f $target ) {
verbose "Found file '$target'\n";
@@ -216,7 +210,7 @@
if ( -d $target ) {
verbose "Found directory '$target'\n";
verbose "Searching for Perl files... ";
- @files = $FIND_PERL->in( $target );
+ @files = find($target);
verbose "found " . scalar(@files) . " file(s)\n";
} elsif ( -f $target ) {
verbose "Found file '$target'\n";
@@ -247,6 +241,18 @@
verbose "[ok]\n";
}
+}
+
+sub find {
+ my $dir = shift;
+ my $perl = File::Find::Rule->perl_files;
+ my $build = File::Find::Rule->name('blib', '_build')->directory;
+ return dist($dir)
+ ? File::Find::Rule->any(
+ $build->prune->discard,
+ $perl,
+ )->in( $target )
+ : $perl->in( $target );
}
@@ -283,6 +289,17 @@
}
}
+sub dist ($) {
+ my $dir = shift;
+ if ( -f File::Spec->catfile($dir, 'Makefile.PL') ) {
+ return 1;
+ }
+ if ( -f File::Spec->catfile($dir, 'Build.PL') ) {
+ return 1;
+ }
+ return '';
+}
+
=pod
=head1 TO DO
Modified: branches/upstream/libperl-minimumversion-perl/current/t/01_compile.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/t/01_compile.t?rev=25211&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/t/01_compile.t (original)
+++ branches/upstream/libperl-minimumversion-perl/current/t/01_compile.t Tue Sep 16 14:01:53 2008
@@ -15,5 +15,5 @@
use_ok('Perl::MinimumVersion' );
-script_compiles_ok( 'script/perlver', 'perver compiles ok' );
+script_compiles_ok( 'script/perlver', 'perlver compiles ok' );
More information about the Pkg-perl-cvs-commits
mailing list