@@ -27,3 +27,4 @@ user/templates/*

 !user/templates/.gitignore

 db/*

 !db/.gitignore

+extlib

@@ -1,19 +0,0 @@

-1.00

-  - First major release!

-0.05

-  - added reverse proxy support

-0.04

-  - added encoding option

-  - added text_exts option

-  - added prevent_xss option

-  - fixed many bugs.

-0.03 (beta)

-  - don't overwrite gitweblite.conf

-  - config file become JSON.

-  - URL become more restful.

-  - Git command automatically detect

-0.02 (beta)

-  - fixed blob, blog_plain, commitdiff, commitdiff_plain encoding bug

-

-0.01 (beta)

-  - first beta release.

@@ -2,6 +2,15 @@ gitprep

   Github clone. Serve git repository.

+Features

+

+  - Github clone

+  - Perl 5.8.7+ only needed

+

+Installation

+

+  perl cpanm -L extlib --installdeps .

+

 Operation

   Start

@@ -11,7 +20,7 @@ Operation

     Application start in back ground. Port is 10020.

     You can access the following URL.

-      http://localhost:10010

+      http://localhost:10020

     If you change port, edit githublite.conf.

@@ -0,0 +1,4 @@

+requires 'DBI', '== 1.621';

+requires 'DBD::SQLite', '== 1.37';

+requires 'Object::Simple', '== 3.08';

+requires 'DBIx::Custom', '== 0.28';

@@ -18,7 +18,7 @@ my %fatpacked;

 $fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';

   package App::cpanminus;

-  our $VERSION = "1.5007";

+  our $VERSION = "1.6005";

   =head1 NAME

@@ -28,7 +28,7 @@ $fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';

       cpanm Module

-  Run C<cpanm -h> for more options.

+  Run C<cpanm -h> or C<perldoc cpanm> for more options.

   =head1 DESCRIPTION

@@ -133,10 +133,10 @@ $fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';

   =head2 Zero-conf? How does this module get/parse/update the CPAN index?

-  It queries the CPAN Meta DB site running on Google AppEngine at

-  L<http://cpanmetadb.plackperl.org/>. The site is updated every hour to reflect

-  the latest changes from fast syncing mirrors. The script then also falls back

-  to scrape the site L<http://search.cpan.org/>.

+  It queries the CPAN Meta DB site at L<http://cpanmetadb.plackperl.org/>.

+  The site is updated at least every hour to reflect the latest changes

+  from fast syncing mirrors. The script then also falls back to query the

+  module at L<http://metacpan.org/> using its wonderful API.

   Fetched files are unpacked in C<~/.cpanm> and automatically cleaned up

   periodically.  You can configure the location of this with the

@@ -247,15 +247,11 @@ $fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';

   =item L<JSON::PP> Copyright 2007−2011 by Makamaka Hannyaharamitu

-  =item L<CPAN::Meta> Copyright (c) 2010 by David Golden and Ricardo Signes

+  =item L<CPAN::Meta>, L<CPAN::Meta::Requirements> Copyright (c) 2010 by David Golden and Ricardo Signes

-  =item L<Try::Tiny> Copyright (c) 2009 Yuval Kogman

+  =item L<CPAN::Meta::YAML> Copyright 2010 Adam Kennedy

-  =item L<parent> Copyright (c) 2007-10 Max Maischein

-  

-  =item L<Version::Requirements> copyright (c) 2010 by Ricardo Signes

-  

-  =item L<CPAN::Meta::YAML> copyright (c) 2010 by Adam Kennedy

+  =item L<File::pushd> Copyright 2012 David Golden

   =back

@@ -314,11 +310,13 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   use strict;

   use Config;

   use Cwd ();

+  use App::cpanminus;

   use File::Basename ();

   use File::Find ();

   use File::Path ();

   use File::Spec ();

   use File::Copy ();

+  use File::Temp ();

   use Getopt::Long ();

   use Parse::CPAN::Meta;

   use Symbol ();

@@ -326,18 +324,47 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   use constant WIN32 => $^O eq 'MSWin32';

   use constant SUNOS => $^O eq 'solaris';

-  our $VERSION = "1.5007";

+  our $VERSION = $App::cpanminus::VERSION;

+  

+  if ($INC{"App/FatPacker/Trace.pm"}) {

+      require JSON::PP;

+      require CPAN::Meta::YAML;

+      require CPAN::Meta::Prereqs;

+      require version::vpp;

+      require File::pushd;

+  }

   my $quote = WIN32 ? q/"/ : q/'/;

+  sub agent {

+      my $self = shift;

+      "cpanminus/$VERSION perl/$]";

+  }

+  

+  sub determine_home {

+      my $class = shift;

+  

+      my $homedir = $ENV{HOME}

+        || eval { require File::HomeDir; File::HomeDir->my_home }

+        || join('', @ENV{qw(HOMEDRIVE HOMEPATH)}); # Win32

+  

+      if (WIN32) {

+          require Win32; # no fatpack

+          $homedir = Win32::GetShortPathName($homedir);

+      }

+  

+      return "$homedir/.cpanm";

+  }

+  

   sub new {

       my $class = shift;

       bless {

-          home => "$ENV{HOME}/.cpanm",

+          home => $class->determine_home,

           cmd  => 'install',

           seen => {},

           notest => undef,

+          test_only => undef,

           installdeps => undef,

           force => undef,

           sudo => undef,

@@ -371,6 +398,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           format   => 'tree',

           save_dists => undef,

           skip_configure => 0,

+          verify => 0,

           @_,

       }, $class;

   }

@@ -391,8 +419,10 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       Getopt::Long::GetOptions(

           'f|force'   => sub { $self->{skip_installed} = 0; $self->{force} = 1 },

           'n|notest!' => \$self->{notest},

+          'test-only' => sub { $self->{notest} = 0; $self->{skip_installed} = 0; $self->{test_only} = 1 },

           'S|sudo!'   => \$self->{sudo},

           'v|verbose' => sub { $self->{verbose} = $self->{interactive} = 1 },

+          'verify!'   => \$self->{verify},

           'q|quiet!'  => \$self->{quiet},

           'h|help'    => sub { $self->{action} = 'show_help' },

           'V|version' => sub { $self->{action} = 'show_version' },

@@ -405,7 +435,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           },

           'mirror=s@' => $self->{mirrors},

           'mirror-only!' => \$self->{mirror_only},

-          'mirror-index=s'  => sub { $self->{mirror_index} = $_[1]; $self->{mirror_only} = 1 },

+          'mirror-index=s'  => \$self->{mirror_index},

           'cascade-search!' => \$self->{cascade_search},

           'prompt!'   => \$self->{prompt},

           'installdeps' => \$self->{installdeps},

@@ -416,7 +446,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           'i|install' => sub { $self->{cmd} = 'install' },

           'info'      => sub { $self->{cmd} = 'info' },

           'look'      => sub { $self->{cmd} = 'look'; $self->{skip_installed} = 0 },

-          'self-upgrade' => sub { $self->{cmd} = 'install'; $self->{skip_installed} = 1; push @ARGV, 'App::cpanminus' },

+          'self-upgrade' => sub { $self->check_upgrade; $self->{cmd} = 'install'; $self->{skip_installed} = 1; push @ARGV, 'App::cpanminus' },

           'uninst-shadows!'  => \$self->{uninstall_shadows},

           'lwp!'    => \$self->{try_lwp},

           'wget!'   => \$self->{try_wget},

@@ -430,7 +460,8 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

               $self->{save_dists} = $self->maybe_abs($_[1]);

           },

           'skip-configure!' => \$self->{skip_configure},

-          'metacpan'   => \$self->{metacpan},

+          'dev!'       => \$self->{dev_release},

+          'metacpan!'  => \$self->{metacpan},

       );

       if (!@ARGV && $0 ne '-' && !-t STDIN){ # e.g. # cpanm < author/requires.cpanm

@@ -441,6 +472,33 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       $self->{argv} = \@ARGV;

   }

+  sub check_upgrade {

+      if ($0 !~ /^$Config{installsitebin}/) {

+          if ($0 =~ m!perlbrew/bin!) {

+              warn <<WARN;

+  It appears your cpanm executable was installed via `perlbrew install-cpanm`.

+  cpanm --self-upgrade won't upgrade the version of cpanm you're running.

+  

+  Run the following command to get it upgraded.

+  

+    perlbrew install-cpanm

+  

+  WARN

+          } else {

+              warn <<WARN;

+  You are running cpanm from the path where your current perl won't install executables to.

+  Because of that, cpanm --self-upgrade won't upgrade the version of cpanm you're running.

+  

+    cpanm path   : $0

+    Install path : $Config{installsitebin}

+  

+  It means you either installed cpanm globally with system perl, or use distro packages such

+  as rpm or apt-get, and you have to use them again to upgrade cpanm.

+  WARN

+          }

+      }

+  }

+  

   sub check_libs {

       my $self = shift;

       return if $self->{_checked}++;

@@ -453,11 +511,39 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       }

   }

+  sub setup_verify {

+      my $self = shift;

+  

+      my $has_modules = eval { require Module::Signature; require Digest::SHA; 1 };

+      $self->{cpansign} = $self->which('cpansign');

+  

+      unless ($has_modules && $self->{cpansign}) {

+          warn "WARNING: Module::Signature and Digest::SHA is required for distribution verifications.\n";

+          $self->{verify} = 0;

+      }

+  }

+  

+  sub parse_module_args {

+      my($self, $module) = @_;

+  

+      # Plack@1.2 -> Plack~"==1.2"

+      # BUT don't expand @ in git URLs

+      $module =~ s/^([A-Za-z0-9_:]+)@([v\d\._]+)$/$1~== $2/;

+  

+      # Plack~1.20, DBI~"> 1.0, <= 2.0"

+      if ($module =~ /\~[v\d\._,\!<>= ]+$/) {

+          return split /\~/, $module, 2;

+      } else {

+          return $module, undef;

+      }

+  }

+  

   sub doit {

       my $self = shift;

       $self->setup_home;

       $self->init_tools;

+      $self->setup_verify if $self->{verify};

       if (my $action = $self->{action}) {

           $self->$action() and return 1;

@@ -477,12 +563,12 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

               $module = join '::', grep { $_ } File::Spec->splitdir($dirs), $file;

           }

-          ($module, my $version) = split /\~/, $module, 2;

-          if ($self->{skip_satisfied} or defined $version) {

+          ($module, my $version) = $self->parse_module_args($module);

+          if ($self->{skip_satisfied}) {

               $self->check_libs;

               my($ok, $local) = $self->check_module($module, $version || 0);

               if ($ok) {

-                  $self->diag("You have $module (" . ($local || 'undef') . ")\n", 1);

+                  $self->diag("You have $module ($local)\n", 1);

                   next;

               }

           }

@@ -504,6 +590,13 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       if ($self->{scandeps}) {

           $self->dump_scandeps();

       }

+      # Workaround for older File::Temp's

+      # where creating a tempdir with an implicit $PWD

+      # causes tempdir non-cleanup if $PWD changes

+      # as paths are stored internally without being resolved

+      # absolutely.

+      # https://rt.cpan.org/Public/Bug/Display.html?id=44924

+      $self->chdir($cwd);

       return !@fail;

   }

@@ -595,7 +688,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       open my $fh, '<', $file or return;

       my $found;

       while (<$fh>) {

-          if (m!^\Q$module\E\s+([\w\.]+)\s+(.*)!m) {

+          if (m!^\Q$module\E\s+([\w\.]+)\s+(\S*)!m) {

               $found = $self->cpan_module($module, $2, $1);

               last;

           }

@@ -604,66 +697,227 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       return $found unless $self->{cascade_search};

       if ($found) {

-          if (!$version or

-              version->new($found->{version} || 0) >= version->new($version)) {

+          if ($self->satisfy_version($module, $found->{module_version}, $version)) {

               return $found;

           } else {

-              $self->chat("Found $module version $found->{version} < $version.\n");

+              $self->chat("Found $module $found->{module_version} which doesn't satisfy $version.\n");

           }

       }

       return;

   }

-  sub search_module {

+  sub with_version_range {

+      my($self, $version) = @_;

+      defined($version) && $version =~ /[<>=]/;

+  }

+  

+  sub encode_json {

+      my($self, $data) = @_;

+      require JSON::PP;

+  

+      my $json = JSON::PP::encode_json($data);

+      $json =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("%%%02x",ord($1))/eg;

+      $json;

+  }

+  

+  # TODO extract this as a module?

+  sub version_to_query {

       my($self, $module, $version) = @_;

-      unless ($self->{mirror_only}) {

-          if ($self->{metacpan}) {

-              require JSON::PP;

-              $self->chat("Searching $module on metacpan ...\n");

-              my $module_uri  = "http://api.metacpan.org/module/$module";

-              my $module_json = $self->get($module_uri);

-              my $module_meta = eval { JSON::PP::decode_json($module_json) };

-              if ($module_meta && $module_meta->{distribution}) {

-                  my $dist_uri = "http://api.metacpan.org/release/$module_meta->{distribution}";

-                  my $dist_json = $self->get($dist_uri);

-                  my $dist_meta = eval { JSON::PP::decode_json($dist_json) };

-                  if ($dist_meta && $dist_meta->{download_url}) {

-                      (my $distfile = $dist_meta->{download_url}) =~ s!.+/authors/id/!!;

-                      local $self->{mirrors} = $self->{mirrors};

-                      if ($dist_meta->{stat}->{mtime} > time()-24*60*60) {

-                          $self->{mirrors} = ['http://cpan.metacpan.org'];

-                      }

-                      return $self->cpan_module($module, $distfile, $dist_meta->{version});

-                  }

+      require CPAN::Meta::Requirements;

+  

+      my $requirements = CPAN::Meta::Requirements->new;

+      $requirements->add_string_requirement($module, $version || '0');

+  

+      my $req = $requirements->requirements_for_module($module);

+  

+      if ($req =~ s/^==\s*//) {

+          return {

+              term => { 'module.version' => $req },

+          };

+      } elsif ($req !~ /\s/) {

+          return {

+              range => { 'module.version_numified' => { 'gte' => $self->numify_ver($req) } },

+          };

+      } else {

+          my %ops = qw(< lt <= lte > gt >= gte);

+          my(%range, @exclusion);

+          my @requirements = split /,\s*/, $req;

+          for my $r (@requirements) {

+              if ($r =~ s/^([<>]=?)\s*//) {

+                  $range{$ops{$1}} = $self->numify_ver($r);

+              } elsif ($r =~ s/\!=\s*//) {

+                  push @exclusion, $self->numify_ver($r);

               }

-              $self->diag_fail("Finding $module on metacpan failed.");

           }

-          $self->chat("Searching $module on cpanmetadb ...\n");

-          my $uri  = "http://cpanmetadb.plackperl.org/v1.0/package/$module";

-          my $yaml = $self->get($uri);

-          my $meta = $self->parse_meta_string($yaml);

-          if ($meta && $meta->{distfile}) {

-              return $self->cpan_module($module, $meta->{distfile}, $meta->{version});

+          my @filters= (

+              { range => { 'module.version_numified' => \%range } },

+          );

+  

+          if (@exclusion) {

+              push @filters, {

+                  not => { or => [ map { +{ term => { 'module.version_numified' => $self->numify_ver($_) } } } @exclusion ] },

+              };

+          }

+  

+          return @filters;

+      }

+  }

