Merge 'generated_app-fix' into 'trunk'

r12228@t0mlaptop (orig r12193):  autarch | 2009-12-05 22:30:42 +0000
branch to fix generated_app.t
r12229@t0mlaptop (orig r12194):  autarch | 2009-12-05 22:32:19 +0000
Fixes for generated_app.t so it doesn't rely on finding catalyst.pl in the current path, and so that it always uses the right share dir
r12237@t0mlaptop (orig r12202):  t0m | 2009-12-06 12:13:01 +0000
Force the optional test dep in author mode

diff --git a/Changes b/Changes
index 89cac19..4ae69aa 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+        - Fix Test::More version dependency so that subtest works correctly.
+        - Add a $VERSION to Catalyst::Helper as PAUSE used to pull $VERSION
+          (i.e. 0.01) out of the app template section and use that, so we now
+          can't not have a version number here or it makes pause unhappy.
+
 1.22  2009-12-05 07:23:00
         - Use MooseX::Emulate::Class::Accessor::Fast so that options
           supplied to ->new are put into the hash even if attributes

diff --git a/Makefile.PL b/Makefile.PL
index 1c1901a..3452781 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -24,7 +24,7 @@ requires 'Template'    => '2.14';
 
 author_requires 'IPC::Run3';
 
-test_requires 'Test::More' => '0.90';
+test_requires 'Test::More' => '0.94';
 
 install_share 'share';
 

diff --git a/lib/Catalyst/Devel.pm b/lib/Catalyst/Devel.pm
index 69b34b8..b0630d1 100644 (file)
--- a/lib/Catalyst/Devel.pm
+++ b/lib/Catalyst/Devel.pm
@@ -3,6 +3,7 @@ package Catalyst::Devel;
 use strict;
 use warnings;
 
+# Change Catalyst::Helper also.
 our $VERSION             = '1.22';
 $VERSION = eval $VERSION;
 our $CATALYST_SCRIPT_GEN = 40;

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 690aad1..d407fee 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -17,6 +17,9 @@ use namespace::autoclean;
 
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
+# Change Catalyst/Devel.pm also
+our $VERSION = '1.22';
+
 my %cache;
 
 =head1 NAME