X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=f34799b2191c6656cf44a40eb9f17bc1f0c46f29;hb=34a83d89a7989524a72b984bdbce63b44ac41686;hp=fe2b3aca09c6ef7361086906d69d677a4704e904;hpb=6c7a1d2f03830ef17b1fc6754cc16427215b83ba;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index fe2b3ac..f34799b 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -60,7 +60,10 @@ sub mk_app {
     # Needs to be here for PAR
     require Catalyst;
 
-    return 0 if $name =~ /[^\w\:]/;
+    if ( $name =~ /[^\w\:]/ ) {
+        warn "Error: Invalid application name.\n";
+        return 0;
+    }
     $self->{name} = $name;
     $self->{dir}  = $name;
     $self->{dir} =~ s/\:\:/-/g;
@@ -651,7 +654,7 @@ plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
 
 all_pod_coverage_ok();
 __cgi__
-[% startperl %] -w
+[% startperl %]
 
 BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
 
@@ -689,7 +692,7 @@ it under the same terms as Perl itself.
 
 =cut
 __fastcgi__
-[% startperl %] -w
+[% startperl %]
 
 BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
 
@@ -701,13 +704,15 @@ use lib "$FindBin::Bin/../lib";
 use [% name %];
 
 my $help = 0;
-my ( $listen, $nproc, $pidfile );
+my ( $listen, $nproc, $pidfile, $manager, $detach );
  
 GetOptions(
     'help|?'      => \$help,
     'listen|l=s'  => \$listen,
     'nproc|n=i'   => \$nproc,
     'pidfile|p=s' => \$pidfile,
+    'manager|M=s' => \$manager,
+    'daemon|d'    => \$detach,
 );
 
 pod2usage(1) if $help;
@@ -716,6 +721,8 @@ pod2usage(1) if $help;
     $listen, 
     {   nproc   => $nproc,
         pidfile => $pidfile, 
+        manager => $manager,
+        detach  => $detach,
     }
 );
 
@@ -740,6 +747,10 @@ pod2usage(1) if $help;
                  requires -listen)
    -p -pidfile   specify filename for pid file
                  (requires -listen)
+   -d -daemon    daemonize (requires -listen)
+   -M -manager   specify alternate process manager
+                 (FCGI::ProcessManager sub-class)
+                 or empty string to disable
 
 =head1 DESCRIPTION
 
@@ -758,7 +769,7 @@ it under the same terms as Perl itself.
 
 =cut
 __server__
-[% startperl %] -w
+[% startperl %]
 
 BEGIN { 
     $ENV{CATALYST_ENGINE} ||= 'HTTP';
@@ -861,7 +872,7 @@ it under the same terms as Perl itself.
 
 =cut
 __test__
-[% startperl %] -w
+[% startperl %]
 
 use strict;
 use Getopt::Long;
@@ -916,27 +927,27 @@ it under the same terms as Perl itself.
 
 =cut
 __create__
-[% startperl %] -w
+[% startperl %]
 
 use strict;
 use Getopt::Long;
 use Pod::Usage;
 use Catalyst::Helper;
 
-my $help = 0;
-my $nonew = 0;
+my $force = 0;
+my $help  = 0;
 my $short = 0;
 
 GetOptions(
+    'force'  => \$force,
     'help|?' => \$help,
-    'nonew'  => \$nonew,
     'short'  => \$short
  );
 
 pod2usage(1) if ( $help || !$ARGV[0] );
 
 my $helper =
-    Catalyst::Helper->new( { '.newfiles' => !$nonew, short => $short } );
+    Catalyst::Helper->new( { '.newfiles' => !$force, short => $short } );
 
 pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV );
 
@@ -951,8 +962,8 @@ pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV );
 [% appprefix %]_create.pl [options] model|view|controller name [helper] [options]
 
  Options:
+   -force    don't create a .new file where a file to be created exists
    -help     display this help and exits
-   -nonew    don't create a .new file where a file to be created exists
    -short    use short types, like C instead of Controller...
 
  Examples:
@@ -974,7 +985,7 @@ Create a new Catalyst Component.
 
 Existing component files are not overwritten.  If any of the component files
 to be created already exist the file will be written with a '.new' suffix.
-This behavior can be suppressed with the C<-nonew> option.
+This behavior can be suppressed with the C<-force> option.
 
 =head1 AUTHOR
 
@@ -989,7 +1000,7 @@ it under the same terms as Perl itself.
 
 =cut
 __package__
-[% startperl %] -w
+[% startperl %]
 
 use strict;
 use Getopt::Long;
@@ -1001,7 +1012,7 @@ my $classes   = '';
 my $engine    = 'CGI';
 my $help      = 0;
 my $multiarch = 0;
-my $par       = '[% appprefix %].par';
+my $output    = '[% appprefix %].par';
 
 GetOptions(
     'classes=s' => \$classes,
@@ -1009,7 +1020,7 @@ GetOptions(
     'engine=s'  => \$engine,
     'help|?'    => \$help,
     'multiarch' => \$multiarch,
-    'par=s'     => \$par
+    'output=s'  => \$output
 );
 
 pod2usage(1) if $help;
@@ -1018,8 +1029,8 @@ Catalyst::PAR->new->package( {
     classes   => $classes,
     core      => $core,
     engine    => $engine,
-    par       => $par,
     multiarch => $multiarch,
+    output    => $output,
     class     => '[% name %]'
 } );
 
@@ -1027,7 +1038,7 @@ Catalyst::PAR->new->package( {
 
 =head1 NAME
 
-[% appprefix %]_package.pl - Package a Catalyst application
+[% appprefix %]_package.pl - Package Catalyst Applications
 
 =head1 SYNOPSIS
 
@@ -1040,12 +1051,12 @@ Catalyst::PAR->new->package( {
    -engine       engine to use for dependency detection (defaults to CGI)
    -help         display this help and exits
    -multiarch    enable multiarch support (defaults to false)
-   -par          name for the par archive (defaults to [% appprefix %].par)
+   -output       name for the par archive (defaults to [% appprefix %].par)
 
  Examples:
    [% appprefix %]_package.pl -engine FastCGI
-   [% appprefix %]_package.pl -par foo_linux_i386_apache2.par -engine Apache2
-   [% appprefix %]_package.pl -classes Test::More,Foo::Bar -par foo.par
+   [% appprefix %]_package.pl -o foo_linux_i386_apache2.par -engine Apache2
+   [% appprefix %]_package.pl -classes Test::More,Foo::Bar -o foo.par
 
  See also:
    perldoc Catalyst::Manual
@@ -1054,7 +1065,7 @@ Catalyst::PAR->new->package( {
 
 =head1 DESCRIPTION
 
-Package a Catalyst application with L<PAR>.
+Package Catalyst Applications with L<PAR>.
 
 =head1 AUTHOR