X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=14af0d1a9a82468f935d07457be58d1817f50ea5;hp=7f4dddef26ba09becfb7a13cbf694a47e7d7f6ac;hb=ab2374d3a68f4d44601813f351b38222822b7c39;hpb=26e731318112842b5a605bec2092ccae3369c5e4

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 7f4ddde..14af0d1 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -463,7 +463,7 @@ sub default : Private {
     my ( $self, $c ) = @_;
 
     # Hello World
-    $c->response->output('Congratulations, [% name %] is on Catalyst!');
+    $c->response->output( $c->welcome_message );
 }
 
 #=item end
@@ -653,21 +653,35 @@ use FindBin;
 use lib "$FindBin::Bin/../lib";
 use [% name %];
 
-my $fork = 0;
-my $help = 0;
-my $host = undef;
-my $port = 3000;
+my $fork          = 0;
+my $help          = 0;
+my $host          = undef;
+my $port          = 3000;
+my $restart       = 0;
+my $restart_delay = 1;
+my $restart_regex = '\.yml$|\.yaml$|\.pm$';
+
+my @argv = @ARGV;
 
 GetOptions(
-    'fork'   => \$fork,
-    'help|?' => \$help,
-    'host=s' => \$host,
-    'port=s' => \$port
+    'fork'              => \$fork,
+    'help|?'            => \$help,
+    'host=s'            => \$host,
+    'port=s'            => \$port,
+    'restart|r'         => \$restart,
+    'restartdelay|rd=s' => \$restart_delay,
+    'restartregex|rr=s' => \$restart_regex
 );
 
 pod2usage(1) if $help;
 
-[% name %]->run( $port, $host, $fork );
+[% name %]->run( $port, $host, {
+    argv   => \@argv,
+    'fork' => $fork,
+    restart => $restart,
+    restart_delay => $restart_delay,
+    restart_regex => qr/$restart_regex/
+} );
 
 1;
 
@@ -680,10 +694,17 @@ pod2usage(1) if $help;
 [% appprefix %]_server.pl [options]
 
  Options:
-   -f -fork    handle each request in a new process
-   -? -help    display this help and exits
-      -host    host (defaults to all)
-   -p -port    port (defaults to 3000)
+   -f -fork           handle each request in a new process
+                      (defaults to false)
+   -? -help           display this help and exits
+      -host           host (defaults to all)
+   -p -port           port (defaults to 3000)
+   -r -restart        restart when files got modified
+                      (defaults to false)
+   -rd -restartdelay  delay between file checks
+   -rr -restartregex  regex match files that trigger
+                      a restart when modified
+                      (defaults to '\.yml$|\.yaml$|\.pm$')
 
  See also:
    perldoc Catalyst::Manual