From 88c5c9718b7d6fb655f3f200b727d7d65a92c750 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Thu, 22 Dec 2011 14:25:54 +0000 Subject: [PATCH] Update Term-UI to CPAN version 0.30 [DELTA] Changes for 0.30 Wed Dec 21 23:30:39 GMT 2011 ===================================================== * Resolve PAUSE indexer problems Changes for 0.28 Wed Dec 21 22:26:05 GMT 2011 ===================================================== * Apply Debian patches [rt.cpan.org #73400] --- Porting/Maintainers.pl | 2 +- cpan/Term-UI/lib/Term/UI.pm | 114 ++++++++++++++++++------------------ cpan/Term-UI/lib/Term/UI/History.pm | 14 +++-- cpan/Term-UI/t/00_load.t | 2 +- cpan/Term-UI/t/01_history.t | 34 +++++------ cpan/Term-UI/t/02_ui.t | 18 +++--- pod/perldelta.pod | 4 ++ 7 files changed, 97 insertions(+), 91 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index d496029..ee3157f 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1689,7 +1689,7 @@ use File::Glob qw(:case); 'Term::UI' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/Term-UI-0.26.tar.gz', + 'DISTRIBUTION' => 'BINGOS/Term-UI-0.30.tar.gz', 'FILES' => q[cpan/Term-UI], 'UPSTREAM' => 'cpan', }, diff --git a/cpan/Term-UI/lib/Term/UI.pm b/cpan/Term-UI/lib/Term/UI.pm index ba7a304..34f13f8 100644 --- a/cpan/Term-UI/lib/Term/UI.pm +++ b/cpan/Term-UI/lib/Term/UI.pm @@ -11,7 +11,7 @@ use strict; BEGIN { use vars qw[$VERSION $AUTOREPLY $VERBOSE $INVALID]; $VERBOSE = 1; - $VERSION = '0.26'; + $VERSION = '0.30'; $INVALID = loc('Invalid selection, please try again: '); } @@ -35,7 +35,7 @@ Term::UI - Term::ReadLine UI made easy my $reply = $term->get_reply( prompt => 'What is your favourite colour?', choices => [qw|blue red green|], - default => blue, + default => 'blue', ); my $bool = $term->ask_yn( @@ -55,7 +55,7 @@ Term::UI - Term::ReadLine UI made easy ### always pick the default (good for non-interactive terms) ### -- default is '0' $Term::UI::AUTOREPLY = 1; - + ### Retrieve the entire session as a printable string: $hist = Term::UI::History->history_as_string; $hist = $term->history_as_string; @@ -73,12 +73,12 @@ For asking a yes or no question, there's even a shortcut. =head1 HOW IT WORKS -C places itself at the back of the C +C places itself at the back of the C C<@ISA> array, so you can call its functions through your term object. C uses C to record all interactions with the commandline. You can retrieve this history, or alter -the filehandle the interaction is printed to. See the +the filehandle the interaction is printed to. See the C manpage or the C for details. =head1 METHODS @@ -102,8 +102,8 @@ toggling the C flag. Note that a list of answers will then be returned to you, rather than a simple string. By specifying an C hander, you can yourself validate the answer -a user gives. This can be any of the types that the Params::Check C -function allows, so please refer to that manpage for details. +a user gives. This can be any of the types that the Params::Check C +function allows, so please refer to that manpage for details. Finally, you have the option of adding a C argument, which is simply printed before the prompt. It's printed to the same file handle @@ -135,7 +135,7 @@ sub get_reply { ### add this to the prompt to indicate the default ### answer to the question if there is one. my $prompt_add; - + ### if you supplied several choices to pick from, ### we'll print them separately before the prompt if( @{$args->{choices}} ) { @@ -144,7 +144,7 @@ sub get_reply { for my $choice ( @{$args->{choices}} ) { $i++; # the answer counter -- but humans start counting # at 1 :D - + ### so this choice is the default? add it to 'prompt_add' ### so we can construct a "foo? [DIGIT]" type prompt $prompt_add = $i if (defined $args->{default} and $choice eq $args->{default}); @@ -153,7 +153,7 @@ sub get_reply { $args->{print_me} .= sprintf "\n%3s> %-s", $i, $choice; } - ### we listed some choices -- add another newline for + ### we listed some choices -- add another newline for ### pretty printing $args->{print_me} .= "\n" if $i; @@ -169,14 +169,14 @@ sub get_reply { ### we set up the defaults, prompts etc, dispatch to the readline call return $term->_tt_readline( %$args, prompt_add => $prompt_add ); -} +} =head2 $bool = $term->ask_yn( prompt => "your question", [default => (y|1,n|0), print_me => "extra text to print & record"] ) Asks a simple C or C question to the user, returning a boolean indicating C or C to the caller. -The C answer will automatically returned, if the user hits +The C answer will automatically returned, if the user hits C or if C<$AUTOREPLY> is set to true. See the C section further below. @@ -199,7 +199,7 @@ sub ask_yn { default => { default => undef, allow => [qw|0 1 y n|], strict_type => 1 }, prompt => { default => '', required => 1, strict_type => 1 }, - print_me => { default => '', strict_type => 1 }, + print_me => { default => '', strict_type => 1 }, multi => { default => 0, no_override => 1 }, choices => { default => [qw|y n|], no_override => 1 }, allow => { default => [qr/^y(?:es)?$/i, qr/^n(?:o)?$/i], @@ -208,7 +208,7 @@ sub ask_yn { }; my $args = check( $tmpl, \%hash, $VERBOSE ) or return undef; - + ### uppercase the default choice, if there is one, to be added ### to the prompt in a 'foo? [Y/n]' type style. my $prompt_add; @@ -217,10 +217,10 @@ sub ask_yn { ### if you supplied the default as a boolean, rather than y/n ### transform it to a y/n now - $args->{default} = $args->{default} =~ /\d/ + $args->{default} = $args->{default} =~ /\d/ ? { 0 => 'n', 1 => 'y' }->{ $args->{default} } : $args->{default}; - + @list = map { lc $args->{default} eq lc $_ ? uc $args->{default} : $_ @@ -231,7 +231,7 @@ sub ask_yn { } my $rv = $term->_tt_readline( %$args, prompt_add => $prompt_add ); - + return $rv =~ /^y/i ? 1 : 0; } @@ -247,11 +247,11 @@ sub _tt_readline { my ($default, $prompt, $choices, $multi, $allow, $prompt_add, $print_me); my $tmpl = { - default => { default => undef, strict_type => 1, + default => { default => undef, strict_type => 1, store => \$default }, prompt => { default => '', strict_type => 1, required => 1, store => \$prompt }, - choices => { default => [], strict_type => 1, + choices => { default => [], strict_type => 1, store => \$choices }, multi => { default => 0, allow => [0, 1], store => \$multi }, allow => { default => qr/.*/, store => \$allow, }, @@ -265,7 +265,7 @@ sub _tt_readline { ### it can display wonky on some terminals. history( $print_me ) if $print_me; - + ### we might have to add a default value to the prompt, to ### show the user what will be picked by default: $prompt .= " [$prompt_add]: " if $prompt_add; @@ -273,16 +273,16 @@ sub _tt_readline { ### are we in autoreply mode? if ($AUTOREPLY) { - + ### you used autoreply, but didnt provide a default! - carp loc( + carp loc( q[You have '%1' set to true, but did not provide a default!], - '$AUTOREPLY' + '$AUTOREPLY' ) if( !defined $default && $VERBOSE); ### print it out for visual feedback history( join ' ', grep { defined } $prompt, $default ); - + ### and return the default return $default; } @@ -290,16 +290,16 @@ sub _tt_readline { ### so, no AUTOREPLY, let's see what the user will answer LOOP: { - + ### annoying bug in T::R::Perl that mucks up lines with a \n ### in them; So split by \n, save the last line as the prompt ### and just print the rest { my @lines = split "\n", $prompt; $prompt = pop @lines; - + history( "$_\n" ) for @lines; } - + ### pose the question my $answer = $term->readline($prompt); $answer = $default unless length $answer; @@ -315,12 +315,12 @@ sub _tt_readline { ### the return value list my @rv; - + if( @$choices ) { - + for my $answer (@answers) { - - ### a digit implies a multiple choice question, + + ### a digit implies a multiple choice question, ### a non-digit is an open answer if( $answer =~ /\D/ ) { push @rv, $answer if allow( $answer, $allow ); @@ -328,24 +328,24 @@ sub _tt_readline { ### remember, the answer digits are +1 compared to ### the choices, because humans want to start counting - ### at 1, not at 0 - push @rv, $choices->[ $answer - 1 ] + ### at 1, not at 0 + push @rv, $choices->[ $answer - 1 ] if $answer > 0 && defined $choices->[ $answer - 1]; - } + } } - + ### no fixed list of choices.. just check if the answers ### (or otherwise the default!) pass the allow handler - } else { + } else { push @rv, grep { allow( $_, $allow ) } - scalar @answers ? @answers : ($default); + scalar @answers ? @answers : ($default); } ### if not all the answers made it to the return value list, - ### at least one of them was an invalid answer -- make the + ### at least one of them was an invalid answer -- make the ### user do it again - if( (@rv != @answers) or - (scalar(@$choices) and not scalar(@answers)) + if( (@rv != @answers) or + (scalar(@$choices) and not scalar(@answers)) ) { $prompt = $INVALID; $prompt .= "[$prompt_add] " if $prompt_add; @@ -486,7 +486,7 @@ This defaults to C<*STDOUT>. which would look like: - Your favourite colour? + Your favourite colour? and C<$reply> would hold the text the user typed. @@ -502,8 +502,8 @@ which would look like: 1> red 2> green 3> blue - - Your favourite colour? + + Your favourite colour? C<$reply> will hold one of the choices presented. C will repose the question if the user attempts to enter an answer that's not in the @@ -523,8 +523,8 @@ which would look like: 1> red 2> green 3> blue - - Your favourite colour? [3]: + + Your favourite colour? [3]: Note the default answer after the prompt. A user can now just hit C (or set C<$Term::UI::AUTOREPLY> -- see the C section) and @@ -532,10 +532,10 @@ the sensible answer 'blue' will be returned. =head2 get_reply using print_me & multi - ### allow the user to pick more than one colour and add an + ### allow the user to pick more than one colour and add an ### introduction text @reply = $term->get_reply( - print_me => 'Tell us what colours you like', + print_me => 'Tell us what colours you like', prompt => 'Your favourite colours?', choices => [qw|red green blue|], multi => 1 ); @@ -546,15 +546,15 @@ which would look like: 1> red 2> green 3> blue - + Your favourite colours? An answer of C<3 2 1> would fill C<@reply> with C =head2 get_reply & allow - ### pose an open question, but do a custom verification on - ### the answer, which will only exit the question loop, if + ### pose an open question, but do a custom verification on + ### the answer, which will only exit the question loop, if ### the answer matches the allow handler. $reply = $term->get_reply( prompt => "What is the magic number?", @@ -571,18 +571,18 @@ C's C function. Check its manpage for details. ### and inform him first what cookies are. $bool = $term->ask_yn( prompt => 'Do you like cookies?', default => 'y', - print_me => 'Cookies are LOVELY!!!' ); + print_me => 'Cookies are LOVELY!!!' ); -would print: +would print: Cookies are LOVELY!!! - Do you like cookies? [Y/n]: + Do you like cookies? [Y/n]: -If a user then simply hits C, agreeing with the default, -C<$bool> would be set to C. (Simply hitting 'y' would also +If a user then simply hits C, agreeing with the default, +C<$bool> would be set to C. (Simply hitting 'y' would also return C. Hitting 'n' would return C) -We could later retrieve this interaction by printing out the Q&A +We could later retrieve this interaction by printing out the Q&A history as follows: print $term->history_as_string; @@ -614,7 +614,7 @@ This module by Jos Boumans Ekane@cpan.orgE. =head1 COPYRIGHT -This library is free software; you may redistribute and/or modify it +This library is free software; you may redistribute and/or modify it under the same terms as Perl itself. =cut diff --git a/cpan/Term-UI/lib/Term/UI/History.pm b/cpan/Term-UI/lib/Term/UI/History.pm index 1d77c01..6da99ed 100644 --- a/cpan/Term-UI/lib/Term/UI/History.pm +++ b/cpan/Term-UI/lib/Term/UI/History.pm @@ -8,7 +8,7 @@ use base 'Log::Message::Simple'; =head1 NAME -Term::UI::History +Term::UI::History - history function =head1 SYNOPSIS @@ -37,8 +37,8 @@ manpage for additional functionality available via this package. =head2 history("message string" [,VERBOSE]) -Records a message on the stack, and prints it to C -(or actually C<$HISTORY_FH>, see the C section +Records a message on the stack, and prints it to C +(or actually C<$HISTORY_FH>, see the C section below), if the C option is true. The C option defaults to true. @@ -55,7 +55,7 @@ BEGIN { for my $func ( @EXPORT ) { no strict 'refs'; - + *$func = sub { my $msg = shift; $log->store( message => $msg, @@ -74,8 +74,10 @@ BEGIN { } -{ package Log::Message::Handlers; - +{ + package # hide this from PAUSE + Log::Message::Handlers; + sub history { my $self = shift; my $verbose = shift; diff --git a/cpan/Term-UI/t/00_load.t b/cpan/Term-UI/t/00_load.t index aacd60f..affc3d0 100644 --- a/cpan/Term-UI/t/00_load.t +++ b/cpan/Term-UI/t/00_load.t @@ -1,7 +1,7 @@ use Test::More 'no_plan'; use strict; -BEGIN { +BEGIN { chdir 't' if -d 't'; use File::Spec; use lib File::Spec->catdir( qw[.. lib] ); diff --git a/cpan/Term-UI/t/01_history.t b/cpan/Term-UI/t/01_history.t index b0219de..23c7cc0 100644 --- a/cpan/Term-UI/t/01_history.t +++ b/cpan/Term-UI/t/01_history.t @@ -1,7 +1,7 @@ use Test::More 'no_plan'; use strict; -BEGIN { +BEGIN { chdir 't' if -d 't'; use File::Spec; use lib File::Spec->catdir( qw[.. lib] ); @@ -16,56 +16,56 @@ my $Verbose = 0; # print to STDOUT? for my $pkg ( $Class, __PACKAGE__ ) { can_ok( $pkg, $Func ); - } + } } ### test string recording -{ history( $$, $Verbose ); +{ history( $$, $Verbose ); my $str = $Class->history_as_string; ok( $str, "Message recorded" ); is( $str, $$, " With appropriate content" ); - + $Class->flush; ok( !$Class->history_as_string, " Stack flushed" ); } -### test filehandle printing -SKIP: { +### test filehandle printing +SKIP: { my $file = "$$.tmp"; - + { open my $fh, ">$file" or skip "Could not open $file: $!", 6; - + ### declare twice for 'used only once' warning local $Term::UI::History::HISTORY_FH = $fh; - local $Term::UI::History::HISTORY_FH = $fh; - + local $Term::UI::History::HISTORY_FH = $fh; + history( $$ ); close $fh; - } + } my $str = $Class->history_as_string; ok( $str, "Message recorded" ); is( $str, $$, " With appropriate content" ); - + ### check file contents { ok( -e $file, "File $file exists" ); ok( -s $file, " File has size" ); - + open my $fh, $file or skip "Could not open $file: $!", 2; my $cont = do { local $/; <$fh> }; chomp $cont; - + is( $cont, $str, " File has same content" ); - } + } $Class->flush; - + ### for VMS etc 1 while unlink $file; - + ok( ! -e $file, " File $file removed" ); } diff --git a/cpan/Term-UI/t/02_ui.t b/cpan/Term-UI/t/02_ui.t index 3a8a320..cf5d1d4 100644 --- a/cpan/Term-UI/t/02_ui.t +++ b/cpan/Term-UI/t/02_ui.t @@ -76,10 +76,10 @@ my $tmpl = { { my $args = { prompt => 'Uninit warning on empty default', }; - + my $warnings = ''; local $SIG{__WARN__} = sub { $warnings .= "@_" }; - + my $res = $term->get_reply( %$args ); ok( !$res, "Empty result on autoreply without default" ); @@ -88,17 +88,17 @@ my $tmpl = { " No warnings from Term::UI" ); } - + # used to print: Use of uninitialized value in string at Params/Check.pm # [#13412] { my $args = { prompt => 'Undef warning on failing allow', allow => sub { 0 }, }; - + my $warnings = ''; local $SIG{__WARN__} = sub { $warnings .= "@_" }; - + my $res = $term->get_reply( %$args ); ok( !$res, "Empty result on autoreply without default" ); @@ -108,7 +108,7 @@ my $tmpl = { } -#### test parse_options +#### test parse_options { my $str = q[command --no-foo --baz --bar=0 --quux=bleh ] . q[--option="some'thing" -one-dash -single=blah' foo bar-zot]; @@ -135,12 +135,12 @@ my $tmpl = { [ 'x --update_source' => 'x', { update_source => 1 } ], [ '--update_source' => '', { update_source => 1 } ], ); - + for my $aref ( @map ) { my( $input, $munged, $expect ) = @$aref; - + my($href,$rest) = $term->parse_options( $input ); - + ok( $href, "Parsed '$input'" ); is_deeply( $href, $expect, " Options parsed correctly" ); diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 6dbdcda..b09f48e 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -105,6 +105,10 @@ XXX L has been upgraded from version 0.9113 to version 0.9115. +=item * + +L has been upgraded from version 0.26 to version 0.30. + =back =head2 Removed Modules and Pragmata -- 2.7.4