X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCPAN%2FFirstTime.pm;h=35043d7b3029d32971866e8804f38a5a1f2f7b19;hb=ac49b0251b62a2ed1e5f0e17d1c256ce3f88d6dd;hp=dd1a89fc73e777a6688ec0e77baaf9fd3eaf03e6;hpb=ec385757ddd27dbd1bbd254e8b322dae1caa6318;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm index dd1a89f..35043d7 100644 --- a/lib/CPAN/FirstTime.pm +++ b/lib/CPAN/FirstTime.pm @@ -12,12 +12,13 @@ sub url { shift->[2] } package CPAN::FirstTime; use strict; -use ExtUtils::MakeMaker qw(prompt); +use ExtUtils::MakeMaker (); use FileHandle (); use File::Basename (); use File::Path (); +use File::Spec; use vars qw($VERSION); -$VERSION = substr q$Revision: 1.53 $, 10; +$VERSION = substr q$Revision: 1.60_01 $, 10; =head1 NAME @@ -47,7 +48,7 @@ sub init { local($\) = ""; local($|) = 1; - my($ans,$default,$local,$cont,$url,$expected_size); + my($ans,$default); # # Files, directories @@ -67,23 +68,22 @@ dialog anytime later by typing 'o conf init' at the cpan prompt.) ]; - my $manual_conf = - ExtUtils::MakeMaker::prompt("Are you ready for manual configuration?", - "yes"); + my $manual_conf = prompt("Are you ready for manual configuration?", "yes"); my $fastread; { - local $^W; - if ($manual_conf =~ /^\s*y/i) { + if ($manual_conf =~ /^y/i) { $fastread = 0; - *prompt = \&ExtUtils::MakeMaker::prompt; } else { $fastread = 1; $CPAN::Config->{urllist} ||= []; + + local $^W = 0; # prototype should match that of &MakeMaker::prompt - *prompt = sub ($;$) { + *_real_prompt = sub ($;$) { my($q,$a) = @_; my($ret) = defined $a ? $a : ""; printf qq{%s [%s]\n\n}, $q, $ret; + $ret; }; } @@ -97,7 +97,7 @@ This may be a site-wide directory or a personal directory. }; - my $cpan_home = $CPAN::Config->{cpan_home} || MM->catdir($ENV{HOME}, ".cpan"); + my $cpan_home = $CPAN::Config->{cpan_home} || File::Spec->catdir($ENV{HOME}, ".cpan"); if (-d $cpan_home) { print qq{ @@ -116,6 +116,14 @@ First of all, I\'d like to create this directory. 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. @@ -140,8 +148,8 @@ next question. }; - $CPAN::Config->{keep_source_where} = MM->catdir($CPAN::Config->{cpan_home},"sources"); - $CPAN::Config->{build_dir} = MM->catdir($CPAN::Config->{cpan_home},"build"); + $CPAN::Config->{keep_source_where} = File::Spec->catdir($CPAN::Config->{cpan_home},"sources"); + $CPAN::Config->{build_dir} = File::Spec->catdir($CPAN::Config->{cpan_home},"build"); # # Cache size, Index expire @@ -189,8 +197,8 @@ is not available, the normal index mechanism will be used. defined($default = $CPAN::Config->{cache_metadata}) or $default = 1; do { $ans = prompt("Cache metadata (yes/no)?", ($default ? 'yes' : 'no')); - } while ($ans !~ /^\s*[yn]/i); - $CPAN::Config->{cache_metadata} = ($ans =~ /^\s*y/i ? 1 : 0); + } while ($ans !~ /^[yn]/i); + $CPAN::Config->{cache_metadata} = ($ans =~ /^y/i ? 1 : 0); # # term_is_latin @@ -213,8 +221,32 @@ will be output in UTF-8. do { $ans = prompt("Your terminal expects ISO-8859-1 (yes/no)?", ($default ? 'yes' : 'no')); - } while ($ans !~ /^\s*[yn]/i); - $CPAN::Config->{term_is_latin} = ($ans =~ /^\s*y/i ? 1 : 0); + } while ($ans !~ /^[yn]/i); + $CPAN::Config->{term_is_latin} = ($ans =~ /^y/i ? 1 : 0); + + # + # save history in file histfile + # + print qq{ + +If you have one of the readline packages (Term::ReadLine::Perl, +Term::ReadLine::Gnu, possibly others) installed, the interactive CPAN +shell will have history support. The next two questions deal with the +filename of the history file and with its size. If you do not want to +set this variable, please hit SPACE RETURN to the following question. + +}; + + 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; + } # # prerequisites_policy @@ -257,7 +289,10 @@ by ENTER. my(@path) = split /$Config{'path_sep'}/, $ENV{'PATH'}; local $^W = $old_warn; my $progname; - for $progname (qw/gzip tar unzip make lynx wget ncftpget ncftp ftp/){ + for $progname (qw/gzip tar unzip make + curl lynx wget ncftpget ncftp ftp + gpg/) + { if ($^O eq 'MacOS') { $CPAN::Config->{$progname} = 'not_here'; next; @@ -268,7 +303,7 @@ by ENTER. my $path = $CPAN::Config->{$progname} || $Config::Config{$progname} || ""; - if (MM->file_name_is_absolute($path)) { + if (File::Spec->file_name_is_absolute($path)) { # testing existence is not good enough, some have these exe # extensions @@ -295,7 +330,7 @@ by ENTER. $ans = prompt("What is your favorite pager program?",$path); $CPAN::Config->{'pager'} = $ans; $path = $CPAN::Config->{'shell'}; - if (MM->file_name_is_absolute($path)) { + if (File::Spec->file_name_is_absolute($path)) { warn "Warning: configured $path does not exist\n" unless -e $path; $path = ""; } @@ -328,8 +363,7 @@ If you don\'t understand this question, just press ENTER. prompt("Parameters for the 'perl Makefile.PL' command? Typical frequently used settings: - POLLUTE=1 increasing backwards compatibility - LIB=~/perl non-root users (please see manual for more hints) + PREFIX=~/perl non-root users (please see manual for more hints) Your choice: ",$default); $default = $CPAN::Config->{make_arg} || ""; @@ -414,7 +448,7 @@ be echoed to the terminal! }; } - $CPAN::Config->{proxy_pass} = prompt("Your proxy password?"); + $CPAN::Config->{proxy_pass} = prompt_no_strip("Your proxy password?"); if ($CPAN::META->has_inst("Term::ReadKey")) { Term::ReadKey::ReadMode("restore"); } @@ -428,19 +462,6 @@ be echoed to the terminal! conf_sites() unless $fastread; - unless (@{$CPAN::Config->{'wait_list'}||[]}) { - print qq{ - -WAIT support is available as a Plugin. You need the CPAN::WAIT module -to actually use it. But we need to know your favorite WAIT server. If -you don\'t know a WAIT server near you, just press ENTER. - -}; - $default = "wait://ls6.informatik.uni-dortmund.de:1404"; - $ans = prompt("Your favorite WAIT server?\n ",$default); - push @{$CPAN::Config->{'wait_list'}}, $ans; - } - # We don't ask that now, it will be noticed in time, won't it? $CPAN::Config->{'inhibit_startup_message'} = 0; $CPAN::Config->{'getcwd'} = 'cwd'; @@ -451,7 +472,7 @@ you don\'t know a WAIT server near you, just press ENTER. sub conf_sites { my $m = 'MIRRORED.BY'; - my $mby = MM->catfile($CPAN::Config->{keep_source_where},$m); + my $mby = File::Spec->catfile($CPAN::Config->{keep_source_where},$m); File::Path::mkpath(File::Basename::dirname($mby)); if (-f $mby && -f $m && -M $m < -M $mby) { require File::Copy; @@ -507,7 +528,7 @@ sub find_exe { my($dir); #warn "in find_exe exe[$exe] path[@$path]"; for $dir (@$path) { - my $abs = MM->catfile($dir,$exe); + my $abs = File::Spec->catfile($dir,$exe); if (($abs = MM->maybe_command($abs))) { return $abs; } @@ -518,33 +539,33 @@ sub picklist { my($items,$prompt,$default,$require_nonempty,$empty_warning)=@_; $default ||= ''; - my $pos = 0; + my $pos = 0; my @nums; 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 = 0 if $pos >= @$items; - - my $num = prompt($prompt,$default); - - @nums = split (' ', $num); - 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"); - } - print "\n"; - - # a blank line continues... - next unless @nums; - last; + # 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 = 0 if $pos >= @$items; + + my $num = prompt($prompt,$default); + + @nums = split (' ', $num); + 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"); + } + print "\n"; + + # a blank line continues... + next unless @nums; + last; } for (@nums) { $_-- } @{$items}[@nums]; @@ -558,7 +579,10 @@ sub display_some { for my $item (@displayable) { printf "(%d) %s\n", ++$pos, $item; } - printf "%d more items, hit ENTER\n", (@$items - $pos) if $pos < @$items; + printf("%d more items, hit SPACE RETURN to show them\n", + (@$items - $pos) + ) + if $pos < @$items; return $pos; } @@ -642,8 +666,8 @@ http: -- that host a CPAN mirror. } } push (@urls, map ("$_ (previous pick)", @previous_urls)); - my $prompt = "Select as many URLs as you like, -put them on one line, separated by blanks"; + 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)); @@ -690,4 +714,28 @@ later if you\'re sure it\'s right.\n}, map { print " $_\n" } @{$CPAN::Config->{urllist}}; } + +sub _strip_spaces { + $_[0] =~ s/^\s+//; # no leading spaces + $_[0] =~ s/\s+\z//; # no trailing spaces +} + + +sub prompt ($;$) { + my $ans = _real_prompt(@_); + + _strip_spaces($ans); + + return $ans; +} + + +sub prompt_no_strip ($;$) { + return _real_prompt(@_); +} + + +*_real_prompt = \*ExtUtils::MakeMaker::prompt; + + 1;