@@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '1.56_11'; +$VERSION = '1.56_12'; =head1 NAME @@ -167,6 +167,7 @@ Print the script version and CPAN.pm version then exit. use autouse Carp => qw(carp croak cluck); use CPAN (); use autouse Cwd => qw(cwd); +use autouse 'Data::Dumper' => qw(Dumper); use File::Spec::Functions; use File::Basename; @@ -334,10 +335,13 @@ sub run $logger->debug( "Using logger from @{[ref $logger]}" ); $class->_hook_into_CPANpm_report; + $logger->debug( "Hooked into output" ); $class->_stupid_interface_hack_for_non_rtfmers; + $logger->debug( "Patched cargo culting" ); my $options = $class->_process_options; + $logger->debug( "Options are @{[Dumper($options)]}" ); $class->_process_setup_options( $options ); @@ -491,7 +495,7 @@ BEGIN { my @skip_lines = ( qr/^\QWarning \(usually harmless\)/, qr/\bwill not store persistent state\b/, - qr(^//hint//), + qr(//hint//), qr/^\s+reports\s+/, ); @@ -501,11 +505,20 @@ sub _get_cpanpm_last_line my @lines = <$fh>; + # This is a bit ugly. Once we examine a line, we have to + # examine the line before it and go through all of the same + # regexes. I could do something fancy, but this works. + REGEXES: { foreach my $regex ( @skip_lines ) { - pop @lines if $lines[-1] =~ m/$regex/; + if( $lines[-1] =~ m/$regex/ ) + { + pop @lines; + redo REGEXES; # we have to go through all of them for every line! + } } - + } + $logger->debug( "Last interesting line of CPAN.pm output is:\n\t$lines[-1]" ); $lines[-1]; lib/Cpan.pm @@ -3,7 +3,7 @@ use strict; use vars qw($VERSION); use App::Cpan; -$VERSION = '1.56_11'; +$VERSION = '1.56_12'; my $rc = App::Cpan->run( @ARGV ); script/cpan @@ -2,7 +2,7 @@ use strict; use warnings; -use Test::More tests => 59; +use Test::More tests => 60; # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # my $CPAN = 'CPAN::Shell'; @@ -112,6 +112,25 @@ _clear(); } # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +{ +my $message = <<'HERE'; +Result: FAIL + D:/Workspace/CI/DRW-Perl/DRW-Module-Build/distributions/DRW-Module-Build/. + C:\strawberry\\perl\\bin\\perl.exe ./Build test -- NOT OK +//hint// to see the cpan-testers results for installing this module, try: + reports D:/Workspace/CI/DRW-Perl/DRW-Module-Build/distributions/DRW-Module-Build/. +Directory 'D:/Workspace/CI/DRW-Perl/DRW-Module-Build/distributions/DRW-Module-Build/.' not below D:\Workspace\drwperl\build, will not store persistent state +HERE + +$CPAN->_clear_cpanpm_output; +$CPAN->myprint( $message ); + +my $last_line = $class->_get_cpanpm_last_line(); +like( $last_line, qr/NOT OK/, 'Last line is NOT OK line' ); + +} + +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # sub my_clear_and_get { my( $method, $message ) = @_; t/cpanpm_output_hook.t @@ -2,6 +2,8 @@ use strict; use warnings; +$|++; + use Test::More tests => 10; use File::Spec::Functions qw(catfile devnull); @@ -36,7 +38,7 @@ diag( <<"HERE" ); ================================================================= You're going to see a mess of output. This is normal and it comes from the external process I am testing. I'm intentionally trying -to install modules that will fail. +to install modules that will fail. I'll tell you when I'm done. ================================================================= @@ -56,3 +58,14 @@ foreach my $trial ( @trials ) is( $exit_value, $expected_exit_value, "$command @config @$options" ); } + +diag( <<"HERE" ); + + + +================================================================= +I'm done. Any further messes you see are real errors. +================================================================= + + +HERE t/return_values.t 5e3ee1b0d1ec69745060f202eeb50922b58a0646 bfoy bfoy@WWD-BFOY01.US.DRWHoldings.com http://github.com/briandfoy/cpan-script/commit/287e7db81f9316d407a844b5f402fdf6146fd870 287e7db81f9316d407a844b5f402fdf6146fd870 2009-03-19T20:31:11-07:00 2009-03-19T20:31:11-07:00 * Run all regexes against all lines as I look for the real status line bec9c801733ce1cb88f3400ae1f944a20b4d276e bfoy bfoy@WWD-BFOY01.US.DRWHoldings.com