r44424 - in /branches/upstream/libmouse-perl/current: ./ author/ inc/Test/ lib/ lib/Mouse/ lib/Mouse/Meta/ lib/Mouse/Meta/Method/ t/030_roles/ t/800_shikabased/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sun Sep 20 17:44:17 UTC 2009


Author: jawnsy-guest
Date: Sun Sep 20 17:44:12 2009
New Revision: 44424

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44424
Log:
[svn-upgrade] Integrating new upstream version, libmouse-perl (0.29)

Modified:
    branches/upstream/libmouse-perl/current/Changes
    branches/upstream/libmouse-perl/current/META.yml
    branches/upstream/libmouse-perl/current/Makefile.PL
    branches/upstream/libmouse-perl/current/author/generate-mouse-tiny.pl
    branches/upstream/libmouse-perl/current/inc/Test/More.pm
    branches/upstream/libmouse-perl/current/lib/Mouse.pm
    branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Attribute.pm
    branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Accessor.pm
    branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Role.pm
    branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm
    branches/upstream/libmouse-perl/current/t/030_roles/002_role.t
    branches/upstream/libmouse-perl/current/t/800_shikabased/013-compatibility-get_method_list.t

Modified: branches/upstream/libmouse-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/Changes?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/Changes (original)
+++ branches/upstream/libmouse-perl/current/Changes Sun Sep 20 17:44:12 2009
@@ -1,4 +1,18 @@
 Revision history for Mouse
+
+0.29 Thu Sep 17 11:49:49 2009
+
+    * role class has ->meta in method_list, because it does in Moose since 0.90
+
+0.28 Wed Sep  8 20:00:06 2009
+    * Alter Makefile.PL so in author mode we generate lib/Mouse/Tiny.pm on
+      every run so that 'make dist' actually does what it's meant to (mst)
+
+    * Only unlink Mouse::Tiny if it exists, otherwise autodie pitches
+      a fit (miyagawa)
+    
+    * Make auto_deref also handles isa not only ArrayRef and HashRef, but also 
+      ArrayRef[Foo::Bar] and HashRef[Foo::Bar]
 
 0.27 Thu Jul  2 15:17:37 2009
     * Doc updates (Sartak)

Modified: branches/upstream/libmouse-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/META.yml?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/META.yml (original)
+++ branches/upstream/libmouse-perl/current/META.yml Sun Sep 20 17:44:12 2009
@@ -25,4 +25,4 @@
   perl: 5.6.0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.27
+version: 0.28

Modified: branches/upstream/libmouse-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/Makefile.PL?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/Makefile.PL (original)
+++ branches/upstream/libmouse-perl/current/Makefile.PL Sun Sep 20 17:44:12 2009
@@ -24,6 +24,7 @@
     } else {
         print "you don't have a moose. skipping moose compatibility test\n";
     }
+    system("author/generate-mouse-tiny.pl");
 }
 
 auto_include;

Modified: branches/upstream/libmouse-perl/current/author/generate-mouse-tiny.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/author/generate-mouse-tiny.pl?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/author/generate-mouse-tiny.pl (original)
+++ branches/upstream/libmouse-perl/current/author/generate-mouse-tiny.pl Sun Sep 20 17:44:12 2009
@@ -4,8 +4,10 @@
 use File::Find;
 use File::Slurp 'slurp';
 use List::MoreUtils 'uniq';
+use autodie;
 
-unlink 'lib/Mouse/Tiny.pm';
+unlink 'lib/Mouse/Tiny.pm'
+    if -e 'lib/Mouse/Tiny.pm';
 
 my @files;
 

Modified: branches/upstream/libmouse-perl/current/inc/Test/More.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Test/More.pm?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Test/More.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Test/More.pm Sun Sep 20 17:44:12 2009
@@ -18,7 +18,7 @@
     return warn @_, " at $file line $line\n";
 }
 
-our $VERSION = '0.88';
+our $VERSION = '0.94';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Builder::Module;
@@ -34,10 +34,11 @@
   done_testing
   can_ok isa_ok new_ok
   diag note explain
