r38133 - in /branches/upstream/libclass-method-modifiers-perl/current: ./ inc/Module/ inc/Module/Install/ lib/Class/Method/ t/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Tue Jun 16 03:00:30 UTC 2009


Author: jawnsy-guest
Date: Tue Jun 16 02:59:55 2009
New Revision: 38133

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38133
Log:
[svn-upgrade] Integrating new upstream version, libclass-method-modifiers-perl (1.04)

Added:
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/GithubMeta.pm
Removed:
    branches/upstream/libclass-method-modifiers-perl/current/SIGNATURE
Modified:
    branches/upstream/libclass-method-modifiers-perl/current/Changes
    branches/upstream/libclass-method-modifiers-perl/current/MANIFEST
    branches/upstream/libclass-method-modifiers-perl/current/META.yml
    branches/upstream/libclass-method-modifiers-perl/current/Makefile.PL
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install.pm
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Base.pm
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Can.pm
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Fetch.pm
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Makefile.pm
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Metadata.pm
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Win32.pm
    branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/WriteAll.pm
    branches/upstream/libclass-method-modifiers-perl/current/lib/Class/Method/Modifiers.pm
    branches/upstream/libclass-method-modifiers-perl/current/t/010-before-args.t
    branches/upstream/libclass-method-modifiers-perl/current/t/011-after-args.t
    branches/upstream/libclass-method-modifiers-perl/current/t/012-around-args.t
    branches/upstream/libclass-method-modifiers-perl/current/t/020-multiple-inheritance.t
    branches/upstream/libclass-method-modifiers-perl/current/t/030-multiple-before.t
    branches/upstream/libclass-method-modifiers-perl/current/t/031-multiple-after.t
    branches/upstream/libclass-method-modifiers-perl/current/t/032-multiple-around.t
    branches/upstream/libclass-method-modifiers-perl/current/t/034-multiple-everything.t
    branches/upstream/libclass-method-modifiers-perl/current/t/035-multiple-everything-twice.t
    branches/upstream/libclass-method-modifiers-perl/current/t/040-twice-orig.t
    branches/upstream/libclass-method-modifiers-perl/current/t/051-undef-list-ctxt.t
    branches/upstream/libclass-method-modifiers-perl/current/t/060-caller.t
    branches/upstream/libclass-method-modifiers-perl/current/t/070-modify-multiple-at-once.t
    branches/upstream/libclass-method-modifiers-perl/current/t/080-multiple-modifiers.t
    branches/upstream/libclass-method-modifiers-perl/current/t/081-sub-and-modifier.t
    branches/upstream/libclass-method-modifiers-perl/current/t/090-diamond.t
    branches/upstream/libclass-method-modifiers-perl/current/t/100-class-mop-method-modifiers.t
    branches/upstream/libclass-method-modifiers-perl/current/t/101-bank-account.t

