r54454 - in /trunk/libcpan-uploader-perl: Changes META.json META.yml Makefile.PL README bin/cpan-upload debian/changelog debian/control lib/CPAN/Uploader.pm

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Wed Mar 17 20:32:11 UTC 2010


Author: jawnsy-guest
Date: Wed Mar 17 20:32:04 2010
New Revision: 54454

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54454
Log:
* New upstream release
* Adds a dependency on GLD 0.084

Modified:
    trunk/libcpan-uploader-perl/Changes
    trunk/libcpan-uploader-perl/META.json
    trunk/libcpan-uploader-perl/META.yml
    trunk/libcpan-uploader-perl/Makefile.PL
    trunk/libcpan-uploader-perl/README
    trunk/libcpan-uploader-perl/bin/cpan-upload
    trunk/libcpan-uploader-perl/debian/changelog
    trunk/libcpan-uploader-perl/debian/control
    trunk/libcpan-uploader-perl/lib/CPAN/Uploader.pm

Modified: trunk/libcpan-uploader-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/Changes?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/Changes (original)
+++ trunk/libcpan-uploader-perl/Changes Wed Mar 17 20:32:04 2010
@@ -1,4 +1,11 @@
 Revision history for CPAN-Uploader
+
+0.100760  2010-03-17 12:14:52 America/New_York
+          fix internal log_debug to not try logging $self (thanks, Chris
+          Prather)
+
+0.100750  2010-03-16 09:29:19 America/New_York
+          prompt for password if using -u to specify a user not in config file
 
 0.100660  2010-03-07 10:49:55 America/New_York
           make the log and log_debug methods public

Modified: trunk/libcpan-uploader-perl/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/META.json?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/META.json (original)
+++ trunk/libcpan-uploader-perl/META.json Wed Mar 17 20:32:04 2010
@@ -6,8 +6,8 @@
       "version" : 1.4,
       "url" : "http://module-build.sourceforge.net/META-spec-v1.4.html"
    },
-   "generated_by" : "Dist::Zilla version 1.100660",
-   "version" : "0.100660",
+   "generated_by" : "Dist::Zilla version 1.100730",
+   "version" : "0.100760",
    "name" : "CPAN-Uploader",
    "author" : [
       "Ricardo SIGNES <rjbs at cpan.org>"
@@ -22,7 +22,7 @@
       "HTTP::Request::Common" : "0",
       "Test::More" : "0",
       "LWP::UserAgent" : "0",
-      "Getopt::Long::Descriptive" : "0",
+      "Getopt::Long::Descriptive" : "0.084",
       "File::Basename" : "0",
       "Term::ReadKey" : "0"
    },

Modified: trunk/libcpan-uploader-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/META.yml?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/META.yml (original)
+++ trunk/libcpan-uploader-perl/META.yml Wed Mar 17 20:32:04 2010
@@ -5,7 +5,7 @@
 build_requires: {}
 configure_requires:
   ExtUtils::MakeMaker: 6.11
-generated_by: 'Dist::Zilla version 1.100660'
+generated_by: 'Dist::Zilla version 1.100730'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -16,7 +16,7 @@
   Data::Dumper: 0
   File::Basename: 0
   File::Spec: 0
-  Getopt::Long::Descriptive: 0
+  Getopt::Long::Descriptive: 0.084
   HTTP::Request::Common: 0
   HTTP::Status: 0
   LWP::UserAgent: 0
@@ -24,4 +24,4 @@
   Test::More: 0
 resources:
   repository: git://git.codesimply.com/CPAN-Uploader.git
-version: 0.100660
+version: 0.100760

Modified: trunk/libcpan-uploader-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/Makefile.PL?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/Makefile.PL (original)
+++ trunk/libcpan-uploader-perl/Makefile.PL Wed Mar 17 20:32:04 2010
@@ -23,7 +23,7 @@
                        'EXE_FILES' => [
                                         'bin/cpan-upload'
                                       ],
-                       'VERSION' => '0.100660',
+                       'VERSION' => '0.100760',
                        'PREREQ_PM' => {
                                         'File::Spec' => '0',
                                         'Data::Dumper' => '0',
@@ -32,7 +32,7 @@
                                         'HTTP::Request::Common' => '0',
                                         'Test::More' => '0',
                                         'LWP::UserAgent' => '0',
-                                        'Getopt::Long::Descriptive' => '0',
+                                        'Getopt::Long::Descriptive' => '0.084',
                                         'File::Basename' => '0',
                                         'Term::ReadKey' => '0'
                                       },

Modified: trunk/libcpan-uploader-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/README?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/README (original)
+++ trunk/libcpan-uploader-perl/README Wed Mar 17 20:32:04 2010
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution CPAN-Uploader, version
-0.100660:
+0.100760:
 
   upload things to the CPAN
 

Modified: trunk/libcpan-uploader-perl/bin/cpan-upload
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/bin/cpan-upload?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/bin/cpan-upload (original)
+++ trunk/libcpan-uploader-perl/bin/cpan-upload Wed Mar 17 20:32:04 2010
@@ -1,9 +1,11 @@
 #!perl
 use strict;
 use warnings;
+
 use Carp;
 use CPAN::Uploader;
 use File::Spec;
+use Getopt::Long::Descriptive 0.084;
 
 =head1 NAME
 
@@ -35,9 +37,6 @@
 
 =cut
 
-use Getopt::Long::Descriptive;
-$Getopt::Long::Descriptive::MungeOptions = 1;
-
 my %arg;
 
 my $home = $ENV{HOME} || '.';
