Somewhat fix the scripts and tests

diff --git a/share/script/myapp_cgi.pl.tt b/share/script/myapp_cgi.pl.tt
index a4bba44..9a98915 100644 (file)
--- a/share/script/myapp_cgi.pl.tt
+++ b/share/script/myapp_cgi.pl.tt
@@ -1,7 +1,7 @@
 [% startperl %]
 
 use Catalyst::ScriptRunner;
-Catalyst::ScriptRunner->run('Catalyst','CGI');
+Catalyst::ScriptRunner->run('[% name %]', 'CGI');
 
 1;
 

diff --git a/share/script/myapp_fastcgi.pl.tt b/share/script/myapp_fastcgi.pl.tt
index a12f9ac..eafbd53 100644 (file)
--- a/share/script/myapp_fastcgi.pl.tt
+++ b/share/script/myapp_fastcgi.pl.tt
@@ -1,7 +1,7 @@
 [% startperl %]
 
 use Catalyst::ScriptRunner;
-Catalyst::ScriptRunner->run('Catalyst','FastCGI');
+Catalyst::ScriptRunner->run('[% name %]','FastCGI');
 
 1;
 

diff --git a/share/script/myapp_server.pl.tt b/share/script/myapp_server.pl.tt
index f51d48d..9be7f74 100644 (file)
--- a/share/script/myapp_server.pl.tt
+++ b/share/script/myapp_server.pl.tt
@@ -1,34 +1,7 @@
-package [% appprefix %]::Script::Server;
-
-use Catalyst::Engine::HTTP;
-use [% appprefix %];
-use Moose;
-
-with 'MooseX::GetOpt';
-
-has argv => ( isa => 'ArrayRef', is => 'ro', required => 1 );
-has [qw/ fork background keepalive /] => ( isa => 'Bool', is => 'ro', required => 1, default => 0 );
-has pidfile => ( isa => 'Str', required => 0, is => 'ro' );
-
-sub run {
-    my $self = shift;
-    [% appprefix %]->run(
-        $port, $host,
-        {
-            argv       => $self->argv,
-            'fork'     => $self->fork,
-            keepalive  => $self->keepalive,
-            background => $self->background,
-            pidfile    => $self->pidfile,
-        }
-    );
-}
-
-
-
-__PACKAGE__->new_with_options->run;
-
+[% startperl %]
 
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('[% name %]', 'Server');
 
 1;
 

diff --git a/share/script/myapp_test.pl.tt b/share/script/myapp_test.pl.tt
index 8a26322..d58d109 100644 (file)
--- a/share/script/myapp_test.pl.tt
+++ b/share/script/myapp_test.pl.tt
@@ -1,7 +1,7 @@
 [% startperl %]
 
 use Catalyst::ScriptRunner;
-Catalyst::ScriptRunner->run('Catalyst','Test');
+Catalyst::ScriptRunner->run('[% name %]','Test');
 
 1;
 

diff --git a/share/t/01app.t.tt b/share/t/01app.t.tt
index 046ff1f..eb4e09a 100644 (file)
--- a/share/t/01app.t.tt
+++ b/share/t/01app.t.tt
@@ -3,6 +3,6 @@ use strict;
 use warnings;
 use Test::More tests => 2;
 
-BEGIN { use_ok 'Catalyst::Test', '[% app %]' }
+BEGIN { use_ok 'Catalyst::Test', '[% name %]' }
 
 ok( request('/')->is_success, 'Request should succeed' );

diff --git a/share/t/comptest.tt b/share/t/comptest.tt
index dd2c5e6..acfcd97 100644 (file)
--- a/share/t/comptest.tt
+++ b/share/t/comptest.tt
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 [% IF long_type == 'Controller' %][% IF mech %]use Test::More;
 
-eval "use Test::WWW::Mechanize::Catalyst '[% app %]'";
+eval "use Test::WWW::Mechanize::Catalyst '[% name %]'";
 plan $@
     ? ( skip_all => 'Test::WWW::Mechanize::Catalyst required' )
     : ( tests => 2 );
@@ -12,7 +12,7 @@ ok( my $mech = Test::WWW::Mechanize::Catalyst->new, 'Created mech object' );
 $mech->get_ok( 'http://localhost[% uri %]' );
 [% ELSE %]use Test::More tests => 3;
 
-BEGIN { use_ok 'Catalyst::Test', '[% app %]' }
+BEGIN { use_ok 'Catalyst::Test', '[% name %]' }
 BEGIN { use_ok '[% class %]' }
 
 ok( request('[% uri %]')->is_success, 'Request should succeed' );