Add a --tarball option

This allows to do the cpan/ upgrade without having to contact CPAN.
For instance, from dromedary, it seems to be impossible to fetch
files from CPAN. With the --tarball option, you can pass the location
of the tarball, and this will used instead of fetching it automatically
from CPAN.

diff --git a/Porting/sync-with-cpan b/Porting/sync-with-cpan
index 1c078f2..032eddc 100755 (executable)
--- a/Porting/sync-with-cpan
+++ b/Porting/sync-with-cpan
@@ -5,8 +5,8 @@
 #
 # Does the following:
 #    - Fetches the package list from CPAN. Finds the current version of
-#      the given package.
-#    - Downloads the relevant tarball; unpacks the tarball;.
+#      the given package. [1]
+#    - Downloads the relevant tarball; unpacks the tarball;. [1]
 #    - Clean out the old directory (git clean -dfx)
 #    - Moves the old directory out of the way, moves the new directory in place.
 #    - Restores any .gitignore file.
@@ -22,6 +22,10 @@
 #    - Runs tests for the package
 #    - Runs the porting tests
 #
+# [1]  If the --tarball option is given, then CPAN is not consulted.
+#      --tarball should be the path to the tarball; the version is extracted
+#      from the filename -- but can be overwritten by the --version option.
+#
 # TODO:  - Delete files from MANIFEST
 #        - Update Porting/Maintainers.pl
 #        - Optional, run a full test suite
@@ -37,10 +41,13 @@
 #        of Porting/Maintainers.pl
 #
 
+package Maintainers;
+
 use 5.010;
 
 use strict;
 use warnings;
+use Getopt::Long;
 no  warnings 'syntax';
 
 $| = 1;
@@ -48,8 +55,6 @@ $| = 1;
 die "This does not like top level directory"
      unless -d "cpan" && -d "Porting";
 
-package Maintainers;
-
 our @IGNORABLE;
 our %Modules;
 
@@ -65,18 +70,17 @@ my $package      = "02packages.details.txt";
 my $package_url  = "http://www.cpan.org/modules/$package";
 my $package_file = "/tmp/$package";
 
-#
-# Poor man's cache
-#
-unless (-f $package_file && -M $package_file < 1) {
-    system wget => $package_url, '-qO', $package_file;
-}
 
-die "Usage: $0 module [cpan package]" unless @ARGV == 1 || @ARGV == 2;
+GetOptions ('tarball=s'  =>  \my $tarball,
+            'version=s'  =>  \my $version)
+        or  die "Failed to parse arguments";
+
+die "Usage: $0 module [args] [cpan package]" unless @ARGV == 1 || @ARGV == 2;
 
 my ($module)  = shift;
 my  $cpan_mod = @ARGV ? shift : $module;
 
+
 my  $info         = $Modules {$module} or die "Cannot find module $module";
 my  $distribution = $$info {DISTRIBUTION};
 my  $pkg_dir      = $$info {FILES};
@@ -92,11 +96,33 @@ if ($cpan_mod =~ /-/ && $cpan_mod !~ /::/) {
 #
 # Find the information from CPAN.
 #
-my  $new_line = `grep '^$cpan_mod ' $package_file`
-                 or die "Cannot find $cpan_mod on CPAN\n";
-chomp $new_line;
-my (undef, $new_version, $new_path) = split ' ', $new_line;
-my $new_file = (split '/', $new_path) [-1];
+my $new_file;
+my $new_version;
+unless ($tarball) {
+    #
+    # Poor man's cache
+    #
+    unless (-f $package_file && -M $package_file < 1) {
+        system wget => $package_url, '-qO', $package_file;
+    }
+
+    my  $new_line = `grep '^$cpan_mod ' $package_file`
+                     or die "Cannot find $cpan_mod on CPAN\n";
+    chomp $new_line;
+    (undef, $new_version, my $new_path) = split ' ', $new_line;
+    $new_file = (split '/', $new_path) [-1];
+
+    my $url = "http://search.cpan.org/CPAN/authors/id/$new_path";
+    say "Fetching $url";
+    #
+    # Fetch the new distro
+    #
+    system wget => $url, '-qO', $new_file;
+}
+else {
+    $new_file     = $tarball;
+    $new_version  = $version // ($new_file =~ /-([0-9._]+)\.tar\.gz/) [0];
+}
 
 my  $old_dir      = "$pkg_dir-$old_version";
 my  $new_dir      = "$pkg_dir-$new_version";
@@ -104,17 +130,6 @@ my  $new_dir      = "$pkg_dir-$new_version";
 say "Cleaning out old directory";
 system git => 'clean', '-dfxq', $pkg_dir;
 
-
-
-my $url = "http://search.cpan.org/CPAN/authors/id/$new_path";
-
-say "Fetching $url";
-
-#
-# Fetch the new distro
-#
-system wget => $url, '-qO', $new_file;
-
 say "Unpacking $new_file";
 
 system tar => 'xfz', $new_file;