Update CPANPLUS to CPAN version 0.9107

  [DELTA]

  Changes for 0.9107      Tue Jul 12 15:22:14 2011
  ================================================
  * Add support for v-strings and x.y.z versions, using the version module.
  * Resolve [rt.cpan.org #69420] "type checking for CPANPLUS::Backend::RV::new is incorrect"
  * Resolve [rt.cpan.org #69203] "custom sources ignores timeout config option"

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 8c51685e23dd8bc2ec248660b19295c5302e84a7..dd80e3aef34ab80d0a255baf59b8239fcfba7eb0 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -459,7 +459,7 @@ use File::Glob qw(:case);
     'CPANPLUS' =>
        {
        'MAINTAINER'    => 'kane',
-       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-0.9106.tar.gz',
+       'DISTRIBUTION'  => 'BINGOS/CPANPLUS-0.9107.tar.gz',
        'FILES'         => q[cpan/CPANPLUS],
        'EXCLUDED'      => [ qr{^inc/},
                             qr{^t/dummy-.*\.hidden$},
@@ -470,7 +470,7 @@ use File::Glob qw(:case);
                                 t/031_CPANPLUS-Internals-Source-SQLite.t
                                 t/032_CPANPLUS-Internals-Source-via-sqlite.t
                               },
-                             qw{ Makefile.PL },
+           qw{ Makefile.PL },
                           ],
        'CUSTOMIZED'    => [ qw{ Makefile.PL } ],
        'UPSTREAM'      => 'cpan',

diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index 7496688a2f69aab2a027fbc0636460d6c04e4e74..0f6607b6782bb7b80d7edd92a31a8fe66e96d848 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS.pm
@@ -13,7 +13,7 @@ BEGIN {
     use vars        qw( @EXPORT @ISA $VERSION );
     @EXPORT     =   qw( shell fetch get install );
     @ISA        =   qw( Exporter );
-    $VERSION = "0.9106";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.9107";     #have to hardcode or cpan.org gets unhappy
 }
 
 ### purely for backward compatibility, so we can call it from the commandline:

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm b/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm
index 0d945d5524e8510c615cc96f879d1618e089d9a7..1ea888106b59edc0eba6053cebe65cf772976933 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Backend.pm
@@ -397,7 +397,7 @@ for my $func (qw[fetch extract install readme files distributions]) {
 
         return CPANPLUS::Backend::RV->new(
                     function    => $func,
-                    ok          => !$flag,
+                    ok          => ( !$flag ? 1 : 0 ),
                     rv          => $href,
                     args        => \%hash,
                 );

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index c882c933bd5278da4daad999c994289fa559ce8c..f126e09f545fff26fee5aa3d844f8ea744087986 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
@@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION];
             CPANPLUS::Internals::Report
         ];
 
-$VERSION = "0.9106";
+$VERSION = "0.9107";
 
 =pod
 

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
index 342df63d5128595072a3a960d8f55ddaf6e53a22..b93cc1c96b3d20ef08ab0ae5c1550031eff186ab 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Source.pm
@@ -1210,10 +1210,11 @@ sub __update_custom_module_source {
     ### so add it explicitly.
     my $dir =  tempdir( CLEANUP => 1 );
 
-    my $res =  do {  local $File::Fetch::WARN = 0;
+    my $res =  do {
                     local $File::Fetch::WARN = 0;
+                    local $File::Fetch::TIMEOUT = $conf->get_conf('timeout');
                     $ff->fetch( to => $dir );
-                };
+               };
 
     ### couldn't get the file
     unless( $res ) {

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
index 46ddec858e4281abef7f747659739c8258a20b26..bf475c9a71e93bffaa23ea641f5c28042eba93af 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Utils.pm
@@ -10,6 +10,7 @@ use File::Copy;
 use Params::Check               qw[check];
 use Module::Load::Conditional   qw[can_load];
 use Locale::Maketext::Simple    Class => 'CPANPLUS', Style => 'gettext';
+use version;
 
 local $Params::Check::VERBOSE = 1;
 
@@ -199,7 +200,8 @@ sub _version_to_number {
 
     check( $tmpl, \%hash ) or return;
 
-    return $version if $version =~ /^\.?\d/;
+    return $version if $version =~ /^\d*(?:\.\d+)?$/;
+    return eval { version->parse($1)->numify } if $version =~ /^(v?\d+(?:\.\d+(?:\.\d+)?)?)/;
     return '0.0';
 }
 
@@ -374,7 +376,8 @@ sub _vcmp {
     my $self = shift;
     my ($x, $y) = @_;
 
-    s/_//g foreach $x, $y;
+    $x = $self->_version_to_number(version => $x);
+    $y = $self->_version_to_number(version => $y);
 
     return $x <=> $y;
 }

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm b/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
index 963f8ba09e613772883b2dad261365e4e3c8f69d..e27f98b09c7638bbf1e989cfdf10d1acb282aeee 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Selfupdate.pm
@@ -49,7 +49,7 @@ CPANPLUS::Selfupdate
             'Module::Load'              => '0.10',
             'Module::Load::Conditional' => '0.38', # returns dir for loaded
                                                    # modules
-            'version'                   => '0.73', # needed for M::L::C
+            'version'                   => '0.77', # needed for M::L::C
                                                    # addresses #24630 and
                                                    # #24675
                                                    # Address ~0 overflow issue

diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index db75c44594db27dcb0466d8e4cac7b8bd249dfda..9bfe3e5af17155b93b249446e75235d1d4a2b4d0 100644 (file)
--- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
@@ -26,7 +26,7 @@ local $Data::Dumper::Indent     = 1; # for dumpering from !
 BEGIN {
     use vars        qw[ $VERSION @ISA ];
     @ISA        =   qw[ CPANPLUS::Shell::_Base::ReadLine ];
-    $VERSION = "0.9106";
+    $VERSION = "0.9107";
 }
 
 load CPANPLUS::Shell;

diff --git a/cpan/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t b/cpan/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t
index dc9dcffa21801f8f2063fa47fa96b88b7a67a35c..e15dcb2fc06ff39873fb62ed769dc97726aeead8 100644 (file)
--- a/cpan/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t
+++ b/cpan/CPANPLUS/t/00_CPANPLUS-Internals-Utils.t
@@ -8,7 +8,7 @@ use strict;
 
 ### make sure to keep the plan -- this is the only test
 ### supported for 'older' T::H (pre 2.28) -- see Makefile.PL for details
-use Test::More tests => 40;
+use Test::More tests => 48;
 
 use Cwd;
 use Data::Dumper;
@@ -116,11 +116,15 @@ rmdir $Dir  if -d $Dir;
 
 ### _version_to_number tests ###
 {   my $map = {
-        '1'     => '1',
-        '1.2'   => '1.2',
-        '.2'    => '.2',
-        'foo'   => '0.0',
-        'a.1'   => '0.0',
+        '1'      => '1',
+        '1.2'    => '1.2',
+        '.2'     => '.2',
+        'foo'    => '0.0',
+        'a.1'    => '0.0',
+        '1.2.3'  => '1.002003',
+        'v1.2.3' => '1.002003',
+        'v1.5'   => '1.005000',
+        '1.5-a'  => '1.500',
     };
 
     while( my($try,$expect) = each %$map ) {

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index b91d66ccc757a53e2f3621ab53c88fcef8f25e62..723914cd067fd078880e684923b48f709b6fe320 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -192,7 +192,7 @@ IO::Compress::Zip when the content size was exactly 0xFFFFFFFF.
 
 =item *
 
-L<CPANPLUS> has been upgraded from version 0.9105 to version 0.9106
+L<CPANPLUS> has been upgraded from version 0.9105 to version 0.9107
 
 =item *