r33836 - in /branches/upstream/libmouse-perl/current: ./ inc/Module/ inc/Module/Install/ lib/ lib/Mouse/ lib/Mouse/Meta/ lib/Mouse/Meta/Method/ t/ t/900_bug/ xt/
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Fri Apr 24 02:48:31 UTC 2009
Author: ryan52-guest
Date: Fri Apr 24 02:48:25 2009
New Revision: 33836
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=33836
Log:
[svn-upgrade] Integrating new upstream version, libmouse-perl (0.22)
Added:
branches/upstream/libmouse-perl/current/t/404-role-overrides.t
branches/upstream/libmouse-perl/current/t/900_bug/002_does_role_should_search_parent.t
branches/upstream/libmouse-perl/current/xt/
branches/upstream/libmouse-perl/current/xt/99_pod.t
Removed:
branches/upstream/libmouse-perl/current/.gitignore
Modified:
branches/upstream/libmouse-perl/current/Changes
branches/upstream/libmouse-perl/current/MANIFEST
branches/upstream/libmouse-perl/current/META.yml
branches/upstream/libmouse-perl/current/Makefile.PL
branches/upstream/libmouse-perl/current/SIGNATURE
branches/upstream/libmouse-perl/current/inc/Module/Install.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/Base.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/Can.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/Include.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libmouse-perl/current/inc/Module/Install/WriteAll.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/Class.pm
branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Constructor.pm
branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm
Modified: branches/upstream/libmouse-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/Changes?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/Changes (original)
+++ branches/upstream/libmouse-perl/current/Changes Fri Apr 24 02:48:25 2009
@@ -1,4 +1,12 @@
Revision history for Mouse
+
+0.22 Tue Apr 21 03:26:43 2009
+ * Regenerate broken signature (Sartak)
+ rerpoted by Michael Gray [rt.cpan.org #45167]
+
+ * does_role now checks parent classes (tokuhirom)
+
+ * Fix for $_ not being available type constraint messages (Sartak)
0.21 Sat Apr 11 13:52:11 2009
* clone_instance has been made private, like in Moose (tokuhirom)
Modified: branches/upstream/libmouse-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/MANIFEST?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/MANIFEST (original)
+++ branches/upstream/libmouse-perl/current/MANIFEST Fri Apr 24 02:48:25 2009
@@ -1,4 +1,3 @@
-.gitignore
author/benchmarks/basic.pl
author/benchmarks/caf.pl
author/generate-mouse-tiny.pl
@@ -137,6 +136,7 @@
t/401-meta-role.t
t/402-attribute-application.t
t/403-method-modifiers.t
+t/404-role-overrides.t
t/500_moose_extends_mouse.t
t/501_moose_coerce_mouse.t
t/600-tiny-tiny.t
@@ -157,7 +157,9 @@
t/800_shikabased/013-compatibility-get_method_list.t
t/800_shikabased/014-subtype-as.t
t/900_bug/001_immutable_types.t
+t/900_bug/002_does_role_should_search_parent.t
t/lib/BaseClass.pm
t/lib/ClassType_Foo.pm
t/lib/SyntaxError.pm
t/lib/Unsweetened.pm
+xt/99_pod.t
Modified: branches/upstream/libmouse-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/META.yml?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/META.yml (original)
+++ branches/upstream/libmouse-perl/current/META.yml Fri Apr 24 02:48:25 2009
@@ -3,12 +3,13 @@
author:
- 'Shawn M Moore, C<< <sartak at gmail.com> >>'
build_requires:
+ ExtUtils::MakeMaker: 6.42
Test::Exception: 0
Test::More: 0
configure_requires:
- ExtUtils::MakeMaker: 6.48
+ ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.81'
+generated_by: 'Module::Install version 0.84'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -23,4 +24,4 @@
perl: 5.6.0
resources:
license: http://dev.perl.org/licenses/
-version: 0.21
+version: 0.22
Modified: branches/upstream/libmouse-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/Makefile.PL?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/Makefile.PL (original)
+++ branches/upstream/libmouse-perl/current/Makefile.PL Fri Apr 24 02:48:25 2009
@@ -74,6 +74,7 @@
close $rfh;
$s;
};
+ $src =~ s/Mouse::is_class_loaded/Class::MOP::is_class_loaded/g;
$src =~ s/Mouse/Moose/g;
$src;
};
Modified: branches/upstream/libmouse-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/SIGNATURE?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/SIGNATURE (original)
+++ branches/upstream/libmouse-perl/current/SIGNATURE Fri Apr 24 02:48:25 2009
@@ -14,46 +14,45 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 744288e66fbefbc3b94f94dedd8f4751604fcf08 .gitignore
-SHA1 462975565bcd8a7b0b77d325d74a17f568c92df8 Changes
-SHA1 b64c68688d87c7faeaf4c25330889ea54ad8a598 MANIFEST
-SHA1 e64c594b662d5e778ec5582f8a073727839ec8de META.yml
-SHA1 be366f1623ef4c58824ea3136dc7071da0b593eb Makefile.PL
+SHA1 c5e0017796cef8cc7e6a8866f95b3240f40b50c7 Changes
+SHA1 3bc2194aa8033132d888b42487c515f700505a33 MANIFEST
+SHA1 b3e3ca961ec63cf7b98b15a4f193ea618dfd7c4d META.yml
+SHA1 1609a04a7d6d71c2cdbb231cea272ea0a0d405d1 Makefile.PL
SHA1 eec192dccd58fd399dd521615e8f3e11994fed56 author/benchmarks/basic.pl
SHA1 d4abebe7f431a63ad99ff234e4e0700b17280556 author/benchmarks/caf.pl
SHA1 a408c24efc701c368bbde43c020b29e1ebd80f64 author/generate-mouse-tiny.pl
SHA1 ead9858dc8c0cedaa528be47343c9abb6bd4c6db author/munge-tests-for-moose.pl
-SHA1 0ee138b692d09ede5107b5e90fcb0559c14ccf00 inc/Module/Install.pm
-SHA1 85ada888142a3992433fa164ed103afc5f4b88a0 inc/Module/Install/Base.pm
-SHA1 74f79103450ad44d6e9cd3deffb1cd5bdee4f047 inc/Module/Install/Can.pm
-SHA1 441fb3c1a4db8beef56f41f5cdb091f42a63e8b8 inc/Module/Install/Fetch.pm
-SHA1 6ec5842c626c056dad625019bbe56492dfe70ea6 inc/Module/Install/Include.pm
-SHA1 b444632abd605e508a89a21af4690226a2ac92a9 inc/Module/Install/Makefile.pm
-SHA1 0436aa3e436884a3ce9f5a3edc4c3482cd4aaf1f inc/Module/Install/Metadata.pm
-SHA1 6717f1e3af4ad5729471923e5394082c2b94ec44 inc/Module/Install/Win32.pm
-SHA1 dacd292443c703c2f270fb0398752f2d8ead43b6 inc/Module/Install/WriteAll.pm
+SHA1 bc47e8f4bf1fcb7d97f55b9933b6476351a5ea3e inc/Module/Install.pm
+SHA1 114a6fb09697f4b016cf9dcd038c9e3519b02022 inc/Module/Install/Base.pm
+SHA1 f1e78d7c4b902eaf95a3289c42669a19f4125d28 inc/Module/Install/Can.pm
+SHA1 d1c70bc59bf648fc6e4e93b1cd6699fc5841fd64 inc/Module/Install/Fetch.pm
+SHA1 ddcd08a072dc0847346f82148bc697d64d1bb2a5 inc/Module/Install/Include.pm
+SHA1 079203f749342191f5c26170649dbeda93b7c294 inc/Module/Install/Makefile.pm
+SHA1 cf79ec0a289b05e1804733c04d91ca04dc5dbbf6 inc/Module/Install/Metadata.pm
+SHA1 e67c232bed8c4d91a7a2ea06236cf47cd37369d0 inc/Module/Install/Win32.pm
+SHA1 ac709b9014051e94d5afcef5dedf6155124d8cec inc/Module/Install/WriteAll.pm
SHA1 29ccdbe057fec4775456b275262881a6f79531d6 inc/Test/Exception.pm
SHA1 ab0c02dbe66a1a82be1cc3909a06b41d3e5894c2 inc/Test/More.pm
-SHA1 9f8c1b74ec0ac473fbb5fdc4c5559b2bdaac071e lib/Mouse.pm
-SHA1 ec8412fef29d1d8bdec5c152caaa65f0b6a75197 lib/Mouse/Meta/Attribute.pm
-SHA1 7707419c70e90e50e1971c02c25bbc3c43814d37 lib/Mouse/Meta/Class.pm
+SHA1 f533f2ad2ccf2cd26504882733054beef0d4c98e lib/Mouse.pm
+SHA1 f060628159141811891dd38253daf62b561ea438 lib/Mouse/Meta/Attribute.pm
+SHA1 c7a5fa0c45ae8a504b3896e22deba53f703422d7 lib/Mouse/Meta/Class.pm
SHA1 6c9c029992d398bc966b207230811fd72abb8c94 lib/Mouse/Meta/Method/Accessor.pm
-SHA1 050fb63e397c41d86603ddb3ba7b085d203dacf2 lib/Mouse/Meta/Method/Constructor.pm
+SHA1 9ec71e3ac0042e8cfaaf984e12083e38a5dcce57 lib/Mouse/Meta/Method/Constructor.pm
SHA1 8feddf4deaee14d9c1f69eff8d0c986222e90dde lib/Mouse/Meta/Method/Destructor.pm
-SHA1 217da3adc733894d8dfbde2dbf9ff877cd26c6c9 lib/Mouse/Meta/Role.pm
-SHA1 fae0192b93bf4e53d909000a3abb1deaa8a21258 lib/Mouse/Meta/TypeConstraint.pm
-SHA1 76773288ce559991b683ad0100fa22f3bbb1bae0 lib/Mouse/Object.pm
-SHA1 fffeb3da9d3ea420a0fa0ef306e46ecf552169db lib/Mouse/Role.pm
-SHA1 b2838a7b5c4acf77e1c902a39652346c4ca4985f lib/Mouse/Tiny.pm
+SHA1 10122e3b1966a463c25bf5c5066cde1210c4e52b lib/Mouse/Meta/Role.pm
+SHA1 aeedb4cce3076d23d8bb852951154da02245ea54 lib/Mouse/Meta/TypeConstraint.pm
+SHA1 7fbdcfc30fac0d5e0a5e18c38467be4be971049e lib/Mouse/Object.pm
+SHA1 9f45252a4aa85150dbfb64444542c71081c056e1 lib/Mouse/Role.pm
+SHA1 19b686decddfcac1c648ca5416d16a1eb374589f lib/Mouse/Tiny.pm
SHA1 affa82bf47e1888f22731b76c5c0f678bc5e43c0 lib/Mouse/TypeRegistry.pm
SHA1 5413c3ac0bae3c80e1f50dfbf30ffdf8e80aacd3 lib/Mouse/Util.pm
-SHA1 7776d6e0f3bafab6f576737f58c328b4967f5b6c lib/Mouse/Util/TypeConstraints.pm
+SHA1 711e7c3539730a0af8317a043fbd106893c5ca1e lib/Mouse/Util/TypeConstraints.pm
SHA1 e99225c45d89838e9de6b2497c7e57259b622ae3 lib/Squirrel.pm
SHA1 1d459388c2b9e9173b9fcb0f13413b85758a1e7a lib/Squirrel/Role.pm
SHA1 7953af29701a1f92486e4af890baac30155774e0 lib/ouse.pm
SHA1 a032ef857e5af0b9abf473804cb16a3ce335ec4f t/000-load.t
SHA1 7a6085c37c3b375546885d4fa9bc06ed30468435 t/000-recipes/001_point.t
-SHA1 65ec24d59beae08900e45b6aa75e3dcf0fe881df t/000-recipes/002_schwartz_tutorial.t
+SHA1 3974806f44709481d3562dd5bae1928cb6338cb1 t/000-recipes/002_schwartz_tutorial.t
SHA1 a1444748d74f42d345ab1e36383dc1c0206d094c t/000-recipes/basics-recipe10.t
SHA1 87e71f415a91d6ac23ad63054f2aab8b42670521 t/001-strict.t
SHA1 b6bf566efa068afb392bb25d1497adc0f342dd09 t/002-warnings.t
@@ -82,12 +81,12 @@
SHA1 4ec25bec482afa02875f25d0c9f75d6755667d9a t/025-more-isa.t
SHA1 00c3e4811d64afe0f54995dcc8c614f3dd8c28bf t/026-auto-deref.t
SHA1 730d72a94a5335c46e4f334063b44015fab83ee8 t/027-modifiers.t
-SHA1 171113befd804d6bcc7d5d687f5bb8dd43f93669 t/028-subclass-attr.t
+SHA1 731244ae8a03104880c0cd40eb547f7b4a4cc27c t/028-subclass-attr.t
SHA1 2fc379519bfbf7e5e3127aca75ca819ce49e9c8e t/029-new.t
SHA1 dc394f55c4ebac2f09398ec0722ef088166f4ab8 t/030-has-plus.t
SHA1 4d325604d56ca4d2d16f38c2b1bc5351d3185cb4 t/030_roles/002_role.t
-SHA1 ed09eb62299cbd6a7e9125c017690d06db5e0111 t/030_roles/003_apply_role.t
-SHA1 bb4ad19a873f41f97a7f2739f2bb210714bf3f11 t/030_roles/019_build.t
+SHA1 414506cff37ec0c672fcd1e822ce81b11e8c8783 t/030_roles/003_apply_role.t
+SHA1 988452fe8e64a2a0a82670bb97494a8dce0da86e t/030_roles/019_build.t
SHA1 96f1047d9815af90397a0368d665fd3d311e049c t/030_roles/031_roles_applied_in_create.t
SHA1 a7300d4d9fe0c756c5e3d4fc1fd0ecddc0e015dc t/030_roles/failing/001_meta_role.t
SHA1 dcc2f46b862f1efe5517ba5fd01cce0099aaec64 t/030_roles/failing/004_role_composition_errors.t
@@ -118,7 +117,7 @@
SHA1 b14fa26cf5719adb9ae59cd4d6df300aa139e2b9 t/030_roles/failing/035_anonymous_roles.t
SHA1 83d5c22118f9132bfcbfdfe8d4c0619bafd32f91 t/030_roles/failing/036_free_anonymous_roles.t
SHA1 c757cbcb44fb862dedf88a59bfe0dc178bc8dc1d t/030_roles/failing/037_create_role_subclass.t
-SHA1 8b1dd39e9d620b6f3d62c4997d6b768ff3773644 t/031-clone.t
+SHA1 8cdfc370bb192ea0cdffcf06cd284cc5f4906d3a t/031-clone.t
SHA1 bcf6dd6814486bc12df83cb8e94cfe4eb1d41c2f t/032-buildargs.t
SHA1 019939ac411fd8ef48ae9875d0aad0f04eca6838 t/033-readwrite.t
SHA1 3ba5e7d896e349f31e1d2b0424d843181a3e99b4 t/033-requires.t
@@ -127,7 +126,7 @@
SHA1 cd66f4083cc7ba54acfacb5d4be79b6ec28512d6 t/036-with-method-alias.t
SHA1 79edbf027ac61e4a98bfff64925492fc71631598 t/037-dont-load-test-exception.t
SHA1 6e73be9e0b24bf0baf62517aa41b36807990a372 t/038-main.t
-SHA1 5a41d555a7dbb2319d30d9827e441d57e314fdd4 t/039-subtype.t
+SHA1 16ff9cb132d7fcd9f8c7de918ebb98981ab61d5e t/039-subtype.t
SHA1 e845d0feb414ec954d04efac50dacdaa2cab30a1 t/040-existing-subclass.t
SHA1 abcd24e01ed3653acd0cb5443df1a49aef4b5ffa t/041-enum.t
SHA1 89bbc4b861d0366721cdb919d3950c0926f41f9f t/042-override.t
@@ -152,7 +151,8 @@
SHA1 199e4d90651594b4a459562bb6261ca7787638e8 t/401-meta-role.t
SHA1 14b7688b7f0d07d289f137051641a7885eeefef9 t/402-attribute-application.t
SHA1 44c26a61ae4fbf84d7ca6bb5a9dfe1dea4872466 t/403-method-modifiers.t
-SHA1 3e6cd52ab51e18702aa0350e31f349387bb34903 t/500_moose_extends_mouse.t
+SHA1 9cc0856a174c6bd8634c72e3af943d0b2390812d t/404-role-overrides.t
+SHA1 9081f26371c5d3fc74b7cec8dbb8c9604cf9f485 t/500_moose_extends_mouse.t
SHA1 8e0aa09822a675fb7a5956c0554410f9203fa85e t/501_moose_coerce_mouse.t
SHA1 2e7f7f98574d85d60badc954085c921d6e514972 t/600-tiny-tiny.t
SHA1 15b7a10fc869cc014d8d173aa28bd9ae6a3101b2 t/601-tiny-mouse.t
@@ -172,14 +172,16 @@
SHA1 febaad9c6c6ac6ba64605543371cbdf5f1cd5b76 t/800_shikabased/013-compatibility-get_method_list.t
SHA1 342fa56f2ef817d5d3bba2efc68108c013d0b05b t/800_shikabased/014-subtype-as.t
SHA1 c76c2e28b0fb780bd17e3b17546e93758ace2546 t/900_bug/001_immutable_types.t
+SHA1 a84dd7b932633fbae87c4d58d9f0961f55088a80 t/900_bug/002_does_role_should_search_parent.t
SHA1 d059463111c35328dbf41710ec76daa5fb5b93dc t/lib/BaseClass.pm
SHA1 e4f152b946efb3a39d27f3e708d0f5a49fba42b4 t/lib/ClassType_Foo.pm
SHA1 5c30addc00eab464845e8d593ec12b44919997c3 t/lib/SyntaxError.pm
SHA1 ad8b48c63818ff1e20c100959a687b01c737343d t/lib/Unsweetened.pm
+SHA1 e9c6a5881fc60173fbc8d479c1afd2ce3b43bef1 xt/99_pod.t
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
-iD8DBQFJ3pD8sxfQtHhyRPoRAjbVAJ4hCZjC3plLqN4DLNTk6w0IlkWnmACfcS+F
-NgvoXJCWOs8OTHeUq3xY0nQ=
-=0tNm
+iD8DBQFJ7XXusxfQtHhyRPoRAl/eAJ46iedtW+A6bBg4v4nHyEOfN4S1uACghEIp
+JjzYIm/v5Bmk5xkSS1IZFXA=
+=N1Ea
-----END PGP SIGNATURE-----
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install.pm Fri Apr 24 02:48:25 2009
@@ -17,12 +17,10 @@
# 3. The ./inc/ version of Module::Install loads
# }
-BEGIN {
- require 5.004;
-}
+use 5.005;
use strict 'vars';
-use vars qw{$VERSION};
+use vars qw{$VERSION $MAIN};
BEGIN {
# All Module::Install core packages now require synchronised versions.
# This will be used to ensure we don't accidentally load old or
@@ -30,7 +28,10 @@
# 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.81';
+ $VERSION = '0.84';
+
+ # Storage for the pseudo-singleton
+ $MAIN = undef;
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -93,6 +94,7 @@
+
# 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" }
@@ -131,14 +133,22 @@
$sym->{$cwd} = sub {
my $pwd = Cwd::cwd();
if ( my $code = $sym->{$pwd} ) {
- # delegate back to parent dirs
+ # Delegate back to parent dirs
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unless ( uc($1) eq $1 ) {
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')};
+ my $method = $1;
+ if ( uc($method) eq $method ) {
+ # Do nothing
+ return;
+ } elsif ( $method =~ /^_/ and $self->can($method) ) {
+ # Dispatch to the root M:I class
+ return $self->$method(@_);
}
+
+ # Dispatch to the appropriate plugin
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')};
};
}
@@ -163,6 +173,9 @@
delete $INC{"$self->{file}"};
delete $INC{"$self->{path}.pm"};
+ # Save to the singleton
+ $MAIN = $self;
+
return 1;
}
@@ -176,8 +189,7 @@
my @exts = @{$self->{extensions}};
unless ( @exts ) {
- my $admin = $self->{admin};
- @exts = $admin->load_all_extensions;
+ @exts = $self->{admin}->load_all_extensions;
}
my %seen;
@@ -260,7 +272,7 @@
sub load_extensions {
my ($self, $path, $top) = @_;
- unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
+ unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
unshift @INC, $self->{prefix};
}
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/Base.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/Base.pm Fri Apr 24 02:48:25 2009
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.81';
+$VERSION = '0.84';
# Suspend handler for "redefined" warnings
BEGIN {
@@ -15,48 +15,57 @@
#line 41
sub new {
- my ($class, %args) = @_;
+ my ($class, %args) = @_;
- foreach my $method ( qw(call load) ) {
- *{"$class\::$method"} = sub {
- shift()->_top->$method(@_);
- } unless defined &{"$class\::$method"};
- }
+ foreach my $method ( qw(call load) ) {
+ next if defined &{"$class\::$method"};
+ *{"$class\::$method"} = sub {
+ shift()->_top->$method(@_);
+ };
+ }
- bless( \%args, $class );
+ bless( \%args, $class );
}
-#line 61
+#line 62
sub AUTOLOAD {
- my $self = shift;
- local $@;
- my $autoload = eval { $self->_top->autoload } or return;
- goto &$autoload;
+ my $self = shift;
+ local $@;
+ my $autoload = eval {
+ $self->_top->autoload
+ } or return;
+ goto &$autoload;
}
-#line 76
+#line 79
-sub _top { $_[0]->{_top} }
+sub _top {
+ $_[0]->{_top};
+}
-#line 89
+#line 94
sub admin {
- $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin}
+ or
+ Module::Install::Base::FakeAdmin->new;
}
-#line 101
+#line 110
sub is_admin {
- $_[0]->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
package Module::Install::Base::FakeAdmin;
-my $Fake;
-sub new { $Fake ||= bless(\@_, $_[0]) }
+my $fake;
+sub new {
+ $fake ||= bless(\@_, $_[0]);
+}
sub AUTOLOAD {}
@@ -69,4 +78,4 @@
1;
-#line 146
+#line 157
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/Can.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/Can.pm Fri Apr 24 02:48:25 2009
@@ -9,7 +9,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.84';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/Fetch.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/Fetch.pm Fri Apr 24 02:48:25 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.84';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/Include.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/Include.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/Include.pm Fri Apr 24 02:48:25 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.84';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/Makefile.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/Makefile.pm Fri Apr 24 02:48:25 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.84';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -114,17 +114,32 @@
my $self = shift;
die "&Makefile->write() takes no arguments\n" if @_;
- # Make sure we have a new enough
+ # Check the current Perl version
+ my $perl_version = $self->perl_version;
+ if ( $perl_version ) {
+ eval "use $perl_version; 1"
+ or die "ERROR: perl: Version $] is installed, "
+ . "but we need version >= $perl_version";
+ }
+
+ # Make sure we have a new enough MakeMaker
require ExtUtils::MakeMaker;
- # MakeMaker can complain about module versions that include
- # 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->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
-
- # Generate the
+ if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
+ # MakeMaker can complain about module versions that include
+ # 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+)/ );
+ } 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->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ }
+
+ # Generate the MakeMaker params
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
$args->{NAME} = $self->module_name || $self->name;
@@ -133,7 +148,7 @@
if ( $self->tests ) {
$args->{test} = { TESTS => $self->tests };
}
- if ($] >= 5.005) {
+ if ( $] >= 5.005 ) {
$args->{ABSTRACT} = $self->abstract;
$args->{AUTHOR} = $self->author;
}
@@ -147,7 +162,7 @@
delete $args->{SIGN};
}
- # merge both kinds of requires into prereq_pm
+ # Merge both kinds of requires into prereq_pm
my $prereq = ($args->{PREREQ_PM} ||= {});
%$prereq = ( %$prereq,
map { @$_ }
@@ -250,4 +265,4 @@
__END__
-#line 379
+#line 394
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/Metadata.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/Metadata.pm Fri Apr 24 02:48:25 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.84';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/Win32.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/Win32.pm Fri Apr 24 02:48:25 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.84';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libmouse-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/inc/Module/Install/WriteAll.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libmouse-perl/current/inc/Module/Install/WriteAll.pm Fri Apr 24 02:48:25 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.81';
+ $VERSION = '0.84';
@ISA = qw{Module::Install::Base};
$ISCORE = 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=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse.pm Fri Apr 24 02:48:25 2009
@@ -4,7 +4,7 @@
use 5.006;
use base 'Exporter';
-our $VERSION = '0.21';
+our $VERSION = '0.22';
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=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Attribute.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Attribute.pm Fri Apr 24 02:48:25 2009
@@ -225,13 +225,14 @@
}
sub verify_against_type_constraint {
- return 1 unless $_[0]->{type_constraint};
-
- local $_ = $_[1];
- return 1 if $_[0]->{type_constraint}->check($_);
-
- my $self = shift;
- $self->verify_type_constraint_error($self->name, $_, $self->{type_constraint});
+ my ($self, $value) = @_;
+ my $tc = $self->type_constraint;
+ return 1 unless $tc;
+
+ local $_ = $value;
+ return 1 if $tc->check($value);
+
+ $self->verify_type_constraint_error($self->name, $value, $tc);
}
sub verify_type_constraint_error {
Modified: branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Class.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Class.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Class.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Class.pm Fri Apr 24 02:48:25 2009
@@ -309,7 +309,7 @@
for my $class ($self->linearized_isa) {
next unless $class->can('meta') and $class->meta->can('roles');
- for my $role (@{ $self->roles }) {
+ for my $role (@{ $class->meta->roles }) {
return 1 if $role->name eq $role_name;
}
}
Modified: branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Constructor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Constructor.pm?rev=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Constructor.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Meta/Method/Constructor.pm Fri Apr 24 02:48:25 2009
@@ -61,7 +61,7 @@
}
$code .= "
\$attrs[$index]->verify_type_constraint_error(
- '$key', \$_, \$attrs[$index]->type_constraint
+ '$key', \$value, \$attrs[$index]->type_constraint
)
}
";
@@ -117,7 +117,7 @@
if ($attr->has_type_constraint) {
$code .= "{
unless (\$attrs[$index]->{type_constraint}->check(\$value)) {
- \$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)
+ \$attrs[$index]->verify_type_constraint_error('$key', \$value, \$attrs[$index]->type_constraint)
}
}";
}
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=33836&op=diff
==============================================================================
--- branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm (original)
+++ branches/upstream/libmouse-perl/current/lib/Mouse/Tiny.pm Fri Apr 24 02:48:25 2009
@@ -227,7 +227,7 @@
use 5.006;
use base 'Exporter';
-our $VERSION = '0.21';
+our $VERSION = '0.22';
use Carp 'confess';
use Scalar::Util 'blessed';
@@ -631,13 +631,14 @@
}
sub verify_against_type_constraint {
- return 1 unless $_[0]->{type_constraint};
-
- local $_ = $_[1];
- return 1 if $_[0]->{type_constraint}->check($_);
-
- my $self = shift;
- $self->verify_type_constraint_error($self->name, $_, $self->{type_constraint});
+ my ($self, $value) = @_;
+ my $tc = $self->type_constraint;
+ return 1 unless $tc;
+
+ local $_ = $value;
+ return 1 if $tc->check($value);
+
+ $self->verify_type_constraint_error($self->name, $value, $tc);
}
sub verify_type_constraint_error {
@@ -998,7 +999,7 @@
for my $class ($self->linearized_isa) {
next unless $class->can('meta') and $class->meta->can('roles');
- for my $role (@{ $self->roles }) {
+ for my $role (@{ $class->meta->roles }) {
return 1 if $role->name eq $role_name;
}
}
@@ -1254,7 +1255,7 @@
}
$code .= "
\$attrs[$index]->verify_type_constraint_error(
- '$key', \$_, \$attrs[$index]->type_constraint
+ '$key', \$value, \$attrs[$index]->type_constraint
)
}
";
@@ -1310,7 +1311,7 @@
if ($attr->has_type_constraint) {
$code .= "{
unless (\$attrs[$index]->{type_constraint}->check(\$value)) {
- \$attrs[$index]->verify_type_constraint_error('$key', \$_, \$attrs[$index]->type_constraint)
+ \$attrs[$index]->verify_type_constraint_error('$key', \$value, \$attrs[$index]->type_constraint)
}
}";
}
@@ -2382,7 +2383,7 @@
}; #eval
} #unless
-} # XXX added manually
+} # argh!
package Mouse::Tiny;
use base 'Mouse';
Added: branches/upstream/libmouse-perl/current/t/404-role-overrides.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/t/404-role-overrides.t?rev=33836&op=file
==============================================================================
--- branches/upstream/libmouse-perl/current/t/404-role-overrides.t (added)
+++ branches/upstream/libmouse-perl/current/t/404-role-overrides.t Fri Apr 24 02:48:25 2009
@@ -1,0 +1,35 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More tests => 2;
+
+do {
+ package My::Role;
+ use Mouse::Role;
+
+ sub foo { 'role' }
+
+ package Parent;
+ use Mouse;
+
+ sub foo { 'parent' }
+
+ package Child;
+ use Mouse;
+ extends 'Parent';
+ with 'My::Role';
+};
+
+is(Child->foo, 'role');
+
+do {
+ package ChildOverride;
+ use Mouse;
+ extends 'Parent';
+ with 'My::Role';
+
+ sub foo { 'child' }
+};
+
+is(ChildOverride->foo, 'child');
+
Added: branches/upstream/libmouse-perl/current/t/900_bug/002_does_role_should_search_parent.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/t/900_bug/002_does_role_should_search_parent.t?rev=33836&op=file
==============================================================================
--- branches/upstream/libmouse-perl/current/t/900_bug/002_does_role_should_search_parent.t (added)
+++ branches/upstream/libmouse-perl/current/t/900_bug/002_does_role_should_search_parent.t Fri Apr 24 02:48:25 2009
@@ -1,0 +1,26 @@
+use strict;
+use warnings;
+use Test::More tests => 2;
+
+# Klass->does_role should check the parent classes.
+
+{
+ package R1;
+ use Mouse::Role;
+}
+
+{
+ package C1;
+ use Mouse;
+ with 'R1';
+}
+
+{
+ package C2;
+ use Mouse;
+ extends 'C1';
+}
+
+ok(C1->meta->does_role('R1'));
+ok(C2->meta->does_role('R1'));
+
Added: branches/upstream/libmouse-perl/current/xt/99_pod.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmouse-perl/current/xt/99_pod.t?rev=33836&op=file
==============================================================================
--- branches/upstream/libmouse-perl/current/xt/99_pod.t (added)
+++ branches/upstream/libmouse-perl/current/xt/99_pod.t Fri Apr 24 02:48:25 2009
@@ -1,0 +1,4 @@
+use Test::More;
+eval "use Test::Pod 1.00";
+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
+all_pod_files_ok();
More information about the Pkg-perl-cvs-commits
mailing list