diff options
| author | Steve Peters <steve@fisharerojo.org> | 2006-09-12 15:30:57 +0000 |
|---|---|---|
| committer | Steve Peters <steve@fisharerojo.org> | 2006-09-12 15:30:57 +0000 |
| commit | 8962fc49433b904c85e0ec947ec7e1d19c26eb99 (patch) | |
| tree | d689ae034f7b1394a1a105f64be8b6d1611d4699 /lib | |
| parent | 58d3253823637a1fee2c1c8064022162bc9d6374 (diff) | |
| download | perl-8962fc49433b904c85e0ec947ec7e1d19c26eb99.tar.gz | |
Upgrade to CPAN-1.87_62
p4raw-id: //depot/perl@28826
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CPAN.pm | 430 | ||||
| -rw-r--r-- | lib/CPAN/FirstTime.pm | 884 | ||||
| -rw-r--r-- | lib/CPAN/HandleConfig.pm | 36 |
3 files changed, 881 insertions, 469 deletions
diff --git a/lib/CPAN.pm b/lib/CPAN.pm index 22c9b599f2..456f2ccbb1 100644 --- a/lib/CPAN.pm +++ b/lib/CPAN.pm @@ -1,8 +1,8 @@ # -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*- -package CPAN; -$VERSION = '1.87_55'; -$VERSION = eval $VERSION; use strict; +package CPAN; +$CPAN::VERSION = '1.87_62'; +$CPAN::VERSION = eval $CPAN::VERSION; use CPAN::HandleConfig; use CPAN::Version; @@ -26,8 +26,17 @@ use Safe (); use Sys::Hostname qw(hostname); use Text::ParseWords (); use Text::Wrap (); -no lib "."; # we need to run chdir all over and we would get at wrong - # libraries there + +# we need to run chdir all over and we would get at wrong libraries +# there +BEGIN { + if (File::Spec->can("rel2abs")) { + for my $inc (@INC) { + $inc = File::Spec->rel2abs($inc); + } + } +} +no lib "."; require Mac::BuildTools if $^O eq 'MacOS'; @@ -133,10 +142,11 @@ sub shell { } close $fh; }} - # $term->OUT is autoflushed anyway - for ($CPAN::Config->{term_ornaments}) { + for ($CPAN::Config->{term_ornaments}) { # alias + local $Term::ReadLine::termcap_nowarn = 1; $term->ornaments($_) if defined; } + # $term->OUT is autoflushed anyway my $odef = select STDERR; $| = 1; select STDOUT; @@ -157,17 +167,19 @@ sub shell { ($term->ReadLine ne "Term::ReadLine::Stub") ? "enabled" : "available (try 'install Bundle::CPAN')"; - $CPAN::Frontend->myprint( - sprintf qq{ + unless ($CPAN::Config->{'inhibit_startup_message'}){ + $CPAN::Frontend->myprint( + sprintf qq{ cpan shell -- CPAN exploration and modules installation (v%s) ReadLine support %s }, - $CPAN::VERSION, - $rl_avail - ) - unless $CPAN::Config->{'inhibit_startup_message'} ; + $CPAN::VERSION, + $rl_avail + ) + } my($continuation) = ""; + my $last_term_ornaments; SHELLCOMMAND: while () { if ($Suppress_readline) { print $prompt; @@ -243,6 +255,19 @@ ReadLine support %s goto &shell; } } + for ($CPAN::Config->{term_ornaments}) { # alias + if (defined $_) { + if (not defined $last_term_ornaments + or $_ != $last_term_ornaments + ) { + local $Term::ReadLine::termcap_nowarn = 1; + $term->ornaments($_); + $last_term_ornaments = $_; + } + } else { + undef $last_term_ornaments; + } + } } soft_chdir_with_alternatives(\@cwd); } @@ -396,10 +421,9 @@ sub as_string { package CPAN::Shell; use strict; -use vars qw($AUTOLOAD @ISA $COLOR_REGISTERED $ADVANCED_QUERY $PRINT_ORNAMENTING); +use vars qw($AUTOLOAD @ISA $COLOR_REGISTERED $ADVANCED_QUERY); @CPAN::Shell::ISA = qw(CPAN::Debug); $COLOR_REGISTERED ||= 0; -$PRINT_ORNAMENTING ||= 0; #-> sub CPAN::Shell::AUTOLOAD ; sub AUTOLOAD { @@ -568,7 +592,7 @@ sub suggest_myconfig () { SUGGEST_MYCONFIG: if(!$INC{'CPAN/MyConfig.pm'}) { $CPAN::Frontend->myprint("You don't seem to have a user ". "configuration (MyConfig.pm) yet.\n"); - my $new = ExtUtils::MakeMaker::prompt("Do you want to create a ". + my $new = CPAN::Shell::colorable_makemaker_prompt("Do you want to create a ". "user configuration now? (Y/n)", "yes"); if($new =~ m{^y}i) { @@ -634,7 +658,7 @@ You may want to kill it and delete the lockfile, maybe. On UNIX try: }); } elsif (-w $lockfile) { my($ans) = - ExtUtils::MakeMaker::prompt + CPAN::Shell::colorable_makemaker_prompt (qq{Other job not responding. Shall I overwrite }. qq{the lockfile '$lockfile'? (Y/n)},"y"); $CPAN::Frontend->myexit("Ok, bye\n") @@ -911,18 +935,18 @@ sub has_inst { install Bundle::libnet }) unless $Have_warned->{"Net::FTP"}++; - sleep 3; + $CPAN::Frontend->mysleep(3); } elsif ($mod eq "Digest::SHA"){ if ($Have_warned->{"Digest::SHA"}++) { $CPAN::Frontend->myprint(qq{CPAN: checksum security checks disabled}. qq{because Digest::SHA not installed.\n}); } else { - $CPAN::Frontend->myprint(qq{ + $CPAN::Frontend->mywarn(qq{ CPAN: checksum security checks disabled because Digest::SHA not installed. Please consider installing the Digest::SHA module. }); - sleep 2; + $CPAN::Frontend->mysleep(2); } } elsif ($mod eq "Module::Signature"){ if (not $CPAN::Config->{check_sigs}) { @@ -937,14 +961,14 @@ sub has_inst { $CPAN::Config->{'gpg'} =~ /\S/ ) ) { - $CPAN::Frontend->myprint(qq{ + $CPAN::Frontend->mywarn(qq{ CPAN: Module::Signature security checks disabled because Module::Signature not installed. Please consider installing the Module::Signature module. You may also need to be able to connect over the Internet to the public keyservers like pgp.mit.edu (port 11371). }); - sleep 2; + $CPAN::Frontend->mysleep(2); } } } else { @@ -987,7 +1011,7 @@ sub cleanup { unlink $META->{LOCK}; # require Carp; # Carp::cluck("DEBUGGING"); - $CPAN::Frontend->mywarn("Lockfile removed.\n"); + $CPAN::Frontend->myprint("Lockfile removed.\n"); } #-> sub CPAN::savehist @@ -1141,7 +1165,7 @@ sub disk_usage { "the permission to change the permission; ". "can only partially estimate disk usage ". "of '$_'\n"); - sleep 5; + $CPAN::Frontend->mysleep(5); return; } } @@ -1410,8 +1434,10 @@ sub i { #-> sub CPAN::Shell::o ; -# CPAN::Shell::o and CPAN::Config::edit are closely related. 'o conf' -# should have been called set and 'o debug' maybe 'set debug' +# CPAN::Shell::o and CPAN::HandleConfig::edit are closely related. 'o +# conf' calls through to CPAN::HandleConfig::edit. 'o conf' should +# have been called 'set' and 'o debug' maybe 'set debug' or 'debug' +# 'o conf XXX' calls ->edit in CPAN/HandleConfig.pm sub o { my($self,$o_type,@o_what) = @_; $DB::single = 1; @@ -1527,8 +1553,18 @@ sub reload { my $redef = 0; chdir $CPAN::iCwd if $CPAN::iCwd; # may fail my $failed; - MFILE: for my $f (qw(CPAN.pm CPAN/HandleConfig.pm CPAN/FirstTime.pm CPAN/Tarzip.pm - CPAN/Debug.pm CPAN/Version.pm)) { + my @relo = ( + "CPAN.pm", + "CPAN/HandleConfig.pm", + "CPAN/FirstTime.pm", + "CPAN/Tarzip.pm", + "CPAN/Debug.pm", + "CPAN/Version.pm", + ); + if ($CPAN::Config->{test_report}) { + push @relo, "CPAN/Reporter.pm"; + } + MFILE: for my $f (@relo) { local($SIG{__WARN__}) = paintdots_onreload(\$redef); $self->reload_this($f) or $failed++; } @@ -1646,9 +1682,11 @@ sub scripts { my($self, $arg) = @_; $CPAN::Frontend->mywarn(">>>> experimental command, currently unsupported <<<<\n\n"); - require HTML::LinkExtor; - require Sort::Versions; - require List::Util; + for my $req (qw( HTML::LinkExtor Sort::Versions List::Util )) { + unless ($CPAN::META->has_inst($req)) { + $CPAN::Frontend->mywarn(" $req not available\n"); + } + } my $p = HTML::LinkExtor->new(); my $indexfile = "/home/ftp/pub/PAUSE/scripts/new/index.html"; unless (-f $indexfile) { @@ -1658,7 +1696,7 @@ sub scripts { my @hrefs; my $qrarg; if ($arg =~ s|^/(.+)/$|$1|) { - $qrarg = qr/$arg/; + $qrarg = eval 'qr/$arg/'; # hide construct from 5.004 } for my $l ($p->links) { my $tag = shift @$l; @@ -2151,10 +2189,29 @@ sub format_result { # debugging utility that reveals which output is going through which # channel. No, I don't like the colors ;-) -#-> sub CPAN::Shell::print_ornameted ; +# to turn colordebugging on, write +# cpan> o conf colorize_output 1 + +#-> sub CPAN::Shell::print_ornamented ; +{ + my $print_ornamented_have_warned = 0; + sub colorize_output { + my $colorize_output = $CPAN::Config->{colorize_output}; + if ($colorize_output && !$CPAN::META->has_inst("Term::ANSIColor")) { + unless ($print_ornamented_have_warned++) { + # no myprint/mywarn within myprint/mywarn! + warn "Colorize_output is set to true but Term::ANSIColor is not +installed. To activate colorized output, please install Term::ANSIColor.\n\n"; + } + $colorize_output = 0; + } + return $colorize_output; + } +} + + sub print_ornamented { my($self,$what,$ornament) = @_; - my $longest = 0; return unless defined $what; local $| = 1; # Flush immediately @@ -2162,44 +2219,84 @@ sub print_ornamented { print {report_fh()} $what; return; } - + my $swhat = "$what"; # stringify if it is an object if ($CPAN::Config->{term_is_latin}){ # courtesy jhi: - $what + $swhat =~ s{([\xC0-\xDF])([\x80-\xBF])}{chr(ord($1)<<6&0xC0|ord($2)&0x3F)}eg; #}; } - if ($PRINT_ORNAMENTING) { - unless (defined &color) { - if ($CPAN::META->has_inst("Term::ANSIColor")) { - import Term::ANSIColor "color"; - } else { - *color = sub { return "" }; - } - } - my $line; - for $line (split /\n/, $what) { - $longest = length($line) if length($line) > $longest; - } - my $sprintf = "%-" . $longest . "s"; - while ($what){ - $what =~ s/(.*\n?)//m; - my $line = $1; - last unless $line; - my($nl) = chomp $line ? "\n" : ""; - # print "line[$line]ornament[$ornament]sprintf[$sprintf]\n"; - print color($ornament), sprintf($sprintf,$line), color("reset"), $nl; - } + my $line; + my $longest = 0; # Does list::util work on 5.004? + for $line (split /\n/, $swhat) { + $longest = length($line) if length($line) > $longest; + } + $longest = 78 if $longest > 78; # yes, arbitrary, who wants it set-able? + if ($self->colorize_output) { + my $color_on = eval { Term::ANSIColor::color($ornament) } || ""; + if ($@) { + print "Term::ANSIColor rejects color[$ornament]: $@\n +Please choose a different color (Hint: try 'o conf init color.*')\n"; + } + my $demobug = 0; # (=0) works, (=1) has some obscure bugs and + # breaks 30shell.t, (=2) has some obvious + # bugs but passes 30shell.t + if ($demobug == 1) { + my $nl = chomp $swhat ? "\n" : ""; + while (length $swhat) { + $line = ""; + if (0) { + $swhat =~ s/(.*\n?)//m; + $line = $1; + last unless $line; + } else { + while (length $swhat) { + my $c = substr($swhat,0,1); + $swhat = substr($swhat,1); + $line .= $c; + if ($c eq "\n") { + last; + } + } + } + + # my($nl) = chomp $line ? "\n" : ""; + # ->debug verboten within print_ornamented ==> recursion! + # warn("line[$line]ornament[$ornament]sprintf[$sprintf]\n") if $CPAN::DEBUG; + print $color_on, + sprintf("%-*s",$longest,$line), + Term::ANSIColor::color("reset"), + $line =~ /\n/ ? "" : $nl; + } + } elsif ($demobug == 2) { + my $block = join "\n", + map { + sprintf("%s%-*s%s", + $color_on, + $longest, + $_, + Term::ANSIColor::color("reset"), + ) + } + split /[\r ]*\n/, $swhat; + print $block; + } else { + print $color_on, + $swhat, + Term::ANSIColor::color("reset"); + } } else { - # chomp $what; - # $what .= "\n"; # newlines unless $PRINT_ORNAMENTING - print $what; + print $swhat; } } +# where is myprint/mywarn/Frontend/etc. documented? We need guidelines +# where to use what! I think, we send everything to STDOUT and use +# print for normal/good news and warn for news that need more +# attention. Yes, this is our working contract for now. sub myprint { my($self,$what) = @_; - $self->print_ornamented($what, 'bold blue on_yellow'); + $self->print_ornamented($what, $CPAN::Config->{colorize_print}||'bold blue'); } sub myexit { @@ -2210,19 +2307,13 @@ sub myexit { sub mywarn { my($self,$what) = @_; - $self->print_ornamented($what, 'bold red on_yellow'); + $self->print_ornamented($what, $CPAN::Config->{colorize_warn}||'bold red'); } -#sub myconfess { -# my($self,$what) = @_; -# $self->print_ornamented($what, 'bold red on_white'); -# Carp::confess "died"; -#} - # only to be used for shell commands sub mydie { my($self,$what) = @_; - $self->print_ornamented($what, 'bold red on_white'); + $self->print_ornamented($what, $CPAN::Config->{colorize_warn}||'bold red'); # If it is the shell, we want that the following die to be silent, # but if it is not the shell, we would need a 'die $what'. We need @@ -2232,6 +2323,21 @@ sub mydie { die "\n"; } +# sub CPAN::Shell::colorable_makemaker_prompt +sub colorable_makemaker_prompt { + my($foo,$bar) = @_; + if (CPAN::Shell->colorize_output) { + my $ornament = $CPAN::Config->{colorize_print}||'bold blue'; + my $color_on = eval { Term::ANSIColor::color($ornament); } || ""; + print $color_on; + } + my $ans = ExtUtils::MakeMaker::prompt($foo,$bar); + if (CPAN::Shell->colorize_output) { + print Term::ANSIColor::color('reset'); + } + return $ans; +} + # use this only for unrecoverable errors! sub unrecoverable_error { my($self,$what) = @_; @@ -2309,7 +2415,7 @@ sub rematein { } elsif ($s =~ m|^/|) { # looks like a regexp $CPAN::Frontend->mywarn("Sorry, $meth with a regular expression is ". "not supported\n"); - sleep 2; + $CPAN::Frontend->mysleep(2); next; } elsif ($meth eq "ls") { $self->globls($s,\@pragma); @@ -2327,17 +2433,17 @@ sub rematein { if ($meth =~ /^(dump|ls)$/) { $obj->$meth(); } else { - $CPAN::Frontend->myprint( - join "", - "Don't be silly, you can't $meth ", - $obj->fullname, - " ;-)\n" - ); - sleep 2; + $CPAN::Frontend->mywarn( + join "", + "Don't be silly, you can't $meth ", + $obj->fullname, + " ;-)\n" + ); + $CPAN::Frontend->mysleep(2); } } else { $CPAN::Frontend - ->myprint(qq{Warning: Cannot $meth $s, }. + ->mywarn(qq{Warning: Cannot $meth $s, }. qq{don\'t know what it is. Try the command @@ -2345,7 +2451,7 @@ Try the command to find objects with matching identifiers. }); - sleep 2; + $CPAN::Frontend->mysleep(2); } } @@ -2431,7 +2537,7 @@ sub config { @ISA = qw(Exporter LWP::UserAgent); $SETUPDONE++; } else { - $CPAN::Frontend->mywarn("LWP::UserAgent not available\n"); + $CPAN::Frontend->mywarn(" LWP::UserAgent not available\n"); } } @@ -2481,7 +2587,7 @@ sub get_non_proxy_credentials { o conf username your_username o conf password your_password )\nUsername:"; - + ($user, $password) = _get_username_and_password_from_user($username_prompt); return ($user,$password); @@ -2778,14 +2884,20 @@ sub localize { } unless ($CPAN::Signal) { my(@mess); - push @mess, - qq{Please check, if the URLs I found in your configuration file \(}. - join(", ", @{$CPAN::Config->{urllist}}). - qq{\) are valid. The urllist can be edited.}, - qq{E.g. with 'o conf urllist push ftp://myurl/'}; - $CPAN::Frontend->myprint(Text::Wrap::wrap("","",@mess). "\n\n"); - sleep 2; - $CPAN::Frontend->myprint("Could not fetch $file\n"); + local $" = " "; + if (@{$CPAN::Config->{urllist}}) { + push @mess, + qq{Please check, if the URLs I found in your configuration file \(}. + join(", ", @{$CPAN::Config->{urllist}}). + qq{\) are valid.}; + } else { + push @mess, qq{Your urllist is empty!}; + } + push @mess, qq{The urllist can be edited.}, + qq{E.g. with 'o conf urllist push ftp://myurl/'}; + $CPAN::Frontend->mywarn(Text::Wrap::wrap("","","@mess"). "\n\n"); + $CPAN::Frontend->mywarn("Could not fetch $file\n"); + $CPAN::Frontend->mysleep(2); } if ($restore) { rename "$aslocal.bak", $aslocal; @@ -2884,7 +2996,7 @@ sub hosteasy { # skip Net::FTP anymore when LWP is available. } } else { - $CPAN::Frontend->myprint("LWP not available\n"); + $CPAN::Frontend->mywarn(" LWP not available\n"); } return if $CPAN::Signal; if ($url =~ m|^ftp://(.*?)/(.*)/(.*)|) { @@ -2997,7 +3109,7 @@ Trying with "$funkyftp$src_switch" to get if (-s $asl_ungz) { my $content = do { local *FH; open FH, $asl_ungz or die; local $/; <FH> }; if ($content =~ /^<.*<title>[45]/si) { - $CPAN::Frontend->myprint(qq{ + $CPAN::Frontend->mywarn(qq{ No success, the file that lynx has has downloaded looks like an error message: $content }); @@ -3082,12 +3194,11 @@ sub hosthardest { $CPAN::Frontend->myprint("No external ftp command available\n\n"); return; } - $CPAN::Frontend->myprint(qq{ + $CPAN::Frontend->mywarn(qq{ As a last ressort we now switch to the external ftp command '$ftpbin' to get '$aslocal'. -Doing so often leads to problems that are hard to diagnose, even endless -loops may be encountered. +Doing so often leads to problems that are hard to diagnose. If you're victim of such problems, please consider unsetting the ftp config variable with @@ -3096,7 +3207,7 @@ config variable with o conf commit }); - $CPAN::Frontend->mysleep(4); + $CPAN::Frontend->mysleep(2); HOSTHARDEST: for $ro_url (@$host_seq) { my $url = "$ro_url$file"; $self->debug("localizing ftpwise[$url]") if $CPAN::DEBUG; @@ -3197,8 +3308,8 @@ $dialog $CPAN::Frontend->myprint("Bad luck... Still failed!\n"); } return if $CPAN::Signal; - $CPAN::Frontend->myprint("Can't access URL $url.\n\n"); - sleep 2; + $CPAN::Frontend->mywarn("Can't access URL $url.\n\n"); + $CPAN::Frontend->mysleep(2); } # host } @@ -3630,13 +3741,13 @@ sub rd_modpacks { } if (not defined $line_count) { - warn qq{Warning: Your $index_target does not contain a Line-Count header. + $CPAN::Frontend->mywarn(qq{Warning: Your $index_target does not contain a Line-Count header. Please check the validity of the index file by comparing it to more than one CPAN mirror. I'll continue but problems seem likely to happen.\a -}; +}); - sleep 5; + $CPAN::Frontend->mysleep(5); } elsif ($line_count != scalar @lines) { warn sprintf qq{Warning: Your %s @@ -3648,13 +3759,13 @@ $index_target, $line_count, scalar(@lines); } if (not defined $last_updated) { - warn qq{Warning: Your $index_target does not contain a Last-Updated header. + $CPAN::Frontend->mywarn(qq{Warning: Your $index_target does not contain a Last-Updated header. Please check the validity of the index file by comparing it to more than one CPAN mirror. I'll continue but problems seem likely to happen.\a -}; +}); - sleep 5; + $CPAN::Frontend->mysleep(5); } else { $CPAN::Frontend @@ -3667,7 +3778,7 @@ happen.\a require HTTP::Date; $age -= HTTP::Date::str2time($last_updated); } else { - $CPAN::Frontend->myprint(" HTTP::Date not available\n"); + $CPAN::Frontend->mywarn(" HTTP::Date not available\n"); require Time::Local; my(@d) = $last_updated =~ / (\d+) (\w+) (\d+) (\d+):(\d+):(\d+) /; $d[1] = index("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec", $d[1])/4; @@ -3721,7 +3832,7 @@ happen.\a ) { local($^W)= 0; if ($version > $CPAN::VERSION){ - $CPAN::Frontend->myprint(qq{ + $CPAN::Frontend->mywarn(qq{ New CPAN.pm version (v$version) available. [Currently running version is v$CPAN::VERSION] You might want to try @@ -3731,7 +3842,7 @@ happen.\a the current session. }); #}); - sleep 2; + $CPAN::Frontend->mysleep(2); $CPAN::Frontend->myprint(qq{\n}); } last if $CPAN::Signal; @@ -4089,7 +4200,7 @@ sub dump { } local $Data::Dumper::Sortkeys; $Data::Dumper::Sortkeys = 1; - print Data::Dumper::Dumper($self); + $CPAN::Frontend->myprint(Data::Dumper::Dumper($self)); } package CPAN::Author; @@ -4435,7 +4546,11 @@ sub uptodate { my $c; foreach $c ($self->containsmods) { my $obj = CPAN::Shell->expandany($c); - return 0 unless $obj->uptodate; + unless ($obj->uptodate){ + my $id = $self->pretty_id; + $self->debug("$id not uptodate due to $c") if $CPAN::DEBUG; + return 0; + } } return 1; } @@ -4642,7 +4757,7 @@ and there run $self->debug("Module::Signature has verified") if $CPAN::DEBUG; } } else { - $CPAN::Frontend->myprint(qq{Package came without SIGNATURE\n\n}); + $CPAN::Frontend->mywarn(qq{Package came without SIGNATURE\n\n}); } } else { $self->debug("Module::Signature is NOT installed") if $CPAN::DEBUG; @@ -4658,7 +4773,7 @@ and there run # NFS has been reported to have racing problems after the # renaming of a directory in some environments. # This trick helps. - sleep 1; + $CPAN::Frontend->mysleep(1); my $mpldh = DirHandle->new($packagedir) or Carp::croak("Couldn't opendir $packagedir: $!"); $mpl_exists = grep /^Makefile\.PL$/, $mpldh->read; @@ -4686,12 +4801,12 @@ and there run # do we have anything to do? $self->{'configure'} = $configure; } elsif (-f File::Spec->catfile($packagedir,"Makefile")) { - $CPAN::Frontend->myprint(qq{ + $CPAN::Frontend->mywarn(qq{ Package comes with a Makefile and without a Makefile.PL. We\'ll try to build it with that Makefile then. }); $self->{writemakefile} = CPAN::Distrostatus->new("YES"); - sleep 2; + $CPAN::Frontend->mysleep(2); } else { my $cf = $self->called_for || "unknown"; if ($cf =~ m|/|) { @@ -4700,11 +4815,11 @@ We\'ll try to build it with that Makefile then. } $cf =~ s|[/\\:]||g; # risk of filesystem damage $cf = "unknown" unless length($cf); - $CPAN::Frontend->myprint(qq{Package seems to come without Makefile.PL. + $CPAN::Frontend->mywarn(qq{Package seems to come without Makefile.PL. (The test -f "$mpl" returned false.) Writing one on our own (setting NAME to $cf)\a\n}); $self->{had_no_makefile_pl}++; - sleep 3; + $CPAN::Frontend->mysleep(3); # Writing our own Makefile.PL @@ -4970,7 +5085,6 @@ Displaying file $local_file with pager "$pager" }); - sleep 2; $fh_pager->print(<$fh_readme>); $fh_pager->close; } @@ -5089,7 +5203,7 @@ Warning: checksum file '$chk_file' broken. When trying to read that file I expected to get a hash reference for further processing, but got garbage instead. }); - my $answer = ExtUtils::MakeMaker::prompt("Proceed nonetheless?", "no"); + my $answer = CPAN::Shell::colorable_makemaker_prompt("Proceed nonetheless?", "no"); $answer =~ /^\s*y/i or $CPAN::Frontend->mydie("Aborted.\n"); $self->{CHECKSUM_STATUS} = "NIL -- CHECKSUMS file broken"; return; @@ -5152,7 +5266,7 @@ The cause for this may be that the file is very new and the checksum has not yet been calculated, but it may also be that something is going awry right now. }); - my $answer = ExtUtils::MakeMaker::prompt("Proceed?", "yes"); + my $answer = CPAN::Shell::colorable_makemaker_prompt("Proceed?", "yes"); $answer =~ /^\s*y/i or $CPAN::Frontend->mydie("Aborted.\n"); } $self->{CHECKSUM_STATUS} = "NIL -- distro not in CHECKSUMS file"; @@ -5287,7 +5401,7 @@ or $self->called_for, $self->id); $self->{make} = CPAN::Distrostatus->new("NO isa perl"); - sleep 2; + $CPAN::Frontend->mysleep(1); return; } } @@ -5409,8 +5523,9 @@ or if ($@){ kill 9, $pid; waitpid $pid, 0; - $CPAN::Frontend->myprint($@); - $self->{writemakefile} = CPAN::Distrostatus->new("NO $@"); + my $err = "$@"; + $CPAN::Frontend->myprint($err); + $self->{writemakefile} = CPAN::Distrostatus->new("NO $err"); $@ = ""; return; } @@ -5419,6 +5534,7 @@ or if ($ret != 0) { $self->{writemakefile} = CPAN::Distrostatus ->new("NO '$system' returned status $ret"); + $CPAN::Frontend->mywarn("Warning: No success on command[$system]\n"); return; } } @@ -5437,8 +5553,13 @@ or if (my @prereq = $self->unsat_prereq){ return 1 if $self->follow_prereqs(@prereq); # signal success to the queuerunner } - # XXX modulebuild / make if ($self->{modulebuild}) { + unless (-f "Build") { + my $cwd = Cwd::cwd; + $CPAN::Frontend->mywarn("Alert: no Build file available for 'make $self->{id}'". + " in cwd[$cwd]. Danger, Will Robinson!"); + $CPAN::Frontend->mysleep(5); + } $system = sprintf "%s %s", $self->_build_command(), $CPAN::Config->{mbuild_arg}; } else { $system = join " ", $self->_make_command(), $CPAN::Config->{make_arg}; @@ -5449,7 +5570,7 @@ or } else { $self->{writemakefile} ||= CPAN::Distrostatus->new("YES"); $self->{make} = CPAN::Distrostatus->new("NO"); - $CPAN::Frontend->myprint(" $system -- NOT OK\n"); + $CPAN::Frontend->mywarn(" $system -- NOT OK\n"); } } @@ -5485,7 +5606,7 @@ sub follow_prereqs { if ($CPAN::Config->{prerequisites_policy} eq "follow") { $follow = 1; } elsif ($CPAN::Config->{prerequisites_policy} eq "ask") { - my $answer = ExtUtils::MakeMaker::prompt( + my $answer = CPAN::Shell::colorable_makemaker_prompt( "Shall I follow them and prepend them to the queue of modules we are processing right now?", "yes"); $follow = $answer =~ /^\s*y/i; @@ -5635,7 +5756,7 @@ sub prereq_pm { $CPAN::Frontend->mywarn("Suspicious key-value pair in META.yml's ". "requires hash: $k => $v; I'll take both ". "key and value as a module name\n"); - sleep 1; + $CPAN::Frontend->mysleep(1); $areq->{$k} = 0; $areq->{$v} = 0; $do_replace++; @@ -5773,14 +5894,21 @@ sub test { } else { $system = join " ", $self->_make_command(), "test"; } - if (system($system) == 0) { + my $tests_ok; + if ( $CPAN::Config->{test_report} && + $CPAN::META->has_inst("CPAN::Reporter") ) { + $tests_ok = CPAN::Reporter::test($self, $system); + } else { + $tests_ok = system($system) == 0; + } + if ( $tests_ok ) { $CPAN::Frontend->myprint(" $system -- OK\n"); $CPAN::META->is_tested($self->{'build_dir'}); $self->{make_test} = CPAN::Distrostatus->new("YES"); } else { $self->{make_test} = CPAN::Distrostatus->new("NO"); $self->{badtestcnt}++; - $CPAN::Frontend->myprint(" $system -- NOT OK\n"); + $CPAN::Frontend->mywarn(" $system -- NOT OK\n"); } } @@ -5815,6 +5943,12 @@ sub clean { my $system; if ($self->{modulebuild}) { + unless (-f "Build") { + my $cwd = Cwd::cwd; + $CPAN::Frontend->mywarn("Alert: no Build file available for 'clean $self->{id}". + " in cwd[$cwd]. Danger, Will Robinson!"); + $CPAN::Frontend->mysleep(5); + } $system = sprintf "%s clean", $self->_build_command(); } else { $system = join " ", $self->_make_command(), "clean"; @@ -5844,7 +5978,7 @@ sub clean { # Hmmm, what to do if make clean failed? $self->{make_clean} = CPAN::Distrostatus->new("NO"); - $CPAN::Frontend->myprint(qq{ $system -- NOT OK\n}); + $CPAN::Frontend->mywarn(qq{ $system -- NOT OK\n}); # 2006-02-27: seems silly to me to force a make now # $self->force("make"); # so that this directory won't be used again @@ -5944,7 +6078,9 @@ sub install { my($pipe) = FileHandle->new("$system $stderr |"); my($makeout) = ""; while (<$pipe>){ - $CPAN::Frontend->myprint($_); + print $_; # intentionally NOT use Frontend->myprint because it + # looks irritating when we markup in color what we + # just pass through from an external program $makeout .= $_; } $pipe->close; @@ -5954,7 +6090,7 @@ sub install { return $self->{install} = CPAN::Distrostatus->new("YES"); } else { $self->{install} = CPAN::Distrostatus->new("NO"); - $CPAN::Frontend->myprint(" $system -- NOT OK\n"); + $CPAN::Frontend->mywarn(" $system -- NOT OK\n"); if ( $makeout =~ /permission/s && $> > 0 @@ -6039,7 +6175,7 @@ Displaying URL $url with browser $browser }); - sleep 2; + $CPAN::Frontend->mysleep(1); system("$browser $url"); if ($saved_file) { 1 while unlink($saved_file) } } else { @@ -6099,7 +6235,7 @@ Displaying URL $url with pager "$pager" }); - sleep 2; + $CPAN::Frontend->mysleep(1); $fh_pager->print(<FH>); $fh_pager->close; } else { @@ -6168,7 +6304,7 @@ sub _getsave_url { return; } } else { - $CPAN::Frontend->myprint("LWP not available\n"); + $CPAN::Frontend->mywarn(" LWP not available\n"); return; } } @@ -6393,7 +6529,7 @@ sub rematein { The Bundle }.$self->id.qq{ contains explicitly a file $s. }); - sleep 3; + $CPAN::Frontend->mysleep(3); } # possibly noisy action: $self->debug("type[$type] s[$s]") if $CPAN::DEBUG; @@ -6907,6 +7043,7 @@ sub test { #-> sub CPAN::Module::uptodate ; sub uptodate { my($self) = @_; + local($_); # protect against a bug in MakeMaker 6.17 my($latest) = $self->cpan_version; $latest ||= 0; my($inst_file) = $self->inst_file; @@ -6946,7 +7083,7 @@ sub install { \n\n\n ***WARNING*** The module $self->{ID} has no active maintainer.\n\n\n }); - sleep 5; + $CPAN::Frontend->mysleep(5); } $self->rematein('install') if $doit; } @@ -6959,6 +7096,9 @@ sub inst_file { my($dir,@packpath); @packpath = split /::/, $self->{ID}; $packpath[-1] .= ".pm"; + if (@packpath == 1 && $packpath[0] eq "readline.pm") { + unshift @packpath, "Term", "ReadLine"; # historical reasons + } foreach $dir (@INC) { my $pmfile = File::Spec->catfile($dir,@packpath); if (-f $pmfile){ @@ -7059,7 +7199,7 @@ Batch mode: install $distro; # same thing CPAN::Shell->install($distro); # same thing CPAN::Shell->expandany($distro)->install; # same thing - CPAN::Shell->expand("Module",$distro)->install; # same thing + CPAN::Shell->expand("Distribution",$distro)->install; # same thing =head1 STATUS @@ -7597,6 +7737,8 @@ any case and if this fails, the install will be canceled. The cancellation can be avoided by letting C<force> run the C<install> for you. +Note that install() gives no meaningful return value. See uptodate(). + =item CPAN::Distribution::isa_perl() Returns 1 if this distribution file seems to be a perl distribution. @@ -7960,7 +8102,9 @@ added to the search path of the CPAN module before the use() or require() statements. The configuration dialog can be started any time later again by -issuing the command C< o conf init > in the CPAN shell. +issuing the command C< o conf init > in the CPAN shell. A subset of +the configuration dialog can be run by issuing C<o conf init WORD> +where WORD is any valid config variable or a regular expression. Currently the following keys in the hash reference $CPAN::Config are defined: @@ -8015,6 +8159,7 @@ defined: tar location of external program tar term_is_latin if true internal UTF-8 is translated to ISO-8859-1 (and nonsense for characters outside latin range) + test_report email test reports (if CPAN::Reporter is installed) unzip location of external program unzip urllist arrayref to nearby CPAN sites (or equivalent locations) wait_list arrayref to a wait server to try (See CPAN::WAIT) @@ -8051,7 +8196,7 @@ works like the corresponding perl commands. =back -=head2 Not on config variable getcwd +=head2 Note on config variable getcwd CPAN.pm changes the current working directory often and needs to determine its own current working directory. Per default it uses @@ -8365,7 +8510,7 @@ not using the private area. How to get a package, unwrap it, and make a change before building it? - look Sybase::Sybperl +Have a look at the C<look> (!) command. =item 7) @@ -8461,12 +8606,15 @@ decent command. How do I install a "DEVELOPER RELEASE" of a module? -By default, CPAN will install the latest non-developer release of a module. -If you want to install a dev release, you have to specify a partial path to -the tarball you wish to install, like so: +By default, CPAN will install the latest non-developer release of a +module. If you want to install a dev release, you have to specify the +partial path starting with the author id to the tarball you wish to +install, like so: cpan> install KWILLIAMS/Module-Build-0.27_07.tar.gz +Note that you can use the C<ls> command to get this path listed. + =item 13) How do I install a module and all its dependencies from the commandline, diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm index 9d39282b80..946ca24eec 100644 --- a/lib/CPAN/FirstTime.pm +++ b/lib/CPAN/FirstTime.pm @@ -2,7 +2,7 @@ package CPAN::Mirrored::By; use strict; use vars qw($VERSION); -$VERSION = sprintf "%.6f", substr(q$Rev: 742 $,4)/1000000 + 5.4; +$VERSION = sprintf "%.6f", substr(q$Rev: 819 $,4)/1000000 + 5.4; sub new { my($self,@arg) = @_; @@ -20,8 +20,8 @@ use FileHandle (); use File::Basename (); use File::Path (); use File::Spec; -use vars qw($VERSION); -$VERSION = sprintf "%.6f", substr(q$Rev: 742 $,4)/1000000 + 5.4; +use vars qw($VERSION $urllist); +$VERSION = sprintf "%.6f", substr(q$Rev: 819 $,4)/1000000 + 5.4; =head1 NAME @@ -46,6 +46,16 @@ sub init { use Config; # extra arg in 'o conf init make' selects only $item =~ /make/ my $matcher = $args{args} && @{$args{args}} ? $args{args}[0] : ''; + if ($matcher =~ /^\w+$/) { + if ( + exists $CPAN::HandleConfig::keys{$matcher} + ) { + $matcher = "\\b$matcher\\b"; + } else { + $CPAN::Frontend->myprint("'$matcher' is not a valid configuration variable"); + return; + } + } CPAN->debug("matcher[$matcher]") if $CPAN::DEBUG; unless ($CPAN::VERSION) { @@ -61,19 +71,26 @@ sub init { my($ans,$default); # - # Files, directories + #= Files, directories # - print $prompts{manual_config}; + unless ($matcher) { + $CPAN::Frontend->myprint($prompts{manual_config}); + } my $manual_conf; - local *_real_prompt = \&ExtUtils::MakeMaker::prompt; + local *_real_prompt = \&CPAN::Shell::colorable_makemaker_prompt; if ( $args{autoconfig} ) { $manual_conf = "no"; + } elsif ($matcher) { + $manual_conf = "yes"; } else { - $manual_conf = prompt("Are you ready for manual configuration?", "yes"); + my $_conf = prompt("Would you like me to configure as much as possible ". + "automatically?", "yes"); + $manual_conf = ($_conf and $_conf =~ /^y/i) ? "no" : "yes"; } + CPAN->debug("manual_conf[$manual_conf]") if $CPAN::DEBUG; my $fastread; { if ($manual_conf =~ /^y/i) { @@ -84,259 +101,258 @@ sub init { local $^W = 0; # prototype should match that of &MakeMaker::prompt + my $current_second = time; + my $current_second_count = 0; + my $i_am_mad = 0; *_real_prompt = sub ($;$) { my($q,$a) = @_; my($ret) = defined $a ? $a : ""; $CPAN::Frontend->myprint(sprintf qq{%s [%s]\n\n}, $q, $ret); eval { require Time::HiRes }; unless ($@) { - Time::HiRes::sleep(0.1); + if (time == $current_second) { + $current_second_count++; + if ($current_second_count > 20) { + # I don't like more than 20 prompts per second + $i_am_mad++; + } + } else { + $current_second = time; + $current_second_count = 0; + $i_am_mad-- if $i_am_mad>0; + } + if ($i_am_mad>0){ + #require Carp; + #Carp::cluck("SLEEEEEEEEPIIIIIIIIIIINGGGGGGGGGGG"); + Time::HiRes::sleep(0.1); + } } $ret; }; } } - $CPAN::Frontend->myprint($prompts{config_intro}) - if !$matcher or 'config_intro' =~ /$matcher/; + if (!$matcher or 'cpan_home keep_source_where build_dir' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{config_intro}); - my $cpan_home = $CPAN::Config->{cpan_home} - || File::Spec->catdir($ENV{HOME}, ".cpan"); + if (!$matcher or 'cpan_home' =~ /$matcher/) { + my $cpan_home = $CPAN::Config->{cpan_home} + || File::Spec->catdir($ENV{HOME}, ".cpan"); - if (-d $cpan_home) { - if (!$matcher or 'config_intro' =~ /$matcher/) { - $CPAN::Frontend->myprint(qq{ + if (-d $cpan_home) { + $CPAN::Frontend->myprint(qq{ I see you already have a directory $cpan_home Shall we use it as the general CPAN build and cache directory? }); - } - } else { - # no cpan-home, must prompt and get one - $CPAN::Frontend->myprint($prompts{cpan_home_where}); - } - - $default = $cpan_home; - while ($ans = prompt("CPAN build and cache directory?",$default)) { - unless (File::Spec->file_name_is_absolute($ans)) { - require Cwd; - my $cwd = Cwd::cwd(); - my $absans = File::Spec->catdir($cwd,$ans); - warn "The path '$ans' is not an absolute path. Please specify an absolute path\n"; - $default = $absans; - next; - } - eval { File::Path::mkpath($ans); }; # dies if it can't - if ($@) { - warn "Couldn't create directory $ans.\nPlease retry.\n"; - next; - } - if (-d $ans && -w _) { - last; - } else { - warn "Couldn't find directory $ans\n" - . "or directory is not writable. Please retry.\n"; - } - } - $CPAN::Config->{cpan_home} = $ans; + } else { + # no cpan-home, must prompt and get one + $CPAN::Frontend->myprint($prompts{cpan_home_where}); + } - $CPAN::Frontend->myprint($prompts{keep_source_where}); + $default = $cpan_home; + while ($ans = prompt("CPAN build and cache directory?",$default)) { + unless (File::Spec->file_name_is_absolute($ans)) { + require Cwd; + my $cwd = Cwd::cwd(); + my $absans = File::Spec->catdir($cwd,$ans); + $CPAN::Frontend->mywarn("The path '$ans' is not an ". + "absolute path. Please specify ". + "an absolute path\n"); + $default = $absans; + next; + } + eval { File::Path::mkpath($ans); }; # dies if it can't + if ($@) { + $CPAN::Frontend->mywarn("Couldn't create directory $ans.\n". + "Please retry.\n"); + next; + } + if (-d $ans && -w _) { + last; + } else { + $CPAN::Frontend->mywarn("Couldn't find directory $ans\n". + "or directory is not writable. Please retry.\n"); + } + } + $CPAN::Config->{cpan_home} = $ans; + } - $CPAN::Config->{keep_source_where} - = File::Spec->catdir($CPAN::Config->{cpan_home},"sources"); + if (!$matcher or 'keep_source_where' =~ /$matcher/) { + my_dflt_prompt("keep_source_where", + File::Spec->catdir($CPAN::Config->{cpan_home},"sources"), + $matcher, + ); + } - $CPAN::Config->{build_dir} - = File::Spec->catdir($CPAN::Config->{cpan_home},"build"); + if (!$matcher or 'build_dir' =~ /$matcher/) { + my_dflt_prompt("build_dir", + File::Spec->catdir($CPAN::Config->{cpan_home},"build"), + $matcher + ); + } + } # - # Cache size, Index expire + #= Cache size, Index expire # - $CPAN::Frontend->myprint($prompts{build_cache_intro}) - if !$matcher or 'build_cache_intro' =~ /$matcher/; - - # large enough to build large dists like Tk - my_dflt_prompt(build_cache => 100, $matcher); + if (!$matcher or 'build_cache' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{build_cache_intro}); - # XXX This the time when we refetch the index files (in days) - $CPAN::Config->{'index_expire'} = 1; - - $CPAN::Frontend->myprint($prompts{scan_cache_intro}) - if !$matcher or 'build_cache_intro' =~ /$matcher/; - - my_prompt_loop(scan_cache => 'atstart', $matcher, 'atstart|never'); - - # - # cache_metadata - # - - if (!$matcher or 'build_cache_intro' =~ /$matcher/) { + # large enough to build large dists like Tk + my_dflt_prompt(build_cache => 100, $matcher); + } - $CPAN::Frontend->myprint($prompts{cache_metadata}); + if (!$matcher or 'index_expire' =~ /$matcher/) { + $CPAN::Frontend->myprint($prompts{index_expire_intro}); - defined($default = $CPAN::Config->{cache_metadata}) or $default = 1; - do { - $ans = prompt("Cache metadata (yes/no)?", ($default ? 'yes' : 'no')); - } while ($ans !~ /^[yn]/i); - $CPAN::Config->{cache_metadata} = ($ans =~ /^y/i ? 1 : 0); + my_dflt_prompt(index_expire => 1, $matcher); } - # - # term_is_latin - # - $CPAN::Frontend->myprint($prompts{term_is_latin}) - if !$matcher or 'term_is_latin' =~ /$matcher/; + if (!$matcher or 'scan_cache' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{scan_cache_intro}); - defined($default = $CPAN::Config->{term_is_latin}) or $default = 1; - do { - $ans = prompt("Your terminal expects ISO-8859-1 (yes/no)?", - ($default ? 'yes' : 'no')); - } while ($ans !~ /^[yn]/i); - $CPAN::Config->{term_is_latin} = ($ans =~ /^y/i ? 1 : 0); + my_prompt_loop(scan_cache => 'atstart', $matcher, 'atstart|never'); + } # - # save history in file 'histfile' + #= cache_metadata # - $CPAN::Frontend->myprint($prompts{histfile_intro}); - - defined($default = $CPAN::Config->{histfile}) or - $default = File::Spec->catfile($CPAN::Config->{cpan_home},"histfile"); - $ans = prompt("File to save your history?", $default); - $CPAN::Config->{histfile} = $ans; - - if ($CPAN::Config->{histfile}) { - defined($default = $CPAN::Config->{histsize}) or $default = 100; - $ans = prompt("Number of lines to save?", $default); - $CPAN::Config->{histsize} = $ans; - } + my_yn_prompt(cache_metadata => 1, $matcher); # - # do an ls on the m or the d command + #= Do we follow PREREQ_PM? # - $CPAN::Frontend->myprint($prompts{show_upload_date_intro}); - defined($default = $CPAN::Config->{show_upload_date}) or - $default = 'n'; - $ans = prompt("Always try to show upload date with 'd' and 'm' command (yes/no)?", - ($default ? 'yes' : 'no')); - $CPAN::Config->{show_upload_date} = ($ans =~ /^[y1]/i ? 1 : 0); + if (!$matcher or 'prerequisites_policy' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{prerequisites_policy_intro}); - #my_prompt_loop(show_upload_date => 'n', $matcher, - #'follow|ask|ignore'); + my_prompt_loop(prerequisites_policy => 'ask', $matcher, + 'follow|ask|ignore'); + } # - # prerequisites_policy - # Do we follow PREREQ_PM? + #= Module::Signature # - - $CPAN::Frontend->myprint($prompts{prerequisites_policy_intro}) - if !$matcher or 'prerequisites_policy_intro' =~ /$matcher/; - - my_prompt_loop(prerequisites_policy => 'ask', $matcher, - 'follow|ask|ignore'); - + if (!$matcher or 'check_sigs' =~ /$matcher/) { + my_yn_prompt(check_sigs => 0, $matcher); + } # - # Module::Signature + #= CPAN::Reporter # - $CPAN::Frontend->myprint($prompts{check_sigs_intro}); - - defined($default = $CPAN::Config->{check_sigs}) or - $default = 0; - $ans = prompt($prompts{check_sigs}, - ($default ? 'yes' : 'no')); - $CPAN::Config->{check_sigs} = ($ans =~ /^y/i ? 1 : 0); + if (!$matcher or 'test_report' =~ /$matcher/) { + my_yn_prompt(test_report => 0, $matcher); + if ( + $CPAN::Config->{test_report} && + $CPAN::META->has_inst("CPAN::Reporter") && + CPAN::Reporter->can('configure') + ) { + $CPAN::Frontend->myprint("\nProceeding to configure CPAN::Reporter.\n"); + CPAN::Reporter::configure(); + $CPAN::Frontend->myprint("\nReturning to CPAN configuration.\n"); + } + } # - # External programs + #= External programs # - $CPAN::Frontend->myprint($prompts{external_progs}) - if !$matcher or 'external_progs' =~ /$matcher/; - - my $old_warn = $^W; - local $^W if $^O eq 'MacOS'; - my(@path) = split /$Config{'path_sep'}/, $ENV{'PATH'}; - local $^W = $old_warn; - my $progname; - for $progname (qw/bzip2 gzip tar unzip make + my @external_progs = qw/bzip2 gzip tar unzip make curl lynx wget ncftpget ncftp ftp - gpg/) - { - if ($^O eq 'MacOS') { - $CPAN::Config->{$progname} = 'not_here'; - next; - } - next if $matcher && $progname !~ /$matcher/; - - my $progcall = $progname; - # we don't need ncftp if we have ncftpget - next if $progname eq "ncftp" && $CPAN::Config->{ncftpget} gt " "; - my $path = $CPAN::Config->{$progname} - || $Config::Config{$progname} - || ""; - if (File::Spec->file_name_is_absolute($path)) { - # testing existence is not good enough, some have these exe - # extensions - - # warn "Warning: configured $path does not exist\n" unless -e $path; - # $path = ""; - } elsif ($path =~ /^\s+$/) { - # preserve disabled programs - } else { - $path = ''; - } - unless ($path) { - # e.g. make -> nmake - $progcall = $Config::Config{$progname} if $Config::Config{$progname}; - } + gpg/; + my(@path) = split /$Config{'path_sep'}/, $ENV{'PATH'}; + if (!$matcher or "@external_progs" =~ /$matcher/) { + $CPAN::Frontend->myprint($prompts{external_progs}); + + my $old_warn = $^W; + local $^W if $^O eq 'MacOS'; + local $^W = $old_warn; + my $progname; + for $progname (@external_progs) { + if ($^O eq 'MacOS') { + $CPAN::Config->{$progname} = 'not_here'; + next; + } + next if $matcher && $progname !~ /$matcher/; + + my $progcall = $progname; + # we don't need ncftp if we have ncftpget + next if $progname eq "ncftp" && $CPAN::Config->{ncftpget} gt " "; + my $path = $CPAN::Config->{$progname} + || $Config::Config{$progname} + || ""; + if (File::Spec->file_name_is_absolute($path)) { + # testing existence is not good enough, some have these exe + # extensions + + # warn "Warning: configured $path does not exist\n" unless -e $path; + # $path = ""; + } elsif ($path =~ /^\s+$/) { + # preserve disabled programs + } else { + $path = ''; + } + unless ($path) { + # e.g. make -> nmake + $progcall = $Config::Config{$progname} if $Config::Config{$progname}; + } - $path ||= find_exe($progcall,[@path]); - $CPAN::Frontend->mywarn("Warning: $progcall not found in PATH\n") unless - $path; # not -e $path, because find_exe already checked that - $ans = prompt("Where is your $progname program?",$path) || $path; - $CPAN::Config->{$progname} = $ans; + $path ||= find_exe($progcall,[@path]); + $CPAN::Frontend->mywarn("Warning: $progcall not found in PATH\n") unless + $path; # not -e $path, because find_exe already checked that + $ans = prompt("Where is your $progname program?",$path) || $path; + $CPAN::Config->{$progname} = $ans; + } } - my $path = $CPAN::Config->{'pager'} || - $ENV{PAGER} || find_exe("less",[@path]) || - find_exe("more",[@path]) || ($^O eq 'MacOS' ? $ENV{EDITOR} : 0 ) - || "more"; - $ans = prompt("What is your favorite pager program?",$path); - $CPAN::Config->{'pager'} = $ans; - $path = $CPAN::Config->{'shell'}; - if (File::Spec->file_name_is_absolute($path)) { - warn "Warning: configured $path does not exist\n" unless -e $path; - $path = ""; + + if (!$matcher or 'pager' =~ /$matcher/) { + my $path = $CPAN::Config->{'pager'} || + $ENV{PAGER} || find_exe("less",[@path]) || + find_exe("more",[@path]) || ($^O eq 'MacOS' ? $ENV{EDITOR} : 0 ) + || "more"; + $ans = prompt("What is your favorite pager program?",$path); + $CPAN::Config->{'pager'} = $ans; } - $path ||= $ENV{SHELL}; - $path ||= $ENV{COMSPEC} if $^O eq "MSWin32"; - if ($^O eq 'MacOS') { - $CPAN::Config->{'shell'} = 'not_here'; - } else { - $path =~ s,\\,/,g if $^O eq 'os2'; # Cosmetic only - $ans = prompt("What is your favorite shell?",$path); - $CPAN::Config->{'shell'} = $ans; + + if (!$matcher or 'shell' =~ /$matcher/) { + my $path = $CPAN::Config->{'shell'}; + if (File::Spec->file_name_is_absolute($path)) { + $CPAN::Frontend->mywarn("Warning: configured $path does not exist\n") + unless -e $path; + $path = ""; + } + $path ||= $ENV{SHELL}; + $path ||= $ENV{COMSPEC} if $^O eq "MSWin32"; + if ($^O eq 'MacOS') { + $CPAN::Config->{'shell'} = 'not_here'; + } else { + $path =~ s,\\,/,g if $^O eq 'os2'; # Cosmetic only + $ans = prompt("What is your favorite shell?",$path); + $CPAN::Config->{'shell'} = $ans; + } } # - # Arguments to make etc. + #= Installer, arguments to make etc. # - $CPAN::Frontend->myprint($prompts{prefer_installer_intro}) - if !$matcher or 'prerequisites_policy_intro' =~ /$matcher/; - - my_prompt_loop(prefer_installer => 'EUMM', $matcher, 'MB|EUMM'); + if (!$matcher or 'prefer_installer' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{prefer_installer_intro}); + my_prompt_loop(prefer_installer => 'EUMM', $matcher, 'MB|EUMM'); + } - $CPAN::Frontend->myprint($prompts{makepl_arg_intro}) - if !$matcher or 'makepl_arg_intro' =~ /$matcher/; - - my_dflt_prompt(makepl_arg => "", $matcher); + if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{makepl_arg_intro}); - my_dflt_prompt(make_arg => "", $matcher); + my_dflt_prompt(makepl_arg => "", $matcher); + my_dflt_prompt(make_arg => "", $matcher); + } require CPAN::HandleConfig; if (exists $CPAN::HandleConfig::keys{make_install_make_command}) { @@ -349,12 +365,13 @@ Shall we use it as the general CPAN build and cache directory? my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", $matcher); - $CPAN::Frontend->myprint($prompts{mbuildpl_arg_intro}) - if !$matcher or 'mbuildpl_arg_intro' =~ /$matcher/; + if (!$matcher or 'mbuildpl_arg mbuild_arg' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{mbuildpl_arg_intro}); - my_dflt_prompt(mbuildpl_arg => "", $matcher); + my_dflt_prompt(mbuildpl_arg => "", $matcher); - my_dflt_prompt(mbuild_arg => "", $matcher); + my_dflt_prompt(mbuild_arg => "", $matcher); + } if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command}) { # as long as Windows needs $self->_build_command, we cannot @@ -365,67 +382,168 @@ Shall we use it as the general CPAN build and cache directory? my_dflt_prompt(mbuild_install_arg => "", $matcher); # - # Alarm period + #= Alarm period + # + + if (!$matcher or 'inactivity_timeout' =~ /$matcher/) { + $CPAN::Frontend->myprint($prompts{inactivity_timeout_intro}); + $default = $CPAN::Config->{inactivity_timeout} || 0; + $CPAN::Config->{inactivity_timeout} = + prompt("Timeout for inactivity during {Makefile,Build}.PL?",$default); + } + + # + #= Proxies # - $CPAN::Frontend->myprint($prompts{inactivity_timeout_intro}) - if !$matcher or 'inactivity_timeout_intro' =~ /$matcher/; + my @proxy_vars = qw/ftp_proxy http_proxy no_proxy/; + my @proxy_user_vars = qw/proxy_user proxy_pass/; + if (!$matcher or "@proxy_vars @proxy_user_vars" =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{proxy_intro}); - # my_dflt_prompt(inactivity_timeout => 0); + for (@proxy_vars) { + if (!$matcher or /$matcher/){ + $default = $CPAN::Config->{$_} || $ENV{$_} || ""; + $CPAN::Config->{$_} = prompt("Your $_?",$default); + } + } - $default = $CPAN::Config->{inactivity_timeout} || 0; - $CPAN::Config->{inactivity_timeout} = - prompt("Timeout for inactivity during {Makefile,Build}.PL?",$default); + if ($CPAN::Config->{ftp_proxy} || + $CPAN::Config->{http_proxy}) { - # Proxies + $default = $CPAN::Config->{proxy_user} || $CPAN::LWP::UserAgent::USER || ""; - $CPAN::Frontend->myprint($prompts{proxy_intro}) - if !$matcher or 'proxy_intro' =~ /$matcher/; + $CPAN::Frontend->myprint($prompts{proxy_user}); - for (qw/ftp_proxy http_proxy no_proxy/) { - next if $matcher and $_ =~ /$matcher/; + if ($CPAN::Config->{proxy_user} = prompt("Your proxy user id?",$default)) { + $CPAN::Frontend->myprint($prompts{proxy_pass}); - $default = $CPAN::Config->{$_} || $ENV{$_}; - $CPAN::Config->{$_} = prompt("Your $_?",$default); + if ($CPAN::META->has_inst("Term::ReadKey")) { + Term::ReadKey::ReadMode("noecho"); + } else { + $CPAN::Frontend->myprint($prompts{password_warn}); + } + $CPAN::Config->{proxy_pass} = prompt_no_strip("Your proxy password?"); + if ($CPAN::META->has_inst("Term::ReadKey")) { + Term::ReadKey::ReadMode("restore"); + } + $CPAN::Frontend->myprint("\n\n"); + } + } } - if ($CPAN::Config->{ftp_proxy} || - $CPAN::Config->{http_proxy}) { + # + #= how FTP works + # - $default = $CPAN::Config->{proxy_user} || $CPAN::LWP::UserAgent::USER; + my_yn_prompt(ftp_passive => 1, $matcher); - $CPAN::Frontend->myprint($prompts{proxy_user}); + # + #= how cwd works + # - if ($CPAN::Config->{proxy_user} = prompt("Your proxy user id?",$default)) { - $CPAN::Frontend->myprint($prompts{proxy_pass}); + if (!$matcher or 'getcwd' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{getcwd_intro}); - if ($CPAN::META->has_inst("Term::ReadKey")) { - Term::ReadKey::ReadMode("noecho"); - } else { - $CPAN::Frontend->myprint($prompts{password_warn}); - } - $CPAN::Config->{proxy_pass} = prompt_no_strip("Your proxy password?"); - if ($CPAN::META->has_inst("Term::ReadKey")) { - Term::ReadKey::ReadMode("restore"); + my_prompt_loop(getcwd => 'cwd', $matcher, + 'cwd|getcwd|fastcwd|backtickcwd'); + } + + # + #= the CPAN shell itself + # + + my_yn_prompt(commandnumber_in_prompt => 1, $matcher); + my_yn_prompt(term_ornaments => 1, $matcher); + if ("colorize_output colorize_print colorize_warn" =~ $matcher) { + my_yn_prompt(colorize_output => 0, $matcher); + if ($CPAN::Config->{colorize_output}) { + for my $tuple ( + ["colorize_print", "bold blue"], + ["colorize_warn", "bold red"], + ) { + my_dflt_prompt($tuple->[0] => $tuple->[1], $matcher); + if ($CPAN::META->has_inst("Term::ANSIColor")) { + eval { Term::ANSIColor::color($CPAN::Config->{$tuple->[0]})}; + if ($@) { + $CPAN::Config->{$tuple->[0]} = $tuple->[1]; + $CPAN::Frontend->mywarn($@."setting to default '$tuple->[1]'\n"); + } + } } - $CPAN::Frontend->myprint("\n\n"); } } # - # MIRRORED.BY + #== term_is_latin + # + + if (!$matcher or 'term_is_latin' =~ /$matcher/){ + $CPAN::Frontend->myprint($prompts{term_is_latin}); + my_yn_prompt(term_is_latin => 1, $matcher); + } + + # + #== save history in file 'histfile' + # + + if (!$matcher or 'histfile histsize' =~ /$matcher/) { + $CPAN::Frontend->myprint($prompts{histfile_intro}); + defined($default = $CPAN::Config->{histfile}) or + $default = File::Spec->catfile($CPAN::Config->{cpan_home},"histfile"); + $ans = prompt("File to save your history?", $default); + $CPAN::Config->{histfile} = $ans; + + if ($CPAN::Config->{histfile}) { + defined($default = $CPAN::Config->{histsize}) or $default = 100; + $ans = prompt("Number of lines to save?", $default); + $CPAN::Config->{histsize} = $ans; + } + } + + # + #== do an ls on the m or the d command + # + if (!$matcher or 'show_upload_date' =~ /$matcher/) { + $CPAN::Frontend->myprint($prompts{show_upload_date_intro}); + + defined($default = $CPAN::Config->{show_upload_date}) or + $default = 'n'; + $ans = prompt("Always try to show upload date with 'd' and 'm' command (yes/no)?", + ($default ? 'yes' : 'no')); + $CPAN::Config->{show_upload_date} = ($ans =~ /^[y1]/i ? 1 : 0); + } + + # + #= MIRRORED.BY and conf_sites() # - conf_sites() unless $fastread; + if ($matcher){ + if ("urllist" =~ $matcher) { + # conf_sites would go into endless loop with the smash prompt + local *_real_prompt; + *_real_prompt = \&CPAN::Shell::colorable_makemaker_prompt; + conf_sites(); + } + } elsif ($fastread) { + $CPAN::Frontend->myprint("Autoconfigured everything but 'urllist'.\n". + "Please call 'o conf init urllist' to configure ". + "your CPAN server(s) now!"); + } else { + conf_sites(); + } - # We don't ask these now, the defaults are very likely OK. + # We don't ask this one now, it's plain silly and maybe is not + # even used correctly everywhere. $CPAN::Config->{inhibit_startup_message} = 0; - $CPAN::Config->{getcwd} = 'cwd'; - $CPAN::Config->{ftp_passive} = 1; - $CPAN::Config->{term_ornaments} = 1; $CPAN::Frontend->myprint("\n\n"); - CPAN::HandleConfig->commit($configpm); + if ($matcher) { + $CPAN::Frontend->myprint("Please remember to call 'o conf commit' to ". + "make the config permanent!\n\n"); + } else { + CPAN::HandleConfig->commit($configpm); + } } sub my_dflt_prompt { @@ -440,6 +558,23 @@ sub my_dflt_prompt { } } +sub my_yn_prompt { + my ($item, $dflt, $m) = @_; + my $default; + defined($default = $CPAN::Config->{$item}) or $default = $dflt; + + $DB::single = 1; + if (!$m || $item =~ /$m/) { + if (my $intro = $prompts{$item . "_intro"}) { + $CPAN::Frontend->myprint($intro); + } + my $ans = prompt($prompts{$item}, $default ? 'yes' : 'no'); + $CPAN::Config->{$item} = ($ans =~ /^[y1]/i ? 1 : 0); + } else { + $CPAN::Config->{$item} = $default; + } +} + sub my_prompt_loop { my ($item, $dflt, $m, $ok) = @_; my $default = $CPAN::Config->{$item} || $dflt; @@ -481,25 +616,28 @@ Shall I use the local database in $mby?}; } while ($mby) { if ($overwrite_local) { - print qq{Trying to overwrite $mby\n}; + $CPAN::Frontend->myprint(qq{Trying to overwrite $mby\n}); $mby = CPAN::FTP->localize($m,$mby,3); $overwrite_local = 0; } elsif ( ! -f $mby ){ - print qq{You have no $mby\n I\'m trying to fetch one\n}; + $CPAN::Frontend->myprint(qq{You have no $mby\n I\'m trying to fetch one\n}); $mby = CPAN::FTP->localize($m,$mby,3); } elsif (-M $mby > 60 && $loopcount == 0) { - print qq{Your $mby is older than 60 days,\n I\'m trying to fetch one\n}; - $mby = CPAN::FTP->localize($m,$mby,3); - $loopcount++; + $CPAN::Frontend->myprint(qq{Your $mby is older than 60 days,\n I\'m trying }. + qq{to fetch one\n}); + $mby = CPAN::FTP->localize($m,$mby,3); + $loopcount++; } elsif (-s $mby == 0) { - print qq{You have an empty $mby,\n I\'m trying to fetch one\n}; + $CPAN::Frontend->myprint(qq{You have an empty $mby,\n I\'m trying to fetch one\n}); $mby = CPAN::FTP->localize($m,$mby,3); } else { last; } } + local $urllist = []; read_mirrored_by($mby); bring_your_own(); + $CPAN::Config->{urllist} = $urllist; } sub find_exe { @@ -516,34 +654,45 @@ sub find_exe { sub picklist { my($items,$prompt,$default,$require_nonempty,$empty_warning)=@_; + CPAN->debug("picklist('$items','$prompt','$default','$require_nonempty',". + "'$empty_warning')") if $CPAN::DEBUG; $default ||= ''; my $pos = 0; my @nums; - while (1) { + SELECTION: while (1) { # display, at most, 15 items at a time my $limit = $#{ $items } - $pos; $limit = 15 if $limit > 15; # show the next $limit items, get the new position - $pos = display_some($items, $limit, $pos); + $pos = display_some($items, $limit, $pos, $default); $pos = 0 if $pos >= @$items; my $num = prompt($prompt,$default); @nums = split (' ', $num); + { + my %seen; + @nums = grep { !$seen{$_}++ } @nums; + } my $i = scalar @$items; - (warn "invalid items entered, try again\n"), next - if grep (/\D/ || $_ < 1 || $_ > $i, @nums); - if ($require_nonempty) { - (warn "$empty_warning\n"); + if (grep (/\D/ || $_ < 1 || $_ > $i, @nums)){ + $CPAN::Frontend->mywarn("invalid items entered, try again\n"); + if ("@nums" =~ /\D/) { + $CPAN::Frontend->mywarn("(we are expecting at least one number between 1 and $i)\n"); + } + next SELECTION; + } + if ($require_nonempty && !@nums) { + $CPAN::Frontend->mywarn("$empty_warning\n"); } - print "\n"; + $CPAN::Frontend->myprint("\n"); # a blank line continues... - next unless @nums; + next SELECTION unless @nums; last; } for (@nums) { $_-- } @@ -551,18 +700,20 @@ sub picklist { } sub display_some { - my ($items, $limit, $pos) = @_; - $pos ||= 0; + my ($items, $limit, $pos, $default) = @_; + $pos ||= 0; - my @displayable = @$items[$pos .. ($pos + $limit)]; + my @displayable = @$items[$pos .. ($pos + $limit)]; for my $item (@displayable) { - printf "(%d) %s\n", ++$pos, $item; + $CPAN::Frontend->myprint(sprintf "(%d) %s\n", ++$pos, $item); } - printf("%d more items, hit SPACE RETURN to show them\n", - (@$items - $pos) - ) - if $pos < @$items; - return $pos; + my $hit_what = $default ? "SPACE RETURN" : "RETURN"; + $CPAN::Frontend->myprint(sprintf("%d more items, hit %s to show them\n", + (@$items - $pos), + $hit_what, + )) + if $pos < @$items; + return $pos; } sub read_mirrored_by { @@ -588,20 +739,22 @@ sub read_mirrored_by { } $fh->close; $CPAN::Config->{urllist} ||= []; - my(@previous_urls); - if (@previous_urls = @{$CPAN::Config->{urllist}}) { - $CPAN::Config->{urllist} = []; - } + my @previous_urls = @{$CPAN::Config->{urllist}}; - print $prompts{urls_intro}; + $CPAN::Frontend->myprint($prompts{urls_intro}); my (@cont, $cont, %cont, @countries, @urls, %seen); - my $no_previous_warn = - "Sorry! since you don't have any existing picks, you must make a\n" . - "geographic selection."; - @cont = picklist([sort keys %all], + my $no_previous_warn = + "Sorry! since you don't have any existing picks, you must make a\n" . + "geographic selection."; + my $offer_cont = [sort keys %all]; + if (@previous_urls) { + push @$offer_cont, "(edit previous picks)"; + $default = @$offer_cont; + } + @cont = picklist($offer_cont, "Select your continent (or several nearby continents)", - '', + $default, ! @previous_urls, $no_previous_warn); @@ -612,21 +765,26 @@ sub read_mirrored_by { @c = map ("$_ ($cont)", @c) if @cont > 1; push (@countries, @c); } + if (@previous_urls && @countries) { + push @countries, "(edit previous picks)"; + $default = @countries; + } if (@countries) { @countries = picklist (\@countries, "Select your country (or several nearby countries)", - '', + $default, ! @previous_urls, $no_previous_warn); %seen = map (($_ => 1), @previous_urls); # hmmm, should take list of defaults from CPAN::Config->{'urllist'}... foreach $country (@countries) { + next if $country =~ /edit previous picks/; (my $bare_country = $country) =~ s/ \(.*\)//; my @u = sort keys %{$all{$cont{$bare_country}}{$bare_country}}; @u = grep (! $seen{$_}, @u); @u = map ("$_ ($bare_country)", @u) - if @countries > 1; + if @countries > 1; push (@urls, @u); } } @@ -634,18 +792,18 @@ sub read_mirrored_by { my $prompt = "Select as many URLs as you like (by number), put them on one line, separated by blanks, e.g. '1 4 5'"; if (@previous_urls) { - $default = join (' ', ((scalar @urls) - (scalar @previous_urls) + 1) .. - (scalar @urls)); - $prompt .= "\n(or just hit RETURN to keep your previous picks)"; + $default = join (' ', ((scalar @urls) - (scalar @previous_urls) + 1) .. + (scalar @urls)); + $prompt .= "\n(or just hit RETURN to keep your previous picks)"; } @urls = picklist (\@urls, $prompt, $default); foreach (@urls) { s/ \(.*\)//; } - push @{$CPAN::Config->{urllist}}, @urls; + push @$urllist, @urls; } sub bring_your_own { - my %seen = map (($_ => 1), @{$CPAN::Config->{urllist}}); + my %seen = map (($_ => 1), @$urllist); my($ans,@urls); do { my $prompt = "Enter another URL or RETURN to quit:"; @@ -662,21 +820,24 @@ Please enter your CPAN site:}; if ($ans =~ /^\w+:\/./) { push @urls, $ans unless $seen{$ans}++; } else { - printf(qq{"%s" doesn\'t look like an URL at first sight. + $CPAN::Frontend-> + myprint(sprintf(qq{"%s" doesn\'t look like an URL at first sight. I\'ll ignore it for now. You can add it to your %s later if you\'re sure it\'s right.\n}, - $ans, - $INC{'CPAN/MyConfig.pm'} || $INC{'CPAN/Config.pm'} || "configuration file", - ); + $ans, + $INC{'CPAN/MyConfig.pm'} + || $INC{'CPAN/Config.pm'} + || "configuration file", + )); } } } while $ans || !%seen; - push @{$CPAN::Config->{urllist}}, @urls; + push @$urllist, @urls; # xxx delete or comment these out when you're happy that it works - print "New set of picks:\n"; - map { print " $_\n" } @{$CPAN::Config->{urllist}}; + $CPAN::Frontend->myprint("New set of picks:\n"); + map { $CPAN::Frontend->myprint(" $_\n") } @$urllist; } @@ -685,7 +846,6 @@ sub _strip_spaces { $_[0] =~ s/\s+\z//; # no trailing spaces } - sub prompt ($;$) { my $ans = _real_prompt(@_); @@ -707,14 +867,17 @@ my @prompts = ( manual_config => qq[ CPAN is the world-wide archive of perl resources. It consists of about -300 sites that all replicate the same contents around the globe. -Many countries have at least one CPAN site already. The resources -found on CPAN are easily accessible with the CPAN.pm module. If you -want to use CPAN.pm, you have to configure it properly. - -If you do NOT want to enter a dialog now, you can answer 'no' to this -question and I'll try to autoconfigure. (Note: you can revisit this -dialog anytime later by typing 'o conf init' at the cpan prompt.) +300 sites that all replicate the same contents around the globe. Many +countries have at least one CPAN site already. The resources found on +CPAN are easily accessible with the CPAN.pm module. If you want to use +CPAN.pm, lots of things have to be configured. Fortunately, most of +them can be determined automatically. If you prefer the automatic +configuration, answer 'yes' below. + +If you prefer to enter a dialog instead, you can answer 'no' to this +question and I'll let you configure in small steps one thing after the +other. (Note: you can revisit this dialog anytime later by typing 'o +conf init' at the cpan prompt.) ], @@ -737,13 +900,9 @@ First of all, I\'d like to create this directory. Where? keep_source_where => qq{ -If you like, I can cache the source files after I build them. Doing -so means that, if you ever rebuild that module in the future, the -files will be taken from the cache. The tradeoff is that it takes up -space. How much space would you like to allocate to this cache? (If -you don\'t want me to keep a cache, answer 0.) - -}, +Unless you are accessing the CPAN via the filesystem directly CPAN.pm +needs to keep the source files it downloads somewhere. Please supply a +directory where the downloaded files are to be kept.}, build_cache_intro => qq{ @@ -755,6 +914,9 @@ with all the intermediate files\? build_cache => "Cache size for build directory (in MB)?", +build_dir => + +"Directory where the build process takes place?", scan_cache_intro => qq{ @@ -766,7 +928,7 @@ performed to keep the cache size in sync. To prevent this, answer scan_cache => "Perform cache scanning (atstart or never)?", -cache_metadata => qq{ +cache_metadata_intro => qq{ To considerably speed up the initial CPAN shell startup, it is possible to use Storable to create a cache of metadata. If Storable @@ -774,7 +936,9 @@ is not available, the normal index mechanism will be used. }, -term_is_latin => qq{ +cache_metadata => qq{Cache metadata (yes/no)?}, + +term_is_latin_intro => qq{ The next option deals with the charset (aka character set) your terminal supports. In general, CPAN is English speaking territory, so @@ -788,6 +952,8 @@ anyway. If you answer no, names will be output in UTF-8. }, +term_is_latin => qq{Your terminal expects ISO-8859-1 (yes/no)?}, + histfile_intro => qq{ If you have one of the readline packages (Term::ReadLine::Perl, @@ -852,13 +1018,35 @@ check_sigs => qq{Always try to check and verify signatures if a SIGNATURE file is in the package and Module::Signature is installed (yes/no)?}, +test_report_intro => +qq{ + +The goal of the CPAN Testers project (http://testers.cpan.org/) is to +test as many CPAN packages as possible on as many platforms as +possible. This provides valuable feedback to module authors and +potential users to identify bugs or platform compatibility issues and +improves the overall quality and value of CPAN. + +One way you can contribute is to send test results for each module +that you install. If you install the CPAN::Reporter module, you have +the option to automatically generate and email test reports to CPAN +Testers whenever you run tests on a CPAN package. + +See the CPAN::Reporter documentation for additional details and +configuration settings. If your firewall blocks outgoing email, +you will need to configure CPAN::Reporter before sending reports. + +}, + +test_report => +qq{Email test reports if CPAN::Reporter is installed (yes/no)?}, + external_progs => qq{ The CPAN module will need a few external programs to work properly. Please correct me, if I guess the wrong path for a program. Don\'t panic if you do not have some of them, just press ENTER for those. To -disable the use of a download program, you can type a space followed -by ENTER. +disable the use of a program, you can type a space followed by ENTER. }, @@ -867,7 +1055,7 @@ prefer_installer_intro => qq{ When you have Module::Build installed and a module comes with both a Makefile.PL and a Build.PL, which shall have precedence? The two installer modules we have are the old and well established -ExtUtils::MakeMaker (for short: EUMM) understands the Makefile.PL and +ExtUtils::MakeMaker (for short: EUMM) which uses the Makefile.PL and the next generation installer Module::Build (MB) works with the Build.PL. @@ -971,9 +1159,10 @@ Your choice: }, inactivity_timeout_intro => qq{ Sometimes you may wish to leave the processes run by CPAN alone -without caring about them. Because the Makefile.PL sometimes contains -question you\'re expected to answer, you can set a timer that will -kill a 'perl Makefile.PL' process after the specified time in seconds. +without caring about them. Because the Makefile.PL or the Build.PL +sometimes contains question you\'re expected to answer, you can set a +timer that will kill a 'perl Makefile.PL' process after the specified +time in seconds. If you set this value to 0, these processes will wait forever. This is the default and recommended setting. @@ -1016,13 +1205,13 @@ a few sites onto the array (just in case the first on the array won\'t work). If you are mirroring CPAN to your local workstation, specify a file: URL. -First, pick a nearby continent and country (you can pick several of -each, separated by spaces, or none if you just want to keep your -existing selections). Then, you will be presented with a list of URLs -of CPAN mirrors in the countries you selected, along with previously -selected URLs. Select some of those URLs, or just keep the old list. -Finally, you will be prompted for any extra URLs -- file:, ftp:, or -http: -- that host a CPAN mirror. +First, pick a nearby continent and country by typing in the number(s) +in front of the item(s) you want to select. You can pick several of +each, separated by spaces. Then, you will be presented with a list of +URLs of CPAN mirrors in the countries you selected, along with +previously selected URLs. Select some of those URLs, or just keep the +old list. Finally, you will be prompted for any extra URLs -- file:, +ftp:, or http: -- that host a CPAN mirror. }, @@ -1033,6 +1222,65 @@ be echoed to the terminal! }, +commandnumber_in_prompt => qq{ + +The prompt of the cpan shell can contain the current command number +for easier tracking of the session or be a plain string. Do you want +the command number in the prompt (yes/no)?}, + +ftp_passive => qq{ + +Shall we always set FTP_PASSIVE envariable when dealing with ftp +download (yes/no)?}, + +# taken from the manpage: +getcwd_intro => qq{ + +CPAN.pm changes the current working directory often and needs to +determine its own current working directory. Per default it uses +Cwd::cwd but if this doesn't work on your system for some reason, +alternatives can be configured according to the following table: + + cwd Cwd::cwd + getcwd Cwd::getcwd + fastcwd Cwd::fastcwd + backtickcwd external command cwd + +}, + +getcwd => qq{Preferred method for determining the current working directory?}, + +index_expire_intro => qq{ + +The CPAN indexes are usually rebuilt once or twice per hour, but the +typical CPAN mirror mirrors only once or twice per day. Depending on +the quality of your mirror and your desire to be on the bleeding edge, +you may want to set the following value to more or less than one day +(which is the default). It determines after how many days CPAN.pm +downloads new indexes. + +}, + +index_expire => qq{Let the index expire after how many days?}, + +term_ornaments => qq{ + +When using Term::ReadLine, you can turn ornaments on so that your +input stands out against the output from CPAN.pm. Do you want to turn +ornaments on?}, + +colorize_output => qq{ + +When you have Term::ANSIColor installed, you can turn on colorized +output to have some visual differences between normal CPAN.pm output, +warnings, and the output of the modules being installed. Set your +favorite colors after some experimenting with the Term::ANSIColor +module. Do you want to turn on colored output?}, + +colorize_print => qq{Color for normal output?}, + +colorize_warn => qq{Color for warnings?}, + ); die "Coding error in \@prompts declaration. Odd number of elements, above" @@ -1041,17 +1289,13 @@ die "Coding error in \@prompts declaration. Odd number of elements, above" %prompts = @prompts; if (scalar(keys %prompts) != scalar(@prompts)/2) { - my %already; - for my $item (0..$#prompts) { next if $item % 2; - die "$prompts[$item] is duplicated\n" - if $already{$prompts[$item]}++; + die "$prompts[$item] is duplicated\n" if $already{$prompts[$item]}++; } - } -} +} # EOBEGIN 1; diff --git a/lib/CPAN/HandleConfig.pm b/lib/CPAN/HandleConfig.pm index 588b15bbc0..5b3c296757 100644 --- a/lib/CPAN/HandleConfig.pm +++ b/lib/CPAN/HandleConfig.pm @@ -2,7 +2,7 @@ package CPAN::HandleConfig; use strict; use vars qw(%can %keys $VERSION); -$VERSION = sprintf "%.6f", substr(q$Rev: 740 $,4)/1000000 + 5.4; +$VERSION = sprintf "%.6f", substr(q$Rev: 809 $,4)/1000000 + 5.4; %can = ( commit => "Commit changes to disk", @@ -18,6 +18,9 @@ $VERSION = sprintf "%.6f", substr(q$Rev: 740 $,4)/1000000 + 5.4; "bzip2", "cache_metadata", "check_sigs", + "colorize_output", + "colorize_print", + "colorize_warn", "commandnumber_in_prompt", "cpan_home", "curl", @@ -53,12 +56,15 @@ $VERSION = sprintf "%.6f", substr(q$Rev: 740 $,4)/1000000 + 5.4; "password", "prefer_installer", "prerequisites_policy", + "proxy_pass", + "proxy_user", "scan_cache", "shell", "show_upload_date", "tar", "term_is_latin", "term_ornaments", + "test_report", "unzip", "urllist", "username", @@ -89,7 +95,7 @@ sub edit { $o = shift @args; $DB::single = 1; if($can{$o}) { - $self->$o(args => \@args); + $self->$o(args => \@args); # o conf init => sub init => sub load return 1; } else { CPAN->debug("o[$o]") if $CPAN::DEBUG; @@ -141,6 +147,7 @@ sub edit { } else { $CPAN::Config->{$o} = $args[0] if defined $args[0]; $self->prettyprint($o); + return 1; } } } @@ -445,17 +452,18 @@ sub load { } local($") = ", "; - $CPAN::Frontend->myprint(<<END) if $redo && ! $theycalled; + if ($redo && ! $theycalled){ + $CPAN::Frontend->myprint(<<END); Sorry, we have to rerun the configuration dialog for CPAN.pm due to the following indispensable but missing parameters: @miss END + $args{args} = ["\\b".join("|",@miss)."\\b"]; + } $CPAN::Frontend->myprint(qq{ $configpm initialized. }); - - sleep 2; CPAN::FirstTime::init($configpm, %args); } @@ -521,13 +529,25 @@ sub cpl { if ( defined($words[2]) and + $words[2] =~ /list$/ + and ( - $words[2] =~ /list$/ && @words == 3 + @words == 3 || - $words[2] =~ /list$/ && @words == 4 && length($word) + @words == 4 && length($word) ) ) { return grep /^\Q$word\E/, qw(splice shift unshift pop push); + } elsif (defined($words[2]) + and + $words[2] eq "init" + and + ( + @words == 3 + || + @words == 4 && length($word) + )) { + return sort grep /^\Q$word\E/, keys %keys; } elsif (@words >= 4) { return (); } @@ -552,7 +572,7 @@ package use strict; use vars qw($AUTOLOAD $VERSION); -$VERSION = sprintf "%.2f", substr(q$Rev: 740 $,4)/100; +$VERSION = sprintf "%.2f", substr(q$Rev: 809 $,4)/100; # formerly CPAN::HandleConfig was known as CPAN::Config sub AUTOLOAD { |