+  

+  sub numify_ver {

+      my($self, $ver) = @_;

+      version->new($ver)->numify;

+  }

+  

+  sub maturity_filter {

+      my($self, $module, $version) = @_;

+  

+      my @filters;

+  

+      # TODO: dev release should be enabled per dist

+      if (!$self->with_version_range($version) or $self->{dev_release}) {

+          # backpan'ed dev release are considered "cancelled"

+          push @filters, { not => { term => { status => 'backpan' } } };

+      }

+  

+      unless ($self->{dev_release} or $version =~ /==/) {

+          push @filters, { term => { maturity => 'released' } };

+      }

+  

+      return @filters;

+  }

+  

+  sub search_metacpan {

+      my($self, $module, $version) = @_;

+  

+      require JSON::PP;

+  

+      $self->chat("Searching $module ($version) on metacpan ...\n");

+  

+      my $metacpan_uri = 'http://api.metacpan.org/v0';

+  

+      my @filter = $self->maturity_filter($module, $version);

+  

+      my $query = { filtered => {

+          (@filter ? (filter => { and => \@filter }) : ()),

+          query => { nested => {

+              score_mode => 'max',

+              path => 'module',

+              query => { custom_score => {

+                  metacpan_script => "score_version_numified",

+                  query => { constant_score => {

+                      filter => { and => [

+                          { term => { 'module.authorized' => JSON::PP::true() } },

+                          { term => { 'module.indexed' => JSON::PP::true() } },

+                          { term => { 'module.name' => $module } },

+                          $self->version_to_query($module, $version),

+                      ] }

+                  } },

+              } },

+          } },

+      } };

+  

+      my $module_uri = "$metacpan_uri/file/_search?source=";

+      $module_uri .= $self->encode_json({

+          query => $query,

+          fields => [ 'release', 'module' ],

+      });

+  

+      my($release, $module_version);

+  

+      my $module_json = $self->get($module_uri);

+      my $module_meta = eval { JSON::PP::decode_json($module_json) };

+      my $match = $module_meta ? $module_meta->{hits}{hits}[0]{fields} : undef;

+      if ($match) {

+          $release = $match->{release};

+          my $module_matched = (grep { $_->{name} eq $module } @{$match->{module}})[0];

+          $module_version = $module_matched->{version};

+      }

+  

+      unless ($release) {

+          $self->chat("! Could not find a release matching $module ($version) on MetaCPAN.\n");

+          return;

+      }

+  

+      my $dist_uri = "$metacpan_uri/release/_search?source=";

+      $dist_uri .= $self->encode_json({

+          filter => {

+              term => { 'release.name' => $release },

+          },

+          fields => [ 'download_url', 'stat', 'status' ],

+      });

+  

+      my $dist_json = $self->get($dist_uri);

+      my $dist_meta = eval { JSON::PP::decode_json($dist_json) };

+  

+      if ($dist_meta) {

+          $dist_meta = $dist_meta->{hits}{hits}[0]{fields};

+      }

+      if ($dist_meta && $dist_meta->{download_url}) {

+          (my $distfile = $dist_meta->{download_url}) =~ s!.+/authors/id/!!;

+          local $self->{mirrors} = $self->{mirrors};

+          if ($dist_meta->{status} eq 'backpan') {

+              $self->{mirrors} = [ 'http://backpan.perl.org' ];

+          } elsif ($dist_meta->{stat}{mtime} > time()-24*60*60) {

+              $self->{mirrors} = [ 'http://cpan.metacpan.org' ];

           }

+          return $self->cpan_module($module, $distfile, $module_version);

+      }

+  

+      $self->diag_fail("Finding $module on metacpan failed.");

+      return;

+  }