Modified: branches/upstream/libclass-method-modifiers-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/Changes?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/Changes (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/Changes Tue Jun 16 02:59:55 2009
@@ -1,7 +1,17 @@
 Revision history for Class-Method-Modifiers
+
+1.04    Mon Jun 15 11:33:31 2009
+        We need parens around confess if we're going to delay-load
+            Carp, affects only 5.10 (reported by David Raab)
+
+1.03    Sun Jun 14 14:44:25 2009
+        Modernize the dist
+        Fix possible test failures
+        Only load Carp if we have to
 
 1.02    Sun May 31 23:33:42 2009
         Fix for void context (reported by tokuhirom)
+        Lift dependency on on MRO::Compat
 
 1.01    Thu Jun 26 22:22:30 2008
         Revert the caching fix. It makes wrapping parent-class methods

Modified: branches/upstream/libclass-method-modifiers-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/MANIFEST?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/MANIFEST (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/MANIFEST Tue Jun 16 02:59:55 2009
@@ -3,6 +3,7 @@
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
 inc/Module/Install/Fetch.pm
+inc/Module/Install/GithubMeta.pm
 inc/Module/Install/Makefile.pm
 inc/Module/Install/Metadata.pm
 inc/Module/Install/Win32.pm
@@ -11,7 +12,6 @@
 Makefile.PL
 MANIFEST			This list of files
 META.yml
-SIGNATURE
 t/000-load.t
 t/001-error.t
 t/002-cache.t

Modified: branches/upstream/libclass-method-modifiers-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/META.yml?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/META.yml (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/META.yml Tue Jun 16 02:59:55 2009
@@ -1,25 +1,25 @@
 ---
 abstract: 'provides Moose-like method modifiers'
 author:
-  - 'Shawn M Moore, C<< <sartak at gmail.com> >>'
+  - '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.42
 distribution_type: module
-generated_by: 'Module::Install version 0.89'
+generated_by: 'Module::Install version 0.91'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: 1.4
-module_name: Class::Method::Modifiers
 name: Class-Method-Modifiers
 no_index:
   directory:
     - inc
     - t
 resources:
+  homepage: http://github.com/sartak/Class-Method-Modifiers/tree
   license: http://dev.perl.org/licenses/
-version: 1.02
+  repository: git://github.com/sartak/Class-Method-Modifiers.git
+version: 1.04

Modified: branches/upstream/libclass-method-modifiers-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/Makefile.PL?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/Makefile.PL (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/Makefile.PL Tue Jun 16 02:59:55 2009
@@ -1,8 +1,11 @@
+# Load the Module::Install bundled in ./inc/
 use inc::Module::Install;
 
+# Define metadata
+name           'Class-Method-Modifiers';
 all_from       'lib/Class/Method/Modifiers.pm';
+githubmeta;
 
-build_requires 'Test::More';
 build_requires 'Test::Exception';
 
 WriteAll;

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install.pm Tue Jun 16 02:59:55 2009
@@ -28,7 +28,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.89';
+	$VERSION = '0.91';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Base.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Base.pm Tue Jun 16 02:59:55 2009
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.89';
+	$VERSION = '0.91';
 }
 
 # Suspend handler for "redefined" warnings
@@ -13,42 +13,34 @@
 	$SIG{__WARN__} = sub { $w };
 }
 
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 45
+#line 42
 
 sub new {
-	my ($class, %args) = @_;
-
-	foreach my $method ( qw(call load) ) {
-		next if defined &{"$class\::$method"};
-		*{"$class\::$method"} = sub {
-			shift()->_top->$method(@_);
-		};
+	my $class = shift;
+	unless ( defined &{"${class}::call"} ) {
+		*{"${class}::call"} = sub { shift->_top->call(@_) };
 	}
-
-	bless( \%args, $class );
+	unless ( defined &{"${class}::load"} ) {
+		*{"${class}::load"} = sub { shift->_top->load(@_) };
+	}
+	bless { @_ }, $class;
 }
 
-#line 66
+#line 61
 
 sub AUTOLOAD {
-	my $self = shift;
 	local $@;
-	my $autoload = eval {
-		$self->_top->autoload
-	} or return;
-	goto &$autoload;
+	my $func = eval { shift->_top->autoload } or return;
+	goto &$func;
 }
 
-#line 83
+#line 75
 
 sub _top {
 	$_[0]->{_top};
 }
 
-#line 98
+#line 90
 
 sub admin {
 	$_[0]->_top->{admin}
@@ -56,7 +48,7 @@
 	Module::Install::Base::FakeAdmin->new;
 }
 
-#line 114
+#line 106
 
 sub is_admin {
 	$_[0]->admin->VERSION;
@@ -83,4 +75,4 @@
 
 1;
 
-#line 162
+#line 154

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Can.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Can.pm Tue Jun 16 02:59:55 2009
@@ -2,16 +2,16 @@
 package Module::Install::Can;
 
 use strict;
-use Module::Install::Base;
-use Config              ();
-use File::Spec          ();
-use ExtUtils::MakeMaker ();
+use Config                ();
+use File::Spec            ();
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.89';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 # check if we can load some module

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Fetch.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Fetch.pm Tue Jun 16 02:59:55 2009
@@ -2,13 +2,13 @@
 package Module::Install::Fetch;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.89';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub get_file {

Added: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/GithubMeta.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/GithubMeta.pm?rev=38133&op=file
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/GithubMeta.pm (added)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/GithubMeta.pm Tue Jun 16 02:59:55 2009
@@ -1,0 +1,50 @@
+#line 1
+package Module::Install::GithubMeta;
+
+use strict;
+use warnings;
+use Cwd;
+use base qw(Module::Install::Base);
+use vars qw($VERSION);
+
+$VERSION = '0.08';
+
+sub githubmeta {
+  my $self = shift;
+  return unless $Module::Install::AUTHOR;
+  return unless _under_git();
+  return unless $self->can_run('git');
+  return unless my ($git_url) = `git remote show origin` =~ /URL: (.*)$/m;
+  return unless $git_url =~ /github\.com/; # Not a Github repository
+  my $http_url = $git_url;
+  $git_url =~ s![\w\-]+\@([^:]+):!git://$1/!;
+  $http_url =~ s![\w\-]+\@([^:]+):!http://$1/!;
+  $http_url =~ s!\.git$!/tree!;
+  $self->repository( $git_url );
+  $self->homepage( $http_url ) unless $self->homepage();
+  return 1;
+}
+
+sub _under_git {
+  return 1 if -e '.git';
+  my $cwd = getcwd;
+  my $last = $cwd;
+  my $found = 0;
+  while (1) {
+    chdir '..' or last;
+    my $current = getcwd;
+    last if $last eq $current;
+    $last = $current;
+    if ( -e '.git' ) {
+       $found = 1;
+       last;
+    }
+  }
+  chdir $cwd;
+  return $found;
+}
+
+'Github';
+__END__
+
+#line 108

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Makefile.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Makefile.pm Tue Jun 16 02:59:55 2009
@@ -2,14 +2,14 @@
 package Module::Install::Makefile;
 
 use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.89';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub Makefile { $_[0] }

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Metadata.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Metadata.pm Tue Jun 16 02:59:55 2009
@@ -2,18 +2,17 @@
 package Module::Install::Metadata;
 
 use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.89';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 
 my @boolean_keys = qw{
 	sign
-	mymeta
 };
 
 my @scalar_keys = qw{
@@ -506,6 +505,17 @@
 	}
 }
 
+sub test_requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->test_requires( $module => $version );
+	}
+}
+
 # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
 # numbers (eg, 5.006001 or 5.008009).
 # Also, convert double-part versions (eg, 5.8)
@@ -516,7 +526,8 @@
 	$v =~ s/(\.\d\d\d)000$/$1/;
 	$v =~ s/_.+$//;
 	if ( ref($v) ) {
-		$v = $v + 0; # Numify
+		# Numify
+		$v = $v + 0;
 	}
 	return $v;
 }
@@ -526,21 +537,56 @@
 
 
 ######################################################################
-# MYMETA.yml Support
+# MYMETA Support
 
 sub WriteMyMeta {
 	die "WriteMyMeta has been deprecated";
 }
 
-sub write_mymeta {
-	my $self = shift;
-
-	# If there's no existing META.yml there is nothing we can do
-	return unless -f 'META.yml';
+sub write_mymeta_yaml {
+	my $self = shift;
 
 	# We need YAML::Tiny to write the MYMETA.yml file
 	unless ( eval { require YAML::Tiny; 1; } ) {
 		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.yml\n";
+	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+	my $self = shift;
+
+	# We need JSON to write the MYMETA.json file
+	unless ( eval { require JSON; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.json\n";
+	Module::Install::_write(
+		'MYMETA.json',
+		JSON->new->pretty(1)->canonical->encode($meta),
+	);
+}
+
+sub _write_mymeta_data {
+	my $self = shift;
+
+	# If there's no existing META.yml there is nothing we can do
+	return undef unless -f 'META.yml';
+
+	# We need Parse::CPAN::Meta to load the file
+	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+		return undef;
 	}
 
 	# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
 	}
 
 	# Load the advisory META.yml file
-	my @yaml = YAML::Tiny::LoadFile('META.yml');
+	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
 	my $meta = $yaml[0];
 
 	# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
 		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
 	}
 
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+	return $meta;
 }
 
 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Win32.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/Win32.pm Tue Jun 16 02:59:55 2009
@@ -2,12 +2,12 @@
 package Module::Install::Win32;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.89';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 

Modified: branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/WriteAll.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/inc/Module/Install/WriteAll.pm Tue Jun 16 02:59:55 2009
@@ -2,11 +2,11 @@
 package Module::Install::WriteAll;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.89';
+	$VERSION = '0.91';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }
@@ -41,8 +41,18 @@
 
 	# The Makefile write process adds a couple of dependencies,
 	# so write the META.yml files after the Makefile.
-	$self->Meta->write        if $args{meta};
-	$self->Meta->write_mymeta if $self->mymeta;
+	if ( $args{meta} ) {
+		$self->Meta->write;
+	}
+
+	# Experimental support for MYMETA
+	if ( $ENV{X_MYMETA} ) {
+		if ( $ENV{X_MYMETA} eq 'JSON' ) {
+			$self->Meta->write_mymeta_json;
+		} else {
+			$self->Meta->write_mymeta_yaml;
+		}
+	}
 
 	return 1;
 }

Modified: branches/upstream/libclass-method-modifiers-perl/current/lib/Class/Method/Modifiers.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/lib/Class/Method/Modifiers.pm?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/lib/Class/Method/Modifiers.pm (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/lib/Class/Method/Modifiers.pm Tue Jun 16 02:59:55 2009
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.02';
+our $VERSION = '1.04';
 
 use base 'Exporter';
 our @EXPORT = qw(before after around);
@@ -12,8 +12,6 @@
     all   => \@EXPORT_OK,
 );
 