@@ -46,13 +45,14 @@
 # Process .pause
 open my $pauserc, '<', $rc or die "can't open $rc for reading: $!";
 
+my %from_file;
 while (<$pauserc>) {
   chomp;
   next unless $_ and $_ !~ /^\s*#/;
 
   my ($k, $v) = /^\s*(\w+)\s+(.+)$/;
-  croak "multiple enties for $k" if $arg{$k};
-  $arg{$k} = $v;
+  croak "multiple enties for $k" if $from_file{$k};
+  $from_file{$k} = $v;
 }
 
 # This nonsensical hack is to cope with Module::Install wanting to call
@@ -60,7 +60,7 @@
 $ARGV[0] = '--verbose' if @ARGV == 2 and $ARGV[0] eq '-verbose';
 
 # Process arguments
-my ($opts, $usage) = describe_options(
+my ($opt, $usage) = describe_options(
 	"usage: %c [options] file-to-upload",
 
   [ "verbose|v" => "enable verbose logging" ],
@@ -73,20 +73,27 @@
   [ "http-proxy=s"  => "URL of the http proxy to use in uploading" ],
 );
 
-if ($opts->{help}) {
+if ($opt->help) {
   print $usage->text;
   exit;
 }
 
-die "Please provide a file name.\n".$usage unless my $file = $ARGV[0];
+die "Please provide a file name.\n" . $usage unless my $file = $ARGV[0];
 
-$arg{debug}  = 1 if $opts->{verbose};
-$arg{subdir} = $opts->{directory} if defined $opts->{directory};
+$arg{user} = uc( $opt->_specified('user') ? $opt->user : $from_file{user} );
 
-$arg{ $_ } = $opts->{ $_ }
-  for grep { defined $opts->{ $_ } } qw(dry_run user password http-proxy);
+$arg{password} = $opt->password if $opt->_specified('password');
 
-if (!$arg{password}) {
+if (! $arg{password} and ($arg{user} eq uc $from_file{user})) {
+  $arg{password} = $from_file{password};
+}
+
+$arg{debug}  = 1 if $opt->verbose;
+$arg{subdir} = $opt->directory if defined $opt->directory;
+
+$arg{ $_ } = $opt->$_ for grep { defined $opt->$_ } qw(dry_run http_proxy);
+
+if (! $arg{password}) {
   require Term::ReadKey;
   local $| = 1;
   print "PAUSE Password: ";

Modified: trunk/libcpan-uploader-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/debian/changelog?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/debian/changelog (original)
+++ trunk/libcpan-uploader-perl/debian/changelog Wed Mar 17 20:32:04 2010
@@ -1,3 +1,10 @@
+libcpan-uploader-perl (0.100760-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Adds a dependency on GLD 0.084
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Wed, 17 Mar 2010 16:26:27 -0400
+
 libcpan-uploader-perl (0.100660-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libcpan-uploader-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/debian/control?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/debian/control (original)
+++ trunk/libcpan-uploader-perl/debian/control Wed Mar 17 20:32:04 2010
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50)
-Build-Depends-Indep: perl, libgetopt-long-descriptive-perl,
+Build-Depends-Indep: perl, libgetopt-long-descriptive-perl (>= 0.084),
  libwww-perl, libterm-readkey-perl, libpod-coverage-trustpod-perl,
  libtest-pod-perl, libtest-pod-coverage-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
@@ -14,8 +14,8 @@
 
 Package: libcpan-uploader-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libgetopt-long-descriptive-perl,
- libterm-readkey-perl, libwww-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libterm-readkey-perl, libwww-perl,
+ libgetopt-long-descriptive-perl (>= 0.084)
 Description: module to upload packages to the CPAN
  CPAN::Uploader is a Perl module which allows developers to upload their
  modules and packages to the Comprehensive Perl Archive Network (CPAN) via

Modified: trunk/libcpan-uploader-perl/lib/CPAN/Uploader.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-uploader-perl/lib/CPAN/Uploader.pm?rev=54454&op=diff
==============================================================================
--- trunk/libcpan-uploader-perl/lib/CPAN/Uploader.pm (original)
+++ trunk/libcpan-uploader-perl/lib/CPAN/Uploader.pm Wed Mar 17 20:32:04 2010
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 package CPAN::Uploader;
-our $VERSION = '0.100660';
+our $VERSION = '0.100760';
 # ABSTRACT: upload things to the CPAN
 
 
@@ -87,16 +87,17 @@
         "It used to be: ", $PAUSE_ADD_URI, "\n",
         "Please inform the maintainer of $self.\n";
     } else {
-      die "request failed\n  Error code: ", $response->code,
+      die "request failed with error code ", $response->code,
         "\n  Message: ", $response->message, "\n";
     }
   } else {
-    $self->log_debug(
+    $self->log_debug($_) for (
       "Looks OK!",
       "----- RESPONSE BEGIN -----",
       $response->as_string,
       "----- RESPONSE END -------"
     );
+
     $self->log("PAUSE add message sent ok [" . $response->code . "]");
   }
 }
@@ -118,7 +119,7 @@
 
 
 sub log_debug {
-  my ($self) = @_;
+  my $self = shift;
   return unless $self->{debug};
   $self->log($_[0]);
 }
@@ -134,7 +135,7 @@
 
 =head1 VERSION
 
-version 0.100660
+version 0.100760
 
 =head1 METHODS
 




More information about the Pkg-perl-cvs-commits mailing list