+  subtest
   BAIL_OUT
 );
 
-#line 163
+#line 164
 
 sub plan {
     my $tb = Test::More->builder;
@@ -71,7 +72,7 @@
     return;
 }
 
-#line 216
+#line 217
 
 sub done_testing {
     my $tb = Test::More->builder;
@@ -188,6 +189,7 @@
             }
             elsif( $error =~ /Can't call method "isa" without a package/ ) {
                 # It's something that can't even be a class
+                $obj_name = 'The thing' unless defined $obj_name;
                 $diag = "$obj_name isn't a class or reference";
             }
             else {
@@ -220,7 +222,7 @@
     return $ok;
 }
 
-#line 650
+#line 651
 
 sub new_ok {
     my $tb = Test::More->builder;
@@ -245,7 +247,16 @@
     return $obj;
 }
 
-#line 690
+#line 719
+
+sub subtest($&) {
+    my ($name, $subtests) = @_;
+
+    my $tb = Test::More->builder;
+    return $tb->subtest(@_);
+}
+
+#line 743
 
 sub pass (;$) {
     my $tb = Test::More->builder;
@@ -259,7 +270,7 @@
     return $tb->ok( 0, @_ );
 }
 
-#line 753
+#line 806
 
 sub use_ok ($;@) {
     my( $module, @imports ) = @_;
@@ -321,7 +332,7 @@
     return( $eval_result, $eval_error );
 }
 
-#line 822
+#line 875
 
 sub require_ok ($) {
     my($module) = shift;
@@ -365,7 +376,7 @@
     return $module =~ /^[a-zA-Z]\w*$/ ? 1 : 0;
 }
 
-#line 899
+#line 952
 
 our( @Data_Stack, %Refs_Seen );
 my $DNE = bless [], 'Does::Not::Exist';
@@ -472,7 +483,7 @@
     return '';
 }
 
-#line 1059
+#line 1112
 
 sub diag {
     return Test::More->builder->diag(@_);
@@ -482,13 +493,13 @@
     return Test::More->builder->note(@_);
 }
 
-#line 1085
+#line 1138
 
 sub explain {
     return Test::More->builder->explain(@_);
 }
 
-#line 1151
+#line 1204
 
 ## no critic (Subroutines::RequireFinalReturn)
 sub skip {
@@ -516,7 +527,7 @@
     last SKIP;
 }
 
-#line 1238
+#line 1288
 
 sub todo_skip {
     my( $why, $how_many ) = @_;
@@ -537,7 +548,7 @@
     last TODO;
 }
 
-#line 1293
+#line 1343
 
 sub BAIL_OUT {
     my $reason = shift;
@@ -546,7 +557,7 @@
     $tb->BAIL_OUT($reason);
 }
 
-#line 1332
+#line 1382
 
 #'#
 sub eq_array {
@@ -672,7 +683,7 @@
     }
 }
 
-#line 1465
+#line 1515
 
 sub eq_hash {
     local @Data_Stack = ();
@@ -705,7 +716,7 @@
     return $ok;
 }
 
-#line 1522
+#line 1572
 
 sub eq_set {
     my( $a1, $a2 ) = @_;
@@ -730,6 +741,6 @@
     );
 }
 
-#line 1717
+#line 1774
 
 1;

Modified: branches/upstream/libmouse-perl/current/lib/Mouse.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/lib/Mouse.pm?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse.pm Sun Sep 20 17:44:12 2009
@@ -4,7 +4,7 @@
 use 5.006;
 use base 'Exporter';
 
-our $VERSION = '0.27';
+our $VERSION = '0.29';
 
 use Carp 'confess';
 use Scalar::Util 'blessed';

Modified: branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Attribute.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Attribute.pm?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Attribute.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Attribute.pm Sun Sep 20 17:44:12 2009
@@ -209,8 +209,7 @@
 
     confess "You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)"
         if $args->{auto_deref}
