prettier logs

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Helper.pm

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index b9b2f5d..dfd5a0e 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -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";
@@ -322,13 +329,10 @@ sub _mk_cgi {
     my $self   = shift;
     my $name   = $self->{name};
     my $script = $self->{script};
-    $self->mk_file( "$script\/nph-cgi.pl", <<"EOF");
+    $self->mk_file( "$script\/cgi.pl", <<"EOF");
 $Config{startperl} -w
 
-BEGIN {
-    \$ENV{CATALYST_ENGINE} = 'CGI';
-    \$ENV{CATALYST_TEST}   = 1;
-}
+BEGIN { \$ENV{CATALYST_ENGINE} = 'CGI' }
 
 use strict;
 use FindBin;
@@ -342,7 +346,7 @@ __END__
 
 =head1 NAME
 
-nph-cgi - Catalyst CGI
+cgi - Catalyst CGI
 
 =head1 SYNOPSIS
 
@@ -365,7 +369,7 @@ the same terms as perl itself.
 
 =cut
 EOF
-    chmod 0700, "$script/nph-cgi.pl";
+    chmod 0700, "$script/cgi.pl";
 }
 
 sub _mk_fcgi {
@@ -375,28 +379,14 @@ sub _mk_fcgi {
     $self->mk_file( "$script\/fcgi.pl", <<"EOF");
 $Config{startperl} -w
 
-BEGIN {
-    \$ENV{CATALYST_ENGINE} = 'CGI';
-    \$ENV{CATALYST_TEST}   = 1;
-}
+BEGIN { \$ENV{CATALYST_ENGINE} = 'FCGI' }
 
 use strict;
 use FindBin;
 use lib "\$FindBin::Bin/../lib";
-use FCGI;
 use $name;
 
-my \$request = FCGI::Request();
-while ( \$request->Accept() >= 0 ) {
-    my \$output;
-    {
-        local(*STDOUT);
-        open( STDOUT, '>', \\\$output );
-        $name->run;
-    }
-    \$output =~ s!^HTTP/\\d+.\\d+ \\d\\d\\d.*?\\n!!s;
-    print \$output;
-}
+$name->run;
 
 1;
 __END__
@@ -436,10 +426,7 @@ sub _mk_server {
     $self->mk_file( "$script\/server.pl", <<"EOF");
 $Config{startperl} -w
 
-BEGIN { 
-    \$ENV{CATALYST_ENGINE} = 'Server';
-    \$ENV{CATALYST_TEST}   = 1;
-}
+BEGIN { \$ENV{CATALYST_ENGINE} = 'HTTP' }
 
 use strict;
 use Getopt::Long;
@@ -503,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;
 
@@ -515,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__
@@ -639,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");