X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=dfd5a0e3cfe2ec42fd8de415ff7504c77e530fd3;hb=5fbed090416a5800ae1b0670b9b5d480b7ca9df8;hp=77703b6fe8c881775f17b8e74cf7dde6d738ed6c;hpb=bc024080353d9982272a134e49e8601ed20c1a50;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 77703b6..dfd5a0e 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -39,8 +39,8 @@ sub mk_app {
     $self->_mk_changes;
     $self->_mk_apptest;
     $self->_mk_cgi;
+    $self->_mk_fcgi;
     $self->_mk_server;
-    $self->_mk_cgiserver;
     $self->_mk_test;
     $self->_mk_create;
     return 1;
@@ -223,14 +223,12 @@ $name->config(
     root => '$base/root',
 );
 
-$name->action(
+$name->setup;
 
-    '!default' => sub {
-        my ( \$self, \$c ) = \@_;
-        \$c->res->output('Congratulations, $name is on Catalyst!');
-    },
-
-);
+sub default : Private {
+    my ( \$self, \$c ) = \@_;
+    \$c->res->output('Congratulations, $name is on Catalyst!');
+}
 
 =head1 NAME
 
@@ -270,7 +268,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     NAME         => '$name',
     VERSION_FROM => 'lib/$class.pm',
-    PREREQ_PM    => { Catalyst => 0 },
+    PREREQ_PM    => { Catalyst => 5 },
     test         => { TESTS => join ' ', ( glob('t/*.t'), glob('t/*/*.t') ) }
 );
 EOF
@@ -307,7 +305,16 @@ use_ok( Catalyst::Test, '$name' );
 
 ok( request('/')->is_success );
 EOF
-    $self->mk_file( "$t\/02podcoverage.t", <<"EOF");
+    $self->mk_file( "$t\/02pod.t", <<"EOF");
+use Test::More;
+
+eval "use Test::Pod 1.14";
+plan skip_all => 'Test::Pod 1.14 required' if \$@;
+plan skip_all => 'set TEST_POD to enable this test' unless \$ENV{TEST_POD};
+
+all_pod_files_ok();
+EOF
+    $self->mk_file( "$t\/03podcoverage.t", <<"EOF");
 use Test::More;
 
 eval "use Test::Pod::Coverage 1.04";
@@ -325,6 +332,8 @@ sub _mk_cgi {
     $self->mk_file( "$script\/cgi.pl", <<"EOF");
 $Config{startperl} -w
 
+BEGIN { \$ENV{CATALYST_ENGINE} = 'CGI' }
+
 use strict;
 use FindBin;
 use lib "\$FindBin::Bin/../lib";
@@ -363,51 +372,36 @@ EOF
     chmod 0700, "$script/cgi.pl";
 }
 
-sub _mk_server {
+sub _mk_fcgi {
     my $self   = shift;
     my $name   = $self->{name};
     my $script = $self->{script};
-    $self->mk_file( "$script\/server.pl", <<"EOF");
+    $self->mk_file( "$script\/fcgi.pl", <<"EOF");
 $Config{startperl} -w
 
+BEGIN { \$ENV{CATALYST_ENGINE} = 'FCGI' }
+
 use strict;
-use Getopt::Long;
-use Pod::Usage;
 use FindBin;
 use lib "\$FindBin::Bin/../lib";
-use Catalyst::Test '$name';
-
-my \$help = 0;
-my \$port = 3000;
-
-GetOptions( 'help|?' => \\\$help, 'port=s' => \\\$port );
-
-pod2usage(1) if \$help;
+use $name;
 
-Catalyst::Test::server(\$port);
+$name->run;
 
 1;
 __END__
 
 =head1 NAME
 
-server - Catalyst Testserver
+fcgi - Catalyst FCGI
 
 =head1 SYNOPSIS
 
-server.pl [options]
-
- Options:
-   -? -help    display this help and exits
-   -p -port    port (defaults to 3000)
-
- See also:
-   perldoc Catalyst::Manual
-   perldoc Catalyst::Manual::Intro
+See L<Catalyst::Manual>
 
 =head1 DESCRIPTION
 
-Run a Catalyst Testserver for this application.
+Run a Catalyst application as fcgi.
 
 =head1 AUTHOR
 
@@ -422,22 +416,24 @@ the same terms as perl itself.
 
 =cut
 EOF
-    chmod 0700, "$script/server.pl";
+    chmod 0700, "$script/fcgi.pl";
 }
 
-sub _mk_cgiserver {
+sub _mk_server {
     my $self   = shift;
     my $name   = $self->{name};
     my $script = $self->{script};
-    $self->mk_file( "$script\/cgi-server.pl", <<"EOF");
+    $self->mk_file( "$script\/server.pl", <<"EOF");
 $Config{startperl} -w
 
+BEGIN { \$ENV{CATALYST_ENGINE} = 'HTTP' }
+
 use strict;
 use Getopt::Long;
 use Pod::Usage;
 use FindBin;
-use File::Spec;
-use Catalyst::Test;
+use lib "\$FindBin::Bin/../lib";
+use $name;
 
 my \$help = 0;
 my \$port = 3000;
@@ -446,19 +442,18 @@ GetOptions( 'help|?' => \\\$help, 'port=s' => \\\$port );
 
 pod2usage(1) if \$help;
 
-Catalyst::Test::server(
-    \$port, File::Spec->catfile( \$FindBin::Bin, 'cgi.pl' ) );
+$name->run(\$port);
 
 1;
 __END__
 
 =head1 NAME
 
-cgi-server - Catalyst CGI Testserver
+server - Catalyst Testserver
 
 =head1 SYNOPSIS
 
-cgi-server.pl [options]
+server.pl [options]
 
  Options:
    -? -help    display this help and exits
@@ -470,10 +465,7 @@ cgi-server.pl [options]
 
 =head1 DESCRIPTION
 
-Run a Catalyst CGI Testserver for this application.
-
-Similar to the regular server but doesn't require a restart
-after code changes!
+Run a Catalyst Testserver for this application.
 
 =head1 AUTHOR
 
@@ -488,7 +480,7 @@ the same terms as perl itself.
 
 =cut
 EOF
-    chmod 0700, "$script/cgi-server.pl";
+    chmod 0700, "$script/server.pl";
 }
 
 sub _mk_test {
@@ -498,11 +490,14 @@ sub _mk_test {
     $self->mk_file( "$script/test.pl", <<"EOF");
 $Config{startperl} -w
 
+BEGIN { \$ENV{CATALYST_ENGINE} = 'Test' }
+
 use strict;
 use Getopt::Long;
 use Pod::Usage;
 use FindBin;
 use lib "\$FindBin::Bin/../lib";
+use $name;
 
 my \$help = 0;
 
@@ -510,10 +505,7 @@ GetOptions( 'help|?' => \\\$help );
 
 pod2usage(1) if ( \$help || !\$ARGV[0] );
 
-require Catalyst::Test;
-import Catalyst::Test '$name';
-
-print get(\$ARGV[0]) . "\n";
+print $name->run(\$ARGV[0])->content . "\n";
 
 1;
 __END__
@@ -634,14 +626,10 @@ sub _mk_compclass {
     my $action = '';
     $action = <<"EOF" if $type eq 'C';
 
-$app->action(
-
-    '!?default' => sub {
-        my ( \$self, \$c ) = \@_;
-        \$c->res->output('Congratulations, $class is on Catalyst!');
-    },
-
-);
+sub default : Private {
+    my ( \$self, \$c ) = \@_;
+    \$c->res->output('Congratulations, $class is on Catalyst!');
+}
 EOF
     my $file = $self->{file};
     return $self->mk_file( "$file", <<"EOF");