[Bps-public-commit] r19670 - in RT-Extension-SLA: inc/Module inc/Module/Install
ruz at bestpractical.com
ruz at bestpractical.com
Thu May 14 11:08:02 EDT 2009
Author: ruz
Date: Thu May 14 11:08:02 2009
New Revision: 19670
Modified:
RT-Extension-SLA/META.yml
RT-Extension-SLA/inc/Module/AutoInstall.pm
RT-Extension-SLA/inc/Module/Install.pm
RT-Extension-SLA/inc/Module/Install/AutoInstall.pm
RT-Extension-SLA/inc/Module/Install/Base.pm
RT-Extension-SLA/inc/Module/Install/Can.pm
RT-Extension-SLA/inc/Module/Install/Fetch.pm
RT-Extension-SLA/inc/Module/Install/Include.pm
RT-Extension-SLA/inc/Module/Install/Makefile.pm
RT-Extension-SLA/inc/Module/Install/Metadata.pm
RT-Extension-SLA/inc/Module/Install/Win32.pm
RT-Extension-SLA/inc/Module/Install/WriteAll.pm
Log:
* update M::I
Modified: RT-Extension-SLA/META.yml
==============================================================================
--- RT-Extension-SLA/META.yml (original)
+++ RT-Extension-SLA/META.yml Thu May 14 11:08:02 2009
@@ -8,7 +8,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.87'
+generated_by: 'Module::Install version 0.88'
license: gpl2
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
Modified: RT-Extension-SLA/inc/Module/AutoInstall.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/AutoInstall.pm (original)
+++ RT-Extension-SLA/inc/Module/AutoInstall.pm Thu May 14 11:08:02 2009
@@ -175,15 +175,24 @@
}
# XXX: check for conflicts and uninstalls(!) them.
- if (
- defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) )
+ my $cur = _load($mod);
+ if (_version_cmp ($cur, $arg) >= 0)
{
print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
push @Existing, $mod => $arg;
$DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
}
else {
- print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ if (not defined $cur) # indeed missing
+ {
+ print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ }
+ else
+ {
+ # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
+ print "too old. ($cur < $arg)\n";
+ }
+
push @required, $mod => $arg;
}
}
@@ -268,8 +277,11 @@
require CPAN;
- if ($CPAN::VERSION > '1.89' && $cpan_env) {
- return _running_under('CPAN');
+ if ($CPAN::VERSION > '1.89') {
+ if ($cpan_env) {
+ return _running_under('CPAN');
+ }
+ return; # CPAN.pm new enough, don't need to check further
}
# last ditch attempt, this -will- configure CPAN, very sorry
@@ -310,7 +322,7 @@
while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
# grep out those already installed
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
else {
@@ -349,7 +361,7 @@
# see if we have successfully installed them
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
@@ -404,7 +416,7 @@
my $success;
my $obj = $modtree->{$pkg};
- if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -497,7 +509,7 @@
my $obj = CPAN::Shell->expand( Module => $pkg );
my $success = 0;
- if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -561,7 +573,7 @@
my $ver = shift;
return
- if defined( _version_check( _load($class), $ver ) ); # no need to upgrade
+ if _version_cmp( _load($class), $ver ) >= 0; # no need to upgrade
if (
_prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -670,9 +682,11 @@
}
# compare two versions, either use Sort::Versions or plain comparison
-sub _version_check {
+# return values same as <=>
+sub _version_cmp {
my ( $cur, $min ) = @_;
- return unless defined $cur;
+ return -1 unless defined $cur; # if 0 keep comparing
+ return 1 unless $min;
$cur =~ s/\s+$//;
@@ -683,16 +697,13 @@
) {
# use version.pm if it is installed.
- return (
- ( version->new($cur) >= version->new($min) ) ? $cur : undef );
+ return version->new($cur) <=> version->new($min);
}
elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) )
{
# use Sort::Versions as the sorting algorithm for a.b.c versions
- return ( ( Sort::Versions::versioncmp( $cur, $min ) != -1 )
- ? $cur
- : undef );
+ return Sort::Versions::versioncmp( $cur, $min );
}
warn "Cannot reliably compare non-decimal formatted versions.\n"
@@ -701,7 +712,7 @@
# plain comparison
local $^W = 0; # shuts off 'not numeric' bugs
- return ( $cur >= $min ? $cur : undef );
+ return $cur <=> $min;
}
# nothing; this usage is deprecated.
@@ -791,4 +802,4 @@
__END__
-#line 1045
+#line 1056
Modified: RT-Extension-SLA/inc/Module/Install.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install.pm (original)
+++ RT-Extension-SLA/inc/Module/Install.pm Thu May 14 11:08:02 2009
@@ -28,7 +28,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.87';
+ $VERSION = '0.88';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -353,7 +353,7 @@
if ( $] >= 5.006 ) {
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
}
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
@@ -384,7 +384,7 @@
if ( $] >= 5.006 ) {
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
}
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
Modified: RT-Extension-SLA/inc/Module/Install/AutoInstall.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/AutoInstall.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/AutoInstall.pm Thu May 14 11:08:02 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RT-Extension-SLA/inc/Module/Install/Base.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/Base.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/Base.pm Thu May 14 11:08:02 2009
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
}
# Suspend handler for "redefined" warnings
Modified: RT-Extension-SLA/inc/Module/Install/Can.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/Can.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/Can.pm Thu May 14 11:08:02 2009
@@ -9,7 +9,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RT-Extension-SLA/inc/Module/Install/Fetch.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/Fetch.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/Fetch.pm Thu May 14 11:08:02 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RT-Extension-SLA/inc/Module/Install/Include.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/Include.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/Include.pm Thu May 14 11:08:02 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RT-Extension-SLA/inc/Module/Install/Makefile.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/Makefile.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/Makefile.pm Thu May 14 11:08:02 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: RT-Extension-SLA/inc/Module/Install/Metadata.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/Metadata.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/Metadata.pm Thu May 14 11:08:02 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -511,7 +511,7 @@
# Also, convert double-part versions (eg, 5.8)
sub _perl_version {
my $v = $_[-1];
- $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
+ $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
$v =~ s/(\.\d\d\d)000$/$1/;
$v =~ s/_.+$//;
@@ -534,7 +534,7 @@
sub write_mymeta {
my $self = shift;
-
+
# If there's no existing META.yml there is nothing we can do
return unless -f 'META.yml';
@@ -574,7 +574,7 @@
# Save as the MYMETA.yml file
print "Writing MYMETA.yml\n";
- YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
}
1;
Modified: RT-Extension-SLA/inc/Module/Install/Win32.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/Win32.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/Win32.pm Thu May 14 11:08:02 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: RT-Extension-SLA/inc/Module/Install/WriteAll.pm
==============================================================================
--- RT-Extension-SLA/inc/Module/Install/WriteAll.pm (original)
+++ RT-Extension-SLA/inc/Module/Install/WriteAll.pm Thu May 14 11:08:02 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.87';
+ $VERSION = '0.88';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
More information about the Bps-public-commit
mailing list