-        && $args->{isa} ne 'ArrayRef'
-        && $args->{isa} ne 'HashRef';
+        && $args->{isa} !~ /^(?:ArrayRef|HashRef)(?:\[.*\])?$/;
 
     if ($args->{trigger}) {
         if (ref($args->{trigger}) eq 'HASH') {

Modified: branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Accessor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Accessor.pm?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Accessor.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Accessor.pm Sun Sep 20 17:44:12 2009
@@ -88,7 +88,7 @@
     }
 
     if ($should_deref) {
-        if (ref($constraint) && $constraint->name eq 'ArrayRef') {
+        if (ref($constraint) && $constraint->name =~ '^ArrayRef\b') {
             $accessor .= 'if (wantarray) {
                 return @{ '.$self.'->{'.$key.'} || [] };
             }';

Modified: branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Role.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Role.pm?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Role.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Role.pm Sun Sep 20 17:44:12 2009
@@ -64,7 +64,7 @@
     no strict 'refs';
     # Get all the CODE symbol table entries
     my @functions =
-      grep !/^(?:has|with|around|before|after|augment|inner|override|super|blessed|extends|confess|excludes|meta|requires)$/,
+      grep !/^(?:has|with|around|before|after|augment|inner|override|super|blessed|extends|confess|excludes|requires)$/,
       grep { defined &{"${name}::$_"} }
       keys %{"${name}::"};
     wantarray ? @functions : \@functions;

Modified: branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm Sun Sep 20 17:44:12 2009
@@ -227,7 +227,7 @@
 use 5.006;
 use base 'Exporter';
 
-our $VERSION = '0.27';
+our $VERSION = '0.28';
 
 use Carp 'confess';
 use Scalar::Util 'blessed';
@@ -654,8 +654,7 @@
 
     confess "You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)"
         if $args->{auto_deref}
-        && $args->{isa} ne 'ArrayRef'
-        && $args->{isa} ne 'HashRef';
+        && $args->{isa} !~ /^(?:ArrayRef|HashRef)(?:\[.*\])?$/;
 
     if ($args->{trigger}) {
         if (ref($args->{trigger}) eq 'HASH') {
@@ -1212,7 +1211,7 @@
     }
 
     if ($should_deref) {
-        if (ref($constraint) && $constraint->name eq 'ArrayRef') {
+        if (ref($constraint) && $constraint->name =~ '^ArrayRef\b') {
             $accessor .= 'if (wantarray) {
                 return @{ '.$self.'->{'.$key.'} || [] };
             }';

Modified: branches/upstream/libmouse-perl/current/t/030_roles/002_role.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/t/030_roles/002_role.t?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/t/030_roles/002_role.t (original)
+++ branches/upstream/libmouse-perl/current/t/030_roles/002_role.t Sun Sep 20 17:44:12 2009
@@ -70,7 +70,7 @@
 
 is_deeply(
     [ sort $foo_role->get_method_list() ],
-    [ 'boo', 'foo' ],
+    [ 'boo', 'foo', 'meta' ],
     '... got the right method list');
 
 ok(FooRole->can('foo'), "locally defined methods are still there");

Modified: branches/upstream/libmouse-perl/current/t/800_shikabased/013-compatibility-get_method_list.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/t/800_shikabased/013-compatibility-get_method_list.t?rev=44424&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/t/800_shikabased/013-compatibility-get_method_list.t (original)
+++ branches/upstream/libmouse-perl/current/t/800_shikabased/013-compatibility-get_method_list.t Sun Sep 20 17:44:12 2009
@@ -32,6 +32,6 @@
     die $@ if $@;
     is join(',', sort "${class}Class"->meta->get_method_list()),    'foo,meta',             "mutable   $class";
     is join(',', sort "${class}ClassImm"->meta->get_method_list()), 'DESTROY,foo,meta,new', "immutable $class";
-    is join(',', sort "${class}Role"->meta->get_method_list()),     'bar',                  "role      $class";
+    is join(',', sort "${class}Role"->meta->get_method_list()),     'bar,meta',             "role      $class";
 }
 




More information about the Pkg-perl-cvs-commits mailing list