[Catalyst-commits] r8193 - in Catalyst-Devel/1.00/trunk: . lib/Catalyst

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2008-08-06 21:18:37 +0100 (Wed, 06 Aug 2008)
New Revision: 8193

Modified:
   Catalyst-Devel/1.00/trunk/Changes
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
Log:
Fix warning when devel is missing

Modified: Catalyst-Devel/1.00/trunk/Changes
===================================================================
--- Catalyst-Devel/1.00/trunk/Changes	2008-08-06 15:27:20 UTC (rev 8192)
+++ Catalyst-Devel/1.00/trunk/Changes	2008-08-06 20:18:37 UTC (rev 8193)
@@ -1,4 +1,7 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
+
+        - Fix warning when devel is not installed.
+        
 1.08    2008-07-13 18:000
         - Revert to use Catalyst qw/@plugins/
         - Require Config::General instead of YAML

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm	2008-08-06 15:27:20 UTC (rev 8192)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm	2008-08-06 20:18:37 UTC (rev 8193)
@@ -4,7 +4,7 @@
 use warnings;
 
 our $VERSION             = '1.08';
-our $CATALYST_SCRIPT_GEN = 31;
+our $CATALYST_SCRIPT_GEN = 32;
 
 =head1 NAME
 

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2008-08-06 15:27:20 UTC (rev 8192)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2008-08-06 20:18:37 UTC (rev 8193)
@@ -1082,8 +1082,19 @@
 use warnings;
 use Getopt::Long;
 use Pod::Usage;
-use Catalyst::Helper;
+eval "use Catalyst::Devel;";
 
+if ($@) {
+  die <<END;
+To use the Catalyst development tools including catalyst.pl and the
+generated script/myapp_create.pl you need Catalyst::Helper, which is
+part of the Catalyst-Devel distribution. Please install this via a
+vendor package or by running one of -
+
+  perl -MCPAN -e 'install Catalyst::Devel'
+  perl -MCPANPLUS -e 'install Catalyst::Devel'
+END
+
 my $force = 0;
 my $mech  = 0;
 my $help  = 0;