-use Carp 'confess';
-
 our %MODIFIER_CACHE;
 
 sub _install_modifier {
@@ -23,8 +21,10 @@
     my @names = @_;
 
     for my $name (@names) {
-        my $hit = $into->can($name)
-            or confess "The method '$name' is not found in the inheritance hierarchy for class $into";
+        my $hit = $into->can($name) or do {
+            require Carp;
+            Carp::confess("The method '$name' is not found in the inheritance hierarchy for class $into");
+        };
 
         my $qualified = $into.'::'.$name;
         my $cache = $MODIFIER_CACHE{$into}{$name} ||= {
@@ -49,7 +49,8 @@
             #        my $code = *{$package.'::'.$name}{CODE};
             #        goto $code if $code;
             #    }
-            #    confess "$qualified\::$name disappeared?";
+            #    require Carp;
+            #    Carp::confess("$qualified\::$name disappeared?");
             #};
         }
 
@@ -185,8 +186,8 @@
 In short, C<Class::Method::Modifiers> solves the problem of making sure you
 call C<< $self->SUPER::foo(@_) >>, and provides a cleaner interface for it.
 
-As of version 1.00, C<Class::Method::Modifiers> is faster than L<Moose>. See
-C<benchmark/method_modifiers.pl> in the L<Moose> distribution.
+As of version 1.00, C<Class::Method::Modifiers> is faster in some cases than
+L<Moose>. See C<benchmark/method_modifiers.pl> in the L<Moose> distribution.
 
 =head1 MODIFIERS
 
@@ -289,13 +290,7 @@
 
 =head1 AUTHOR
 
-Shawn M Moore, C<< <sartak at gmail.com> >>
-
-=head1 BUGS
-
-Please report any bugs through RT: email
-C<bug-class-method-modifiers at rt.cpan.org>, or browse to
-L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Class-Method-Modifiers>.
+Shawn M Moore, C<sartak at gmail.com>
 
 =head1 ACKNOWLEDGEMENTS
 
@@ -304,9 +299,9 @@
 
 Thanks to Matt Trout and Stevan Little for their advice.
 
-=head1 COPYRIGHT & LICENSE
-
-Copyright 2007-2008 Shawn M Moore.
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2007-2009 Shawn M Moore.
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/010-before-args.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/010-before-args.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/010-before-args.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/010-before-args.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/011-after-args.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/011-after-args.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/011-after-args.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/011-after-args.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 2;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/012-around-args.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/012-around-args.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/012-around-args.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/012-around-args.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 3;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/020-multiple-inheritance.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/020-multiple-inheritance.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/020-multiple-inheritance.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/020-multiple-inheritance.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 18;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/030-multiple-before.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/030-multiple-before.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/030-multiple-before.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/030-multiple-before.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/031-multiple-after.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/031-multiple-after.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/031-multiple-after.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/031-multiple-after.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/032-multiple-around.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/032-multiple-around.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/032-multiple-around.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/032-multiple-around.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/034-multiple-everything.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/034-multiple-everything.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/034-multiple-everything.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/034-multiple-everything.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/035-multiple-everything-twice.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/035-multiple-everything-twice.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/035-multiple-everything-twice.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/035-multiple-everything-twice.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/040-twice-orig.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/040-twice-orig.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/040-twice-orig.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/040-twice-orig.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/051-undef-list-ctxt.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/051-undef-list-ctxt.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/051-undef-list-ctxt.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/051-undef-list-ctxt.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 6;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/060-caller.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/060-caller.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/060-caller.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/060-caller.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 5;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/070-modify-multiple-at-once.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/070-modify-multiple-at-once.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/070-modify-multiple-at-once.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/070-modify-multiple-at-once.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 2;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/080-multiple-modifiers.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/080-multiple-modifiers.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/080-multiple-modifiers.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/080-multiple-modifiers.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 2;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/081-sub-and-modifier.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/081-sub-and-modifier.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/081-sub-and-modifier.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/081-sub-and-modifier.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 28;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/090-diamond.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/090-diamond.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/090-diamond.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/090-diamond.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More tests => 1;

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/100-class-mop-method-modifiers.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/100-class-mop-method-modifiers.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/100-class-mop-method-modifiers.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/100-class-mop-method-modifiers.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # taken from Class::MOP's test suite, cut down to the interesting bits I haven't
 # necessarily tested yet

Modified: branches/upstream/libclass-method-modifiers-perl/current/t/101-bank-account.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libclass-method-modifiers-perl/current/t/101-bank-account.t?rev=38133&op=diff
==============================================================================
--- branches/upstream/libclass-method-modifiers-perl/current/t/101-bank-account.t (original)
+++ branches/upstream/libclass-method-modifiers-perl/current/t/101-bank-account.t Tue Jun 16 02:59:55 2009
@@ -1,4 +1,4 @@
-#!perl -T
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use Test::More qw/no_plan/;




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