X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=script%2Fcatalyst.pl;h=83c4eb75b84def2f45070d6de7e306b322d59697;hb=88218702354de7958dd7aacfca3b32645a724fef;hp=6a20cfed16f03a3105c68c720b28fb77feaa66cc;hpb=e4d883627ffd461f5ad4c55f3d6f5126c6513616;p=catagits%2FCatalyst-Runtime.git

diff --git a/script/catalyst.pl b/script/catalyst.pl
index 6a20cfe..83c4eb7 100755
--- a/script/catalyst.pl
+++ b/script/catalyst.pl
@@ -3,25 +3,45 @@
 use strict;
 use Getopt::Long;
 use Pod::Usage;
-use Catalyst::Helper;
+eval " use Catalyst::Helper 1.0; ";
 
-my $help    = 0;
-my $nonew   = 0;
-my $scripts = 0;
-my $short   = 0;
+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 $help     = 0;
+my $makefile = 0;
+my $scripts  = 0;
+my $short    = 0;
 
 GetOptions(
-    'help|?'  => \$help,
-    'nonew'   => \$nonew,
-    'scripts' => \$scripts,
-    'short'   => \$short
+    'help|?'      => \$help,
+    'force|nonew' => \$force,
+    'makefile'    => \$makefile,
+    'scripts'     => \$scripts,
+    'short'       => \$short
 );
 
 pod2usage(1) if ( $help || !$ARGV[0] );
 
-my $helper =
-  Catalyst::Helper->new(
-    { '.newfiles' => !$nonew, 'scripts' => $scripts, 'short' => $short } );
+my $helper = Catalyst::Helper->new(
+    {
+        '.newfiles' => !$force,
+        'makefile'  => $makefile,
+        'scripts'   => $scripts,
+        'short'     => $short,
+    }
+);
 pod2usage(1) unless $helper->mk_app( $ARGV[0] );
 
 1;
@@ -35,18 +55,27 @@ catalyst - Bootstrap a Catalyst application
 
 catalyst.pl [options] application-name
 
+'catalyst.pl' creates a skeleton for a new application, and allows you to
+upgrade the skeleton of your old application.
+
  Options:
-   -help       display this help and exits
-   -nonew      don't create a .new file where a file to be created exists
-   -scripts    update helper scripts only
-   -short      use short types, like C instead of Controller...
+   -force      don't create a .new file where a file to be created exists
+   -help       display this help and exit
+   -makefile   only update Makefile.PL
+   -scripts    only update helper scripts
+   -short      use short names, M/V/C instead of Model/View/Controller.
+
+ application-name must be a valid Perl module name and can include "::", 
+ which will be converted to '-' in the project name.
 
- application-name must be a valid Perl module name and can include "::"
 
  Examples:
     catalyst.pl My::App
     catalyst.pl MyApp
 
+ To upgrade your app to a new version of Catalyst:
+    catalyst.pl -force -scripts MyApp
+
 
 =head1 DESCRIPTION
 
@@ -67,18 +96,14 @@ contain the following items:
 
 a skeleton README file, which you are encouraged to expand on
 
-=item Build.PL
-
-a C<Module::Build> build script
-
 =item Changes
 
 a changes file with an initial entry for the creation of the application
 
 =item Makefile.PL
 
-an old-style MakeMaker script.  Catalyst uses the C<Module::Build> system so
-this script actually generates a Makeifle that invokes the Build script.
+Makefile.PL uses the C<Module::Install> system for packaging and distribution
+of the application.
 
 =item lib
 
@@ -96,25 +121,24 @@ a directory containing helper scripts:
 
 =over 4
 
-=item C<my_app_create.pl>
+=item C<myapp_create.pl>
 
 helper script to generate new component modules
 
-=item C<my_app_server.pl>
+=item C<myapp_server.pl>
 
 runs the generated application within a Catalyst test server, which can be
 used for testing without resorting to a full-blown web server configuration.
 
-=item C<my_app_cgi.pl>
+=item C<myapp_cgi.pl>
 
 runs the generated application as a CGI script
 
-=item C<my_app_fastcgi.pl>
+=item C<myapp_fastcgi.pl>
 
 runs the generated application as a FastCGI script
 
-
-=item C<my_app_test.pl>
+=item C<myapp_test.pl>
 
 runs an action of the generated application from the comand line.