diff -Nru libcpan-uploader-perl-0.102150/bin/cpan-upload libcpan-uploader-perl-0.103000/bin/cpan-upload --- libcpan-uploader-perl-0.102150/bin/cpan-upload 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/bin/cpan-upload 2011-04-08 02:05:17.000000000 +0000 @@ -83,7 +83,7 @@ =head1 VERSION -version 0.102150 +version 0.103000 =head1 USAGE @@ -115,7 +115,7 @@ =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2010 by Ricardo SIGNES. +This software is copyright (c) 2011 by Ricardo SIGNES. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff -Nru libcpan-uploader-perl-0.102150/Changes libcpan-uploader-perl-0.103000/Changes --- libcpan-uploader-perl-0.102150/Changes 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/Changes 2011-04-08 02:05:17.000000000 +0000 @@ -1,5 +1,8 @@ Revision history for CPAN-Uploader +0.103000 2011-04-07 22:05:13 America/New_York + allow an alternate upload_uri via constructor arg or env var + 0.102150 2010-08-03 18:34:27 America/New_York allow automatic use of proxy from environment diff -Nru libcpan-uploader-perl-0.102150/debian/changelog libcpan-uploader-perl-0.103000/debian/changelog --- libcpan-uploader-perl-0.102150/debian/changelog 2010-08-07 15:08:53.000000000 +0000 +++ libcpan-uploader-perl-0.103000/debian/changelog 2011-04-20 09:23:47.000000000 +0000 @@ -1,3 +1,16 @@ +libcpan-uploader-perl (0.103000-1) unstable; urgency=low + + [ Angel Abad ] + * New upstream release. + * debian/copyright: + - Update years + - Update license stanzas + + [ Ansgar Burchardt ] + * Update my email address. + + -- Angel Abad Tue, 19 Apr 2011 22:13:40 +0200 + libcpan-uploader-perl (0.102150-1) unstable; urgency=low * New upstream release diff -Nru libcpan-uploader-perl-0.102150/debian/control libcpan-uploader-perl-0.103000/debian/control --- libcpan-uploader-perl-0.102150/debian/control 2010-08-07 15:08:53.000000000 +0000 +++ libcpan-uploader-perl-0.103000/debian/control 2011-04-12 12:12:16.000000000 +0000 @@ -3,10 +3,14 @@ Priority: optional Build-Depends: debhelper (>= 7) Build-Depends-Indep: libgetopt-long-descriptive-perl (>= 0.084), - libterm-readkey-perl, libwww-perl, perl + libterm-readkey-perl, + libwww-perl, + perl Maintainer: Debian Perl Group -Uploaders: Jonathan Yu , Ansgar Burchardt , - gregor herrmann , Angel Abad +Uploaders: Jonathan Yu , + Ansgar Burchardt , + gregor herrmann , + Angel Abad Standards-Version: 3.9.1 Homepage: http://search.cpan.org/dist/CPAN-Uploader/ Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcpan-uploader-perl/ @@ -15,7 +19,9 @@ Package: libcpan-uploader-perl Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, - libgetopt-long-descriptive-perl (>= 0.084), libterm-readkey-perl, libwww-perl + libgetopt-long-descriptive-perl (>= 0.084), + libterm-readkey-perl, + libwww-perl 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 diff -Nru libcpan-uploader-perl-0.102150/debian/copyright libcpan-uploader-perl-0.103000/debian/copyright --- libcpan-uploader-perl-0.102150/debian/copyright 2010-08-07 15:08:53.000000000 +0000 +++ libcpan-uploader-perl-0.103000/debian/copyright 2011-04-12 12:12:16.000000000 +0000 @@ -4,13 +4,13 @@ Name: CPAN-Uploader Files: * -Copyright: 2010, Ricardo SIGNES +Copyright: 2010-2011, Ricardo SIGNES License: Artistic or GPL-1+ Files: debian/* Copyright: 2009, 2010, Jonathan Yu - 2010, Angel Abad - 2010, Ansgar Burchardt + 2010-2011, Angel Abad + 2010, Ansgar Burchardt 2010, gregor herrmann License: Artistic or GPL-1+ @@ -18,8 +18,8 @@ This program is free software; you can redistribute it and/or modify it under the terms of the Artistic License, which comes with Perl. . - On Debian GNU/Linux systems, the complete text of the Artistic License - can be found in `/usr/share/common-licenses/Artistic'. + On Debian systems, the complete text of the Artistic License can be + found in `/usr/share/common-licenses/Artistic'. License: GPL-1+ This program is free software; you can redistribute it and/or modify @@ -27,5 +27,5 @@ the Free Software Foundation; either version 1, or (at your option) any later version. . - On Debian GNU/Linux systems, the complete text of version 1 of the - General Public License can be found in `/usr/share/common-licenses/GPL-1'. + On Debian systems, the complete text of version 1 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-1'. diff -Nru libcpan-uploader-perl-0.102150/lib/CPAN/Uploader.pm libcpan-uploader-perl-0.103000/lib/CPAN/Uploader.pm --- libcpan-uploader-perl-0.102150/lib/CPAN/Uploader.pm 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/lib/CPAN/Uploader.pm 2011-04-08 02:05:17.000000000 +0000 @@ -2,7 +2,7 @@ use warnings; package CPAN::Uploader; BEGIN { - $CPAN::Uploader::VERSION = '0.102150'; + $CPAN::Uploader::VERSION = '0.103000'; } # ABSTRACT: upload things to the CPAN @@ -14,7 +14,8 @@ use HTTP::Status; use LWP::UserAgent; -my $PAUSE_ADD_URI = 'http://pause.perl.org/pause/authenquery'; +my $UPLOAD_URI = $ENV{CPAN_UPLOADER_UPLOAD_URI} + || 'http://pause.perl.org/pause/authenquery'; use Data::Dumper; @@ -36,7 +37,7 @@ "The following arguments would have been used to upload: \n" . '$self: ' . Dumper($self) . '$file: ' . Dumper($file) - ); + ); } else { $self->_upload($file); } @@ -62,8 +63,10 @@ $agent->env_proxy; $agent->proxy(http => $self->{http_proxy}) if $self->{http_proxy}; + my $uri = $self->{upload_uri} || $UPLOAD_URI; + my $request = POST( - $PAUSE_ADD_URI, + $uri, Content_Type => 'form-data', Content => { HIDDENNAME => $self->{user}, @@ -101,7 +104,7 @@ if ($response->code == RC_NOT_FOUND) { die "PAUSE's CGI for handling messages seems to have moved!\n", "(HTTP response code of 404 from the PAUSE web server)\n", - "It used to be: ", $PAUSE_ADD_URI, "\n", + "It used to be: ", $UPLOAD_URI, "\n", "Please inform the maintainer of $self.\n"; } else { die "request failed with error code ", $response->code, @@ -152,7 +155,7 @@ Carp::croak "multiple enties for $k" if $from_file{$k}; $from_file{$k} = $v; } - + return \%from_file; } @@ -180,7 +183,7 @@ =head1 VERSION -version 0.102150 +version 0.103000 =head1 METHODS @@ -195,7 +198,8 @@ user - (required) your CPAN / PAUSE id password - (required) your CPAN / PAUSE password subdir - the directory (under your home directory) to upload to - http_proxy - url of the http proxy to use + http_proxy - uri of the http proxy to use + upload_uri - uri of the upload handler; usually the default (PAUSE) is right debug - if set to true, spew lots more debugging output This method attempts to actually upload the named file to the CPAN. It will @@ -233,11 +237,6 @@ This method behaves like C>, but only logs the message if the CPAN::Uploader is in debug mode. -=head1 WARNING - - This is really, really not well tested or used yet. Give it a few weeks, at - least. -- rjbs, 2008-06-06 - =head1 ORIGIN This code is mostly derived from C by Brad Fitzpatrick, which @@ -251,7 +250,7 @@ =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2010 by Ricardo SIGNES. +This software is copyright (c) 2011 by Ricardo SIGNES. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff -Nru libcpan-uploader-perl-0.102150/LICENSE libcpan-uploader-perl-0.103000/LICENSE --- libcpan-uploader-perl-0.102150/LICENSE 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/LICENSE 2011-04-08 02:05:17.000000000 +0000 @@ -1,4 +1,4 @@ -This software is copyright (c) 2010 by Ricardo SIGNES. +This software is copyright (c) 2011 by Ricardo SIGNES. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2010 by Ricardo SIGNES. +This software is Copyright (c) 2011 by Ricardo SIGNES. This is free software, licensed under: @@ -270,7 +270,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2010 by Ricardo SIGNES. +This software is Copyright (c) 2011 by Ricardo SIGNES. This is free software, licensed under: diff -Nru libcpan-uploader-perl-0.102150/Makefile.PL libcpan-uploader-perl-0.103000/Makefile.PL --- libcpan-uploader-perl-0.102150/Makefile.PL 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/Makefile.PL 2011-04-08 02:05:17.000000000 +0000 @@ -12,7 +12,7 @@ 'ABSTRACT' => 'upload things to the CPAN', 'AUTHOR' => 'Ricardo SIGNES ', 'BUILD_REQUIRES' => { - 'Test::More' => '0' + 'Test::More' => '0.96' }, 'CONFIGURE_REQUIRES' => { 'ExtUtils::MakeMaker' => '6.31' @@ -34,7 +34,7 @@ 'LWP::UserAgent' => '0', 'Term::ReadKey' => '0' }, - 'VERSION' => '0.102150', + 'VERSION' => '0.103000', 'test' => { 'TESTS' => 't/*.t' } diff -Nru libcpan-uploader-perl-0.102150/META.json libcpan-uploader-perl-0.103000/META.json --- libcpan-uploader-perl-0.102150/META.json 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/META.json 2011-04-08 02:05:17.000000000 +0000 @@ -4,7 +4,7 @@ "Ricardo SIGNES " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.101900, CPAN::Meta::Converter version 2.101670", + "generated_by" : "Dist::Zilla version 4.200005, CPAN::Meta::Converter version 2.110930", "license" : [ "perl_5" ], @@ -34,7 +34,7 @@ }, "test" : { "requires" : { - "Test::More" : 0 + "Test::More" : "0.96" } } }, @@ -45,163 +45,179 @@ "url" : "git://git.codesimply.com/CPAN-Uploader.git" } }, - "version" : "0.102150", + "version" : "0.103000", "x_Dist_Zilla" : { "plugins" : [ { + "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed", + "name" : "@RJBS/CheckPrereqsIndexed", + "version" : "0.002" + }, + { "class" : "Dist::Zilla::Plugin::GatherDir", "name" : "@RJBS/@Basic/GatherDir", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "@RJBS/@Basic/PruneCruft", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@RJBS/@Basic/ManifestSkip", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "@RJBS/@Basic/MetaYAML", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@RJBS/@Basic/License", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::Readme", "name" : "@RJBS/@Basic/Readme", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::ExtraTests", "name" : "@RJBS/@Basic/ExtraTests", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::ExecDir", "name" : "@RJBS/@Basic/ExecDir", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::ShareDir", "name" : "@RJBS/@Basic/ShareDir", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::MakeMaker", "name" : "@RJBS/@Basic/MakeMaker", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@RJBS/@Basic/Manifest", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@RJBS/@Basic/TestRelease", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@RJBS/@Basic/ConfirmRelease", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@RJBS/@Basic/UploadToCPAN", - "version" : "4.101900" + "version" : "4.200005" }, { - "class" : "Dist::Zilla::Plugin::AutoPrereq", - "name" : "@RJBS/AutoPrereq", - "version" : "4.101900" + "class" : "Dist::Zilla::Plugin::AutoPrereqs", + "name" : "@RJBS/AutoPrereqs", + "version" : "4.200005" }, { - "class" : "Dist::Zilla::Plugin::AutoVersion", - "name" : "@RJBS/AutoVersion", - "version" : "4.101900" + "class" : "Dist::Zilla::Plugin::Git::NextVersion", + "name" : "@RJBS/Git::NextVersion", + "version" : "1.110500" }, { "class" : "Dist::Zilla::Plugin::PkgVersion", "name" : "@RJBS/PkgVersion", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@RJBS/MetaConfig", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@RJBS/MetaJSON", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@RJBS/NextRelease", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@RJBS/PodSyntaxTests", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::Repository", "name" : "@RJBS/Repository", - "version" : "0.13" + "version" : "0.17" + }, + { + "class" : "Dist::Zilla::Plugin::Prereqs", + "config" : { + "Dist::Zilla::Plugin::Prereqs" : { + "phase" : "test", + "type" : "requires" + } + }, + "name" : "@RJBS/TestMoreWithSubtests", + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", "name" : "@RJBS/PodWeaver", - "version" : "3.101640" + "version" : "3.101641" }, { "class" : "Dist::Zilla::Plugin::Git::Check", "name" : "@RJBS/@Git/Check", - "version" : "1.102090" + "version" : "1.110500" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "name" : "@RJBS/@Git/Commit", - "version" : "1.102090" + "version" : "1.110500" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", "name" : "@RJBS/@Git/Tag", - "version" : "1.102090" + "version" : "1.110500" }, { "class" : "Dist::Zilla::Plugin::Git::Push", "name" : "@RJBS/@Git/Push", - "version" : "1.102090" + "version" : "1.110500" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "4.101900" + "version" : "4.200005" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "4.101900" + "version" : "4.200005" } ], "zilla" : { @@ -209,7 +225,7 @@ "config" : { "is_trial" : 0 }, - "version" : "4.101900" + "version" : "4.200005" } } } diff -Nru libcpan-uploader-perl-0.102150/META.yml libcpan-uploader-perl-0.103000/META.yml --- libcpan-uploader-perl-0.102150/META.yml 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/META.yml 2011-04-08 02:05:17.000000000 +0000 @@ -3,11 +3,11 @@ author: - 'Ricardo SIGNES ' build_requires: - Test::More: 0 + Test::More: 0.96 configure_requires: ExtUtils::MakeMaker: 6.31 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.101900, CPAN::Meta::Converter version 2.101670' +generated_by: 'Dist::Zilla version 4.200005, CPAN::Meta::Converter version 2.110930' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -25,135 +25,147 @@ Term::ReadKey: 0 resources: repository: git://git.codesimply.com/CPAN-Uploader.git -version: 0.102150 +version: 0.103000 x_Dist_Zilla: plugins: - + class: Dist::Zilla::Plugin::CheckPrereqsIndexed + name: '@RJBS/CheckPrereqsIndexed' + version: 0.002 + - class: Dist::Zilla::Plugin::GatherDir name: '@RJBS/@Basic/GatherDir' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::PruneCruft name: '@RJBS/@Basic/PruneCruft' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::ManifestSkip name: '@RJBS/@Basic/ManifestSkip' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::MetaYAML name: '@RJBS/@Basic/MetaYAML' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::License name: '@RJBS/@Basic/License' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::Readme name: '@RJBS/@Basic/Readme' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::ExtraTests name: '@RJBS/@Basic/ExtraTests' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::ExecDir name: '@RJBS/@Basic/ExecDir' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::ShareDir name: '@RJBS/@Basic/ShareDir' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::MakeMaker name: '@RJBS/@Basic/MakeMaker' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::Manifest name: '@RJBS/@Basic/Manifest' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::TestRelease name: '@RJBS/@Basic/TestRelease' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::ConfirmRelease name: '@RJBS/@Basic/ConfirmRelease' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::UploadToCPAN name: '@RJBS/@Basic/UploadToCPAN' - version: 4.101900 + version: 4.200005 - - class: Dist::Zilla::Plugin::AutoPrereq - name: '@RJBS/AutoPrereq' - version: 4.101900 - - - class: Dist::Zilla::Plugin::AutoVersion - name: '@RJBS/AutoVersion' - version: 4.101900 + class: Dist::Zilla::Plugin::AutoPrereqs + name: '@RJBS/AutoPrereqs' + version: 4.200005 + - + class: Dist::Zilla::Plugin::Git::NextVersion + name: '@RJBS/Git::NextVersion' + version: 1.110500 - class: Dist::Zilla::Plugin::PkgVersion name: '@RJBS/PkgVersion' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::MetaConfig name: '@RJBS/MetaConfig' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::MetaJSON name: '@RJBS/MetaJSON' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::NextRelease name: '@RJBS/NextRelease' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::PodSyntaxTests name: '@RJBS/PodSyntaxTests' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::Repository name: '@RJBS/Repository' - version: 0.13 + version: 0.17 + - + class: Dist::Zilla::Plugin::Prereqs + config: + Dist::Zilla::Plugin::Prereqs: + phase: test + type: requires + name: '@RJBS/TestMoreWithSubtests' + version: 4.200005 - class: Dist::Zilla::Plugin::PodWeaver name: '@RJBS/PodWeaver' - version: 3.101640 + version: 3.101641 - class: Dist::Zilla::Plugin::Git::Check name: '@RJBS/@Git/Check' - version: 1.102090 + version: 1.110500 - class: Dist::Zilla::Plugin::Git::Commit name: '@RJBS/@Git/Commit' - version: 1.102090 + version: 1.110500 - class: Dist::Zilla::Plugin::Git::Tag name: '@RJBS/@Git/Tag' - version: 1.102090 + version: 1.110500 - class: Dist::Zilla::Plugin::Git::Push name: '@RJBS/@Git/Push' - version: 1.102090 + version: 1.110500 - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: 4.101900 + version: 4.200005 - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: 4.101900 + version: 4.200005 zilla: class: Dist::Zilla::Dist::Builder config: is_trial: 0 - version: 4.101900 + version: 4.200005 diff -Nru libcpan-uploader-perl-0.102150/README libcpan-uploader-perl-0.103000/README --- libcpan-uploader-perl-0.102150/README 2010-08-03 22:34:31.000000000 +0000 +++ libcpan-uploader-perl-0.103000/README 2011-04-08 02:05:17.000000000 +0000 @@ -1,11 +1,11 @@ This archive contains the distribution CPAN-Uploader, -version 0.102150: +version 0.103000: upload things to the CPAN -This software is copyright (c) 2010 by Ricardo SIGNES. +This software is copyright (c) 2011 by Ricardo SIGNES. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself.