[Catalyst-commits] r13176 - in trunk/Catalyst-Plugin-Singleton: . lib/Catalyst/Plugin

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2010-04-20 15:45:21 +0100 (Tue, 20 Apr 2010)
New Revision: 13176

Modified:
   trunk/Catalyst-Plugin-Singleton/Changes
   trunk/Catalyst-Plugin-Singleton/MANIFEST.SKIP
   trunk/Catalyst-Plugin-Singleton/META.yml
   trunk/Catalyst-Plugin-Singleton/Makefile.PL
   trunk/Catalyst-Plugin-Singleton/lib/Catalyst/Plugin/Singleton.pm
Log:
Use MRO Compat for Singleton plugin

Modified: trunk/Catalyst-Plugin-Singleton/Changes
===================================================================
--- trunk/Catalyst-Plugin-Singleton/Changes	2010-04-20 14:44:43 UTC (rev 13175)
+++ trunk/Catalyst-Plugin-Singleton/Changes	2010-04-20 14:45:21 UTC (rev 13176)
@@ -1,5 +1,7 @@
 Revision history for Perl extension Catalyst::Plugin::Singleton
 
+0.3  2010-04-19 15:29:00
+        - MRO::Compat
 0.2  2005-05-03 22:23:00
         - fixed references.
 

Modified: trunk/Catalyst-Plugin-Singleton/MANIFEST.SKIP
===================================================================
--- trunk/Catalyst-Plugin-Singleton/MANIFEST.SKIP	2010-04-20 14:44:43 UTC (rev 13175)
+++ trunk/Catalyst-Plugin-Singleton/MANIFEST.SKIP	2010-04-20 14:45:21 UTC (rev 13176)
@@ -23,3 +23,4 @@
 \.bak$
 \#$
 \b\.#
+^MYMETA.yml$

Modified: trunk/Catalyst-Plugin-Singleton/META.yml
===================================================================
--- trunk/Catalyst-Plugin-Singleton/META.yml	2010-04-20 14:44:43 UTC (rev 13175)
+++ trunk/Catalyst-Plugin-Singleton/META.yml	2010-04-20 14:45:21 UTC (rev 13176)
@@ -1,14 +1,21 @@
 ---
-name: Catalyst-Plugin-Singleton
-version: 0.02
+abstract: 'Singleton to context'
 author:
-  - Christian Hansen, C<ch at ngmedia.com>
-abstract: Singleton to context
+  - 'Christian Hansen, C<ch at ngmedia.com>'
+configure_requires:
+  Module::Build: 0.36
+generated_by: 'Module::Build version 0.3601'
 license: perl
-requires:
-  Scalar::Util: 0
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: Catalyst-Plugin-Singleton
 provides:
   Catalyst::Plugin::Singleton:
     file: lib/Catalyst/Plugin/Singleton.pm
-    version: 0.02
-generated_by: Module::Build version 0.26
+    version: 0.03
+requires:
+  Scalar::Util: 0
+resources:
+  license: http://dev.perl.org/licenses/
+version: 0.03

Modified: trunk/Catalyst-Plugin-Singleton/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Singleton/Makefile.PL	2010-04-20 14:44:43 UTC (rev 13175)
+++ trunk/Catalyst-Plugin-Singleton/Makefile.PL	2010-04-20 14:45:21 UTC (rev 13176)
@@ -1,31 +1,34 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-    
+# Note: this file was auto-generated by Module::Build::Compat version 0.3601
+
     unless (eval "use Module::Build::Compat 0.02; 1" ) {
       print "This module requires Module::Build to install itself.\n";
-      
+
       require ExtUtils::MakeMaker;
       my $yn = ExtUtils::MakeMaker::prompt
 	('  Install Module::Build now from CPAN?', 'y');
-      
+
       unless ($yn =~ /^y/i) {
 	die " *** Cannot install without Module::Build.  Exiting ...\n";
       }
-      
+
       require Cwd;
       require File::Spec;
       require CPAN;
-      
+
       # Save this 'cause CPAN will chdir all over the place.
       my $cwd = Cwd::cwd();
-      my $makefile = File::Spec->rel2abs($0);
-      
-      CPAN::Shell->install('Module::Build::Compat')
-	or die " *** Cannot install without Module::Build.  Exiting ...\n";
-      
+
+      CPAN::Shell->install('Module::Build::Compat');
+      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
+	or die "Couldn't install Module::Build, giving up.\n";
+
       chdir $cwd or die "Cannot chdir() back to $cwd: $!";
     }
     eval "use Module::Build::Compat 0.02; 1" or die $@;
-    use lib '_build/lib';
+    
     Module::Build::Compat->run_build_pl(args => \@ARGV);
+    my $build_script = 'Build';
+    $build_script .= '.com' if $^O eq 'VMS';
+    exit(0) unless(-e $build_script); # cpantesters convention
     require Module::Build;
     Module::Build::Compat->write_makefile(build_class => 'Module::Build');

Modified: trunk/Catalyst-Plugin-Singleton/lib/Catalyst/Plugin/Singleton.pm
===================================================================
--- trunk/Catalyst-Plugin-Singleton/lib/Catalyst/Plugin/Singleton.pm	2010-04-20 14:44:43 UTC (rev 13175)
+++ trunk/Catalyst-Plugin-Singleton/lib/Catalyst/Plugin/Singleton.pm	2010-04-20 14:45:21 UTC (rev 13176)
@@ -2,8 +2,9 @@
 
 use strict;
 use Scalar::Util;
+use MRO::Compat;
 
-our $VERSION = '0.02';
+our $VERSION = '0.03';
 
 *context = \&instance;
 
@@ -16,7 +17,7 @@
 
 sub prepare {
     my $class   = shift;
-    my $context = $class->NEXT::prepare(@_);
+    my $context = $class->next::method(@_);
 
     {
         no strict 'refs';