+  

+  sub search_database {

+      my($self, $module, $version) = @_;

+  

+      my $found;

+      my $range = ($self->with_version_range($version) || $self->{dev_release});

+  

+      if ($range or $self->{metacpan}) {

+          $found = $self->search_metacpan($module, $version)   and return $found;

+          $found = $self->search_cpanmetadb($module, $version) and return $found;

+      } else {

+          $found = $self->search_cpanmetadb($module, $version) and return $found;

+          $found = $self->search_metacpan($module, $version)   and return $found;

+      }

+  }

-          $self->diag_fail("Finding $module on cpanmetadb failed.");

+  sub search_cpanmetadb {

+      my($self, $module, $version) = @_;

-          $self->chat("Searching $module on search.cpan.org ...\n");

-          my $uri  = "http://search.cpan.org/perldoc?$module";

-          my $html = $self->get($uri);

-          $html =~ m!<a href="/CPAN/authors/id/(.*?\.(?:tar\.gz|tgz|tar\.bz2|zip))">!

-              and return $self->cpan_module($module, $1);

+      $self->chat("Searching $module on cpanmetadb ...\n");

-          $self->diag_fail("Finding $module on search.cpan.org failed.");

+      my $uri  = "http://cpanmetadb.plackperl.org/v1.0/package/$module";

+      my $yaml = $self->get($uri);

+      my $meta = $self->parse_meta_string($yaml);

+      if ($meta && $meta->{distfile}) {

+          return $self->cpan_module($module, $meta->{distfile}, $meta->{version});

       }

+      $self->diag_fail("Finding $module on cpanmetadb failed.");

+      return;

+  }

+  

