tags 527078 + patch pending thanks Dear maintainer, I've prepared an NMU for libapp-cli-perl (versioned as 0.08-0+nmu1) and uploaded it to DELAYED/10. Please free to tell me if I should delay it longer. Cheers, gregor -- .''`. Home: http://info.comodo.priv.at/{,blog/} / GPG Key ID: 0x00F3CFE4 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT, SPI Inc., fellow of FSFE | http://got.to/quote/ `- NP: Jerry Lee Lewis: Whole Lotta Shakin' Goin' On
diff -Nru libapp-cli-perl-0.07/Changes libapp-cli-perl-0.08/Changes --- libapp-cli-perl-0.07/Changes 2006-11-24 22:23:40.000000000 +0100 +++ libapp-cli-perl-0.08/Changes 2009-02-25 22:04:03.000000000 +0100 @@ -1,3 +1,7 @@ +* 0.08 - 25 Feb 2009 + + * Allow commands to be provided as inner packages + * 0.07 - 24 Nov 2006 * Don't use Carp without actually loading it. diff -Nru libapp-cli-perl-0.07/MANIFEST libapp-cli-perl-0.08/MANIFEST --- libapp-cli-perl-0.07/MANIFEST 2006-11-24 22:22:09.000000000 +0100 +++ libapp-cli-perl-0.08/MANIFEST 2009-02-26 04:24:09.000000000 +0100 @@ -1,4 +1,8 @@ -inc/ExtUtils/AutoInstall.pm +Changes +MANIFEST This list of files +META.yml +Makefile.PL +SIGNATURE inc/Module/AutoInstall.pm inc/Module/Install.pm inc/Module/Install/AutoInstall.pm @@ -13,11 +17,6 @@ lib/App/CLI.pm lib/App/CLI/Command.pm lib/App/CLI/Command/Help.pm -Makefile.PL -MANIFEST This list of files -Changes -META.yml -SIGNATURE t/1basic.t t/lib/CLITest.pm t/lib/MyApp.pm diff -Nru libapp-cli-perl-0.07/META.yml libapp-cli-perl-0.08/META.yml --- libapp-cli-perl-0.07/META.yml 2006-11-24 22:22:57.000000000 +0100 +++ libapp-cli-perl-0.08/META.yml 2009-02-26 04:24:31.000000000 +0100 @@ -1,15 +1,22 @@ -abstract: Dispatcher module for command line interface programs -author: Chia-liang Kao <clkao@clkao.org> +--- +abstract: 'Dispatcher module for command line interface programs' +author: + - 'Chia-liang Kao <clkao@clkao.org>' distribution_type: module -generated_by: Module::Install version 0.64 +generated_by: 'Module::Install version 0.79' license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 name: App-CLI -no_index: - directory: +no_index: + directory: - inc - t -requires: +requires: Getopt::Long: 2.35 Locale::Maketext::Simple: 0 Pod::Simple::Text: 0 -version: 0.07 +resources: + license: http://dev.perl.org/licenses/ +version: 0.08 diff -Nru libapp-cli-perl-0.07/Makefile.PL libapp-cli-perl-0.08/Makefile.PL --- libapp-cli-perl-0.07/Makefile.PL 2006-11-24 22:22:09.000000000 +0100 +++ libapp-cli-perl-0.08/Makefile.PL 2009-02-26 04:18:39.000000000 +0100 @@ -14,7 +14,6 @@ 'Pod::Simple::Text' => 0, ); -include('ExtUtils::AutoInstall'); auto_install(); WriteAll( sign => 1 ); diff -Nru libapp-cli-perl-0.07/SIGNATURE libapp-cli-perl-0.08/SIGNATURE --- libapp-cli-perl-0.07/SIGNATURE 2006-11-24 22:24:23.000000000 +0100 +++ libapp-cli-perl-0.08/SIGNATURE 2009-02-26 04:24:28.000000000 +0100 @@ -14,34 +14,33 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 264655816674f45f43108fa31c13377183864d9b Changes -SHA1 8d79441e3301a43c60e88f19bebb9779cfda61fc MANIFEST -SHA1 2db94377405fa3f123772c6d1018f12eb8417687 META.yml -SHA1 f3071db6309f9d0a01a199b6c62962d15a373087 Makefile.PL -SHA1 5b52cbdabc56a44e4c0a90a3f5a5609a90d26f84 inc/ExtUtils/AutoInstall.pm +SHA1 7fd9bee22194a446efee9479819cb1e2756f4525 Changes +SHA1 63b10e1b9dc12d9570df6daa4233ee44ce60c043 MANIFEST +SHA1 8e6b388a9c7135b46f8d5cec0f7de3c90b5cdaa4 META.yml +SHA1 2a8226162700b54e808b0d95edeb545d27073d07 Makefile.PL SHA1 603bb9de29fb8cba7f13409c546750972eff645d inc/Module/AutoInstall.pm -SHA1 9b2f9d83bcf77860f53a0c07c90a4a59ad9f5df1 inc/Module/Install.pm -SHA1 ad955f51ad2c40d4ba35395c27f5ed899a80bf7a inc/Module/Install/AutoInstall.pm -SHA1 abe32855d75ab13747cf65765af9947b7a8c3057 inc/Module/Install/Base.pm -SHA1 95b81d1e91bd634467bf633571eff4420e9c04eb inc/Module/Install/Can.pm -SHA1 1fe98c63cf9d7271c8cb4183ba230f152df69e26 inc/Module/Install/Fetch.pm -SHA1 0606a8b02a420600bc3e2b65ab82f70266784926 inc/Module/Install/Include.pm -SHA1 2249171a2b72cd73ff2c0a06597d29f86e5df456 inc/Module/Install/Makefile.pm -SHA1 381bb98ea3877bba49ae85e7a7ea130645fd3dbf inc/Module/Install/Metadata.pm -SHA1 0c2118868ef82ac517eb6d9c3bd93e6eb9bbf83e inc/Module/Install/Win32.pm -SHA1 e827d6d43771032fa3df35c0ad5e5698d0e54cda inc/Module/Install/WriteAll.pm -SHA1 c065841a4dd516aeebfb5415009db67313aa9911 lib/App/CLI.pm +SHA1 ae018c4565c1277089ca8f1b28f888d95430cb7f inc/Module/Install.pm +SHA1 0a6f29536bedea3bb94744a7d43ffe39da7e4819 inc/Module/Install/AutoInstall.pm +SHA1 4552acdfca8b78f8015d8449e1325616259095f5 inc/Module/Install/Base.pm +SHA1 7fb663fff161fb45882b52edd62857bf15359658 inc/Module/Install/Can.pm +SHA1 8b1d3db746faa6faf2d967a48d3812ec1f44b4c6 inc/Module/Install/Fetch.pm +SHA1 d7ce736cdd05d5156d379ef39cca93beeeeba828 inc/Module/Install/Include.pm +SHA1 9f6beaa2f4749ceb5dd0c9b0c647d0f3289c7b46 inc/Module/Install/Makefile.pm +SHA1 7ad1da4fff7a1e7a634c9d734111c8292be08884 inc/Module/Install/Metadata.pm +SHA1 e9aa83f3e8b16ccfce544a90a57b63b70a497759 inc/Module/Install/Win32.pm +SHA1 ade2ac0b0246d4d8e28fa46942e53f6925abda46 inc/Module/Install/WriteAll.pm +SHA1 ba3a180b4915e0060ced5135e2d6441e766823e0 lib/App/CLI.pm SHA1 afa50c5c799445a48385ce9d6f2589bb8d90d00d lib/App/CLI/Command.pm -SHA1 f6e093003936aed4b3f1105263ca9356c908bc38 lib/App/CLI/Command/Help.pm +SHA1 bbda8c25ee4e1a704cb574e52b1db4e85e008c16 lib/App/CLI/Command/Help.pm SHA1 2e2fae52c7271120faa67828599c8e15c6ee52f6 t/1basic.t SHA1 bdf8cf34a6036e32739dc19cb775db69952184cb t/lib/CLITest.pm SHA1 d8d9e73b090de778d7a046c6cc4ad01b3dc52612 t/lib/MyApp.pm SHA1 d54e822cc998c53e44b74995affadd86c14a38a3 t/lib/MyApp/Help.pm SHA1 a4d7d62cb74ddda64f20836e7ec3ff67215d9f04 t/lib/MyApp/Test.pm -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v2.0.9 (GNU/Linux) -iD8DBQFFZ2MHk1XldlEkA5YRAmsFAJ45yjG6sxsIc5MStrx/24SIP474iQCfY3AJ -/nZp05prCDDbwmzDyxWSVSw= -=EbSw +iEYEARECAAYFAkmmC2wACgkQMflWJZZAbqDtpgCgrVJYpHaTY7NMaq88VPcOtJDV ++lcAn3w7ctgg9ed/6j1zeS1Sl7imX5+D +=+oKY -----END PGP SIGNATURE----- diff -Nru libapp-cli-perl-0.07/debian/changelog libapp-cli-perl-0.08/debian/changelog --- libapp-cli-perl-0.07/debian/changelog 2009-05-27 18:57:46.000000000 +0200 +++ libapp-cli-perl-0.08/debian/changelog 2009-05-27 18:57:47.000000000 +0200 @@ -1,3 +1,11 @@ +libapp-cli-perl (0.08-0+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release (Closes: #527078) + * fix debian/watch watch dist instead of author + + -- AGOSTINI Yves <agostini@univ-metz.fr> Mon, 25 May 2009 09:47:18 +0200 + libapp-cli-perl (0.07-2) unstable; urgency=low * Fix build depends. diff -Nru libapp-cli-perl-0.07/debian/watch libapp-cli-perl-0.08/debian/watch --- libapp-cli-perl-0.07/debian/watch 2009-05-27 18:57:46.000000000 +0200 +++ libapp-cli-perl-0.08/debian/watch 2009-05-27 18:57:47.000000000 +0200 @@ -1,2 +1,4 @@ +# format version number, currently 3; this line is compulsory! version=3 -http://www.cpan.org/pub/CPAN/authors/id/C/CL/CLKAO/App-CLI-(.*)\.tar.gz +# URL to the package page followed by a regex to search +http://search.cpan.org/dist/App-CLI/ .*/App-CLI-v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ diff -Nru libapp-cli-perl-0.07/inc/ExtUtils/AutoInstall.pm libapp-cli-perl-0.08/inc/ExtUtils/AutoInstall.pm --- libapp-cli-perl-0.07/inc/ExtUtils/AutoInstall.pm 2006-11-24 22:22:56.000000000 +0100 +++ libapp-cli-perl-0.08/inc/ExtUtils/AutoInstall.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,647 +0,0 @@ -#line 1 -package ExtUtils::AutoInstall; -$ExtUtils::AutoInstall::VERSION = '0.63'; - -use strict; -use Cwd (); -use ExtUtils::MakeMaker (); - -#line 311 - -# special map on pre-defined feature sets -my %FeatureMap = ( - '' => 'Core Features', # XXX: deprecated - '-core' => 'Core Features', -); - -# various lexical flags -my (@Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS); -my ($Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly); -my ($PostambleActions, $PostambleUsed); - -_accept_default(!-t STDIN); # see if it's a non-interactive session -_init(); - -sub _accept_default { - $AcceptDefault = shift; -} - -sub missing_modules { - return @Missing; -} - -sub do_install { - __PACKAGE__->install( - [ UNIVERSAL::isa($Config, 'HASH') ? %{$Config} : @{$Config}], - @Missing, - ); -} - -# initialize various flags, and/or perform install -sub _init { - foreach my $arg (@ARGV, split(/[\s\t]+/, $ENV{PERL_EXTUTILS_AUTOINSTALL} || '')) { - if ($arg =~ /^--config=(.*)$/) { - $Config = [ split(',', $1) ]; - } - elsif ($arg =~ /^--installdeps=(.*)$/) { - __PACKAGE__->install($Config, @Missing = split(/,/, $1)); - exit 0; - } - elsif ($arg =~ /^--default(?:deps)?$/) { - $AcceptDefault = 1; - } - elsif ($arg =~ /^--check(?:deps)?$/) { - $CheckOnly = 1; - } - elsif ($arg =~ /^--skip(?:deps)?$/) { - $SkipInstall = 1; - } - elsif ($arg =~ /^--test(?:only)?$/) { - $TestOnly = 1; - } - } -} - -# overrides MakeMaker's prompt() to automatically accept the default choice -sub _prompt { - goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault; - - my ($prompt, $default) = @_; - my $y = ($default =~ /^[Yy]/); - - print $prompt, ' [', ($y ? 'Y' : 'y'), '/', ($y ? 'n' : 'N'), '] '; - print "$default\n"; - return $default; -} - -# the workhorse -sub import { - my $class = shift; - my @args = @_ or return; - my $core_all; - - print "*** $class version ".$class->VERSION."\n"; - print "*** Checking for dependencies...\n"; - - my $cwd = Cwd::cwd(); - - $Config = []; - - my $maxlen = length((sort { length($b) <=> length($a) } - grep { /^[^\-]/ } - map { ref($_) ? keys %{ref($_) eq 'HASH' ? $_ : +{@{$_}}} : '' } - map { +{@args}->{$_} } - grep { /^[^\-]/ or /^-core$/i } keys %{+{@args}})[0]); - - while (my ($feature, $modules) = splice(@args, 0, 2)) { - my (@required, @tests, @skiptests); - my $default = 1; - my $conflict = 0; - - if ($feature =~ m/^-(\w+)$/) { - my $option = lc($1); - - # check for a newer version of myself - _update_to($modules, @_) and return if $option eq 'version'; - - # sets CPAN configuration options - $Config = $modules if $option eq 'config'; - - # promote every features to core status - $core_all = ($modules =~ /^all$/i) and next - if $option eq 'core'; - - next unless $option eq 'core'; - } - - print "[".($FeatureMap{lc($feature)} || $feature)."]\n"; - - $modules = [ %{$modules} ] if UNIVERSAL::isa($modules, 'HASH'); - - unshift @$modules, -default => &{shift(@$modules)} - if (ref($modules->[0]) eq 'CODE'); # XXX: bugward combatability - - while (my ($mod, $arg) = splice(@$modules, 0, 2)) { - if ($mod =~ m/^-(\w+)$/) { - my $option = lc($1); - - $default = $arg if ($option eq 'default'); - $conflict = $arg if ($option eq 'conflict'); - @tests = @{$arg} if ($option eq 'tests'); - @skiptests = @{$arg} if ($option eq 'skiptests'); - - next; - } - - printf("- %-${maxlen}s ...", $mod); - - # XXX: check for conflicts and uninstalls(!) them. - if (defined(my $cur = _version_check(_load($mod), $arg ||= 0))) { - print "loaded. ($cur".($arg ? " >= $arg" : '').")\n"; - push @Existing, $mod => $arg; - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - else { - print "missing." . ($arg ? " (would need $arg)" : '') . "\n"; - push @required, $mod => $arg; - } - } - - next unless @required; - - my $mandatory = ($feature eq '-core' or $core_all); - - if (!$SkipInstall and ($CheckOnly or _prompt( - qq{==> Auto-install the }. (@required / 2). - ($mandatory ? ' mandatory' : ' optional'). - qq{ module(s) from CPAN?}, $default ? 'y' : 'n', - ) =~ /^[Yy]/)) { - push (@Missing, @required); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - elsif (!$SkipInstall and $default and $mandatory and _prompt( - qq{==> The module(s) are mandatory! Really skip?}, 'n', - ) =~ /^[Nn]/) { - push (@Missing, @required); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - else { - $DisabledTests{$_} = 1 for map { glob($_) } @tests; - } - } - - _check_lock(); # check for $UnderCPAN - - if (@Missing and not ($CheckOnly or $UnderCPAN)) { - require Config; - print "*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n"; - # make an educated guess of whether we'll need root permission. - print " (You may need to do that as the 'root' user.)\n" if eval '$>'; - } - print "*** $class configuration finished.\n"; - - chdir $cwd; - - # import to main:: - no strict 'refs'; - *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main'; -} - -# CPAN.pm is non-reentrant, so check if we're under it and have no CPANPLUS -sub _check_lock { - return unless @Missing; - return if _has_cpanplus(); - - require CPAN; CPAN::Config->load; - my $lock = MM->catfile($CPAN::Config->{cpan_home}, ".lock"); - - if (-f $lock and open(LOCK, $lock) - and ($^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid()) - and ($CPAN::Config->{prerequisites_policy} || '') ne 'ignore' - ) { - print << '.'; - -*** Since we're running under CPAN, I'll just let it take care - of the dependency's installation later. -. - $UnderCPAN = 1; - } - - close LOCK; -} - -sub install { - my $class = shift; - - my $i; # used below to strip leading '-' from config keys - my @config = (map { s/^-// if ++$i; $_ } @{+shift}); - - my (@modules, @installed); - while (my ($pkg, $ver) = splice(@_, 0, 2)) { - # grep out those already installed - if (defined(_version_check(_load($pkg), $ver))) { - push @installed, $pkg; - } - else { - push @modules, $pkg, $ver; - } - } - - return @installed unless @modules; # nothing to do - - print "*** Installing dependencies...\n"; - - return unless _connected_to('cpan.org'); - - my %args = @config; - my %failed; - local *FAILED; - if ($args{do_once} and open(FAILED, '.#autoinstall.failed')) { - while (<FAILED>) { chomp; $failed{$_}++ } - close FAILED; - - my @newmod; - while (my ($k, $v) = splice(@modules, 0, 2)) { - push @newmod, ($k => $v) unless $failed{$k}; - } - @modules = @newmod; - } - - if (_has_cpanplus()) { - _install_cpanplus(\@modules, \@config); - } - else { - _install_cpan(\@modules, \@config); - } - - print "*** $class installation finished.\n"; - - # see if we have successfully installed them - while (my ($pkg, $ver) = splice(@modules, 0, 2)) { - if (defined(_version_check(_load($pkg), $ver))) { - push @installed, $pkg; - } - elsif ($args{do_once} and open(FAILED, '>> .#autoinstall.failed')) { - print FAILED "$pkg\n"; - } - } - - close FAILED if $args{do_once}; - - return @installed; -} - -sub _install_cpanplus { - my @modules = @{+shift}; - my @config = @{+shift}; - my $installed = 0; - - require CPANPLUS::Backend; - my $cp = CPANPLUS::Backend->new; - my $conf = $cp->configure_object; - - return unless _can_write( - $conf->can('conf') - ? $conf->get_conf('base') # 0.05x+ - : $conf->_get_build('base') # 0.04x - ); - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $conf->get_conf('makeflags') || ''; - if (UNIVERSAL::isa($makeflags, 'HASH')) { - # 0.03+ uses a hashref here - $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST}; - } - else { - # 0.02 and below uses a scalar - $makeflags = join(' ', split(' ', $makeflags), 'UNINST=1') - if ($makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' }); - } - $conf->set_conf(makeflags => $makeflags); - $conf->set_conf(prereqs => 1); - - while (my ($key, $val) = splice(@config, 0, 2)) { - eval { $conf->set_conf($key, $val) }; - } - - my $modtree = $cp->module_tree; - while (my ($pkg, $ver) = splice(@modules, 0, 2)) { - print "*** Installing $pkg...\n"; - - MY::preinstall($pkg, $ver) or next if defined &MY::preinstall; - - my $success; - my $obj = $modtree->{$pkg}; - - if ($obj and defined(_version_check($obj->{version}, $ver))) { - my $pathname = $pkg; $pathname =~ s/::/\\W/; - - foreach my $inc (grep { m/$pathname.pm/i } keys(%INC)) { - delete $INC{$inc}; - } - - my $rv = $cp->install( modules => [ $obj->{module} ]); - - if ($rv and ($rv->{$obj->{module}} or $rv->{ok})) { - print "*** $pkg successfully installed.\n"; - $success = 1; - } - else { - print "*** $pkg installation cancelled.\n"; - $success = 0; - } - - $installed += $success; - } - else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall($pkg, $ver, $success) if defined &MY::postinstall; - } - - return $installed; -} - -sub _install_cpan { - my @modules = @{+shift}; - my @config = @{+shift}; - my $installed = 0; - my %args; - - require CPAN; CPAN::Config->load; - require Config; - - return unless _can_write(MM->catfile($CPAN::Config->{cpan_home}, 'sources')) - and _can_write($Config::Config{sitelib}); - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $CPAN::Config->{make_install_arg} || ''; - $CPAN::Config->{make_install_arg} = join(' ', split(' ', $makeflags), 'UNINST=1') - if ($makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' }); - - # don't show start-up info - $CPAN::Config->{inhibit_startup_message} = 1; - - # set additional options - while (my ($opt, $arg) = splice(@config, 0, 2)) { - ($args{$opt} = $arg, next) - if $opt =~ /^force$/; # pseudo-option - $CPAN::Config->{$opt} = $arg; - } - - local $CPAN::Config->{prerequisites_policy} = 'follow'; - - while (my ($pkg, $ver) = splice(@modules, 0, 2)) { - MY::preinstall($pkg, $ver) or next if defined &MY::preinstall; - - print "*** Installing $pkg...\n"; - - my $obj = CPAN::Shell->expand(Module => $pkg); - my $success = 0; - - if ($obj and defined(_version_check($obj->cpan_version, $ver))) { - my $pathname = $pkg; $pathname =~ s/::/\\W/; - - foreach my $inc (grep { m/$pathname.pm/i } keys(%INC)) { - delete $INC{$inc}; - } - - $obj->force('install') if $args{force}; - - my $rv = $obj->install || eval { - $CPAN::META->instance( - 'CPAN::Distribution', - $obj->cpan_file, - )->{install} if $CPAN::META - }; - - if ($rv eq 'YES') { - print "*** $pkg successfully installed.\n"; - $success = 1; - } - else { - print "*** $pkg installation failed.\n"; - $success = 0; - } - - $installed += $success; - } - else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall($pkg, $ver, $success) if defined &MY::postinstall; - } - - return $installed; -} - -sub _has_cpanplus { - return ( - $HasCPANPLUS = ( - $INC{'CPANPLUS/Config.pm'} or - _load('CPANPLUS::Shell::Default') - ) - ); -} - -# make guesses on whether we're under the CPAN installation directory -sub _under_cpan { - require Cwd; - require File::Spec; - - my $cwd = File::Spec->canonpath(Cwd::cwd()); - my $cpan = File::Spec->canonpath($CPAN::Config->{cpan_home}); - - return (index($cwd, $cpan) > -1); -} - -sub _update_to { - my $class = __PACKAGE__; - my $ver = shift; - - return if defined(_version_check(_load($class), $ver)); # no need to upgrade - - if (_prompt( - "==> A newer version of $class ($ver) is required. Install?", 'y' - ) =~ /^[Nn]/) { - die "*** Please install $class $ver manually.\n"; - } - - print << "."; -*** Trying to fetch it from CPAN... -. - - # install ourselves - _load($class) and return $class->import(@_) - if $class->install([], $class, $ver); - - print << '.'; exit 1; - -*** Cannot bootstrap myself. :-( Installation terminated. -. -} - -# check if we're connected to some host, using inet_aton -sub _connected_to { - my $site = shift; - - return ( - ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(qq( -*** Your host cannot resolve the domain name '$site', which - probably means the Internet connections are unavailable. -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/ - ); -} - -# check if a directory is writable; may create it on demand -sub _can_write { - my $path = shift; - mkdir ($path, 0755) unless -e $path; - - return 1 if -w $path; - - print << "."; -*** You are not allowed to write to the directory '$path'; - the installation may fail due to insufficient permissions. -. - - if (eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(qq( -==> Should we try to re-execute the autoinstall process with 'sudo'?), 'y' - ) =~ /^[Yy]/) { - # try to bootstrap ourselves from sudo - print << "."; -*** Trying to re-execute the autoinstall process with 'sudo'... -. - my $missing = join(',', @Missing); - my $config = join(',', - UNIVERSAL::isa($Config, 'HASH') ? %{$Config} : @{$Config} - ) if $Config; - - return unless system('sudo', $^X, $0, "--config=$config", "--installdeps=$missing"); - - print << "."; -*** The 'sudo' command exited with error! Resuming... -. - } - - return _prompt(qq( -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/ -} - -# load a module and return the version it reports -sub _load { - my $mod = pop; # class/instance doesn't matter - my $file = $mod; - - $file =~ s|::|/|g; - $file .= '.pm'; - - local $@; - return eval { require $file; $mod->VERSION } || ($@ ? undef : 0); -} - -# compare two versions, either use Sort::Versions or plain comparison -sub _version_check { - my ($cur, $min) = @_; - return unless defined $cur; - - $cur =~ s/\s+$//; - - # check for version numbers that are not in decimal format - if (ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./) { - if ($version::VERSION or defined(_load('version'))) { - # use version.pm if it is installed. - return ((version->new($cur) >= version->new($min)) ? $cur : undef); - } - elsif ($Sort::Versions::VERSION or defined(_load('Sort::Versions'))) { - # use Sort::Versions as the sorting algorithm for a.b.c versions - return ((Sort::Versions::versioncmp($cur, $min) != -1) ? $cur : undef); - } - - warn "Cannot reliably compare non-decimal formatted versions.\n". - "Please install version.pm or Sort::Versions.\n"; - } - - # plain comparison - local $^W = 0; # shuts off 'not numeric' bugs - return ($cur >= $min ? $cur : undef); -} - -# nothing; this usage is deprecated. -sub main::PREREQ_PM { return {}; } - -sub _make_args { - my %args = @_; - - $args{PREREQ_PM} = { %{$args{PREREQ_PM} || {} }, @Existing, @Missing } - if $UnderCPAN or $TestOnly; - - if ($args{EXE_FILES}) { - require ExtUtils::Manifest; - my $manifest = ExtUtils::Manifest::maniread('MANIFEST'); - - $args{EXE_FILES} = [ - grep { exists $manifest->{$_} } @{$args{EXE_FILES}} - ]; - } - - $args{test}{TESTS} ||= 't/*.t'; - $args{test}{TESTS} = join(' ', grep { - !exists($DisabledTests{$_}) - } map { glob($_) } split(/\s+/, $args{test}{TESTS})); - - my $missing = join(',', @Missing); - my $config = join(',', - UNIVERSAL::isa($Config, 'HASH') ? %{$Config} : @{$Config} - ) if $Config; - - $PostambleActions = ( - $missing ? "\$(PERL) $0 --config=$config --installdeps=$missing" - : "\@\$(NOOP)" - ); - - return %args; -} - -# a wrapper to ExtUtils::MakeMaker::WriteMakefile -sub Write { - require Carp; - Carp::croak "WriteMakefile: Need even number of args" if @_ % 2; - - if ($CheckOnly) { - print << "."; -*** Makefile not written in check-only mode. -. - return; - } - - my %args = _make_args(@_); - - no strict 'refs'; - - $PostambleUsed = 0; - local *MY::postamble = \&postamble unless defined &MY::postamble; - ExtUtils::MakeMaker::WriteMakefile(%args); - - print << "." unless $PostambleUsed; -*** WARNING: Makefile written with customized MY::postamble() without - including contents from ExtUtils::AutoInstall::postamble() -- - auto installation features disabled. Please contact the author. -. - - return 1; -} - -sub postamble { - $PostambleUsed = 1; - - return << "."; - -config :: installdeps -\t\@\$(NOOP) - -checkdeps :: -\t\$(PERL) $0 --checkdeps - -installdeps :: -\t$PostambleActions - -. - -} - -1; - -__END__ - -#line 977 diff -Nru libapp-cli-perl-0.07/inc/Module/Install/AutoInstall.pm libapp-cli-perl-0.08/inc/Module/Install/AutoInstall.pm --- libapp-cli-perl-0.07/inc/Module/Install/AutoInstall.pm 2006-11-24 22:22:56.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/AutoInstall.pm 2009-02-26 04:24:31.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION $ISCORE @ISA}; BEGIN { - $VERSION = '0.64'; + $VERSION = '0.79'; $ISCORE = 1; @ISA = qw{Module::Install::Base}; } diff -Nru libapp-cli-perl-0.07/inc/Module/Install/Base.pm libapp-cli-perl-0.08/inc/Module/Install/Base.pm --- libapp-cli-perl-0.07/inc/Module/Install/Base.pm 2006-11-24 22:22:56.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/Base.pm 2009-02-26 04:24:31.000000000 +0100 @@ -1,7 +1,7 @@ #line 1 package Module::Install::Base; -$VERSION = '0.64'; +$VERSION = '0.79'; # Suspend handler for "redefined" warnings BEGIN { @@ -45,6 +45,8 @@ $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new; } +#line 101 + sub is_admin { $_[0]->admin->VERSION; } @@ -67,4 +69,4 @@ 1; -#line 138 +#line 146 diff -Nru libapp-cli-perl-0.07/inc/Module/Install/Can.pm libapp-cli-perl-0.08/inc/Module/Install/Can.pm --- libapp-cli-perl-0.07/inc/Module/Install/Can.pm 2006-11-24 22:22:57.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/Can.pm 2009-02-26 04:24:31.000000000 +0100 @@ -11,7 +11,7 @@ use vars qw{$VERSION $ISCORE @ISA}; BEGIN { - $VERSION = '0.64'; + $VERSION = '0.79'; $ISCORE = 1; @ISA = qw{Module::Install::Base}; } @@ -39,6 +39,7 @@ return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + next if $dir eq ''; my $abs = File::Spec->catfile($dir, $_[1]); return $abs if (-x $abs or $abs = MM->maybe_command($abs)); } @@ -79,4 +80,4 @@ __END__ -#line 157 +#line 158 diff -Nru libapp-cli-perl-0.07/inc/Module/Install/Fetch.pm libapp-cli-perl-0.08/inc/Module/Install/Fetch.pm --- libapp-cli-perl-0.07/inc/Module/Install/Fetch.pm 2006-11-24 22:22:57.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/Fetch.pm 2009-02-26 04:24:31.000000000 +0100 @@ -6,20 +6,20 @@ use vars qw{$VERSION $ISCORE @ISA}; BEGIN { - $VERSION = '0.64'; + $VERSION = '0.79'; $ISCORE = 1; @ISA = qw{Module::Install::Base}; } sub get_file { my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = + my ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { $args{url} = $args{ftp_url} or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = + ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; } diff -Nru libapp-cli-perl-0.07/inc/Module/Install/Include.pm libapp-cli-perl-0.08/inc/Module/Install/Include.pm --- libapp-cli-perl-0.07/inc/Module/Install/Include.pm 2006-11-24 22:22:56.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/Include.pm 2009-02-26 04:24:31.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION $ISCORE @ISA}; BEGIN { - $VERSION = '0.64'; + $VERSION = '0.79'; $ISCORE = 1; @ISA = qw{Module::Install::Base}; } diff -Nru libapp-cli-perl-0.07/inc/Module/Install/Makefile.pm libapp-cli-perl-0.08/inc/Module/Install/Makefile.pm --- libapp-cli-perl-0.07/inc/Module/Install/Makefile.pm 2006-11-24 22:22:56.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/Makefile.pm 2009-02-26 04:24:31.000000000 +0100 @@ -7,7 +7,7 @@ use vars qw{$VERSION $ISCORE @ISA}; BEGIN { - $VERSION = '0.64'; + $VERSION = '0.79'; $ISCORE = 1; @ISA = qw{Module::Install::Base}; } @@ -17,192 +17,237 @@ my %seen = (); sub prompt { - shift; + shift; - # Infinite loop protection - my @c = caller(); - if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { - die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; - } - - # In automated testing, always use defaults - if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { - local $ENV{PERL_MM_USE_DEFAULT} = 1; - goto &ExtUtils::MakeMaker::prompt; - } else { - goto &ExtUtils::MakeMaker::prompt; - } + # Infinite loop protection + my @c = caller(); + if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { + die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; + } + + # In automated testing, always use defaults + if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { + local $ENV{PERL_MM_USE_DEFAULT} = 1; + goto &ExtUtils::MakeMaker::prompt; + } else { + goto &ExtUtils::MakeMaker::prompt; + } } sub makemaker_args { - my $self = shift; - my $args = ($self->{makemaker_args} ||= {}); - %$args = ( %$args, @_ ) if @_; - $args; + my $self = shift; + my $args = ( $self->{makemaker_args} ||= {} ); + %$args = ( %$args, @_ ); + return $args; } # For mm args that take multiple space-seperated args, # append an argument to the current list. sub makemaker_append { - my $self = shift; - my $name = shift; - my $args = $self->makemaker_args; - $args->{name} = defined $args->{$name} - ? join( ' ', $args->{name}, @_ ) - : join( ' ', @_ ); + my $self = sShift; + my $name = shift; + my $args = $self->makemaker_args; + $args->{name} = defined $args->{$name} + ? join( ' ', $args->{name}, @_ ) + : join( ' ', @_ ); } sub build_subdirs { - my $self = shift; - my $subdirs = $self->makemaker_args->{DIR} ||= []; - for my $subdir (@_) { - push @$subdirs, $subdir; - } + my $self = shift; + my $subdirs = $self->makemaker_args->{DIR} ||= []; + for my $subdir (@_) { + push @$subdirs, $subdir; + } } sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join(' ', grep length, $clean->{FILES}, @_), - ); + my $self = shift; + my $clean = $self->makemaker_args->{clean} ||= {}; + %$clean = ( + %$clean, + FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), + ); } sub realclean_files { - my $self = shift; - my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join(' ', grep length, $realclean->{FILES}, @_), - ); + my $self = shift; + my $realclean = $self->makemaker_args->{realclean} ||= {}; + %$realclean = ( + %$realclean, + FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), + ); } sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [ shift ]; - $self->makemaker_args( LIBS => $libs ); + my $self = shift; + my $libs = ref $_[0] ? shift : [ shift ]; + $self->makemaker_args( LIBS => $libs ); } sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); + my $self = shift; + $self->makemaker_args( INC => shift ); +} + +my %test_dir = (); + +sub _wanted_t { + /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1; +} + +sub tests_recursive { + my $self = shift; + if ( $self->tests ) { + die "tests_recursive will not work if tests are already defined"; + } + my $dir = shift || 't'; + unless ( -d $dir ) { + die "tests_recursive dir '$dir' does not exist"; + } + %test_dir = (); + require File::Find; + File::Find::find( \&_wanted_t, $dir ); + $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); } sub write { - my $self = shift; - die "&Makefile->write() takes no arguments\n" if @_; + my $self = shift; + die "&Makefile->write() takes no arguments\n" if @_; + + # Make sure we have a new enough + require ExtUtils::MakeMaker; - my $args = $self->makemaker_args; - $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args); - $args->{VERSION} = $self->version || $self->determine_VERSION($args); - $args->{NAME} =~ s/-/::/g; - if ( $self->tests ) { - $args->{test} = { TESTS => $self->tests }; - } - if ($] >= 5.005) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = $self->author; - } - if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { - $args->{NO_META} = 1; - } - if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { - $args->{SIGN} = 1; - } - unless ( $self->is_admin ) { - delete $args->{SIGN}; - } - - # merge both kinds of requires into prereq_pm - my $prereq = ($args->{PREREQ_PM} ||= {}); - %$prereq = ( %$prereq, map { @$_ } map { @$_ } grep $_, - ($self->build_requires, $self->requires) ); - - # merge both kinds of requires into prereq_pm - my $subdirs = ($args->{DIR} ||= []); - if ($self->bundles) { - foreach my $bundle (@{ $self->bundles }) { - my ($file, $dir) = @$bundle; - push @$subdirs, $dir if -d $dir; - delete $prereq->{$file}; - } - } - - if ( my $perl_version = $self->perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - } - - my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; - if ($self->admin->preop) { - $args{dist} = $self->admin->preop; - } + # MakeMaker can complain about module versions that include + # an underscore, even though its own version may contain one! + # Hence the funny regexp to get rid of it. See RT #35800 + # for details. + + $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); + + # Generate the + my $args = $self->makemaker_args; + $args->{DISTNAME} = $self->name; + $args->{NAME} = $self->module_name || $self->name; + $args->{VERSION} = $self->version; + $args->{NAME} =~ s/-/::/g; + if ( $self->tests ) { + $args->{test} = { TESTS => $self->tests }; + } + if ($] >= 5.005) { + $args->{ABSTRACT} = $self->abstract; + $args->{AUTHOR} = $self->author; + } + if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { + $args->{NO_META} = 1; + } + if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { + $args->{SIGN} = 1; + } + unless ( $self->is_admin ) { + delete $args->{SIGN}; + } + + # merge both kinds of requires into prereq_pm + my $prereq = ($args->{PREREQ_PM} ||= {}); + %$prereq = ( %$prereq, + map { @$_ } + map { @$_ } + grep $_, + ($self->configure_requires, $self->build_requires, $self->requires) + ); + + # Remove any reference to perl, PREREQ_PM doesn't support it + delete $args->{PREREQ_PM}->{perl}; + + # merge both kinds of requires into prereq_pm + my $subdirs = ($args->{DIR} ||= []); + if ($self->bundles) { + foreach my $bundle (@{ $self->bundles }) { + my ($file, $dir) = @$bundle; + push @$subdirs, $dir if -d $dir; + delete $prereq->{$file}; + } + } + + if ( my $perl_version = $self->perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + } + + $args->{INSTALLDIRS} = $self->installdirs; + + my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + + my $user_preop = delete $args{dist}->{PREOP}; + if (my $preop = $self->admin->preop($user_preop)) { + foreach my $key ( keys %$preop ) { + $args{dist}->{$key} = $preop->{$key}; + } + } - my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); - $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); + my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); + $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); } sub fix_up_makefile { - my $self = shift; - my $makefile_name = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" - . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" - . ($self->postamble || ''); - - local *MAKEFILE; - open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - my $makefile = do { local $/; <MAKEFILE> }; - close MAKEFILE or die $!; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; - $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; - - # Module::Install will never be used to build the Core Perl - # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks - # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist - $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; - #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; - - # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. - $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g; - - # XXX - This is currently unused; not sure if it breaks other MM-users - # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - - open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - print MAKEFILE "$preamble$makefile$postamble" or die $!; - close MAKEFILE or die $!; + my $self = shift; + my $makefile_name = shift; + my $top_class = ref($self->_top) || ''; + my $top_version = $self->_top->VERSION || ''; + + my $preamble = $self->preamble + ? "# Preamble by $top_class $top_version\n" + . $self->preamble + : ''; + my $postamble = "# Postamble by $top_class $top_version\n" + . ($self->postamble || ''); + + local *MAKEFILE; + open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + my $makefile = do { local $/; <MAKEFILE> }; + close MAKEFILE or die $!; + + $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; + $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; + $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; + $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; + $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; + + # Module::Install will never be used to build the Core Perl + # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks + # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist + $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; + #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; + + # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. + $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; + + # XXX - This is currently unused; not sure if it breaks other MM-users + # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; + + open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + print MAKEFILE "$preamble$makefile$postamble" or die $!; + close MAKEFILE or die $!; - 1; + 1; } sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; + my ($self, $text) = @_; + $self->{preamble} = $text . $self->{preamble} if defined $text; + $self->{preamble}; } sub postamble { - my ($self, $text) = @_; - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} + my ($self, $text) = @_; + $self->{postamble} ||= $self->admin->postamble; + $self->{postamble} .= $text if defined $text; + $self->{postamble} } 1; __END__ -#line 334 +#line 379 diff -Nru libapp-cli-perl-0.07/inc/Module/Install/Metadata.pm libapp-cli-perl-0.08/inc/Module/Install/Metadata.pm --- libapp-cli-perl-0.07/inc/Module/Install/Metadata.pm 2006-11-24 22:22:56.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/Metadata.pm 2009-02-26 04:24:31.000000000 +0100 @@ -6,310 +6,505 @@ use vars qw{$VERSION $ISCORE @ISA}; BEGIN { - $VERSION = '0.64'; + $VERSION = '0.79'; $ISCORE = 1; @ISA = qw{Module::Install::Base}; } my @scalar_keys = qw{ - name module_name abstract author version license - distribution_type perl_version tests + name + module_name + abstract + author + version + distribution_type + tests + installdirs }; my @tuple_keys = qw{ - build_requires requires recommends bundles + configure_requires + build_requires + requires + recommends + bundles + resources }; -sub Meta { shift } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } - -foreach my $key (@scalar_keys) { - *$key = sub { - my $self = shift; - return $self->{values}{$key} if defined wantarray and !@_; - $self->{values}{$key} = shift; - return $self; - }; -} - -foreach my $key (@tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{values}{$key} unless @_; - - my @rv; - while (@_) { - my $module = shift or last; - my $version = shift || 0; - if ( $module eq 'perl' ) { - $version =~ s{^(\d+)\.(\d+)\.(\d+)} - {$1 + $2/1_000 + $3/1_000_000}e; - $self->perl_version($version); - next; - } - my $rv = [ $module, $version ]; - push @rv, $rv; - } - push @{ $self->{values}{$key} }, @rv; - @rv; - }; +my @resource_keys = qw{ + homepage + bugtracker + repository +}; + +sub Meta { shift } +sub Meta_ScalarKeys { @scalar_keys } +sub Meta_TupleKeys { @tuple_keys } +sub Meta_ResourceKeys { @resource_keys } + +foreach my $key ( @scalar_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}{$key} if defined wantarray and !@_; + $self->{values}{$key} = shift; + return $self; + }; +} + +foreach my $key ( @resource_keys ) { + *$key = sub { + my $self = shift; + unless ( @_ ) { + return () unless $self->{values}{resources}; + return map { $_->[1] } + grep { $_->[0] eq $key } + @{ $self->{values}{resources} }; + } + return $self->{values}{resources}{$key} unless @_; + my $uri = shift or die( + "Did not provide a value to $key()" + ); + $self->resources( $key => $uri ); + return 1; + }; +} + +foreach my $key ( grep {$_ ne "resources"} @tuple_keys) { + *$key = sub { + my $self = shift; + return $self->{values}{$key} unless @_; + my @added; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @added, [ $module, $version ]; + } + push @{ $self->{values}{$key} }, @added; + return map {@$_} @added; + }; +} + +# Resource handling +my %lc_resource = map { $_ => 1 } qw{ + homepage + license + bugtracker + repository +}; + +sub resources { + my $self = shift; + while ( @_ ) { + my $name = shift or last; + my $value = shift or next; + if ( $name eq lc $name and ! $lc_resource{$name} ) { + die("Unsupported reserved lowercase resource '$name'"); + } + $self->{values}{resources} ||= []; + push @{ $self->{values}{resources} }, [ $name, $value ]; + } + $self->{values}{resources}; } +# Aliases for build_requires that will have alternative +# meanings in some future version of META.yml. +sub test_requires { shift->build_requires(@_) } +sub install_requires { shift->build_requires(@_) } + +# Aliases for installdirs options +sub install_as_core { $_[0]->installdirs('perl') } +sub install_as_cpan { $_[0]->installdirs('site') } +sub install_as_site { $_[0]->installdirs('site') } +sub install_as_vendor { $_[0]->installdirs('vendor') } + sub sign { - my $self = shift; - return $self->{'values'}{'sign'} if defined wantarray and !@_; - $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 ); - return $self; + my $self = shift; + return $self->{values}{sign} if defined wantarray and ! @_; + $self->{values}{sign} = ( @_ ? $_[0] : 1 ); + return $self; } sub dynamic_config { my $self = shift; unless ( @_ ) { - warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n"; + warn "You MUST provide an explicit true/false value to dynamic_config\n"; return $self; } - $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0; - return $self; + $self->{values}{dynamic_config} = $_[0] ? 1 : 0; + return 1; +} + +sub perl_version { + my $self = shift; + return $self->{values}{perl_version} unless @_; + my $version = shift or die( + "Did not provide a value to perl_version()" + ); + + # Normalize the version + $version = $self->_perl_version($version); + + # We don't support the reall old versions + unless ( $version >= 5.005 ) { + die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; + } + + $self->{values}{perl_version} = $version; +} + +sub license { + my $self = shift; + return $self->{values}{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $self->{values}{license} = $license; + + # Automatically fill in license URLs + if ( $license eq 'perl' ) { + $self->resources( license => 'http://dev.perl.org/licenses/' ); + } + + return 1; } sub all_from { - my ( $self, $file ) = @_; + my ( $self, $file ) = @_; + + unless ( defined($file) ) { + my $name = $self->name or die( + "all_from called with no args without setting name() first" + ); + $file = join('/', 'lib', split(/-/, $name)) . '.pm'; + $file =~ s{.*/}{} unless -e $file; + unless ( -e $file ) { + die("all_from cannot find $file from $name"); + } + } + unless ( -f $file ) { + die("The path '$file' does not exist, or is not a file"); + } - unless ( defined($file) ) { - my $name = $self->name - or die "all_from called with no args without setting name() first"; - $file = join('/', 'lib', split(/-/, $name)) . '.pm'; - $file =~ s{.*/}{} unless -e $file; - die "all_from: cannot find $file from $name" unless -e $file; - } - - $self->version_from($file) unless $self->version; - $self->perl_version_from($file) unless $self->perl_version; - - # The remaining probes read from POD sections; if the file - # has an accompanying .pod, use that instead - my $pod = $file; - if ( $pod =~ s/\.pm$/.pod/i and -e $pod ) { - $file = $pod; - } - - $self->author_from($file) unless $self->author; - $self->license_from($file) unless $self->license; - $self->abstract_from($file) unless $self->abstract; + # Some methods pull from POD instead of code. + # If there is a matching .pod, use that instead + my $pod = $file; + $pod =~ s/\.pm$/.pod/i; + $pod = $file unless -e $pod; + + # Pull the different values + $self->name_from($file) unless $self->name; + $self->version_from($file) unless $self->version; + $self->perl_version_from($file) unless $self->perl_version; + $self->author_from($pod) unless $self->author; + $self->license_from($pod) unless $self->license; + $self->abstract_from($pod) unless $self->abstract; + + return 1; } sub provides { - my $self = shift; - my $provides = ( $self->{values}{provides} ||= {} ); - %$provides = (%$provides, @_) if @_; - return $provides; + my $self = shift; + my $provides = ( $self->{values}{provides} ||= {} ); + %$provides = (%$provides, @_) if @_; + return $provides; } sub auto_provides { - my $self = shift; - return $self unless $self->is_admin; - - unless (-e 'MANIFEST') { - warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; - return $self; - } - - # Avoid spurious warnings as we are not checking manifest here. - - local $SIG{__WARN__} = sub {1}; - require ExtUtils::Manifest; - local *ExtUtils::Manifest::manicheck = sub { return }; - - require Module::Build; - my $build = Module::Build->new( - dist_name => $self->name, - dist_version => $self->version, - license => $self->license, - ); - $self->provides(%{ $build->find_dist_packages || {} }); + my $self = shift; + return $self unless $self->is_admin; + unless (-e 'MANIFEST') { + warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; + return $self; + } + # Avoid spurious warnings as we are not checking manifest here. + local $SIG{__WARN__} = sub {1}; + require ExtUtils::Manifest; + local *ExtUtils::Manifest::manicheck = sub { return }; + + require Module::Build; + my $build = Module::Build->new( + dist_name => $self->name, + dist_version => $self->version, + license => $self->license, + ); + $self->provides( %{ $build->find_dist_packages || {} } ); } sub feature { - my $self = shift; - my $name = shift; - my $features = ( $self->{values}{features} ||= [] ); - - my $mods; - - if ( @_ == 1 and ref( $_[0] ) ) { - # The user used ->feature like ->features by passing in the second - # argument as a reference. Accomodate for that. - $mods = $_[0]; - } else { - $mods = \@_; - } - - my $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ - : @$_ - : $_ - } @$mods - ] - ); + my $self = shift; + my $name = shift; + my $features = ( $self->{values}{features} ||= [] ); + my $mods; + + if ( @_ == 1 and ref( $_[0] ) ) { + # The user used ->feature like ->features by passing in the second + # argument as a reference. Accomodate for that. + $mods = $_[0]; + } else { + $mods = \@_; + } - return @$features; + my $count = 0; + push @$features, ( + $name => [ + map { + ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ + } @$mods + ] + ); + + return @$features; } sub features { - my $self = shift; - while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { - $self->feature( $name, @$mods ); - } - return $self->{values}->{features} - ? @{ $self->{values}->{features} } - : (); + my $self = shift; + while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { + $self->feature( $name, @$mods ); + } + return $self->{values}{features} + ? @{ $self->{values}{features} } + : (); } sub no_index { - my $self = shift; - my $type = shift; - push @{ $self->{values}{no_index}{$type} }, @_ if $type; - return $self->{values}{no_index}; + my $self = shift; + my $type = shift; + push @{ $self->{values}{no_index}{$type} }, @_ if $type; + return $self->{values}{no_index}; } sub read { - my $self = shift; - $self->include_deps( 'YAML', 0 ); + my $self = shift; + $self->include_deps( 'YAML::Tiny', 0 ); - require YAML; - my $data = YAML::LoadFile('META.yml'); + require YAML::Tiny; + my $data = YAML::Tiny::LoadFile('META.yml'); - # Call methods explicitly in case user has already set some values. - while ( my ( $key, $value ) = each %$data ) { - next unless $self->can($key); - if ( ref $value eq 'HASH' ) { - while ( my ( $module, $version ) = each %$value ) { - $self->can($key)->($self, $module => $version ); - } - } - else { - $self->can($key)->($self, $value); - } - } - return $self; + # Call methods explicitly in case user has already set some values. + while ( my ( $key, $value ) = each %$data ) { + next unless $self->can($key); + if ( ref $value eq 'HASH' ) { + while ( my ( $module, $version ) = each %$value ) { + $self->can($key)->($self, $module => $version ); + } + } else { + $self->can($key)->($self, $value); + } + } + return $self; } sub write { - my $self = shift; - return $self unless $self->is_admin; - $self->admin->write_meta; - return $self; + my $self = shift; + return $self unless $self->is_admin; + $self->admin->write_meta; + return $self; } sub version_from { - my ( $self, $file ) = @_; - require ExtUtils::MM_Unix; - $self->version( ExtUtils::MM_Unix->parse_version($file) ); + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->version( ExtUtils::MM_Unix->parse_version($file) ); } sub abstract_from { - my ( $self, $file ) = @_; - require ExtUtils::MM_Unix; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($file) - ); -} - -sub _slurp { - my ( $self, $file ) = @_; - - local *FH; - open FH, "< $file" or die "Cannot open $file.pod: $!"; - do { local $/; <FH> }; + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->abstract( + bless( + { DISTNAME => $self->name }, + 'ExtUtils::MM_Unix' + )->parse_abstract($file) + ); +} + +# Add both distribution and module name +sub name_from { + my ($self, $file) = @_; + if ( + Module::Install::_read($file) =~ m/ + ^ \s* + package \s* + ([\w:]+) + \s* ; + /ixms + ) { + my ($name, $module_name) = ($1, $1); + $name =~ s{::}{-}g; + $self->name($name); + unless ( $self->module_name ) { + $self->module_name($module_name); + } + } else { + die("Cannot determine name from $file\n"); + } } sub perl_version_from { - my ( $self, $file ) = @_; - - if ( - $self->_slurp($file) =~ m/ - ^ - use \s* - v? - ([\d_\.]+) - \s* ; - /ixms - ) - { - my $v = $1; - $v =~ s{_}{}g; - $self->perl_version($1); - } - else { - warn "Cannot determine perl version info from $file\n"; - return; - } + my $self = shift; + if ( + Module::Install::_read($_[0]) =~ m/ + ^ + (?:use|require) \s* + v? + ([\d_\.]+) + \s* ; + /ixms + ) { + my $perl_version = $1; + $perl_version =~ s{_}{}g; + $self->perl_version($perl_version); + } else { + warn "Cannot determine perl version info from $_[0]\n"; + return; + } } sub author_from { - my ( $self, $file ) = @_; - my $content = $self->_slurp($file); - if ($content =~ m/ - =head \d \s+ (?:authors?)\b \s* - ([^\n]*) - | - =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* - .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* - ([^\n]*) - /ixms) { - my $author = $1 || $2; - $author =~ s{E<lt>}{<}g; - $author =~ s{E<gt>}{>}g; - $self->author($author); - } - else { - warn "Cannot determine author info from $file\n"; - } + my $self = shift; + my $content = Module::Install::_read($_[0]); + if ($content =~ m/ + =head \d \s+ (?:authors?)\b \s* + ([^\n]*) + | + =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* + .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* + ([^\n]*) + /ixms) { + my $author = $1 || $2; + $author =~ s{E<lt>}{<}g; + $author =~ s{E<gt>}{>}g; + $self->author($author); + } else { + warn "Cannot determine author info from $_[0]\n"; + } } sub license_from { - my ( $self, $file ) = @_; + my $self = shift; + if ( + Module::Install::_read($_[0]) =~ m/ + ( + =head \d \s+ + (?:licen[cs]e|licensing|copyright|legal)\b + .*? + ) + (=head\\d.*|=cut.*|) + \z + /ixms ) { + my $license_text = $1; + my @phrases = ( + 'under the same (?:terms|license) as perl itself' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'BSD license' => 'bsd', 1, + 'Artistic license' => 'artistic', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'proprietary' => 'proprietary', 0, + ); + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s{\s+}{\\s+}g; + if ( $license_text =~ /\b$pattern\b/i ) { + $self->license($license); + return 1; + } + } + } + + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; +} + +sub bugtracker_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + my @links = $content =~ m/L\<(http\:\/\/rt\.cpan\.org\/[^>]+)\>/g; + unless ( @links ) { + warn "Cannot determine bugtracker info from $_[0]\n"; + return 0; + } + if ( @links > 1 ) { + warn "Found more than on rt.cpan.org link in $_[0]\n"; + return 0; + } + + # Set the bugtracker + bugtracker( $links[0] ); + return 1; +} + +# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to +# numbers (eg, 5.006001 or 5.008009). +# Also, convert double-part versions (eg, 5.8) +sub _perl_version { + my $v = $_[-1]; + $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; + $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; + $v =~ s/(\.\d\d\d)000$/$1/; + $v =~ s/_.+$//; + if ( ref($v) ) { + $v = $v + 0; # Numify + } + return $v; +} + + + + - if ( - $self->_slurp($file) =~ m/ - =head \d \s+ - (?:licen[cs]e|licensing|copyright|legal)\b - (.*?) - (=head\\d.*|=cut.*|) - \z - /ixms - ) - { - my $license_text = $1; - my @phrases = ( - 'under the same (?:terms|license) as perl itself' => 'perl', - 'GNU public license' => 'gpl', - 'GNU lesser public license' => 'gpl', - 'BSD license' => 'bsd', - 'Artistic license' => 'artistic', - 'GPL' => 'gpl', - 'LGPL' => 'lgpl', - 'BSD' => 'bsd', - 'Artistic' => 'artistic', - ); - while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) { - $pattern =~ s{\s+}{\\s+}g; - if ( $license_text =~ /\b$pattern\b/i ) { - $self->license($license); - return 1; - } - } - } +###################################################################### +# MYMETA.yml Support + +sub WriteMyMeta { + $_[0]->write_mymeta; +} + +sub write_mymeta { + my $self = shift; + + # If there's no existing META.yml there is nothing we can do + return unless -f 'META.yml'; + + # Merge the perl version into the dependencies + my $val = $self->Meta->{values}; + my $perl = delete $val->{perl_version}; + if ( $perl ) { + $val->{requires} ||= []; + my $requires = $val->{requires}; + + # Canonize to three-dot version after Perl 5.6 + if ( $perl >= 5.006 ) { + $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e + } + unshift @$requires, [ perl => $perl ]; + } + + # Load the advisory META.yml file + require YAML::Tiny; + my @yaml = YAML::Tiny::LoadFile('META.yml'); + my $meta = $yaml[0]; + + # Overwrite the non-configure dependency hashs + delete $meta->{requires}; + delete $meta->{build_requires}; + delete $meta->{recommends}; + if ( exists $val->{requires} ) { + $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; + } + if ( exists $val->{build_requires} ) { + $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; + } - warn "Cannot determine license info from $file\n"; - return 'unknown'; + # Save as the MYMETA.yml file + YAML::Tiny::DumpFile('MYMETA.yml', $meta); } 1; diff -Nru libapp-cli-perl-0.07/inc/Module/Install/Win32.pm libapp-cli-perl-0.08/inc/Module/Install/Win32.pm --- libapp-cli-perl-0.07/inc/Module/Install/Win32.pm 2006-11-24 22:22:57.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/Win32.pm 2009-02-26 04:24:31.000000000 +0100 @@ -4,11 +4,11 @@ use strict; use Module::Install::Base; -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.64'; - $ISCORE = 1; + $VERSION = '0.79'; @ISA = qw{Module::Install::Base}; + $ISCORE = 1; } # determine if the user needs nmake, and download it if needed @@ -16,7 +16,7 @@ my $self = shift; $self->load('can_run'); $self->load('get_file'); - + require Config; return unless ( $^O eq 'MSWin32' and @@ -38,8 +38,7 @@ remove => 1, ); - if (!$rv) { - die <<'END_MESSAGE'; + die <<'END_MESSAGE' unless $rv; ------------------------------------------------------------------------------- @@ -59,7 +58,7 @@ ------------------------------------------------------------------------------- END_MESSAGE - } + } 1; diff -Nru libapp-cli-perl-0.07/inc/Module/Install/WriteAll.pm libapp-cli-perl-0.08/inc/Module/Install/WriteAll.pm --- libapp-cli-perl-0.07/inc/Module/Install/WriteAll.pm 2006-11-24 22:22:56.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install/WriteAll.pm 2009-02-26 04:24:31.000000000 +0100 @@ -4,40 +4,37 @@ use strict; use Module::Install::Base; -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.64'; - $ISCORE = 1; + $VERSION = '0.79'; @ISA = qw{Module::Install::Base}; + $ISCORE = 1; } sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_ - ); - - $self->sign(1) if $args{sign}; - $self->Meta->write if $args{meta}; - $self->admin->WriteAll(%args) if $self->is_admin; - - if ( $0 =~ /Build.PL$/i ) { - $self->Build->write; - } else { - $self->check_nmake if $args{check_nmake}; - unless ( $self->makemaker_args->{'PL_FILES'} ) { - $self->makemaker_args( PL_FILES => {} ); - } - if ($args{inline}) { - $self->Inline->write; - } else { - $self->Makefile->write; - } - } + my $self = shift; + my %args = ( + meta => 1, + sign => 0, + inline => 0, + check_nmake => 1, + @_, + ); + + $self->sign(1) if $args{sign}; + $self->Meta->write if $args{meta}; + $self->admin->WriteAll(%args) if $self->is_admin; + + $self->check_nmake if $args{check_nmake}; + unless ( $self->makemaker_args->{PL_FILES} ) { + $self->makemaker_args( PL_FILES => {} ); + } + + if ( $args{inline} ) { + $self->Inline->write; + } else { + $self->Makefile->write; + } } 1; diff -Nru libapp-cli-perl-0.07/inc/Module/Install.pm libapp-cli-perl-0.08/inc/Module/Install.pm --- libapp-cli-perl-0.07/inc/Module/Install.pm 2006-11-24 22:22:55.000000000 +0100 +++ libapp-cli-perl-0.08/inc/Module/Install.pm 2009-02-26 04:24:31.000000000 +0100 @@ -17,20 +17,30 @@ # 3. The ./inc/ version of Module::Install loads # } -use 5.004; +BEGIN { + require 5.004; +} use strict 'vars'; use vars qw{$VERSION}; BEGIN { - # All Module::Install core packages now require synchronised versions. - # This will be used to ensure we don't accidentally load old or - # different versions of modules. - # This is not enforced yet, but will be some time in the next few - # releases once we can make sure it won't clash with custom - # Module::Install extensions. - $VERSION = '0.64'; + # All Module::Install core packages now require synchronised versions. + # This will be used to ensure we don't accidentally load old or + # different versions of modules. + # This is not enforced yet, but will be some time in the next few + # releases once we can make sure it won't clash with custom + # Module::Install extensions. + $VERSION = '0.79'; + + *inc::Module::Install::VERSION = *VERSION; + @inc::Module::Install::ISA = __PACKAGE__; + } + + + + # Whether or not inc::Module::Install is actually loaded, the # $INC{inc/Module/Install.pm} is what will still get set as long as # the caller loaded module this in the documented manner. @@ -38,26 +48,29 @@ # they may not have a MI version that works with the Makefile.PL. This would # result in false errors or unexpected behaviour. And we don't want that. my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; -unless ( $INC{$file} ) { - die <<"END_DIE"; +unless ( $INC{$file} ) { die <<"END_DIE" } + Please invoke ${\__PACKAGE__} with: - use inc::${\__PACKAGE__}; + use inc::${\__PACKAGE__}; not: - use ${\__PACKAGE__}; + use ${\__PACKAGE__}; END_DIE -} + + + + # If the script that is loading Module::Install is from the future, # then make will detect this and cause it to re-run over and over # again. This is bad. Rather than taking action to touch it (which # is unreliable on some platforms and requires write permissions) # for now we should catch this and refuse to run. -if ( -f $0 and (stat($0))[9] > time ) { - die << "END_DIE"; +if ( -f $0 and (stat($0))[9] > time ) { die <<"END_DIE" } + Your installer $0 has a modification time in the future. This is known to create infinite loops in make. @@ -65,115 +78,144 @@ Please correct this, then run $0 again. END_DIE -} + + + + + +# Build.PL was formerly supported, but no longer is due to excessive +# difficulty in implementing every single feature twice. +if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } + +Module::Install no longer supports Build.PL. + +It was impossible to maintain duel backends, and has been deprecated. + +Please remove all Build.PL files and only use the Makefile.PL installer. + +END_DIE + + + + + +# To save some more typing in Module::Install installers, every... +# use inc::Module::Install +# ...also acts as an implicit use strict. +$^H |= strict::bits(qw(refs subs vars)); + + + + use Cwd (); use File::Find (); use File::Path (); use FindBin; -*inc::Module::Install::VERSION = *VERSION; -@inc::Module::Install::ISA = __PACKAGE__; - sub autoload { - my $self = shift; - my $who = $self->_caller; - my $cwd = Cwd::cwd(); - my $sym = "${who}::AUTOLOAD"; - $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); - if ( my $code = $sym->{$pwd} ) { - # delegate back to parent dirs - goto &$code unless $cwd eq $pwd; - } - $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; - unshift @_, ($self, $1); - goto &{$self->can('call')} unless uc($1) eq $1; - }; + my $self = shift; + my $who = $self->_caller; + my $cwd = Cwd::cwd(); + my $sym = "${who}::AUTOLOAD"; + $sym->{$cwd} = sub { + my $pwd = Cwd::cwd(); + if ( my $code = $sym->{$pwd} ) { + # delegate back to parent dirs + goto &$code unless $cwd eq $pwd; + } + $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; + unless ( uc($1) eq $1 ) { + unshift @_, ( $self, $1 ); + goto &{$self->can('call')}; + } + }; } sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - unless ( -f $self->{file} ) { - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{"$self->{file}"}; - delete $INC{"$self->{path}.pm"}; + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + unless ( -f $self->{file} ) { + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } + + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + + # Unregister loader and worker packages so subdirs can use them again + delete $INC{"$self->{file}"}; + delete $INC{"$self->{path}.pm"}; + + return 1; } sub preload { - my ($self) = @_; - - unless ( $self->{extensions} ) { - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ); - } - - my @exts = @{$self->{extensions}}; - unless ( @exts ) { - my $admin = $self->{admin}; - @exts = $admin->load_all_extensions; - } - - my %seen; - foreach my $obj ( @exts ) { - while (my ($method, $glob) = each %{ref($obj) . '::'}) { - next unless $obj->can($method); - next if $method =~ /^_/; - next if $method eq uc($method); - $seen{$method}++; - } - } - - my $who = $self->_caller; - foreach my $name ( sort keys %seen ) { - *{"${who}::$name"} = sub { - ${"${who}::AUTOLOAD"} = "${who}::$name"; - goto &{"${who}::AUTOLOAD"}; - }; - } + my $self = shift; + unless ( $self->{extensions} ) { + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ); + } + + my @exts = @{$self->{extensions}}; + unless ( @exts ) { + my $admin = $self->{admin}; + @exts = $admin->load_all_extensions; + } + + my %seen; + foreach my $obj ( @exts ) { + while (my ($method, $glob) = each %{ref($obj) . '::'}) { + next unless $obj->can($method); + next if $method =~ /^_/; + next if $method eq uc($method); + $seen{$method}++; + } + } + + my $who = $self->_caller; + foreach my $name ( sort keys %seen ) { + *{"${who}::$name"} = sub { + ${"${who}::AUTOLOAD"} = "${who}::$name"; + goto &{"${who}::AUTOLOAD"}; + }; + } } sub new { - my ($class, %args) = @_; + my ($class, %args) = @_; - # ignore the prefix on extension modules built from top level. - my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { - delete $args{prefix}; - } - - return $args{_self} if $args{_self}; - - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); - $args{bundle} ||= 'inc/BUNDLES'; - $args{base} ||= $base_path; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; - unless ( $args{path} ) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; + # ignore the prefix on extension modules built from top level. + my $base_path = Cwd::abs_path($FindBin::Bin); + unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { + delete $args{prefix}; + } + + return $args{_self} if $args{_self}; + + $args{dispatch} ||= 'Admin'; + $args{prefix} ||= 'inc'; + $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); + $args{bundle} ||= 'inc/BUNDLES'; + $args{base} ||= $base_path; + $class =~ s/^\Q$args{prefix}\E:://; + $args{name} ||= $class; + $args{version} ||= $class->VERSION; + unless ( $args{path} ) { + $args{path} = $args{name}; + $args{path} =~ s!::!/!g; + } + $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; + $args{wrote} = 0; - bless( \%args, $class ); + bless( \%args, $class ); } sub call { @@ -184,98 +226,144 @@ } sub load { - my ($self, $method) = @_; - - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; + my ($self, $method) = @_; - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ) unless $self->{extensions}; + + foreach my $obj (@{$self->{extensions}}) { + return $obj if $obj->can($method); + } - my $admin = $self->{admin} or die <<"END_DIE"; + my $admin = $self->{admin} or die <<"END_DIE"; The '$method' method does not exist in the '$self->{prefix}' path! Please remove the '$self->{prefix}' directory and run $0 again to load it. END_DIE - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; + my $obj = $admin->load($method, 1); + push @{$self->{extensions}}, $obj; - $obj; + $obj; } sub load_extensions { - my ($self, $path, $top) = @_; + my ($self, $path, $top) = @_; - unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) { - unshift @INC, $self->{prefix}; - } - - foreach my $rv ( $self->find_extensions($path) ) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - - local $@; - my $new = eval { require $file; $pkg->can('new') }; - unless ( $new ) { - warn $@ if $@; - next; - } - $self->{pathnames}{$pkg} = delete $INC{$file}; - push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); - } + unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { + unshift @INC, $self->{prefix}; + } + + foreach my $rv ( $self->find_extensions($path) ) { + my ($file, $pkg) = @{$rv}; + next if $self->{pathnames}{$pkg}; + + local $@; + my $new = eval { require $file; $pkg->can('new') }; + unless ( $new ) { + warn $@ if $@; + next; + } + $self->{pathnames}{$pkg} = delete $INC{$file}; + push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); + } - $self->{extensions} ||= []; + $self->{extensions} ||= []; } sub find_extensions { - my ($self, $path) = @_; + my ($self, $path) = @_; + + my @found; + File::Find::find( sub { + my $file = $File::Find::name; + return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; + my $subpath = $1; + return if lc($subpath) eq lc($self->{dispatch}); + + $file = "$self->{path}/$subpath.pm"; + my $pkg = "$self->{name}::$subpath"; + $pkg =~ s!/!::!g; - my @found; - File::Find::find( sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - my $subpath = $1; - return if lc($subpath) eq lc($self->{dispatch}); - - $file = "$self->{path}/$subpath.pm"; - my $pkg = "$self->{name}::$subpath"; - $pkg =~ s!/!::!g; - - # If we have a mixed-case package name, assume case has been preserved - # correctly. Otherwise, root through the file to locate the case-preserved - # version of the package name. - if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - open PKGFILE, "<$subpath.pm" or die "find_extensions: Can't open $subpath.pm: $!"; - my $in_pod = 0; - while ( <PKGFILE> ) { - $in_pod = 1 if /^=\w/; - $in_pod = 0 if /^=cut/; - next if ($in_pod || /^=cut/); # skip pod text - next if /^\s*#/; # and comments - if ( m/^\s*package\s+($pkg)\s*;/i ) { - $pkg = $1; - last; - } - } - close PKGFILE; - } + # If we have a mixed-case package name, assume case has been preserved + # correctly. Otherwise, root through the file to locate the case-preserved + # version of the package name. + if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { + my $content = Module::Install::_read($subpath . '.pm'); + my $in_pod = 0; + foreach ( split //, $content ) { + $in_pod = 1 if /^=\w/; + $in_pod = 0 if /^=cut/; + next if ($in_pod || /^=cut/); # skip pod text + next if /^\s*#/; # and comments + if ( m/^\s*package\s+($pkg)\s*;/i ) { + $pkg = $1; + last; + } + } + } - push @found, [ $file, $pkg ]; - }, $path ) if -d $path; + push @found, [ $file, $pkg ]; + }, $path ) if -d $path; - @found; + @found; } + + + + +##################################################################### +# Utility Functions + sub _caller { - my $depth = 0; - my $call = caller($depth); - while ( $call eq __PACKAGE__ ) { - $depth++; - $call = caller($depth); - } - return $call; + my $depth = 0; + my $call = caller($depth); + while ( $call eq __PACKAGE__ ) { + $depth++; + $call = caller($depth); + } + return $call; +} + +sub _read { + local *FH; + open FH, "< $_[0]" or die "open($_[0]): $!"; + my $str = do { local $/; <FH> }; + close FH or die "close($_[0]): $!"; + return $str; +} + +sub _write { + local *FH; + open FH, "> $_[0]" or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!" } + close FH or die "close($_[0]): $!"; +} + +# _version is for processing module versions (eg, 1.03_05) not +# Perl versions (eg, 5.8.1). + +sub _version ($) { + my $s = shift || 0; + $s =~ s/^(\d+)\.?//; + my $l = $1 || 0; + my @v = map { $_ . '0' x (3 - length $_) } $s =~ /(\d{1,3})\D?/g; + $l = $l . '.' . join '', @v if @v; + return $l + 0; +} + +# Cloned from Params::Util::_CLASS +sub _CLASS ($) { + ( + defined $_[0] + and + ! ref $_[0] + and + $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*$/s + ) ? $_[0] : undef; } 1; + +# Copyright 2008 - 2009 Adam Kennedy. diff -Nru libapp-cli-perl-0.07/lib/App/CLI/Command/Help.pm libapp-cli-perl-0.08/lib/App/CLI/Command/Help.pm --- libapp-cli-perl-0.07/lib/App/CLI/Command/Help.pm 2006-11-24 22:22:09.000000000 +0100 +++ libapp-cli-perl-0.08/lib/App/CLI/Command/Help.pm 2009-02-25 22:01:54.000000000 +0100 @@ -4,6 +4,7 @@ use base qw/App::CLI::Command/; use File::Find qw(find); use Locale::Maketext::Simple; +use Pod::Simple::Text; sub run { my $self = shift; @@ -20,12 +21,13 @@ } elsif (my $file = $self->_find_topic($topic)) { open my $fh, '<:utf8', $file or die $!; + require Pod::Simple::Text; my $parser = Pod::Simple::Text->new; my $buf; $parser->output_string(\$buf); $parser->parse_file($fh); - $buf =~ s/^NAME\s+(.*?)::Help::\S+ - (.+)\s+DESCRIPTION/ $1:/; + $buf =~ s/^NAME\s+(.*?)::Help::\S+ - (.+)\s+DESCRIPTION/ $2:/; print $self->loc_text($buf); } else { @@ -37,7 +39,7 @@ sub help_base { my $self = shift; - return ref($self->app)."::Help"; + return $self->app."::Help"; } my ($inc, @prefix); diff -Nru libapp-cli-perl-0.07/lib/App/CLI.pm libapp-cli-perl-0.08/lib/App/CLI.pm --- libapp-cli-perl-0.07/lib/App/CLI.pm 2006-11-24 22:22:48.000000000 +0100 +++ libapp-cli-perl-0.08/lib/App/CLI.pm 2009-02-25 22:06:16.000000000 +0100 @@ -1,5 +1,5 @@ package App::CLI; -our $VERSION = 0.07; +our $VERSION = 0.08; use strict; use warnings; @@ -101,8 +101,9 @@ my $pkg = join('::', $class->command_class, $class->_cmd_map ($cmd)); my $file = "$pkg.pm"; $file =~ s!::!/!g; + eval {require $file; }; - unless (eval {require $file; 1} and $pkg->can('run')) { + unless ($pkg->can('run')) { warn $@ if $@ and exists $INC{$file}; die $class->error_cmd; }
Attachment:
signature.asc
Description: Digital signature