In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/d6390205f1ab550bd272da547d5a3d0cd3679151?hp=00c1e5d87c16899a7d3efb49a4e6f0fc10dd2387>
- Log ----------------------------------------------------------------- commit d6390205f1ab550bd272da547d5a3d0cd3679151 Author: Chris 'BinGOs' Williams <[email protected]> Date: Wed Jan 23 13:29:20 2013 +0000 Update Log-Message to CPAN version 0.06 [DELTA] Changes for 0.06 Wed Jan 23 12:21:48 GMT 2013 ================================================= * Add deprecate usage to warn if module is loaded from corelib. Log::Message is leaving core with v5.20.0, but will still be available from CPAN. ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/Log-Message/lib/Log/Message.pm | 27 ++++++++++---------- cpan/Log-Message/lib/Log/Message/Config.pm | 3 +- cpan/Log-Message/lib/Log/Message/Handlers.pm | 3 +- cpan/Log-Message/lib/Log/Message/Item.pm | 3 +- cpan/Log-Message/t/01_Log-Message-Config.t | 6 ++-- cpan/Log-Message/t/02_Log-Message.t | 34 +++++++++++++------------- cpan/Log-Message/t/conf/config_file | 2 +- 8 files changed, 41 insertions(+), 39 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 205b4e3..d8dee7e 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1138,7 +1138,7 @@ use File::Glob qw(:case); 'Log::Message' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/Log-Message-0.04.tar.gz', + 'DISTRIBUTION' => 'BINGOS/Log-Message-0.06.tar.gz', 'FILES' => q[cpan/Log-Message], 'UPSTREAM' => 'cpan', }, diff --git a/cpan/Log-Message/lib/Log/Message.pm b/cpan/Log-Message/lib/Log/Message.pm index 96ab34a..effcd13 100644 --- a/cpan/Log-Message/lib/Log/Message.pm +++ b/cpan/Log-Message/lib/Log/Message.pm @@ -1,4 +1,5 @@ package Log::Message; +use if $] > 5.017, 'deprecate'; use strict; @@ -11,9 +12,7 @@ local $Params::Check::VERBOSE = 1; BEGIN { use vars qw[$VERSION @ISA $STACK $CONFIG]; - - $VERSION = 0.04; - + $VERSION = '0.06'; $STACK = []; } @@ -89,7 +88,7 @@ More on this below. These are individual message items, which are objects that contain the user message as well as the meta-data described above. -See the L<Log::Message::Item> manpage to see how to extract this +See the L<Log::Message::Item> manpage to see how to extract this meta-data and how to work with the Item objects. You should never need to create your own Item objects, but knowing about their methods and accessors is important if you want to write @@ -179,8 +178,8 @@ provided. =item verbose Log::Message makes use of another module to validate its arguments, -which is called L<Params::Check>, which is a lightweight, yet -powerful input checker and parser. (See the L<Params::Check> +which is called L<Params::Check>, which is a lightweight, yet +powerful input checker and parser. (See the L<Params::Check> manpage for details). The verbose setting will control whether this module will @@ -314,7 +313,7 @@ sub _new_stack { }; my $args = check( $tmpl, \%hash, $CONFIG->verbose ) or ( - warn(loc(q[Could not create a new stack object: %1], + warn(loc(q[Could not create a new stack object: %1], Params::Check->last_error) ), return @@ -399,9 +398,9 @@ sub store { %hash = @_; } - my $args = check( $tmpl, \%hash ) or ( - warn( loc(q[Could not store error: %1], Params::Check->last_error) ), - return + my $args = check( $tmpl, \%hash ) or ( + warn( loc(q[Could not store error: %1], Params::Check->last_error) ), + return ); my $extra = delete $args->{extra}; @@ -488,10 +487,10 @@ sub retrieve { } my $args = check( $tmpl, \%hash ) or ( - warn( loc(q[Could not parse input: %1], Params::Check->last_error) ), - return + warn( loc(q[Could not parse input: %1], Params::Check->last_error) ), + return ); - + my @list = grep { $_->tag =~ /$args->{tag}/ ? 1 : 0 } grep { $_->level =~ /$args->{level}/ ? 1 : 0 } @@ -561,7 +560,7 @@ This removes all items from the stack and returns them to the caller sub flush { my $self = shift; - + return splice @{$self->{STACK}}; } diff --git a/cpan/Log-Message/lib/Log/Message/Config.pm b/cpan/Log-Message/lib/Log/Message/Config.pm index fff771b..e326e40 100644 --- a/cpan/Log-Message/lib/Log/Message/Config.pm +++ b/cpan/Log-Message/lib/Log/Message/Config.pm @@ -1,4 +1,5 @@ package Log::Message::Config; +use if $] > 5.017, 'deprecate'; use strict; use Params::Check qw[check]; @@ -8,7 +9,7 @@ use Locale::Maketext::Simple Style => 'gettext'; BEGIN { use vars qw[$VERSION $AUTOLOAD]; - $VERSION = 0.04; + $VERSION = '0.06'; } sub new { diff --git a/cpan/Log-Message/lib/Log/Message/Handlers.pm b/cpan/Log-Message/lib/Log/Message/Handlers.pm index 366c03a..956b066 100644 --- a/cpan/Log-Message/lib/Log/Message/Handlers.pm +++ b/cpan/Log-Message/lib/Log/Message/Handlers.pm @@ -1,8 +1,9 @@ package Log::Message::Handlers; +use if $] > 5.017, 'deprecate'; use strict; use vars qw[$VERSION]; -$VERSION = '0.04'; +$VERSION = '0.06'; =pod diff --git a/cpan/Log-Message/lib/Log/Message/Item.pm b/cpan/Log-Message/lib/Log/Message/Item.pm index 918a366..13e1e45 100644 --- a/cpan/Log-Message/lib/Log/Message/Item.pm +++ b/cpan/Log-Message/lib/Log/Message/Item.pm @@ -1,4 +1,5 @@ package Log::Message::Item; +use if $] > 5.017, 'deprecate'; use strict; use vars qw[$VERSION]; @@ -11,7 +12,7 @@ use Carp (); BEGIN { use vars qw[$AUTOLOAD $VERSION]; - $VERSION = '0.04'; + $VERSION = '0.06'; } ### create a new item. diff --git a/cpan/Log-Message/t/01_Log-Message-Config.t b/cpan/Log-Message/t/01_Log-Message-Config.t index 2f8a021..0c7e089 100644 --- a/cpan/Log-Message/t/01_Log-Message-Config.t +++ b/cpan/Log-Message/t/01_Log-Message-Config.t @@ -1,10 +1,10 @@ ### Log::Message::Config test suite ### -BEGIN { +BEGIN { if( $ENV{PERL_CORE} ) { chdir '../lib/Log/Message' if -d '../lib/Log/Message'; unshift @INC, '../../..'; } -} +} BEGIN { chdir 't' if -d 't' } @@ -81,4 +81,4 @@ use_ok( 'Log::Message' ) or diag "Module.pm not found. Dying", die; ); is_deeply( $mixed, $log->{CONFIG}, q[Config creation from file & options] ); } - + diff --git a/cpan/Log-Message/t/02_Log-Message.t b/cpan/Log-Message/t/02_Log-Message.t index 8394458..592c93b 100644 --- a/cpan/Log-Message/t/02_Log-Message.t +++ b/cpan/Log-Message/t/02_Log-Message.t @@ -1,10 +1,10 @@ ### Log::Message test suite ### -BEGIN { +BEGIN { if( $ENV{PERL_CORE} ) { chdir '../lib/Log/Message' if -d '../lib/Log/Message'; unshift @INC, '../../..'; } -} +} BEGIN { chdir 't' if -d 't' } @@ -18,7 +18,7 @@ for my $pkg ( qw[ Log::Message Log::Message::Config Log::Message::Item Log::Message::Handlers] ) { use_ok( $pkg ) or diag "'$pkg' not found. Dying"; -} +} ### test global stack { @@ -69,11 +69,11 @@ for my $pkg ( qw[ Log::Message Log::Message::Config ); { - ok( $log->retrieve( message => qr/baz/ ), + ok( $log->retrieve( message => qr/baz/ ), q[ Retrieving based on message] ); - ok( $log->retrieve( tag => qr/TAG/ ), + ok( $log->retrieve( tag => qr/TAG/ ), q[ Retrieving based on tag] ); - ok( $log->retrieve( level => qr/test/ ), + ok( $log->retrieve( level => qr/test/ ), q[ Retrieving based on level] ); } @@ -95,7 +95,7 @@ for my $pkg ( qw[ Log::Message Log::Message::Config like( $item->shortmess, qr/\w+/, q[ Item shortmess stored properly] ); - + ok( $item->longmess, q[Item longmess stored] ); like( $item->longmess, qr/Log::Message::store/s, q[ Item longmess stored properly] @@ -118,7 +118,7 @@ for my $pkg ( qw[ Log::Message Log::Message::Config { ok( $item->remove, q[Removing item from stack] ); - ok( (!grep{ $item eq $_ } $log->retrieve), + ok( (!grep{ $item eq $_ } $log->retrieve), q[ Item removed from stack] ); } @@ -127,36 +127,36 @@ for my $pkg ( qw[ Log::Message Log::Message::Config ok( @{$log->{STACK}} == 0, q[Flushing stack] ); } } - -### test errors + +### test errors { my $log = Log::Message->new( private => 1 ); - + ### store errors { ### dont make it print my $warnings; local $SIG{__WARN__} = sub { $warnings .= "@_" }; - + my $rv = $log->store(); ok( !$rv, q[Logging empty message failed] ); like( $warnings, qr/message/, q[ Spotted the error] ); } - + ### retrieve errors { ### dont make it print my $warnings; local $SIG{__WARN__} = sub { $warnings .= "@_" }; - + ### XXX whitebox test! local $Params::Check::VERBOSE = 1; # so the warnings are emitted local $Params::Check::VERBOSE = 1; # so the warnings are emitted - + my $rv = $log->retrieve( frobnitz => $$ ); ok( !$rv, q[Retrieval with bogus args] ); - like( $warnings, qr/not a valid key/, + like( $warnings, qr/not a valid key/, qq[ Spotted the error] ); } -} +} diff --git a/cpan/Log-Message/t/conf/config_file b/cpan/Log-Message/t/conf/config_file index 834529a..0c47131 100644 --- a/cpan/Log-Message/t/conf/config_file +++ b/cpan/Log-Message/t/conf/config_file @@ -27,4 +27,4 @@ # retrieve errors in chronological order, or not? # if none provided, set to '1' - chrono = 0 + chrono = 0 \ No newline at end of file -- Perl5 Master Repository
