Hello community, here is the log from the commit of package perl-App-Cmd for openSUSE:Factory checked in at 2013-11-26 19:22:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-App-Cmd (Old) and /work/SRC/openSUSE:Factory/.perl-App-Cmd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-App-Cmd" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-App-Cmd/perl-App-Cmd.changes 2013-06-05 17:47:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-App-Cmd.new/perl-App-Cmd.changes 2013-11-26 19:22:30.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Nov 25 07:39:36 UTC 2013 - [email protected] + +- updated to 0.322 + require a newer Getopt::Long to avoid --version conflicts + avoiding getting [undef] in argument list in Simple apps + add --version support via version command (thanks, Jakob Voss!) +- remove outdated perl-App-Cmd-old_Test-More.patch + +------------------------------------------------------------------- Old: ---- App-Cmd-0.320.tar.gz perl-App-Cmd-old_Test-More.patch New: ---- App-Cmd-0.322.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-App-Cmd.spec ++++++ --- /var/tmp/diff_new_pack.9Axlyn/_old 2013-11-26 19:22:30.000000000 +0100 +++ /var/tmp/diff_new_pack.9Axlyn/_new 2013-11-26 19:22:30.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-App-Cmd -Version: 0.320 +Version: 0.322 Release: 0 %define cpan_name App-Cmd Summary: write command line apps with less suffering @@ -25,7 +25,6 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/App-Cmd/ Source: http://www.cpan.org/authors/id/R/RJ/RJBS/%{cpan_name}-%{version}.tar.gz -Patch1: perl-App-Cmd-old_Test-More.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -33,6 +32,7 @@ BuildRequires: perl(Capture::Tiny) >= 0.13 BuildRequires: perl(Class::Load) >= 0.06 BuildRequires: perl(Data::OptList) +BuildRequires: perl(Getopt::Long) >= 2.39 BuildRequires: perl(Getopt::Long::Descriptive) >= 0.084 BuildRequires: perl(IO::TieCombine) BuildRequires: perl(IPC::Cmd) @@ -66,6 +66,7 @@ Requires: perl(Capture::Tiny) >= 0.13 Requires: perl(Class::Load) >= 0.06 Requires: perl(Data::OptList) +Requires: perl(Getopt::Long) >= 2.39 Requires: perl(Getopt::Long::Descriptive) >= 0.084 Requires: perl(IO::TieCombine) Requires: perl(Module::Pluggable::Object) @@ -86,11 +87,6 @@ %prep %setup -q -n %{cpan_name}-%{version} -# MANUAL -%if 0%{?suse_version} <= 1110 -%patch1 -p1 -sed -i "s|__vendorperl__|%{perl_vendorlib}|g" Makefile.PL t/*.t -%endif find . -type f -print0 | xargs -0 chmod 644 %build ++++++ App-Cmd-0.320.tar.gz -> App-Cmd-0.322.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/Changes new/App-Cmd-0.322/Changes --- old/App-Cmd-0.320/Changes 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/Changes 2013-10-28 13:00:39.000000000 +0100 @@ -1,5 +1,13 @@ Revision history for App-Cmd +0.322 2013-10-28 08:00:35 America/New_York + require a newer Getopt::Long to avoid --version conflicts + +0.321 2013-10-26 07:44:19 America/New_York + avoiding getting [undef] in argument list in Simple apps + + add --version support via version command (thanks, Jakob Voss!) + 0.320 2013-01-30 19:37:46 America/New_York when answering "Unknown subcommand," the commands list is sent ot STDERR (#75652) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/MANIFEST new/App-Cmd-0.322/MANIFEST --- old/App-Cmd-0.320/MANIFEST 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/MANIFEST 2013-10-28 13:00:39.000000000 +0100 @@ -11,6 +11,7 @@ lib/App/Cmd/Command.pm lib/App/Cmd/Command/commands.pm lib/App/Cmd/Command/help.pm +lib/App/Cmd/Command/version.pm lib/App/Cmd/Plugin.pm lib/App/Cmd/Setup.pm lib/App/Cmd/Simple.pm @@ -19,7 +20,6 @@ lib/App/Cmd/Tester.pm lib/App/Cmd/Tester/CaptureExternal.pm lib/App/Cmd/Tutorial.pod -t/00-compile.t t/00-load.t t/000-report-versions-tiny.t t/abbrev.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/META.json new/App-Cmd-0.322/META.json --- old/App-Cmd-0.320/META.json 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/META.json 2013-10-28 13:00:39.000000000 +0100 @@ -4,7 +4,7 @@ "Ricardo Signes <[email protected]>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.300029, CPAN::Meta::Converter version 2.120921", + "generated_by" : "Dist::Zilla version 4.300039, CPAN::Meta::Converter version 2.132830", "license" : [ "perl_5" ], @@ -32,6 +32,7 @@ "Class::Load" : "0.06", "Data::OptList" : "0", "File::Basename" : "0", + "Getopt::Long" : "2.39", "Getopt::Long::Descriptive" : "0.084", "IO::TieCombine" : "0", "Module::Pluggable::Object" : "0", @@ -50,137 +51,146 @@ "test" : { "requires" : { "Data::Dumper" : "0", - "File::Find" : "0", - "File::Temp" : "0", "IPC::Cmd" : "0", "Test::Fatal" : "0", "Test::More" : "0.96", - "base" : "0" + "base" : "0", + "lib" : "0" } } }, "release_status" : "stable", "resources" : { "bugtracker" : { - "web" : "https://github.com/rjbs/app-cmd/issues"; + "web" : "https://github.com/rjbs/App-Cmd/issues"; }, - "homepage" : "https://github.com/rjbs/app-cmd";, + "homepage" : "https://github.com/rjbs/App-Cmd";, "repository" : { "type" : "git", - "url" : "https://github.com/rjbs/app-cmd.git";, - "web" : "https://github.com/rjbs/app-cmd"; + "url" : "https://github.com/rjbs/App-Cmd.git";, + "web" : "https://github.com/rjbs/App-Cmd"; } }, - "version" : "0.320", + "version" : "0.322", "x_Dist_Zilla" : { "perl" : { - "version" : "5.017008" + "version" : "5.019005" }, "plugins" : [ { "class" : "Dist::Zilla::Plugin::Git::GatherDir", "name" : "@RJBS/Git::GatherDir", - "version" : "2.007" + "version" : "2.017" }, { "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed", "name" : "@RJBS/CheckPrereqsIndexed", - "version" : "0.008" + "version" : "0.009" }, { "class" : "Dist::Zilla::Plugin::CheckExtraTests", "name" : "@RJBS/CheckExtraTests", + "version" : "0.013" + }, + { + "class" : "Dist::Zilla::Plugin::PromptIfStale", + "name" : "@RJBS/RJBS-Outdated", + "version" : "0.008" + }, + { + "class" : "Dist::Zilla::Plugin::PromptIfStale", + "name" : "@RJBS/CPAN-Outdated", "version" : "0.008" }, { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "@RJBS/@Filter/PruneCruft", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@RJBS/@Filter/ManifestSkip", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "@RJBS/@Filter/MetaYAML", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@RJBS/@Filter/License", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::Readme", "name" : "@RJBS/@Filter/Readme", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ExecDir", "name" : "@RJBS/@Filter/ExecDir", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ShareDir", "name" : "@RJBS/@Filter/ShareDir", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MakeMaker", "name" : "@RJBS/@Filter/MakeMaker", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@RJBS/@Filter/Manifest", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@RJBS/@Filter/TestRelease", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@RJBS/@Filter/ConfirmRelease", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@RJBS/@Filter/UploadToCPAN", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "@RJBS/AutoPrereqs", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::Git::NextVersion", "name" : "@RJBS/Git::NextVersion", - "version" : "2.007" + "version" : "2.017" }, { "class" : "Dist::Zilla::Plugin::PkgVersion", "name" : "@RJBS/PkgVersion", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@RJBS/MetaConfig", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@RJBS/MetaJSON", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@RJBS/NextRelease", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::Test::ChangesHasContent", @@ -190,17 +200,12 @@ { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@RJBS/PodSyntaxTests", - "version" : "4.300029" - }, - { - "class" : "Dist::Zilla::Plugin::Test::Compile", - "name" : "@RJBS/Test::Compile", - "version" : "1.112820" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ReportVersions::Tiny", "name" : "@RJBS/ReportVersions::Tiny", - "version" : "1.08" + "version" : "1.10" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -211,37 +216,46 @@ } }, "name" : "@RJBS/TestMoreWithSubtests", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", + "config" : { + "Dist::Zilla::Plugin::PodWeaver" : { + "config_plugin" : "@RJBS", + "finder" : [ + ":InstallModules", + ":ExecFiles" + ] + } + }, "name" : "@RJBS/PodWeaver", - "version" : "3.101641" + "version" : "3.102000" }, { "class" : "Dist::Zilla::Plugin::GithubMeta", "name" : "@RJBS/GithubMeta", - "version" : "0.28" + "version" : "0.42" }, { "class" : "Dist::Zilla::Plugin::Git::Check", "name" : "@RJBS/@Git/Check", - "version" : "2.007" + "version" : "2.017" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "name" : "@RJBS/@Git/Commit", - "version" : "2.007" + "version" : "2.017" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", "name" : "@RJBS/@Git/Tag", - "version" : "2.007" + "version" : "2.017" }, { "class" : "Dist::Zilla::Plugin::Git::Push", "name" : "@RJBS/@Git/Push", - "version" : "2.007" + "version" : "2.017" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -252,37 +266,37 @@ } }, "name" : "Prereqs", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "4.300029" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "4.300029" + "version" : "4.300039" } ], "zilla" : { @@ -290,7 +304,7 @@ "config" : { "is_trial" : "0" }, - "version" : "4.300029" + "version" : "4.300039" } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/META.yml new/App-Cmd-0.322/META.yml --- old/App-Cmd-0.320/META.yml 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/META.yml 2013-10-28 13:00:39.000000000 +0100 @@ -4,16 +4,15 @@ - 'Ricardo Signes <[email protected]>' build_requires: Data::Dumper: 0 - File::Find: 0 - File::Temp: 0 IPC::Cmd: 0 Test::Fatal: 0 Test::More: 0.96 base: 0 + lib: 0 configure_requires: ExtUtils::MakeMaker: 6.30 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.300029, CPAN::Meta::Converter version 2.120921' +generated_by: 'Dist::Zilla version 4.300039, CPAN::Meta::Converter version 2.132830' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -25,6 +24,7 @@ Class::Load: 0.06 Data::OptList: 0 File::Basename: 0 + Getopt::Long: 2.39 Getopt::Long::Descriptive: 0.084 IO::TieCombine: 0 Module::Pluggable::Object: 0 @@ -39,98 +39,106 @@ strict: 0 warnings: 0 resources: - bugtracker: https://github.com/rjbs/app-cmd/issues - homepage: https://github.com/rjbs/app-cmd - repository: https://github.com/rjbs/app-cmd.git -version: 0.320 + bugtracker: https://github.com/rjbs/App-Cmd/issues + homepage: https://github.com/rjbs/App-Cmd + repository: https://github.com/rjbs/App-Cmd.git +version: 0.322 x_Dist_Zilla: perl: - version: 5.017008 + version: 5.019005 plugins: - class: Dist::Zilla::Plugin::Git::GatherDir name: '@RJBS/Git::GatherDir' - version: 2.007 + version: 2.017 - class: Dist::Zilla::Plugin::CheckPrereqsIndexed name: '@RJBS/CheckPrereqsIndexed' - version: 0.008 + version: 0.009 - class: Dist::Zilla::Plugin::CheckExtraTests name: '@RJBS/CheckExtraTests' + version: 0.013 + - + class: Dist::Zilla::Plugin::PromptIfStale + name: '@RJBS/RJBS-Outdated' + version: 0.008 + - + class: Dist::Zilla::Plugin::PromptIfStale + name: '@RJBS/CPAN-Outdated' version: 0.008 - class: Dist::Zilla::Plugin::PruneCruft name: '@RJBS/@Filter/PruneCruft' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::ManifestSkip name: '@RJBS/@Filter/ManifestSkip' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::MetaYAML name: '@RJBS/@Filter/MetaYAML' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::License name: '@RJBS/@Filter/License' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::Readme name: '@RJBS/@Filter/Readme' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::ExecDir name: '@RJBS/@Filter/ExecDir' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::ShareDir name: '@RJBS/@Filter/ShareDir' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::MakeMaker name: '@RJBS/@Filter/MakeMaker' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::Manifest name: '@RJBS/@Filter/Manifest' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::TestRelease name: '@RJBS/@Filter/TestRelease' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::ConfirmRelease name: '@RJBS/@Filter/ConfirmRelease' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::UploadToCPAN name: '@RJBS/@Filter/UploadToCPAN' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::AutoPrereqs name: '@RJBS/AutoPrereqs' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::Git::NextVersion name: '@RJBS/Git::NextVersion' - version: 2.007 + version: 2.017 - class: Dist::Zilla::Plugin::PkgVersion name: '@RJBS/PkgVersion' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::MetaConfig name: '@RJBS/MetaConfig' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::MetaJSON name: '@RJBS/MetaJSON' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::NextRelease name: '@RJBS/NextRelease' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::Test::ChangesHasContent name: '@RJBS/Test::ChangesHasContent' @@ -138,15 +146,11 @@ - class: Dist::Zilla::Plugin::PodSyntaxTests name: '@RJBS/PodSyntaxTests' - version: 4.300029 - - - class: Dist::Zilla::Plugin::Test::Compile - name: '@RJBS/Test::Compile' - version: 1.112820 + version: 4.300039 - class: Dist::Zilla::Plugin::ReportVersions::Tiny name: '@RJBS/ReportVersions::Tiny' - version: 1.08 + version: 1.10 - class: Dist::Zilla::Plugin::Prereqs config: @@ -154,31 +158,37 @@ phase: test type: requires name: '@RJBS/TestMoreWithSubtests' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::PodWeaver + config: + Dist::Zilla::Plugin::PodWeaver: + config_plugin: '@RJBS' + finder: + - ':InstallModules' + - ':ExecFiles' name: '@RJBS/PodWeaver' - version: 3.101641 + version: 3.102000 - class: Dist::Zilla::Plugin::GithubMeta name: '@RJBS/GithubMeta' - version: 0.28 + version: 0.42 - class: Dist::Zilla::Plugin::Git::Check name: '@RJBS/@Git/Check' - version: 2.007 + version: 2.017 - class: Dist::Zilla::Plugin::Git::Commit name: '@RJBS/@Git/Commit' - version: 2.007 + version: 2.017 - class: Dist::Zilla::Plugin::Git::Tag name: '@RJBS/@Git/Tag' - version: 2.007 + version: 2.017 - class: Dist::Zilla::Plugin::Git::Push name: '@RJBS/@Git/Push' - version: 2.007 + version: 2.017 - class: Dist::Zilla::Plugin::Prereqs config: @@ -186,33 +196,33 @@ phase: runtime type: requires name: Prereqs - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: 4.300029 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: 4.300029 + version: 4.300039 zilla: class: Dist::Zilla::Dist::Builder config: is_trial: 0 - version: 4.300029 + version: 4.300039 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/Makefile.PL new/App-Cmd-0.322/Makefile.PL --- old/App-Cmd-0.320/Makefile.PL 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/Makefile.PL 2013-10-28 13:00:39.000000000 +0100 @@ -11,15 +11,7 @@ my %WriteMakefileArgs = ( "ABSTRACT" => "write command line apps with less suffering", "AUTHOR" => "Ricardo Signes <rjbs\@cpan.org>", - "BUILD_REQUIRES" => { - "Data::Dumper" => 0, - "File::Find" => 0, - "File::Temp" => 0, - "IPC::Cmd" => 0, - "Test::Fatal" => 0, - "Test::More" => "0.96", - "base" => 0 - }, + "BUILD_REQUIRES" => {}, "CONFIGURE_REQUIRES" => { "ExtUtils::MakeMaker" => "6.30" }, @@ -33,6 +25,7 @@ "Class::Load" => "0.06", "Data::OptList" => 0, "File::Basename" => 0, + "Getopt::Long" => "2.39", "Getopt::Long::Descriptive" => "0.084", "IO::TieCombine" => 0, "Module::Pluggable::Object" => 0, @@ -46,13 +39,34 @@ "strict" => 0, "warnings" => 0 }, - "VERSION" => "0.320", + "TEST_REQUIRES" => { + "Data::Dumper" => 0, + "IPC::Cmd" => 0, + "Test::Fatal" => 0, + "Test::More" => "0.96", + "base" => 0, + "lib" => 0 + }, + "VERSION" => "0.322", "test" => { "TESTS" => "t/*.t" } ); +unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { + my $tr = delete $WriteMakefileArgs{TEST_REQUIRES}; + my $br = $WriteMakefileArgs{BUILD_REQUIRES}; + for my $mod ( keys %$tr ) { + if ( exists $br->{$mod} ) { + $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod}; + } + else { + $br->{$mod} = $tr->{$mod}; + } + } +} + unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) { my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; my $pp = $WriteMakefileArgs{PREREQ_PM}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/README new/App-Cmd-0.322/README --- old/App-Cmd-0.320/README 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/README 2013-10-28 13:00:39.000000000 +0100 @@ -1,7 +1,7 @@ This archive contains the distribution App-Cmd, -version 0.320: +version 0.322: write command line apps with less suffering diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/dist.ini new/App-Cmd-0.322/dist.ini --- old/App-Cmd-0.320/dist.ini 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/dist.ini 2013-10-28 13:00:39.000000000 +0100 @@ -7,4 +7,5 @@ github_issues = 1 [Prereqs] +Getopt::Long = 2.39 ; avoid --version mixup Getopt::Long::Descriptive = 0.084 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/ArgProcessor.pm new/App-Cmd-0.322/lib/App/Cmd/ArgProcessor.pm --- old/App-Cmd-0.320/lib/App/Cmd/ArgProcessor.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/ArgProcessor.pm 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ package App::Cmd::ArgProcessor; { - $App::Cmd::ArgProcessor::VERSION = '0.320'; + $App::Cmd::ArgProcessor::VERSION = '0.322'; } # ABSTRACT: App::Cmd-specific wrapper for Getopt::Long::Descriptive @@ -35,7 +35,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Command/commands.pm new/App-Cmd-0.322/lib/App/Cmd/Command/commands.pm --- old/App-Cmd-0.320/lib/App/Cmd/Command/commands.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Command/commands.pm 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ package App::Cmd::Command::commands; { - $App::Cmd::Command::commands::VERSION = '0.320'; + $App::Cmd::Command::commands::VERSION = '0.322'; } use App::Cmd::Command; BEGIN { our @ISA = 'App::Cmd::Command' }; @@ -22,6 +22,7 @@ print { $target } "Available commands:\n\n"; my @primary_commands = + grep { $_ ne 'version' } map { ($_->command_names)[0] } $self->app->command_plugins; @@ -75,7 +76,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Command/help.pm new/App-Cmd-0.322/lib/App/Cmd/Command/help.pm --- old/App-Cmd-0.320/lib/App/Cmd/Command/help.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Command/help.pm 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ package App::Cmd::Command::help; { - $App::Cmd::Command::help::VERSION = '0.320'; + $App::Cmd::Command::help::VERSION = '0.322'; } use App::Cmd::Command; BEGIN { our @ISA = 'App::Cmd::Command'; } @@ -68,7 +68,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Command/version.pm new/App-Cmd-0.322/lib/App/Cmd/Command/version.pm --- old/App-Cmd-0.320/lib/App/Cmd/Command/version.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Command/version.pm 2013-10-28 13:00:39.000000000 +0100 @@ -0,0 +1,63 @@ +use strict; +use warnings; + +package App::Cmd::Command::version; +{ + $App::Cmd::Command::version::VERSION = '0.322'; +} +use App::Cmd::Command; +BEGIN { our @ISA = 'App::Cmd::Command'; } + +# ABSTRACT: display an app's version + + +sub command_names { qw/version --version/ } + +sub version_for_display { + $_[0]->version_package->VERSION +} + +sub version_package { + ref($_[0]->app) +} + +sub execute { + my ($self, $opts, $args) = @_; + + printf "%s (%s) version %s (%s)\n", + $self->app->arg0, $self->version_package, + $self->version_for_display, $self->app->full_arg0; +} + +1; + +__END__ + +=pod + +=head1 NAME + +App::Cmd::Command::version - display an app's version + +=head1 VERSION + +version 0.322 + +=head1 DESCRIPTION + +This plugin implements the C<version> command, often invoked by its switch-like +name, C<--version>. On execution it shows the program name, its base class +with version number, and the full program name. + +=head1 AUTHOR + +Ricardo Signes <[email protected]> + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2013 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. + +=cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Command.pm new/App-Cmd-0.322/lib/App/Cmd/Command.pm --- old/App-Cmd-0.320/lib/App/Cmd/Command.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Command.pm 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ package App::Cmd::Command; { - $App::Cmd::Command::VERSION = '0.320'; + $App::Cmd::Command::VERSION = '0.322'; } use App::Cmd::ArgProcessor; BEGIN { our @ISA = 'App::Cmd::ArgProcessor' }; @@ -152,7 +152,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 METHODS @@ -248,7 +248,7 @@ =head2 description This method should be overridden to provide full option description. It -is used by the built-in L<App::Cmd::Command::help|help> command. +is used by the built-in L<help|App::Cmd::Command::help> command. If not overridden, it returns an empty string. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Plugin.pm new/App-Cmd-0.322/lib/App/Cmd/Plugin.pm --- old/App-Cmd-0.320/lib/App/Cmd/Plugin.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Plugin.pm 2013-10-28 13:00:39.000000000 +0100 @@ -2,7 +2,7 @@ use warnings; package App::Cmd::Plugin; { - $App::Cmd::Plugin::VERSION = '0.320'; + $App::Cmd::Plugin::VERSION = '0.322'; } # ABSTRACT: a plugin for App::Cmd commands @@ -27,7 +27,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Setup.pm new/App-Cmd-0.322/lib/App/Cmd/Setup.pm --- old/App-Cmd-0.320/lib/App/Cmd/Setup.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Setup.pm 2013-10-28 13:00:39.000000000 +0100 @@ -2,7 +2,7 @@ use warnings; package App::Cmd::Setup; { - $App::Cmd::Setup::VERSION = '0.320'; + $App::Cmd::Setup::VERSION = '0.322'; } # ABSTRACT: helper for setting up App::Cmd classes @@ -150,7 +150,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 OVERVIEW diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Simple.pm new/App-Cmd-0.322/lib/App/Cmd/Simple.pm --- old/App-Cmd-0.320/lib/App/Cmd/Simple.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Simple.pm 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ package App::Cmd::Simple; { - $App::Cmd::Simple::VERSION = '0.320'; + $App::Cmd::Simple::VERSION = '0.322'; } use App::Cmd::Command; BEGIN { our @ISA = 'App::Cmd::Command' } @@ -71,21 +71,18 @@ as => '_cmd_from_args', code => sub { my ($self, $args) = @_; - my $command = shift @$args; - my $plugin = $self->plugin_for($command); - # If help was requested, show the help for the command, not the - # main help. Because the main help would talk about subcommands, - # and a "Simple" app has no subcommands. - if ($plugin and $plugin eq $self->plugin_for("help")) { - return ($command, [ $self->default_command ]); - } - # Any other value for "command" isn't really a command at all -- - # it's the first argument. So unshift it back onto $args and - # call the default command instead. - else { - unshift @$args, $command; - return ($self->default_command, $args); + if (defined(my $command = $args->[0])) { + my $plugin = $self->plugin_for($command); + # If help was requested, show the help for the command, not the + # main help. Because the main help would talk about subcommands, + # and a "Simple" app has no subcommands. + if ($plugin and $plugin eq $self->plugin_for("help")) { + return ($command, [ $self->default_command ]); + } + # Any other value for "command" isn't really a command at all -- + # it's the first argument. So call the default command instead. } + return ($self->default_command, $args); }, }); @@ -122,7 +119,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Subdispatch/DashedStyle.pm new/App-Cmd-0.322/lib/App/Cmd/Subdispatch/DashedStyle.pm --- old/App-Cmd-0.320/lib/App/Cmd/Subdispatch/DashedStyle.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Subdispatch/DashedStyle.pm 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ package App::Cmd::Subdispatch::DashedStyle; { - $App::Cmd::Subdispatch::DashedStyle::VERSION = '0.320'; + $App::Cmd::Subdispatch::DashedStyle::VERSION = '0.322'; } use App::Cmd::Subdispatch; BEGIN { our @ISA = 'App::Cmd::Subdispatch' }; @@ -65,7 +65,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 METHODS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Subdispatch.pm new/App-Cmd-0.322/lib/App/Cmd/Subdispatch.pm --- old/App-Cmd-0.320/lib/App/Cmd/Subdispatch.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Subdispatch.pm 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ package App::Cmd::Subdispatch; { - $App::Cmd::Subdispatch::VERSION = '0.320'; + $App::Cmd::Subdispatch::VERSION = '0.322'; } use App::Cmd; @@ -79,7 +79,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 METHODS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Tester/CaptureExternal.pm new/App-Cmd-0.322/lib/App/Cmd/Tester/CaptureExternal.pm --- old/App-Cmd-0.320/lib/App/Cmd/Tester/CaptureExternal.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Tester/CaptureExternal.pm 2013-10-28 13:00:39.000000000 +0100 @@ -2,7 +2,7 @@ use warnings; package App::Cmd::Tester::CaptureExternal; { - $App::Cmd::Tester::CaptureExternal::VERSION = '0.320'; + $App::Cmd::Tester::CaptureExternal::VERSION = '0.322'; } use parent 'App::Cmd::Tester'; @@ -48,7 +48,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Tester.pm new/App-Cmd-0.322/lib/App/Cmd/Tester.pm --- old/App-Cmd-0.320/lib/App/Cmd/Tester.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Tester.pm 2013-10-28 13:00:39.000000000 +0100 @@ -2,7 +2,7 @@ use warnings; package App::Cmd::Tester; { - $App::Cmd::Tester::VERSION = '0.320'; + $App::Cmd::Tester::VERSION = '0.322'; } # ABSTRACT: for capturing the result of running an app @@ -83,7 +83,7 @@ { package App::Cmd::Tester::Result; { - $App::Cmd::Tester::Result::VERSION = '0.320'; + $App::Cmd::Tester::Result::VERSION = '0.322'; } sub new { @@ -102,7 +102,7 @@ { package App::Cmd::Tester::Exited; { - $App::Cmd::Tester::Exited::VERSION = '0.320'; + $App::Cmd::Tester::Exited::VERSION = '0.322'; } sub throw { my ($class, $code) = @_; @@ -124,7 +124,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd/Tutorial.pod new/App-Cmd-0.322/lib/App/Cmd/Tutorial.pod --- old/App-Cmd-0.320/lib/App/Cmd/Tutorial.pod 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd/Tutorial.pod 2013-10-28 13:00:39.000000000 +0100 @@ -14,7 +14,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 DESCRIPTION @@ -103,7 +103,7 @@ =item help -allows to query for details on command's specifics. +allows one to query for details on command's specifics. $yourcmd help initialize yourcmd initialize [-z] [long options...] @@ -213,7 +213,7 @@ =item * Add a C<description> method to your commands for more verbose output -from the built-in C<App::Cmd::Command::help|help> command. +from the built-in L<help|App::Cmd::Command::help> command. sub description { return "The initialize command prepares ..."; @@ -291,10 +291,10 @@ <whatever you want here> -This will register this packages namespace with YourApp to be excluded from its -plugin validation magic. It otherwise makes no changes to C<::NotACommand>'s -namespace, does nothing magical with C<@ISA>, and doesn't bolt any hidden -functions on. +This will register this package's namespace with YourApp to be excluded from +its plugin validation magic. It otherwise makes no changes to +C<::NotACommand>'s namespace, does nothing magical with C<@ISA>, and doesn't +bolt any hidden functions on. Its also probably good to notice that it is ignored I<only> by C<YourApp>. If for whatever reason you have two different C<App::Cmd> systems @@ -335,8 +335,7 @@ =head1 SEE ALSO -L<CPAN modules using App::Cmd| -http://deps.cpantesters.org/depended-on-by.pl?module=App%3A%3ACmd> +L<CPAN modules using App::Cmd|http://deps.cpantesters.org/depended-on-by.pl?module=App%3A%3ACmd> =head1 AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/lib/App/Cmd.pm new/App-Cmd-0.322/lib/App/Cmd.pm --- old/App-Cmd-0.320/lib/App/Cmd.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/lib/App/Cmd.pm 2013-10-28 13:00:39.000000000 +0100 @@ -4,7 +4,7 @@ package App::Cmd; { - $App::Cmd::VERSION = '0.320'; + $App::Cmd::VERSION = '0.322'; } use App::Cmd::ArgProcessor; BEGIN { our @ISA = 'App::Cmd::ArgProcessor' }; @@ -117,7 +117,7 @@ } } - $self->_load_default_plugin($_, $arg, \%plugin) for qw(commands help); + $self->_load_default_plugin($_, $arg, \%plugin) for qw(commands help version); if ($self->allow_any_unambiguous_abbrev) { # add abbreviations to list of authorized commands @@ -422,7 +422,7 @@ =head1 VERSION -version 0.320 +version 0.322 =head1 SYNOPSIS @@ -495,19 +495,25 @@ no_help_plugin - if true, the help plugin is not added + no_version_plugin - if true, the version plugin is not added + plugin_search_path - The path to search for commands in. Defaults to results of plugin_search_path method -If C<no_commands_plugin> is not given, App::Cmd::Command::commands will be +If C<no_commands_plugin> is not given, L<App::Cmd::Command::commands> will be required, and it will be registered to handle all of its command names not handled by other plugins. -If C<no_help_plugin> is not given, App::Cmd::Command::help will be required, +If C<no_help_plugin> is not given, L<App::Cmd::Command::help> will be required, and it will be registered to handle all of its command names not handled by other plugins. B<Note:> "help" is the default command, so if you do not load the default help plugin, you should provide your own or override the C<default_command> method. +If C<no_version_plugin> is not given, L<App::Cmd::Command::version> will be +required to show the application's version with command C<--version>. The +version command is not included in the command list. + =head2 run $cmd->run; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/00-compile.t new/App-Cmd-0.322/t/00-compile.t --- old/App-Cmd-0.320/t/00-compile.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/00-compile.t 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -#!perl - -use strict; -use warnings; - -use Test::More; - - - -use File::Find; -use File::Temp qw{ tempdir }; - -my @modules; -find( - sub { - return if $File::Find::name !~ /\.pm\z/; - my $found = $File::Find::name; - $found =~ s{^lib/}{}; - $found =~ s{[/\\]}{::}g; - $found =~ s/\.pm$//; - # nothing to skip - push @modules, $found; - }, - 'lib', -); - -sub _find_scripts { - my $dir = shift @_; - - my @found_scripts = (); - find( - sub { - return unless -f; - my $found = $File::Find::name; - # nothing to skip - open my $FH, '<', $_ or do { - note( "Unable to open $found in ( $! ), skipping" ); - return; - }; - my $shebang = <$FH>; - return unless $shebang =~ /^#!.*?\bperl\b\s*$/; - push @found_scripts, $found; - }, - $dir, - ); - - return @found_scripts; -} - -my @scripts; -do { push @scripts, _find_scripts($_) if -d $_ } - for qw{ bin script scripts }; - -my $plan = scalar(@modules) + scalar(@scripts); -$plan ? (plan tests => $plan) : (plan skip_all => "no tests to run"); - -{ - # fake home for cpan-testers - # no fake requested ## local $ENV{HOME} = tempdir( CLEANUP => 1 ); - - like( qx{ $^X -Ilib -e "require $_; print '$_ ok'" }, qr/^\s*$_ ok/s, "$_ loaded ok" ) - for sort @modules; - - SKIP: { - eval "use Test::Script 1.05; 1;"; - skip "Test::Script needed to test script compilation", scalar(@scripts) if $@; - foreach my $file ( @scripts ) { - my $script = $file; - $script =~ s!.*/!!; - script_compiles( $file, "$script script compiles" ); - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/000-report-versions-tiny.t new/App-Cmd-0.322/t/000-report-versions-tiny.t --- old/App-Cmd-0.320/t/000-report-versions-tiny.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/000-report-versions-tiny.t 2013-10-28 13:00:39.000000000 +0100 @@ -9,7 +9,7 @@ END { $success && done_testing; } # List our own version used to generate this -my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.08\n"; +my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n"; eval { # no excuses! # report our Perl details @@ -55,8 +55,7 @@ eval { $v .= pmver('Data::OptList','any version') }; eval { $v .= pmver('ExtUtils::MakeMaker','6.30') }; eval { $v .= pmver('File::Basename','any version') }; -eval { $v .= pmver('File::Find','any version') }; -eval { $v .= pmver('File::Temp','any version') }; +eval { $v .= pmver('Getopt::Long','2.39') }; eval { $v .= pmver('Getopt::Long::Descriptive','0.084') }; eval { $v .= pmver('IO::TieCombine','any version') }; eval { $v .= pmver('IPC::Cmd','any version') }; @@ -67,13 +66,12 @@ eval { $v .= pmver('Sub::Install','any version') }; eval { $v .= pmver('Test::Fatal','any version') }; eval { $v .= pmver('Test::More','0.96') }; -eval { $v .= pmver('Test::Pod','1.41') }; eval { $v .= pmver('Text::Abbrev','any version') }; eval { $v .= pmver('base','any version') }; eval { $v .= pmver('constant','any version') }; +eval { $v .= pmver('lib','any version') }; eval { $v .= pmver('parent','any version') }; eval { $v .= pmver('strict','any version') }; -eval { $v .= pmver('version','0.9901') }; eval { $v .= pmver('warnings','any version') }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/abbrev.t new/App-Cmd-0.322/t/abbrev.t --- old/App-Cmd-0.320/t/abbrev.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/abbrev.t 2013-10-28 13:00:39.000000000 +0100 @@ -13,6 +13,7 @@ my $app = Test::MyCmdAbbrev->new( { no_commands_plugin => 1, no_help_plugin => 1, + no_version_plugin => 1, } ); is_deeply( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/basic.t new/App-Cmd-0.322/t/basic.t --- old/App-Cmd-0.320/t/basic.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/basic.t 2013-10-28 13:00:39.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use warnings; -use Test::More tests => 13; +use Test::More tests => 15; use App::Cmd::Tester; use lib 't/lib'; @@ -16,7 +16,7 @@ is_deeply( [ sort $app->command_names ], - [ sort qw(help --help -h -? commands exit frob frobulate hello justusage stock) ], + [ sort qw(help --help -h --version -? commands exit frob frobulate hello justusage stock version) ], "got correct list of registered command names", ); @@ -25,6 +25,7 @@ [ qw( App::Cmd::Command::commands App::Cmd::Command::help + App::Cmd::Command::version Test::MyCmd::Command::exit Test::MyCmd::Command::frobulate Test::MyCmd::Command::hello @@ -65,11 +66,16 @@ like($@, qr/mandatory method/, "un-subclassed &run leads to death"); } -my $return = test_app('Test::MyCmd', [ qw(commands) ]); +my $return = test_app('Test::MyCmd', [ qw(--version) ]); +my $version_expect = "basic.t (Test::MyCmd) version 0.123 (t/basic.t)\n"; +is($return->stdout, $version_expect, "version plugin enabled"); + +$return = test_app('Test::MyCmd', [ qw(commands) ]); for my $name (qw(commands frobulate hello justusage stock)) { like($return->stdout, qr/^\s+\Q$name\E/sm, "$name plugin in listing"); } +unlike($return->stdout, qr/--version/, "version plugin not in listing"); { my $return = test_app('Test::MyCmd', [ qw(exit 1) ]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/callback.t new/App-Cmd-0.322/t/callback.t --- old/App-Cmd-0.320/t/callback.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/callback.t 2013-10-28 13:00:39.000000000 +0100 @@ -17,7 +17,7 @@ is_deeply( [ sort $app->command_names ], - [ sort qw(help --help -h -? commands lol) ], + [ sort qw(help --help -h --version -? commands lol version) ], "got correct list of registered command names", ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/lib/Test/MyCmd.pm new/App-Cmd-0.322/t/lib/Test/MyCmd.pm --- old/App-Cmd-0.320/t/lib/Test/MyCmd.pm 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/lib/Test/MyCmd.pm 2013-10-28 13:00:39.000000000 +0100 @@ -5,4 +5,6 @@ use base qw(App::Cmd); +our $VERSION = '0.123'; + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/setup-inner.t new/App-Cmd-0.322/t/setup-inner.t --- old/App-Cmd-0.320/t/setup-inner.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/setup-inner.t 2013-10-28 13:00:39.000000000 +0100 @@ -16,7 +16,7 @@ is_deeply( [ sort $app->command_names ], - [ sort qw(help --help -h -? commands poot) ], + [ sort qw(help --help -h --version -? commands poot version) ], "got correct list of registered command names", ); @@ -25,6 +25,7 @@ [ qw( App::Cmd::Command::commands App::Cmd::Command::help + App::Cmd::Command::version Test::WSOF::Command::poot ) ], "got correct list of registered command plugins", @@ -33,7 +34,7 @@ { local @ARGV = qw(poot); my $return = eval { $app->run }; - + is($return, 'woof woof poot', "inner package commands work with Setup"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/setup-nocmd.t new/App-Cmd-0.322/t/setup-nocmd.t --- old/App-Cmd-0.320/t/setup-nocmd.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/setup-nocmd.t 2013-10-28 13:00:39.000000000 +0100 @@ -25,7 +25,7 @@ is_deeply( [ sort $app->command_names ], - [ sort qw(help --help -h -? commands blort) ], + [ sort qw(help --help -h --version -? commands blort version) ], "got correct list of registered command names", ); @@ -34,6 +34,7 @@ [ qw( App::Cmd::Command::commands App::Cmd::Command::help + App::Cmd::Command::version Test::WSNCC::Command::blort ) ], "got correct list of registered command plugins", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/t/setup.t new/App-Cmd-0.322/t/setup.t --- old/App-Cmd-0.320/t/setup.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/t/setup.t 2013-10-28 13:00:39.000000000 +0100 @@ -16,7 +16,7 @@ is_deeply( [ sort $app->command_names ], - [ sort qw(help --help -h -? commands alfie bertie) ], + [ sort qw(help --help -h --version -? commands alfie bertie version) ], "got correct list of registered command names", ); @@ -25,6 +25,7 @@ [ qw( App::Cmd::Command::commands App::Cmd::Command::help + App::Cmd::Command::version Test::WithSetup::Command::alfie Test::WithSetup::Command::bertie ) ], @@ -34,7 +35,7 @@ { local @ARGV = qw(alfie); my $return = eval { $app->run }; - + is_deeply( $return, {}, @@ -45,7 +46,7 @@ { local @ARGV = qw(bertie); my $return = eval { $app->run }; - + is($return->[0], 'Test::XyzzyPlugin', "arg0 = plugin itself"); isa_ok($return->[1], 'Test::WithSetup::Command'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-Cmd-0.320/xt/release/changes_has_content.t new/App-Cmd-0.322/xt/release/changes_has_content.t --- old/App-Cmd-0.320/xt/release/changes_has_content.t 2013-01-31 01:37:50.000000000 +0100 +++ new/App-Cmd-0.322/xt/release/changes_has_content.t 2013-10-28 13:00:39.000000000 +0100 @@ -4,7 +4,7 @@ note 'Checking Changes'; my $changes_file = 'Changes'; -my $newver = '0.320'; +my $newver = '0.322'; my $trial_token = '-TRIAL'; SKIP: { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