+  sub search_module {

+      my($self, $module, $version) = @_;

+  

       if ($self->{mirror_index}) {

           $self->chat("Searching $module on mirror index $self->{mirror_index} ...\n");

           my $pkg = $self->search_mirror_index_file($self->{mirror_index}, $module, $version);

           return $pkg if $pkg;

+  

+          unless ($self->{cascade_search}) {

+             $self->diag_fail("Finding $module ($version) on mirror index $self->{mirror_index} failed.");

+             return;

+          }

+      }

+  

+      unless ($self->{mirror_only}) {

+          my $found = $self->search_database($module, $version);

+          return $found if $found;

       }

       MIRROR: for my $mirror (@{ $self->{mirrors} }) {

@@ -738,6 +992,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

     --interactive             Turns on interactive configure (required for Task:: modules)

     -f,--force                force install

     -n,--notest               Do not run unit tests

+    --test-only               Run tests only, do not install

     -S,--sudo                 sudo to run install commands

     --installdeps             Only install dependencies

     --showdeps                Only display direct dependencies

@@ -794,8 +1049,11 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   sub maybe_abs {

       my($self, $lib) = @_;

-      return $lib if $lib eq '_'; # special case: gh-113

-      $lib =~ /^[~\/]/ ? $lib : File::Spec->canonpath(Cwd::cwd . "/$lib");

+      if ($lib eq '_' or $lib =~ /^~/ or File::Spec->file_name_is_absolute($lib)) {

+          return $lib;

+      } else {

+          return File::Spec->canonpath(File::Spec->catdir(Cwd::cwd(), $lib));

+      }

   }

   sub bootstrap_local_lib {

@@ -822,9 +1080,10 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   ! Can't write to $Config{installsitelib} and $Config{installsitebin}: Installing modules to $ENV{HOME}/perl5

   ! To turn off this warning, you have to do one of the following:

   !   - run me as a root or with --sudo option (to install to $Config{installsitelib} and $Config{installsitebin})

-  |   - run me with --local-lib option e.g. cpanm --local-lib=~/perl5

-  !   - Set PERL_CPANM_OPT="--local-lib=~/perl5" environment variable (in your shell rc file)

-  !   - Configure local::lib in your shell to set PERL_MM_OPT etc.

+  !   - Configure local::lib your existing local::lib in this shell to set PERL_MM_OPT etc.

+  !   - Install local::lib by running the following commands

+  !

+  !         cpanm --local-lib=~/perl5 local::lib && eval \$(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)

   !

   DIAG

       sleep 2;

@@ -834,8 +1093,8 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       my($self, $base) = @_;

       require local::lib;

       (

-          local::lib->install_base_perl_path($base),

-          local::lib->install_base_arch_path($base),

+          local::lib->resolve_path(local::lib->install_base_perl_path($base)),

+          local::lib->resolve_path(local::lib->install_base_arch_path($base)),

           @Config{qw(privlibexp archlibexp)},

       );

   }

@@ -871,8 +1130,8 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

               $self->{search_inc} = [ @inc ];

           } else {

               $self->{search_inc} = [

-                  local::lib->install_base_arch_path($base),

-                  local::lib->install_base_perl_path($base),

+                  local::lib->resolve_path(local::lib->install_base_arch_path($base)),

+                  local::lib->resolve_path(local::lib->install_base_perl_path($base)),

                   @INC,

               ];

           }

@@ -1112,7 +1371,11 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   }

   sub install {

-      my($self, $cmd, $uninst_opts) = @_;

+      my($self, $cmd, $uninst_opts, $depth) = @_;

+  

+      if ($depth == 0 && $self->{test_only}) {

+          return 1;

+      }

       if ($self->{sudo}) {

           unshift @$cmd, "sudo";

@@ -1173,7 +1436,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   sub configure_mirrors {

       my $self = shift;

       unless (@{$self->{mirrors}}) {

-          $self->{mirrors} = [ 'http://search.cpan.org/CPAN' ];

+          $self->{mirrors} = [ 'http://www.cpan.org' ];

       }

       for (@{$self->{mirrors}}) {

           s!^/!file:///!;

@@ -1215,10 +1478,17 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       $self->setup_module_build_patch unless $self->{pod2man};

       if ($dist->{module}) {

-          my($ok, $local) = $self->check_module($dist->{module}, $dist->{module_version} || 0);

-          if ($self->{skip_installed} && $ok) {

-              $self->diag("$dist->{module} is up to date. ($local)\n", 1);

-              return 1;

+          unless ($self->with_version_range($version)) {

+              my($ok, $local) = $self->check_module($dist->{module}, $dist->{module_version} || 0);

+              if ($self->{skip_installed} && $ok) {

+                  $self->diag("$dist->{module} is up to date. ($local)\n", 1);

+                  return 1;

+              }

+          }

+  

+          unless ($self->satisfy_version($dist->{module}, $dist->{module_version}, $version)) {

+              $self->diag("Found $dist->{module} $dist->{module_version} which doesn't satisfy $version.\n");

+              return;

           }

       }

@@ -1299,7 +1569,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           $self->diag_ok;

           $dist->{local_path} = File::Spec->rel2abs($name);

-          my $dir = $self->unpack($file);

+          my $dir = $self->unpack($file, $uri, $dist);

           next unless $dir; # unpack failed

           if (my $save = $self->{save_dists}) {

@@ -1314,7 +1584,12 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   }

   sub unpack {

-      my($self, $file) = @_;

+      my($self, $file, $uri, $dist) = @_;

+  

+      if ($self->{verify}) {

+          $self->verify_archive($file, $uri, $dist) or return;

+      }

+  

       $self->chat("Unpacking $file\n");

       my $dir = $file =~ /\.zip/i ? $self->unzip($file) : $self->untar($file);

       unless ($dir) {

@@ -1323,13 +1598,121 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       return $dir;

   }

+  sub verify_checksums_signature {

+      my($self, $chk_file) = @_;

+  

+      require Module::Signature; # no fatpack

+  

+      $self->chat("Verifying the signature of CHECKSUMS\n");

+  

+      my $rv = eval {

+          local $SIG{__WARN__} = sub {}; # suppress warnings

+          my $v = Module::Signature::_verify($chk_file);

+          $v == Module::Signature::SIGNATURE_OK();

+      };

+      if ($rv) {

+          $self->chat("Verified OK!\n");

+      } else {

+          $self->diag_fail("Verifying CHECKSUMS signature failed: $rv\n");

+          return;

+      }

+  

+      return 1;

+  }

+  

+  sub verify_archive {

+      my($self, $file, $uri, $dist) = @_;

+  

+      unless ($dist->{cpanid}) {

+          $self->chat("Archive '$file' does not seem to be from PAUSE. Skip verification.\n");

+      }

+  

+      (my $mirror = $uri) =~ s!/authors/id.*$!!;

+  

+      (my $chksum_uri = $uri) =~ s!/[^/]*$!/CHECKSUMS!;

+      my $chk_file = $self->source_for($mirror) . "/$dist->{cpanid}.CHECKSUMS";

+      $self->diag_progress("Fetching $chksum_uri");

+      $self->mirror($chksum_uri, $chk_file);

+  

+      unless (-e $chk_file) {

+          $self->diag_fail("Fetching $chksum_uri failed.\n");

+          return;

+      }

+  

+      $self->diag_ok;

+      $self->verify_checksums_signature($chk_file) or return;

+      $self->verify_checksum($file, $chk_file);

+  }

+  

+  sub verify_checksum {

+      my($self, $file, $chk_file) = @_;

+  

+      $self->chat("Verifying the SHA1 for $file\n");

+  

+      open my $fh, "<$chk_file" or die "$chk_file: $!";

+      my $data = join '', <$fh>;

+      $data =~ s/\015?\012/\n/g;

+  

+      require Safe; # no fatpack

+      my $chksum = Safe->new->reval($data);

+  

+      if (!ref $chksum or ref $chksum ne 'HASH') {

+          $self->diag_fail("! Checksum file downloaded from $chk_file is broken.\n");

+          return;

+      }

+  

+      if (my $sha = $chksum->{$file}{sha256}) {

+          my $hex = $self->sha1_for($file);

+          if ($hex eq $sha) {

+              $self->chat("Checksum for $file: Verified!\n");

+          } else {

+              $self->diag_fail("Checksum mismatch for $file\n");

+              return;

+          }

+      } else {

+          $self->chat("Checksum for $file not found in CHECKSUMS.\n");

+          return;

+      }

+  }

+  

+  sub sha1_for {

+      my($self, $file) = @_;

+  

+      require Digest::SHA; # no fatpack

+  

+      open my $fh, "<", $file or die "$file: $!";

+      my $dg = Digest::SHA->new(256);

+      my($data);

+      while (read($fh, $data, 4096)) {

+          $dg->add($data);

+      }

+  

+      return $dg->hexdigest;

+  }

+  

+  sub verify_signature {

+      my($self, $dist) = @_;

+  

+      $self->diag_progress("Verifying the SIGNATURE file");

+      my $out = `$self->{cpansign} -v --skip 2>&1`;

+      $self->log($out);

+  

+      if ($out =~ /Signature verified OK/) {

+          $self->diag_ok("Verified OK");

+          return 1;

+      } else {

+          $self->diag_fail("SIGNATURE verificaion for $dist->{filename} failed\n");

+          return;

+      }

+  }

+  

   sub resolve_name {

       my($self, $module, $version) = @_;

       # URL

       if ($module =~ /^(ftp|https?|file):/) {

-          if ($module =~ m!authors/id/!) {

-              return $self->cpan_dist($module, $module);

+          if ($module =~ m!authors/id/(.*)!) {

+              return $self->cpan_dist($1, $module);

           } else {

               return { uris => [ $module ] };

           }

@@ -1351,6 +1734,11 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           };

       }

+      # Git

+      if ($module =~ /(^git:|\.git$)/) {

+          return $self->git_uri($module);

+      }

+  

       # cpan URI

       if ($module =~ s!^cpan:///distfile/!!) {

           return $self->cpan_dist($module);

@@ -1402,6 +1790,44 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       };

   }

+  sub git_uri {

+      my ($self, $uri) = @_;

+  

+      # similar to http://www.pip-installer.org/en/latest/logic.html#vcs-support

+      # git URL has to end with .git when you need to use pin @ commit/tag/branch

+  

+      ($uri, my $commitish) = split /(?<=\.git)@/i, $uri, 2;

+  

+      my $dh  = File::Temp->newdir(CLEANUP => 1);

+      my $dir = Cwd::abs_path($dh->dirname);

+  

+      $self->diag_progress("Cloning $uri");

+      $self->run([ 'git', 'clone', $uri, $dir ]);

+  

+      unless (-e "$dir/.git") {

+          $self->diag_fail("Failed cloning git repository $uri");

+          return;

+      }

+  

+      if ($commitish) {

+          require File::pushd;

+          my $dir = File::pushd::pushd($dir);

+  

+          unless ($self->run([ 'git', 'checkout', $commitish ])) {

+              $self->diag_fail("Failed to checkout '$commitish' in git repository $uri\n");

+              return;

+          }

+      }

+  

+      $self->diag_ok;

+  

+      return {

+          source => 'local',

+          dir    => $dir,

+          handle => $dh,

+      };

+  }

+  

   sub setup_module_build_patch {

       my $self = shift;

@@ -1432,7 +1858,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       # might be newer than (or actually wasn't core at) the version

       # that is shipped with the current perl

       if ($self->{self_contained} && $self->loaded_from_perl_lib($meta)) {

-          require Module::CoreList;

+          require Module::CoreList; # no fatpack

           unless (exists $Module::CoreList::version{$]+0}{$mod}) {

               return 0, undef;

           }

@@ -1443,23 +1869,43 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       if ($self->is_deprecated($meta)){

           return 0, $version;

-      } elsif (!$want_ver or $version >= version->new($want_ver)) {

+      } elsif ($self->satisfy_version($mod, $version, $want_ver)) {

           return 1, ($version || 'undef');

       } else {

           return 0, $version;

       }

   }

+  sub satisfy_version {

+      my($self, $mod, $version, $want_ver) = @_;

+  

+      $want_ver = '0' unless defined($want_ver) && length($want_ver);

+  

+      require CPAN::Meta::Requirements;

+      my $requirements = CPAN::Meta::Requirements->new;

+      $requirements->add_string_requirement($mod, $want_ver);

+      $requirements->accepts_module($mod, $version);

+  }

+  

+  sub unsatisfy_how {

+      my($self, $ver, $want_ver) = @_;

+  

+      if ($want_ver =~ /^[v0-9\.\_]+$/) {

+          return "$ver < $want_ver";

+      } else {

+          return "$ver doesn't satisfy $want_ver";

+      }

+  }

+  

   sub is_deprecated {

       my($self, $meta) = @_;

       my $deprecated = eval {

-          require Module::CoreList;

+          require Module::CoreList; # no fatpack

           Module::CoreList::is_deprecated($meta->{module});

       };

-      return unless $deprecated;

-      return $self->loaded_from_perl_lib($meta);

+      return $deprecated && $self->loaded_from_perl_lib($meta);

   }

   sub loaded_from_perl_lib {

@@ -1483,7 +1929,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       my($ok, $local) = $self->check_module($mod, $ver);

       if ($ok)       { $self->chat("Yes ($local)\n") }

-      elsif ($local) { $self->chat("No ($local < $ver)\n") }

+      elsif ($local) { $self->chat("No (" . $self->unsatisfy_how($local, $ver) . ")\n") }

       else           { $self->chat("No\n") }

       return $mod unless $ok;

@@ -1536,20 +1982,32 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   sub build_stuff {

       my($self, $stuff, $dist, $depth) = @_;

+      if ($self->{verify} && -e 'SIGNATURE') {

+          $self->verify_signature($dist) or return;

+      }

+  

       my @config_deps;

-      if (!%{$dist->{meta} || {}} && -e 'META.yml') {

+      if (-e 'META.json') {

+          $self->chat("Checking configure dependencies from META.json\n");

+          $dist->{meta} = $self->parse_meta('META.json');

+      } elsif (-e 'META.yml') {

           $self->chat("Checking configure dependencies from META.yml\n");

           $dist->{meta} = $self->parse_meta('META.yml');

       }

       if (!$dist->{meta} && $dist->{source} eq 'cpan') {

-          $self->chat("META.yml not found or unparsable. Fetching META.yml from search.cpan.org\n");

+          $self->chat("META.yml/json not found or unparsable. Fetching META.yml from search.cpan.org\n");

           $dist->{meta} = $self->fetch_meta_sco($dist);

       }

       $dist->{meta} ||= {};

-      push @config_deps, %{$dist->{meta}{configure_requires} || {}};

+      if ( $dist->{meta}->{prereqs} ) {

+          push @config_deps, %{$dist->{meta}{prereqs}{configure}{requires} || {}};

+      }

+      else {

+          push @config_deps, %{$dist->{meta}{configure_requires} || {}};

+      }

       my $target = $dist->{meta}{name} ? "$dist->{meta}{name}-$dist->{meta}{version}" : $dist->{dir};

@@ -1558,7 +2016,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       $self->diag_progress("Configuring $target");

-      my $configure_state = $self->configure_this($dist);

+      my $configure_state = $self->configure_this($dist, $depth);

       $self->diag_ok($configure_state->{configured_ok} ? "OK" : "N/A");

@@ -1617,13 +2075,13 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           $self->diag_progress("Building " . ($self->{notest} ? "" : "and testing ") . $distname);

           $self->build([ $self->{perl}, @switches, "./Build" ], $distname) &&

           $self->test([ $self->{perl}, "./Build", "test" ], $distname) &&

-          $self->install([ $self->{perl}, @switches, "./Build", "install" ], [ "--uninst", 1 ]) &&

+          $self->install([ $self->{perl}, @switches, "./Build", "install" ], [ "--uninst", 1 ], $depth) &&

           $installed++;

       } elsif ($self->{make} && -e 'Makefile') {

           $self->diag_progress("Building " . ($self->{notest} ? "" : "and testing ") . $distname);

           $self->build([ $self->{make} ], $distname) &&

           $self->test([ $self->{make}, "test" ], $distname) &&

-          $self->install([ $self->{make}, "install" ], [ "UNINST=1" ]) &&

+          $self->install([ $self->{make}, "install" ], [ "UNINST=1" ], $depth) &&

           $installed++;

       } else {

           my $why;

@@ -1636,7 +2094,10 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           return;

       }

-      if ($installed) {

+      if ($installed && $self->{test_only}) {

+          $self->diag_ok;

+          $self->diag("Successfully tested $distname\n", 1);

+      } elsif ($installed) {

           my $local   = $self->{local_versions}{$dist->{module} || ''};

           my $version = $dist->{module_version} || $dist->{meta}{version} || $dist->{version};

           my $reinstall = $local && ($local eq $version);

@@ -1651,14 +2112,25 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           $self->save_meta($stuff, $dist, $module_name, \@config_deps, \@deps);

           return 1;

       } else {

-          my $msg = "Building $distname failed";

-          $self->diag_fail("Installing $stuff failed. See $self->{log} for details.", 1);

+          my $what = $self->{test_only} ? "Testing" : "Installing";

+          $self->diag_fail("$what $stuff failed. See $self->{log} for details.", 1);

           return;

       }

   }

   sub configure_this {

-      my($self, $dist) = @_;

+      my($self, $dist, $depth) = @_;

+  

+      if (-e 'cpanfile' && $self->{installdeps} && $depth == 0) {

+          require Module::CPANfile;

+          $dist->{cpanfile} = eval { Module::CPANfile->load('cpanfile') };

+          $self->diag_fail($@, 1) if $@;

+          return {

+              configured       => 1,

+              configured_ok    => !!$dist->{cpanfile},

+              use_module_build => 0,

+          };

+      }

       if ($self->{skip_configure}) {

           my $eumm = -e 'Makefile';

@@ -1723,10 +2195,10 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       unless ($state->{configured_ok}) {

           while (1) {

               my $ans = lc $self->prompt("Configuring $dist->{dist} failed.\nYou can s)kip, r)etry, e)xamine build log, or l)ook ?", "s");

-              last                                if $ans eq 's';

-              return $self->configure_this($dist) if $ans eq 'r';

-              $self->show_build_log               if $ans eq 'e';

-              $self->look                         if $ans eq 'l';

+              last                                        if $ans eq 's';

+              return $self->configure_this($dist, $depth) if $ans eq 'r';

+              $self->show_build_log                       if $ans eq 'e';

+              $self->look                                 if $ans eq 'l';

           }

       }

@@ -1767,12 +2239,12 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

               qw( blib/lib blib/arch ) # FCGI.pm :(

       );

-      mkdir "blib/meta", 0777 or die $!;

+      File::Path::mkpath("blib/meta", 0, 0777);

       my $local = {

           name => $module_name,

-          module => $module,

-          version => $provides->{$module}{version} || $dist->{version},

+          target => $module,

+          version => $provides->{$module_name}{version} || $dist->{version},

           dist => $dist->{distvname},

           pathname => $dist->{pathname},

           provides => $provides,

@@ -1834,6 +2306,15 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   sub extract_meta_prereqs {

       my($self, $dist) = @_;

+      if ($dist->{cpanfile}) {

+          my $prereq = $dist->{cpanfile}->prereq;

+          my @phase = $self->{notest} ? qw( build runtime ) : qw( build test runtime );

+          require CPAN::Meta::Requirements;

+          my $req = CPAN::Meta::Requirements->new;

+          $req->add_requirements($prereq->requirements_for($_, 'requires')) for @phase;

+          return %{$req->as_string_hash};

+      }

+  

       my $meta = $dist->{meta};

       my @deps;

@@ -1865,7 +2346,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           $self->chat("Finding PREREQ from Makefile ...\n");

           open my $mf, "Makefile";

           while (<$mf>) {

-              if (/^\#\s+PREREQ_PM => {\s*(.*?)\s*}/) {

+              if (/^\#\s+PREREQ_PM => \{\s*(.*?)\s*\}/) {

                   my @all;

                   my @pairs = split ', ', $1;

                   for (@pairs) {

@@ -1992,7 +2473,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           require JSON::PP;

           print JSON::PP::encode_json($self->{scandeps_tree});

       } elsif ($self->{format} eq 'yaml') {

-          require YAML;

+          require YAML; # no fatpack

           print YAML::Dump($self->{scandeps_tree});

       } else {

           $self->diag("Unknown format: $self->{format}\n");

@@ -2042,20 +2523,50 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

       return;

   }

-  sub get      { $_[0]->{_backends}{get}->(@_) };

-  sub mirror   { $_[0]->{_backends}{mirror}->(@_) };

+  sub get {

+      my($self, $uri) = @_;

+      if ($uri =~ /^file:/) {

+          $self->file_get($uri);

+      } else {

+          $self->{_backends}{get}->(@_);

+      }

+  }

+  

+  sub mirror {

+      my($self, $uri, $local) = @_;

+      if ($uri =~ /^file:/) {

+          $self->file_mirror($uri, $local);

+      } else {

+          $self->{_backends}{mirror}->(@_);

+      }

+  }

+  

   sub untar    { $_[0]->{_backends}{untar}->(@_) };

   sub unzip    { $_[0]->{_backends}{unzip}->(@_) };

+  sub uri_to_file {

+      my($self, $uri) = @_;

+  

+      # file:///path/to/file -> /path/to/file

+      # file://C:/path       -> C:/path

+      if ($uri =~ s!file:/+!!) {

+          $uri = "/$uri" unless $uri =~ m![a-zA-Z]:!;

+      }

+  

+      return $uri;

+  }

+  

   sub file_get {

       my($self, $uri) = @_;

-      open my $fh, "<$uri" or return;

+      my $file = $self->uri_to_file($uri);

+      open my $fh, "<$file" or return;

       join '', <$fh>;

   }

   sub file_mirror {

       my($self, $uri, $path) = @_;

-      File::Copy::copy($uri, $path);

+      my $file = $self->uri_to_file($uri);

+      File::Copy::copy($file, $path);

   }

   sub init_tools {

@@ -2074,7 +2585,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

               LWP::UserAgent->new(

                   parse_head => 0,

                   env_proxy => 1,

-                  agent => "cpanminus/$VERSION",

+                  agent => $self->agent,

                   timeout => 30,

                   @_,

               );

@@ -2092,49 +2603,57 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           };

       } elsif ($self->{try_wget} and my $wget = $self->which('wget')) {

           $self->chat("You have $wget\n");

+          my @common = (

+              '--user-agent', $self->agent,

+              '--retry-connrefused',

+              ($self->{verbose} ? () : ('-q')),

+          );

           $self->{_backends}{get} = sub {

               my($self, $uri) = @_;

-              return $self->file_get($uri) if $uri =~ s!^file:/+!/!;

-              $self->safeexec( my $fh, $wget, $uri, ( $self->{verbose} ? () : '-q' ), '-O', '-' ) or die "wget $uri: $!";

+              $self->safeexec( my $fh, $wget, $uri, @common, '-O', '-' ) or die "wget $uri: $!";

               local $/;

               <$fh>;

           };

           $self->{_backends}{mirror} = sub {

               my($self, $uri, $path) = @_;

-              return $self->file_mirror($uri, $path) if $uri =~ s!^file:/+!/!;

-              $self->safeexec( my $fh, $wget, '--retry-connrefused', $uri, ( $self->{verbose} ? () : '-q' ), '-O', $path ) or die "wget $uri: $!";

+              $self->safeexec( my $fh, $wget, $uri, @common, '-O', $path ) or die "wget $uri: $!";

               local $/;

               <$fh>;

           };

       } elsif ($self->{try_curl} and my $curl = $self->which('curl')) {

           $self->chat("You have $curl\n");

+          my @common = (

+              '--location',

+              '--user-agent', $self->agent,

+              ($self->{verbose} ? () : '-s'),

+          );

           $self->{_backends}{get} = sub {

               my($self, $uri) = @_;

-              return $self->file_get($uri) if $uri =~ s!^file:/+!/!;

-              $self->safeexec( my $fh, $curl, '-L', ( $self->{verbose} ? () : '-s' ), $uri ) or die "curl $uri: $!";

+              $self->safeexec( my $fh, $curl, @common, $uri ) or die "curl $uri: $!";

               local $/;

               <$fh>;

           };

           $self->{_backends}{mirror} = sub {

               my($self, $uri, $path) = @_;

-              return $self->file_mirror($uri, $path) if $uri =~ s!^file:/+!/!;

-              $self->safeexec( my $fh, $curl, '-L', $uri, ( $self->{verbose} ? () : '-s' ), '-#', '-o', $path ) or die "curl $uri: $!";

+              $self->safeexec( my $fh, $curl, @common, $uri, '-#', '-o', $path ) or die "curl $uri: $!";

               local $/;

               <$fh>;

           };

       } else {

           require HTTP::Tiny;

           $self->chat("Falling back to HTTP::Tiny $HTTP::Tiny::VERSION\n");

-  

+          my %common = (

+              agent => $self->agent,

+          );

           $self->{_backends}{get} = sub {

               my $self = shift;

-              my $res = HTTP::Tiny->new->get($_[0]);

+              my $res = HTTP::Tiny->new(%common)->get($_[0]);

               return unless $res->{success};

               return $res->{content};

           };

           $self->{_backends}{mirror} = sub {

               my $self = shift;

-              my $res = HTTP::Tiny->new->mirror(@_);

+              my $res = HTTP::Tiny->new(%common)->mirror(@_);

               return $res->{status};

           };

       }

@@ -2149,17 +2668,25 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           $self->{_backends}{untar} = sub {

               my($self, $tarfile) = @_;

-              my $xf = "xf" . ($self->{verbose} ? 'v' : '');

+              my $xf = ($self->{verbose} ? 'v' : '')."xf";

               my $ar = $tarfile =~ /bz2$/ ? 'j' : 'z';

-              my($root, @others) = `$tar tf$ar $tarfile`

+              my($root, @others) = `$tar ${ar}tf $tarfile`

                   or return undef;

-              chomp $root;

-              $root =~ s!^\./!!;

-              $root =~ s{^(.+?)/.*$}{$1};

+              FILE: {

+                  chomp $root;

+                  $root =~ s!^\./!!;

+                  $root =~ s{^(.+?)/.*$}{$1};

-              system "$tar $xf$ar $tarfile";

+                  if (!length($root)) {

+                      # archive had ./ as the first entry, so try again

+                      $root = shift(@others);

+                      redo FILE if $root;

+                  }

+              }

+  

+              system "$tar $ar$xf $tarfile";

               return $root if -d $root;

               $self->diag_fail("Bad archive: $tarfile");

@@ -2178,8 +2705,17 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

               my($root, @others) = `$ar -dc $tarfile | $tar tf -`

                   or return undef;

-              chomp $root;

-              $root =~ s{^(.+?)/.*$}{$1};

+              FILE: {

+                  chomp $root;

+                  $root =~ s!^\./!!;

+                  $root =~ s{^(.+?)/.*$}{$1};

+  

+                  if (!length($root)) {

+                      # archive had ./ as the first entry, so try again

+                      $root = shift(@others);

+                      redo FILE if $root;

+                  }

+              }

               system "$ar -dc $tarfile | $tar $x";

               return $root if -d $root;

@@ -2192,8 +2728,17 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

           $self->{_backends}{untar} = sub {

               my $self = shift;

               my $t = Archive::Tar->new($_[0]);

-              my $root = ($t->list_files)[0];

-              $root =~ s{^(.+?)/.*$}{$1};

+              my($root, @others) = $t->list_files;

+              FILE: {

+                  $root =~ s!^\./!!;

+                  $root =~ s{^(.+?)/.*$}{$1};

+  

+                  if (!length($root)) {

+                      # archive had ./ as the first entry, so try again

+                      $root = shift(@others);

+                      redo FILE if $root;

+                  }

+              }

               $t->extract;

               return -d $root ? $root : undef;

           };

@@ -2213,7 +2758,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

                   or return undef;

               chomp $root;

-              $root =~ s{^\s+testing:\s+(.+?)/\s+OK$}{$1};

+              $root =~ s{^\s+testing:\s+([^/]+)/.*?\s+OK$}{$1};

               system "$unzip $opt $zipfile";

               return $root if -d $root;

@@ -2232,15 +2777,16 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

               $self->diag_fail("Read of file[$file] failed")

                   if $status != Archive::Zip::AZ_OK();

               my @members = $zip->members();

-              my $root;

               for my $member ( @members ) {

                   my $af = $member->fileName();

                   next if ($af =~ m!^(/|\.\./)!);

-                  $root = $af unless $root;

                   $status = $member->extractToFileNamed( $af );

                   $self->diag_fail("Extracting of file[$af] from zipfile[$file failed")

                       if $status != Archive::Zip::AZ_OK();

               }

+  

+              my ($root) = $zip->membersMatching( qr<^[^/]+/$> );

+              $root &&= $root->fileName;

               return -d $root ? $root : undef;

           };

       }

@@ -2269,12 +2815,12 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';

   sub parse_meta {

       my($self, $file) = @_;

-      return eval { (Parse::CPAN::Meta::LoadFile($file))[0] } || undef;

+      return eval { Parse::CPAN::Meta->load_file($file) };

   }

   sub parse_meta_string {

       my($self, $yaml) = @_;

-      return eval { (Parse::CPAN::Meta::Load($yaml))[0] } || undef;

+      return eval { Parse::CPAN::Meta->load_yaml_string($yaml) };

   }

   1;

@@ -2284,7 +2830,7 @@ $fatpacked{"CPAN/DistnameInfo.pm"} = <<'CPAN_DISTNAMEINFO';

   package CPAN::DistnameInfo;

-  $VERSION = "0.11";

+  $VERSION = "0.12";

   use strict;

   sub distname_info {

@@ -2315,6 +2861,14 @@ $fatpacked{"CPAN/DistnameInfo.pm"} = <<'CPAN_DISTNAMEINFO';

       $version = $2;

     }

+    if ($version =~ /(.+_.*)-(\d.*)/) {

+        # Catch names like Task-Deprecations5_14-1.00.tar.gz where the 5_14 is

+        # part of the distname. However, names like libao-perl_0.03-1.tar.gz

+        # should still have 0.03-1 as their version.

+        $dist .= $1;

+        $version = $2;

+    }

+  

     # Normalize the Dist.pm-1.23 convention which CGI.pm and

     # a few others use.

     $dist =~ s{\.pm$}{};

@@ -2392,10 +2946,7 @@ $fatpacked{"CPAN/Meta.pm"} = <<'CPAN_META';

   use strict;

   use warnings;

   package CPAN::Meta;

-  BEGIN {

-    $CPAN::Meta::VERSION = '2.110930';

-  }

-  # ABSTRACT: the distribution metadata for a CPAN dist

+  our $VERSION = '2.120921'; # VERSION

   use Carp qw(carp croak);

@@ -2403,15 +2954,9 @@ $fatpacked{"CPAN/Meta.pm"} = <<'CPAN_META';

   use CPAN::Meta::Prereqs;

   use CPAN::Meta::Converter;

   use CPAN::Meta::Validator;

-  use Parse::CPAN::Meta 1.4400 ();

+  use Parse::CPAN::Meta 1.4403 ();

-  sub _dclone {

-    my $ref = shift;

-    my $backend = Parse::CPAN::Meta->json_backend();

-    return $backend->new->decode(

-      $backend->new->convert_blessed->encode($ref)

-    );

-  }

+  BEGIN { *_dclone = \&CPAN::Meta::Converter::_dclone }

   BEGIN {

@@ -2733,6 +3278,8 @@ $fatpacked{"CPAN/Meta.pm"} = <<'CPAN_META';

   1;

+  # ABSTRACT: the distribution metadata for a CPAN dist

+  

@@ -2746,21 +3293,27 @@ $fatpacked{"CPAN/Meta/Converter.pm"} = <<'CPAN_META_CONVERTER';

   use strict;

   use warnings;

   package CPAN::Meta::Converter;

-  BEGIN {

-    $CPAN::Meta::Converter::VERSION = '2.110930';

-  }

-  # ABSTRACT: Convert CPAN distribution metadata structures

+  our $VERSION = '2.120921'; # VERSION

   use CPAN::Meta::Validator;

-  use version 0.82 ();

+  use CPAN::Meta::Requirements;

+  use version 0.88 ();

   use Parse::CPAN::Meta 1.4400 ();

   sub _dclone {

     my $ref = shift;

+  

+    # if an object is in the data structure and doesn't specify how to

+    # turn itself into JSON, we just stringify the object.  That does the

+    # right thing for typical things that might be there, like version objects,

+    # Path::Class objects, etc.

+    no warnings 'once';

+    local *UNIVERSAL::TO_JSON = sub { return "$_[0]" };

+  

     my $backend = Parse::CPAN::Meta->json_backend();

-    return $backend->new->decode(

-      $backend->new->convert_blessed->encode($ref)

+    return $backend->new->utf8->decode(

+      $backend->new->utf8->allow_blessed->convert_blessed->encode($ref)

     );

   }

@@ -3055,7 +3608,10 @@ $fatpacked{"CPAN/Meta/Converter.pm"} = <<'CPAN_META_CONVERTER';

     return 0 if ! length $element;

     return 0 if ( $element eq 'undef' || $element eq '<undef>' );

-    if ( my $v = eval { version->new($element) } ) {

+    my $v = eval { version->new($element) };

+    # XXX check defined $v and not just $v because version objects leak memory

+    # in boolean context -- dagolden, 2012-02-03

+    if ( defined $v ) {

       return $v->is_qv ? $v->normal : $element;

     }

     else {

@@ -3063,29 +3619,36 @@ $fatpacked{"CPAN/Meta/Converter.pm"} = <<'CPAN_META_CONVERTER';

     }

   }

+  sub _bad_version_hook {

+    my ($v) = @_;

+    $v =~ s{[a-z]+$}{}; # strip trailing alphabetics

+    my $vobj = eval { version->parse($v) };

+    return defined($vobj) ? $vobj : version->parse(0); # or give up

+  }

+  

   sub _version_map {

     my ($element) = @_;

-    return undef unless defined $element;

+    return unless defined $element;

     if ( ref $element eq 'HASH' ) {

-      my $new_map = {};

-      for my $k ( keys %$element ) {

+      # XXX turn this into CPAN::Meta::Requirements with bad version hook

+      # and then turn it back into a hash

+      my $new_map = CPAN::Meta::Requirements->new(

+        { bad_version_hook => sub { version->new(0) } } # punt

+      );

+      while ( my ($k,$v) = each %$element ) {

         next unless _is_module_name($k);

-        my $value = $element->{$k};

-        if ( ! ( defined $value && length $value ) ) {

-          $new_map->{$k} = 0;

-        }

-        elsif ( $value eq 'undef' || $value eq '<undef>' ) {

-          $new_map->{$k} = 0;

+        if ( !defined($v) || !length($v) || $v eq 'undef' || $v eq '<undef>'  ) {

+          $v = 0;

         }

-        elsif ( _is_module_name( $value ) ) { # some weird, old META have this

-          $new_map->{$k} = 0;

-          $new_map->{$value} = 0;

-        }

-        else {

-          $new_map->{$k} = _clean_version($value);

+        # some weird, old META have bad yml with module => module

+        # so check if value is like a module name and not like a version

+        if ( _is_module_name($v) && ! version::is_lax($v) ) {

+          $new_map->add_minimum($k => 0);

+          $new_map->add_minimum($v => 0);

         }

+        $new_map->add_string_requirement($k => $v);

       }

-      return $new_map;

+      return $new_map->as_string_hash;

     }

     elsif ( ref $element eq 'ARRAY' ) {

       my $hashref = { map { $_ => 0 } @$element };

@@ -3168,9 +3731,8 @@ $fatpacked{"CPAN/Meta/Converter.pm"} = <<'CPAN_META_CONVERTER';

     my $test_h  = _extract_prereqs($_[2]->{prereqs}, qw(test  requires)) || {};