diff -Nru libmoose-autobox-perl-0.10/Changes libmoose-autobox-perl-0.11/Changes --- libmoose-autobox-perl-0.10/Changes 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/Changes 2010-04-24 00:15:07.000000000 +0100 @@ -1,6 +1,10 @@ Revision history for Perl extension Moose::Autobox -0.10 +0.11 Fri. Mar 23, 2010 + - add each_n_values to Indexed (rafl and rjbs) + - add first and last to Scalar and Array (t0m) + +0.10 Mon. Oct 12 2009 - add each, each_key, each_value to Indexed (array and hash) (rjbs) - add split, words, lines to String (Sartak) - add 'to' to Number (Debolaz) diff -Nru libmoose-autobox-perl-0.10/debian/changelog libmoose-autobox-perl-0.11/debian/changelog --- libmoose-autobox-perl-0.10/debian/changelog 2010-05-09 19:48:48.000000000 +0100 +++ libmoose-autobox-perl-0.11/debian/changelog 2010-04-27 17:19:23.000000000 +0100 @@ -1,3 +1,15 @@ +libmoose-autobox-perl (0.11-1) unstable; urgency=low + + * New upstream release. + * Add build-dep on perl (>= 5.10.1) | libtest-simple-perl (>= 0.89). + * Use source format 3.0 (quilt). + * debian/copyright: Formatting changes for current DEP-5 proposal. + * debian/copyright: Update years of copyright for ./inc/*. + * Bump Standards-Version to 3.8.4. + * Add myself to Uploaders. + + -- Ansgar Burchardt Tue, 27 Apr 2010 08:53:24 +0900 + libmoose-autobox-perl (0.10-1) unstable; urgency=low [ Jonathan Yu ] diff -Nru libmoose-autobox-perl-0.10/debian/control libmoose-autobox-perl-0.11/debian/control --- libmoose-autobox-perl-0.10/debian/control 2010-05-09 19:48:48.000000000 +0100 +++ libmoose-autobox-perl-0.11/debian/control 2010-04-26 15:47:08.000000000 +0100 @@ -3,10 +3,11 @@ Priority: optional Build-Depends: debhelper (>= 7) Build-Depends-Indep: perl, libmoose-perl (>= 0.42), libautobox-perl (>= 2.23), - libtest-exception-perl (>= 0.21), libperl6-junction-perl (>= 1.40000) + libtest-exception-perl (>= 0.21), libperl6-junction-perl (>= 1.40000), + perl (>= 5.10.1) | libtest-simple-perl (>= 0.89) Maintainer: Debian Perl Group -Uploaders: Jonathan Yu -Standards-Version: 3.8.3 +Uploaders: Jonathan Yu , Ansgar Burchardt +Standards-Version: 3.8.4 Homepage: http://search.cpan.org/dist/Moose-Autobox/ Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmoose-autobox-perl/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libmoose-autobox-perl/ diff -Nru libmoose-autobox-perl-0.10/debian/copyright libmoose-autobox-perl-0.11/debian/copyright --- libmoose-autobox-perl-0.10/debian/copyright 2010-05-09 19:48:48.000000000 +0100 +++ libmoose-autobox-perl-0.11/debian/copyright 2010-04-26 15:47:08.000000000 +0100 @@ -1,24 +1,20 @@ -Format-Specification: - http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 -Upstream-Maintainer: Ricardo SIGNES -Upstream-Source: http://search.cpan.org/dist/Moose-Autobox/ -Upstream-Name: Moose-Autobox +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Maintainer: Ricardo SIGNES +Source: http://search.cpan.org/dist/Moose-Autobox/ +Name: Moose-Autobox -Files: * Copyright: 2006-2008, Infinity Interactive, Inc. -License-Alias: Perl -License: Artistic | GPL-1+ +License: Artistic or GPL-1+ Files: debian/* Copyright: 2009, Jonathan Yu -License: Artistic | GPL-1+ +License: Artistic or GPL-1+ Files: inc/Module/* -Copyright: 2002-2009, Adam Kennedy - 2002-2009, Audrey Tang - 2002-2009, Brian Ingerson -License-Alias: Perl -License: Artistic | GPL-1+ +Copyright: 2002-2010, Adam Kennedy + 2002-2010, Audrey Tang + 2002-2010, Brian Ingerson +License: Artistic or GPL-1+ License: Artistic This program is free software; you can redistribute it and/or modify diff -Nru libmoose-autobox-perl-0.10/debian/source/format libmoose-autobox-perl-0.11/debian/source/format --- libmoose-autobox-perl-0.10/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ libmoose-autobox-perl-0.11/debian/source/format 2010-05-09 19:48:48.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/Base.pm libmoose-autobox-perl-0.11/inc/Module/Install/Base.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/Base.pm 2009-10-12 18:19:07.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/Base.pm 2010-04-24 00:15:25.000000000 +0100 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '0.91'; + $VERSION = '0.95'; } # Suspend handler for "redefined" warnings diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/Can.pm libmoose-autobox-perl-0.11/inc/Module/Install/Can.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/Can.pm 2009-10-12 18:19:08.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/Can.pm 2010-04-24 00:15:25.000000000 +0100 @@ -9,7 +9,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '0.95'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/ExtraTests.pm libmoose-autobox-perl-0.11/inc/Module/Install/ExtraTests.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/ExtraTests.pm 2009-10-12 18:19:07.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/ExtraTests.pm 2010-04-24 00:15:25.000000000 +0100 @@ -6,46 +6,60 @@ use Module::Install::Base; BEGIN { - our $VERSION = '0.006'; + our $VERSION = '0.007'; our $ISCORE = 1; our @ISA = qw{Module::Install::Base}; } +our $use_extratests = 0; + sub extra_tests { my ($self) = @_; return unless -d 'xt'; - return unless my @content = grep { $_ =~ /^[.]/ } ; + return unless my @content = grep { $_ !~ /^[.]/ } ; - die "unknown files found in ./xt" if grep { -f } @content; + die "unknown files found in ./xt" if grep { !-d } @content; - my %known = map {; $_ => 1 } qw(author smoke release); + my %known = map {; "xt/$_" => 1 } qw(author smoke release); my @unknown = grep { not $known{$_} } @content; die "unknown directories found in ./xt: @unknown" if @unknown; - { - no warnings qw(closure once); - package # The newline tells PAUSE, "DO NOT INDEXING!" - MY; - sub test_via_harness { - my ($self, $perl, $tests) = @_; - my $a_str = -d 'xt/author' ? 'xt/author' : ''; - my $r_str = -d 'xt/release' ? 'xt/release' : ''; - my $s_str = -d 'xt/smoke' ? 'xt/smoke' : ''; - my $is_author = $Module::Install::AUTHOR ? 1 : 0; - - return qq{\t$perl "-Iinc" "-MModule::Install::ExtraTests" } - . qq{"-e" "Module::Install::ExtraTests::__harness('Test::Harness', $is_author, '$a_str', '$r_str', '$s_str', \$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n}; - } - - sub dist_test { - my ($self, @args) = @_; - my $text = $self->SUPER::dist_test(@args); - my @lines = split /\n/, $text; - $_ =~ s/ (\S*MAKE\S* test )/ RELEASE_TESTING=1 $1 / for grep { m/ test / } @lines; - return join "\n", @lines; - } + $use_extratests = 1; + + return; +} + +{ + no warnings qw(once); + package # The newline tells PAUSE, "DO NOT INDEXING!" + MY; + sub test_via_harness { + my $self = shift; + + return $self->SUPER::test_via_harness(@_) + unless $use_extratests; + + my ($perl, $tests) = @_; + my $a_str = -d 'xt/author' ? 'xt/author' : ''; + my $r_str = -d 'xt/release' ? 'xt/release' : ''; + my $s_str = -d 'xt/smoke' ? 'xt/smoke' : ''; + my $is_author = $Module::Install::AUTHOR ? 1 : 0; + + return qq{\t$perl "-Iinc" "-MModule::Install::ExtraTests" } + . qq{"-e" "Module::Install::ExtraTests::__harness('Test::Harness', $is_author, '$a_str', '$r_str', '$s_str', \$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n}; + } + + sub dist_test { + my ($self, @args) = @_; + + return $self->SUPER::dist_test(@args) + unless $use_extratests; + my $text = $self->SUPER::dist_test(@args); + my @lines = split /\n/, $text; + $_ =~ s/ (\S*MAKE\S* test )/ RELEASE_TESTING=1 $1 / for grep { m/ test / } @lines; + return join "\n", @lines; } } diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/Fetch.pm libmoose-autobox-perl-0.11/inc/Module/Install/Fetch.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/Fetch.pm 2009-10-12 18:19:08.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/Fetch.pm 2010-04-24 00:15:25.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '0.95'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/Makefile.pm libmoose-autobox-perl-0.11/inc/Module/Install/Makefile.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/Makefile.pm 2009-10-12 18:19:07.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/Makefile.pm 2010-04-24 00:15:25.000000000 +0100 @@ -7,7 +7,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '0.95'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -25,8 +25,8 @@ die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; } - # In automated testing, always use defaults - if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { + # In automated testing or non-interactive session, always use defaults + if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { local $ENV{PERL_MM_USE_DEFAULT} = 1; goto &ExtUtils::MakeMaker::prompt; } else { @@ -34,21 +34,110 @@ } } +# Store a cleaned up version of the MakeMaker version, +# since we need to behave differently in a variety of +# ways based on the MM version. +my $makemaker = eval $ExtUtils::MakeMaker::VERSION; + +# If we are passed a param, do a "newer than" comparison. +# Otherwise, just return the MakeMaker version. +sub makemaker { + ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 +} + +# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified +# as we only need to know here whether the attribute is an array +# or a hash or something else (which may or may not be appendable). +my %makemaker_argtype = ( + C => 'ARRAY', + CONFIG => 'ARRAY', +# CONFIGURE => 'CODE', # ignore + DIR => 'ARRAY', + DL_FUNCS => 'HASH', + DL_VARS => 'ARRAY', + EXCLUDE_EXT => 'ARRAY', + EXE_FILES => 'ARRAY', + FUNCLIST => 'ARRAY', + H => 'ARRAY', + IMPORTS => 'HASH', + INCLUDE_EXT => 'ARRAY', + LIBS => 'ARRAY', # ignore '' + MAN1PODS => 'HASH', + MAN3PODS => 'HASH', + META_ADD => 'HASH', + META_MERGE => 'HASH', + PL_FILES => 'HASH', + PM => 'HASH', + PMLIBDIRS => 'ARRAY', + PMLIBPARENTDIRS => 'ARRAY', + PREREQ_PM => 'HASH', + CONFIGURE_REQUIRES => 'HASH', + SKIP => 'ARRAY', + TYPEMAPS => 'ARRAY', + XS => 'HASH', +# VERSION => ['version',''], # ignore +# _KEEP_AFTER_FLUSH => '', + + clean => 'HASH', + depend => 'HASH', + dist => 'HASH', + dynamic_lib=> 'HASH', + linkext => 'HASH', + macro => 'HASH', + postamble => 'HASH', + realclean => 'HASH', + test => 'HASH', + tool_autosplit => 'HASH', + + # special cases where you can use makemaker_append + CCFLAGS => 'APPENDABLE', + DEFINE => 'APPENDABLE', + INC => 'APPENDABLE', + LDDLFLAGS => 'APPENDABLE', + LDFROM => 'APPENDABLE', +); + sub makemaker_args { - my $self = shift; + my ($self, %new_args) = @_; my $args = ( $self->{makemaker_args} ||= {} ); - %$args = ( %$args, @_ ); + foreach my $key (keys %new_args) { + if ($makemaker_argtype{$key} eq 'ARRAY') { + $args->{$key} = [] unless defined $args->{$key}; + unless (ref $args->{$key} eq 'ARRAY') { + $args->{$key} = [$args->{$key}] + } + push @{$args->{$key}}, + ref $new_args{$key} eq 'ARRAY' + ? @{$new_args{$key}} + : $new_args{$key}; + } + elsif ($makemaker_argtype{$key} eq 'HASH') { + $args->{$key} = {} unless defined $args->{$key}; + foreach my $skey (keys %{ $new_args{$key} }) { + $args->{$key}{$skey} = $new_args{$key}{$skey}; + } + } + elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { + $self->makemaker_append($key => $new_args{$key}); + } + else { + if (defined $args->{$key}) { + warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; + } + $args->{$key} = $new_args{$key}; + } + } return $args; } # For mm args that take multiple space-seperated args, # append an argument to the current list. sub makemaker_append { - my $self = sShift; + my $self = shift; my $name = shift; my $args = $self->makemaker_args; - $args->{name} = defined $args->{$name} - ? join( ' ', $args->{name}, @_ ) + $args->{$name} = defined $args->{$name} + ? join( ' ', $args->{$name}, @_ ) : join( ' ', @_ ); } @@ -107,6 +196,9 @@ %test_dir = (); require File::Find; File::Find::find( \&_wanted_t, $dir ); + if ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { + File::Find::find( \&_wanted_t, 'xt' ); + } $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); } @@ -130,12 +222,13 @@ # an underscore, even though its own version may contain one! # Hence the funny regexp to get rid of it. See RT #35800 # for details. - $self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); - $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); + my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; + $self->build_requires( 'ExtUtils::MakeMaker' => $v ); + $self->configure_requires( 'ExtUtils::MakeMaker' => $v ); } else { # Allow legacy-compatibility with 5.005 by depending on the # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); + $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); } @@ -143,59 +236,103 @@ my $args = $self->makemaker_args; $args->{DISTNAME} = $self->name; $args->{NAME} = $self->module_name || $self->name; - $args->{VERSION} = $self->version; $args->{NAME} =~ s/-/::/g; + $args->{VERSION} = $self->version or die <<'EOT'; +ERROR: Can't determine distribution version. Please specify it +explicitly via 'version' in Makefile.PL, or set a valid $VERSION +in a module, and provide its file path via 'version_from' (or +'all_from' if you prefer) in Makefile.PL. +EOT + + $DB::single = 1; if ( $self->tests ) { - $args->{test} = { TESTS => $self->tests }; + my @tests = split ' ', $self->tests; + my %seen; + $args->{test} = { + TESTS => (join ' ', grep {!$seen{$_}++} @tests), + }; + } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { + $args->{test} = { + TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), + }; } if ( $] >= 5.005 ) { $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = $self->author; + $args->{AUTHOR} = join ', ', @{$self->author || []}; } - if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { - $args->{NO_META} = 1; + if ( $self->makemaker(6.10) ) { + $args->{NO_META} = 1; + #$args->{NO_MYMETA} = 1; } - if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { + if ( $self->makemaker(6.17) and $self->sign ) { $args->{SIGN} = 1; } unless ( $self->is_admin ) { delete $args->{SIGN}; } + if ( $self->makemaker(6.31) and $self->license ) { + $args->{LICENSE} = $self->license; + } - # Merge both kinds of requires into prereq_pm my $prereq = ($args->{PREREQ_PM} ||= {}); %$prereq = ( %$prereq, - map { @$_ } + map { @$_ } # flatten [module => version] map { @$_ } grep $_, - ($self->configure_requires, $self->build_requires, $self->requires) + ($self->requires) ); # Remove any reference to perl, PREREQ_PM doesn't support it delete $args->{PREREQ_PM}->{perl}; - # merge both kinds of requires into prereq_pm + # Merge both kinds of requires into BUILD_REQUIRES + my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); + %$build_prereq = ( %$build_prereq, + map { @$_ } # flatten [module => version] + map { @$_ } + grep $_, + ($self->configure_requires, $self->build_requires) + ); + + # Remove any reference to perl, BUILD_REQUIRES doesn't support it + delete $args->{BUILD_REQUIRES}->{perl}; + + # Delete bundled dists from prereq_pm my $subdirs = ($args->{DIR} ||= []); if ($self->bundles) { foreach my $bundle (@{ $self->bundles }) { my ($file, $dir) = @$bundle; push @$subdirs, $dir if -d $dir; - delete $prereq->{$file}; + delete $build_prereq->{$file}; #Delete from build prereqs only } } + unless ( $self->makemaker('6.55_03') ) { + %$prereq = (%$prereq,%$build_prereq); + delete $args->{BUILD_REQUIRES}; + } + if ( my $perl_version = $self->perl_version ) { eval "use $perl_version; 1" or die "ERROR: perl: Version $] is installed, " . "but we need version >= $perl_version"; + + if ( $self->makemaker(6.48) ) { + $args->{MIN_PERL_VERSION} = $perl_version; + } } - $args->{INSTALLDIRS} = $self->installdirs; + if ($self->installdirs) { + warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; + $args->{INSTALLDIRS} = $self->installdirs; + } - my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + my %args = map { + ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) + } keys %$args; my $user_preop = delete $args{dist}->{PREOP}; - if (my $preop = $self->admin->preop($user_preop)) { + if ( my $preop = $self->admin->preop($user_preop) ) { foreach my $key ( keys %$preop ) { $args{dist}->{$key} = $preop->{$key}; } @@ -265,4 +402,4 @@ __END__ -#line 394 +#line 531 diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/Metadata.pm libmoose-autobox-perl-0.11/inc/Module/Install/Metadata.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/Metadata.pm 2009-10-12 18:19:07.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/Metadata.pm 2010-04-24 00:15:25.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '0.95'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -19,7 +19,6 @@ name module_name abstract - author version distribution_type tests @@ -43,8 +42,11 @@ my @array_keys = qw{ keywords + author }; +*authors = \&author; + sub Meta { shift } sub Meta_BooleanKeys { @boolean_keys } sub Meta_ScalarKeys { @scalar_keys } @@ -230,6 +232,8 @@ die("The path '$file' does not exist, or is not a file"); } + $self->{values}{all_from} = $file; + # Some methods pull from POD instead of code. # If there is a matching .pod, use that instead my $pod = $file; @@ -240,7 +244,7 @@ $self->name_from($file) unless $self->name; $self->version_from($file) unless $self->version; $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless $self->author; + $self->author_from($pod) unless @{$self->author || []}; $self->license_from($pod) unless $self->license; $self->abstract_from($pod) unless $self->abstract; @@ -385,11 +389,10 @@ } } -sub perl_version_from { - my $self = shift; +sub _extract_perl_version { if ( - Module::Install::_read($_[0]) =~ m/ - ^ + $_[0] =~ m/ + ^\s* (?:use|require) \s* v? ([\d_\.]+) @@ -398,6 +401,16 @@ ) { my $perl_version = $1; $perl_version =~ s{_}{}g; + return $perl_version; + } else { + return; + } +} + +sub perl_version_from { + my $self = shift; + my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); + if ($perl_version) { $self->perl_version($perl_version); } else { warn "Cannot determine perl version info from $_[0]\n"; @@ -417,59 +430,116 @@ ([^\n]*) /ixms) { my $author = $1 || $2; - $author =~ s{E}{<}g; - $author =~ s{E}{>}g; + + # XXX: ugly but should work anyway... + if (eval "require Pod::Escapes; 1") { + # Pod::Escapes has a mapping table. + # It's in core of perl >= 5.9.3, and should be installed + # as one of the Pod::Simple's prereqs, which is a prereq + # of Pod::Text 3.x (see also below). + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $Pod::Escapes::Name2character_number{$1} + ? chr($Pod::Escapes::Name2character_number{$1}) + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { + # Pod::Text < 3.0 has yet another mapping table, + # though the table name of 2.x and 1.x are different. + # (1.x is in core of Perl < 5.6, 2.x is in core of + # Perl < 5.9.3) + my $mapping = ($Pod::Text::VERSION < 2) + ? \%Pod::Text::HTML_Escapes + : \%Pod::Text::ESCAPES; + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $mapping->{$1} + ? $mapping->{$1} + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + else { + $author =~ s{E}{<}g; + $author =~ s{E}{>}g; + } $self->author($author); } else { warn "Cannot determine author info from $_[0]\n"; } } -sub license_from { - my $self = shift; - if ( - Module::Install::_read($_[0]) =~ m/ - ( - =head \d \s+ - (?:licen[cs]e|licensing|copyright|legal)\b - .*? - ) - (=head\\d.*|=cut.*|) - \z - /ixms ) { - my $license_text = $1; - my @phrases = ( - 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'BSD license' => 'bsd', 1, - 'Artistic license' => 'artistic', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s{\s+}{\\s+}g; - if ( $license_text =~ /\b$pattern\b/i ) { - $self->license($license); - return 1; - } +sub _extract_license { + my $pod = shift; + my $matched; + return __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ (?:licen[cs]e|licensing)\b.*?) + (=head \d.*|=cut.*|)\z + /ixms + ) || __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ (?:copyrights?|legal)\b.*?) + (=head \d.*|=cut.*|)\z + /ixms + ); +} + +sub __extract_license { + my $license_text = shift or return; + my @phrases = ( + 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1, + 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1, + 'Artistic and GPL' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'BSD license' => 'bsd', 1, + 'Artistic license' => 'artistic', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'proprietary' => 'proprietary', 0, + ); + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s#\s+#\\s+#gs; + if ( $license_text =~ /\b$pattern\b/i ) { + return $license; } } +} - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; +sub license_from { + my $self = shift; + if (my $license=_extract_license(Module::Install::_read($_[0]))) { + $self->license($license); + } else { + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; + } } sub _extract_bugtracker { - my @links = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g; + my @links = $_[0] =~ m#L<( + \Qhttp://rt.cpan.org/\E[^>]+| + \Qhttp://github.com/\E[\w_]+/[\w_]+/issues| + \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list + )>#gx; my %links; @links{@links}=(); @links=keys %links; @@ -485,7 +555,7 @@ return 0; } if ( @links > 1 ) { - warn "Found more than on rt.cpan.org link in $_[0]\n"; + warn "Found more than one bugtracker link in $_[0]\n"; return 0; } diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/Win32.pm libmoose-autobox-perl-0.11/inc/Module/Install/Win32.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/Win32.pm 2009-10-12 18:19:08.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/Win32.pm 2010-04-24 00:15:25.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91'; + $VERSION = '0.95'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install/WriteAll.pm libmoose-autobox-perl-0.11/inc/Module/Install/WriteAll.pm --- libmoose-autobox-perl-0.10/inc/Module/Install/WriteAll.pm 2009-10-12 18:19:07.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install/WriteAll.pm 2010-04-24 00:15:25.000000000 +0100 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.91';; + $VERSION = '0.95';; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } @@ -26,7 +26,10 @@ $self->check_nmake if $args{check_nmake}; unless ( $self->makemaker_args->{PL_FILES} ) { - $self->makemaker_args( PL_FILES => {} ); + # XXX: This still may be a bit over-defensive... + unless ($self->makemaker(6.25)) { + $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; + } } # Until ExtUtils::MakeMaker support MYMETA.yml, make sure diff -Nru libmoose-autobox-perl-0.10/inc/Module/Install.pm libmoose-autobox-perl-0.11/inc/Module/Install.pm --- libmoose-autobox-perl-0.10/inc/Module/Install.pm 2009-10-12 18:19:07.000000000 +0100 +++ libmoose-autobox-perl-0.11/inc/Module/Install.pm 2010-04-24 00:15:24.000000000 +0100 @@ -19,6 +19,10 @@ use 5.005; use strict 'vars'; +use Cwd (); +use File::Find (); +use File::Path (); +use FindBin; use vars qw{$VERSION $MAIN}; BEGIN { @@ -28,7 +32,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '0.91'; + $VERSION = '0.95'; # Storage for the pseudo-singleton $MAIN = undef; @@ -38,18 +42,25 @@ } +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; - - - -# Whether or not inc::Module::Install is actually loaded, the -# $INC{inc/Module/Install.pm} is what will still get set as long as -# the caller loaded module this in the documented manner. -# If not set, the caller may NOT have loaded the bundled version, and thus -# they may not have a MI version that works with the Makefile.PL. This would -# result in false errors or unexpected behaviour. And we don't want that. -my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; -unless ( $INC{$file} ) { die <<"END_DIE" } + #------------------------------------------------------------- + # all of the following checks should be included in import(), + # to allow "eval 'require Module::Install; 1' to test + # installation of Module::Install. (RT #51267) + #------------------------------------------------------------- + + # Whether or not inc::Module::Install is actually loaded, the + # $INC{inc/Module/Install.pm} is what will still get set as long as + # the caller loaded module this in the documented manner. + # If not set, the caller may NOT have loaded the bundled version, and thus + # they may not have a MI version that works with the Makefile.PL. This would + # result in false errors or unexpected behaviour. And we don't want that. + my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; + unless ( $INC{$file} ) { die <<"END_DIE" } Please invoke ${\__PACKAGE__} with: @@ -61,26 +72,28 @@ END_DIE - - - - -# If the script that is loading Module::Install is from the future, -# then make will detect this and cause it to re-run over and over -# again. This is bad. Rather than taking action to touch it (which -# is unreliable on some platforms and requires write permissions) -# for now we should catch this and refuse to run. -if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } + # This reportedly fixes a rare Win32 UTC file time issue, but + # as this is a non-cross-platform XS module not in the core, + # we shouldn't really depend on it. See RT #24194 for detail. + # (Also, this module only supports Perl 5.6 and above). + eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; + + # If the script that is loading Module::Install is from the future, + # then make will detect this and cause it to re-run over and over + # again. This is bad. Rather than taking action to touch it (which + # is unreliable on some platforms and requires write permissions) + # for now we should catch this and refuse to run. + if ( -f $0 ) { + my $s = (stat($0))[9]; + + # If the modification time is only slightly in the future, + # sleep briefly to remove the problem. + my $a = $s - time; + if ( $a > 0 and $a < 5 ) { sleep 5 } + + # Too far in the future, throw an error. + my $t = time; + if ( $s > $t ) { die <<"END_DIE" } Your installer $0 has a modification time in the future ($s > $t). @@ -89,15 +102,12 @@ Please correct this, then run $0 again. END_DIE -} - - - + } -# Build.PL was formerly supported, but no longer is due to excessive -# difficulty in implementing every single feature twice. -if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } + # Build.PL was formerly supported, but no longer is due to excessive + # difficulty in implementing every single feature twice. + if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } Module::Install no longer supports Build.PL. @@ -107,23 +117,36 @@ END_DIE + #------------------------------------------------------------- + # To save some more typing in Module::Install installers, every... + # use inc::Module::Install + # ...also acts as an implicit use strict. + $^H |= strict::bits(qw(refs subs vars)); + #------------------------------------------------------------- + unless ( -f $self->{file} ) { + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } -# To save some more typing in Module::Install installers, every... -# use inc::Module::Install -# ...also acts as an implicit use strict. -$^H |= strict::bits(qw(refs subs vars)); - - + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + # Unregister loader and worker packages so subdirs can use them again + delete $INC{"$self->{file}"}; + delete $INC{"$self->{path}.pm"}; + # Save to the singleton + $MAIN = $self; -use Cwd (); -use File::Find (); -use File::Path (); -use FindBin; + return 1; +} sub autoload { my $self = shift; @@ -152,33 +175,6 @@ }; } -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - unless ( -f $self->{file} ) { - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{"$self->{file}"}; - delete $INC{"$self->{path}.pm"}; - - # Save to the singleton - $MAIN = $self; - - return 1; -} - sub preload { my $self = shift; unless ( $self->{extensions} ) { @@ -348,17 +344,24 @@ return $call; } +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; sub _read { local *FH; - if ( $] >= 5.006 ) { - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - } else { - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - } + open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + my $string = do { local $/; }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_NEW +sub _read { + local *FH; + open( FH, "< $_[0]" ) or die "open($_[0]): $!"; my $string = do { local $/; }; close FH or die "close($_[0]): $!"; return $string; } +END_OLD sub _readperl { my $string = Module::Install::_read($_[0]); @@ -379,18 +382,26 @@ return $string; } +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; sub _write { local *FH; - if ( $] >= 5.006 ) { - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - } else { - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; + open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; } + close FH or die "close($_[0]): $!"; +} +END_NEW +sub _write { + local *FH; + open( FH, "> $_[0]" ) or die "open($_[0]): $!"; foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!"; } close FH or die "close($_[0]): $!"; } +END_OLD # _version is for processing module versions (eg, 1.03_05) not # Perl versions (eg, 5.8.1). @@ -427,4 +438,4 @@ 1; -# Copyright 2008 - 2009 Adam Kennedy. +# Copyright 2008 - 2010 Adam Kennedy. diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Array.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Array.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Array.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Array.pm 2010-04-23 21:41:31.000000000 +0100 @@ -3,7 +3,7 @@ use Perl6::Junction; use Moose::Autobox; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Ref', 'Moose::Autobox::List', @@ -85,6 +85,14 @@ [ CORE::sort { $sub->($a, $b) } @$array ]; } +sub first { + $_[0]->[0]; +} + +sub last { + $_[0]->[$#{$_[0]}]; +} + ## ::Indexed implementation sub at { @@ -134,6 +142,17 @@ $sub->($_) for @$array; } +sub each_n_values { + my ($array, $n, $sub) = @_; + my $it = List::MoreUtils::natatime($n, @$array); + + while (my @vals = $it->()) { + $sub->(@vals); + } + + return; +} + # end indexed sub flatten { @@ -235,6 +254,10 @@ =item B +=item B + +=item B + =back =head2 Indexed implementation @@ -259,6 +282,8 @@ =item B +=item B + =back =head2 List implementation diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Code.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Code.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Code.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Code.pm 2010-04-23 21:41:31.000000000 +0100 @@ -2,7 +2,7 @@ use Moose::Role 'with'; use Moose::Autobox; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Ref'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Defined.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Defined.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Defined.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Defined.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Defined; use Moose::Role 'with'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Item'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Hash.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Hash.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Hash.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Hash.pm 2010-04-24 00:13:07.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Hash; use Moose::Role 'with'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Ref', 'Moose::Autobox::Indexed'; @@ -81,6 +81,18 @@ $sub->($_) for CORE::values %$hash; } +sub each_n_values { + my ($hash, $n, $sub) = @_; + my @keys = CORE::keys %$hash; + my $it = List::MoreUtils::natatime($n, @keys); + + while (my @vals = $it->()) { + $sub->(@$hash{ @vals }); + } + + return; +} + # End Indexed @@ -150,6 +162,8 @@ =item B +=item B + =back =over 4 diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Indexed.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Indexed.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Indexed.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Indexed.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Indexed; use Moose::Role 'requires'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; requires 'at'; requires 'put'; @@ -10,7 +10,7 @@ requires 'values'; requires 'kv'; requires 'slice'; -requires qw(each each_key each_value); +requires qw(each each_key each_value each_n_values); 1; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Item.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Item.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Item.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Item.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Item; use Moose::Role 'requires'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; requires 'defined'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/List.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/List.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/List.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/List.pm 2010-04-23 21:41:31.000000000 +0100 @@ -3,7 +3,7 @@ use Moose::Role 'with', 'requires'; use Moose::Autobox; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Value'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Number.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Number.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Number.pm 2009-10-12 18:10:20.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Number.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Number; use Moose::Role; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Value'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Ref.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Ref.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Ref.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Ref.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Ref; use Moose::Role 'with'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Defined'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Scalar.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Scalar.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Scalar.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Scalar.pm 2010-04-24 00:13:21.000000000 +0100 @@ -1,12 +1,14 @@ package Moose::Autobox::Scalar; use Moose::Role 'with'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::String', 'Moose::Autobox::Number'; sub flatten { $_[0] } +sub first { $_[0] } +sub last { $_[0] } sub print { CORE::print $_[0] } sub say { CORE::print $_[0], "\n" } 1; @@ -43,6 +45,14 @@ # Given $input of 5, @array is (5); # Given $input of [ 5, 2, 0], @array is (5, 2, 0) +=item B + +As per flatten. + +=item B + +As per flatten. + =back =head1 BUGS diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/String.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/String.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/String.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/String.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::String; use Moose::Role; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Value'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Undef.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Undef.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Undef.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Undef.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Undef; use Moose::Role 'with'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Item'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox/Value.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox/Value.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox/Value.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox/Value.pm 2010-04-23 21:41:31.000000000 +0100 @@ -1,7 +1,7 @@ package Moose::Autobox::Value; use Moose::Role 'with'; -our $VERSION = '0.10'; +our $VERSION = '0.11'; with 'Moose::Autobox::Defined'; diff -Nru libmoose-autobox-perl-0.10/lib/Moose/Autobox.pm libmoose-autobox-perl-0.11/lib/Moose/Autobox.pm --- libmoose-autobox-perl-0.10/lib/Moose/Autobox.pm 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/lib/Moose/Autobox.pm 2010-04-23 21:41:31.000000000 +0100 @@ -8,7 +8,7 @@ use Scalar::Util (); use Moose::Util (); -our $VERSION = '0.10'; +our $VERSION = '0.11'; use base 'autobox'; diff -Nru libmoose-autobox-perl-0.10/Makefile.PL libmoose-autobox-perl-0.11/Makefile.PL --- libmoose-autobox-perl-0.10/Makefile.PL 2009-10-12 18:19:01.000000000 +0100 +++ libmoose-autobox-perl-0.11/Makefile.PL 2010-04-23 21:17:13.000000000 +0100 @@ -10,7 +10,7 @@ requires 'Moose' => '0.42'; requires 'Perl6::Junction' => '1.40000'; -test_requires 'Test::More' => '0.62'; +test_requires 'Test::More' => '0.89'; test_requires 'Test::Exception' => '0.21'; auto_manifest; diff -Nru libmoose-autobox-perl-0.10/MANIFEST libmoose-autobox-perl-0.11/MANIFEST --- libmoose-autobox-perl-0.10/MANIFEST 2009-10-12 18:19:08.000000000 +0100 +++ libmoose-autobox-perl-0.11/MANIFEST 2010-04-24 00:15:35.000000000 +0100 @@ -41,5 +41,7 @@ t/008_flatten.t t/009_number.t t/010_each.t +t/011_each_n_values.t +t/012_first_last.t xt/release/pod.t xt/release/pod_coverage.t diff -Nru libmoose-autobox-perl-0.10/META.yml libmoose-autobox-perl-0.11/META.yml --- libmoose-autobox-perl-0.10/META.yml 2009-10-12 18:19:08.000000000 +0100 +++ libmoose-autobox-perl-0.11/META.yml 2010-04-24 00:15:25.000000000 +0100 @@ -5,11 +5,11 @@ build_requires: ExtUtils::MakeMaker: 6.42 Test::Exception: 0.21 - Test::More: 0.62 + Test::More: 0.89 configure_requires: ExtUtils::MakeMaker: 6.42 distribution_type: module -generated_by: 'Module::Install version 0.91' +generated_by: 'Module::Install version 0.95' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -28,4 +28,4 @@ perl: 5.6.0 resources: license: http://dev.perl.org/licenses/ -version: 0.10 +version: 0.11 diff -Nru libmoose-autobox-perl-0.10/t/011_each_n_values.t libmoose-autobox-perl-0.11/t/011_each_n_values.t --- libmoose-autobox-perl-0.10/t/011_each_n_values.t 1970-01-01 01:00:00.000000000 +0100 +++ libmoose-autobox-perl-0.11/t/011_each_n_values.t 2010-04-23 21:33:52.000000000 +0100 @@ -0,0 +1,53 @@ +use strict; +use warnings; +use Test::More; + +use Moose::Autobox; + +{ + my @array = ('a' .. 'z'); + + my $aref = [ @array ]; + + { + my @vals; + @array->each_n_values(2, sub { push @vals, [@_] }); + is(scalar @vals, 13); + is(scalar @$_, 2) for @vals; + is_deeply(@vals->map(sub { @{ $_ } }), [@array]); + } + + { + my @vals; + $aref->each_n_values(2, sub { push @vals, [@_] }); + is(scalar @vals, 13); + is(scalar @$_, 2) for @vals; + is_deeply(@vals->map(sub { @{ $_ } }), $aref); + } +} + +{ + my %hash = (a => 1, b => 2, c => 3, d => 4); + + my $href = { %hash }; + + { + my @vals; + %hash->each_n_values(2, sub { push @vals, [@_] }); + my %seen; + is(@vals, 2); + for my $pair (@vals) { $seen{$_}++ for @$pair } + is_deeply(\%seen, { 1,1,2,1,3,1,4,1 }); + } + + { + my @vals; + $href->each_n_values(2, sub { push @vals, [@_] }); + my %seen; + is(@vals, 2); + for my $pair (@vals) { $seen{$_}++ for @$pair } + is_deeply(\%seen, { 1,1,2,1,3,1,4,1 }); + } +} + +done_testing; diff -Nru libmoose-autobox-perl-0.10/t/012_first_last.t libmoose-autobox-perl-0.11/t/012_first_last.t --- libmoose-autobox-perl-0.10/t/012_first_last.t 1970-01-01 01:00:00.000000000 +0100 +++ libmoose-autobox-perl-0.11/t/012_first_last.t 2010-04-23 21:21:20.000000000 +0100 @@ -0,0 +1,19 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use Test::More tests => 5; + +require_ok('Moose::Autobox'); + +use Moose::Autobox; + +my $string = 'foo'; +my $list = ['foo', 'bar']; + +is $string->first, 'foo'; +is $string->last, 'foo'; + +is $list->first, 'foo'; +is $list->last, 'bar';