X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=1fcedad710caa8b3c45dd995424a3a6c3d66e997;hb=70dc1717c4f61c6ddac1f2524d81e1812b94d810;hp=10949985d794d677e6668e2b8e9b99d73a1a6e4a;hpb=57dc50b07c8e492f4eb4a0e946b38725fbdb5eb8;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 1094998..1fcedad 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -11,7 +11,6 @@ use lib "$Bin/../lib";
 use Pod::Usage;
 use Moose;
 use Catalyst::Restarter;
-#use Catalyst::Engine::HTTP;
 use namespace::autoclean;
 
 with 'MooseX::Getopt';
@@ -21,9 +20,7 @@ has debug => (
     cmd_aliases => 'd',
     isa => 'Bool',
     is => 'ro',
-    documentation => qq{
-    -d --debug force debug mode
-    }
+    documentation => qq{ force debug mode }
 
 );
 
@@ -32,16 +29,14 @@ has help => (
     cmd_aliases => 'h',
     isa => 'Bool',
     is => 'ro',
-    documentation => qq{
-    -h --help display this help and exits
-    },
+    documentation => qq{ display this help and exits },
 );
 
 has host => (
     isa => 'Str',
     is => 'ro',
-    ,
-    default =>  "localhost"
+    default =>  "localhost",
+    documentation => qq{ specify a host for the server to run on }
 );
 
 has fork => (
@@ -49,7 +44,7 @@ has fork => (
     cmd_aliases => 'f',
     isa => 'Bool',
     is => 'ro',
-
+    documentation => qq{ fork the server }
 );
 
 has listen => (
@@ -57,8 +52,8 @@ has listen => (
     cmd_aliases => 'l',
     isa => 'Int',
     is => 'ro',
-    ,
-    default => "3000"
+    default => "3000",
+    documentation => qq{ specify a different listening port }
 );
 
 has pidfile => (
@@ -66,7 +61,7 @@ has pidfile => (
     cmd_aliases => 'pid',
     isa => 'Str',
     is => 'ro',
-
+    documentation => qq{ specify a pidfile }
 );
 
 has keepalive => (
@@ -74,7 +69,7 @@ has keepalive => (
     cmd_aliases => 'k',
     isa => 'Bool',
     is => 'ro',
-    ,
+    documentation => qq{ server keepalive },
 
 );
 
@@ -83,6 +78,7 @@ has background => (
     cmd_aliases => 'bg',
     isa => 'Bool',
     is => 'ro',
+    documentation => qq{ run in the background }
 );
 
 
@@ -99,14 +95,16 @@ has restart => (
     cmd_aliases => 'r',
     isa => 'Bool',
     is => 'ro',
-
+    documentation => qq{ use Catalyst::Restarter to detect code changes }
 );
 
 has restart_directory => (
     traits => [qw(Getopt)],
     cmd_aliases => 'rdir',
-    isa => 'Str',
+    isa => 'ArrayRef[Str]',
     is  => 'ro',
+    predicate => '_has_restart_directory',
+    documentation => qq{ restarter directory to watch }
 );
 
 has restart_delay => (
@@ -114,7 +112,8 @@ has restart_delay => (
     cmd_aliases => 'rdel',
     isa => 'Int',
     is => 'ro',
-
+    predicate => '_has_restart_delay',
+    documentation => qq{ set a restart delay }
 );
 
 has restart_regex => (
@@ -122,7 +121,8 @@ has restart_regex => (
     cmd_aliases => 'rxp',
     isa => 'Str',
     is => 'ro',
-
+    predicate => '_has_restart_regex',
+    documentation => qq{ restart regex }
 );
 
 has follow_symlinks => (
@@ -130,6 +130,8 @@ has follow_symlinks => (
     cmd_aliases => 'sym',
     isa => 'Bool',
     is => 'ro',
+    predicate => '_has_follow_symlinks',
+    documentation => qq{ follow symbolic links }
 
 );
 
@@ -140,10 +142,9 @@ sub usage {
 
 }
 
-my @argv = @ARGV;
 
 sub run {
-    my $self = shift;
+    my ($self) = shift;
 
     $self->usage if $self->help;
 
@@ -151,6 +152,14 @@ sub run {
         $ENV{CATALYST_DEBUG} = 1;
     }
 
+    # If we load this here, then in the case of a restarter, it does not
+    # need to be reloaded for each restart.
+    require Catalyst;
+
+    # If this isn't done, then the Catalyst::Devel tests for the restarter
+    # fail.
+    $| = 1 if $ENV{HARNESS_ACTIVE};
+
     if ( $self->restart ) {
         die "Cannot run in the background and also watch for changed files.\n"
             if $self->background;
@@ -160,47 +169,36 @@ sub run {
         my $subclass = Catalyst::Restarter->pick_subclass;
 
         my %args;
-        $args{follow_symlinks} = $self->follow_symlinks;
-        $args{directories}     = $self->restart_directory;
-        $args{sleep_interval}  = $self->restart_delay;
-        $args{filter} = qr/$self->restart_regex/;
+        $args{follow_symlinks} = $self->follow_symlinks
+            if $self->_has_follow_symlinks;
+        $args{directories}     = $self->restart_directory
+            if $self->_has_restart_directory;
+        $args{sleep_interval}  = $self->restart_delay
+            if $self->_has_restart_delay;
+        $args{filter} = qr/$self->restart_regex/
+            if $self->_has_restart_regex;
 
         my $restarter = $subclass->new(
             %args,
-            start_sub => $self->runner,
-            argv      => $self->ARGV,
+            start_sub => sub { $self->_run },
+            argv      => \$self->ARGV,
         );
 
         $restarter->run_and_watch;
     }
     else {
-        $self->runner;
+        $self->_run;
     }
 
 
 }
 
-sub runner {
+sub _run {
     my ($self) = shift;
 
-    # If we load this here, then in the case of a restarter, it does not
-    # need to be reloaded for each restart.
-    require Catalyst;
-
-    # If this isn't done, then the Catalyst::Devel tests for the restarter
-    # fail.
-    $| = 1 if $ENV{HARNESS_ACTIVE};
-
-
-    $self->usage if $self->help;
     my $app = $self->app;
     Class::MOP::load_class($app);
 
-    if ( $self->debug ) {
-        $ENV{CATALYST_DEBUG} = 1;
-    }
-
-
     $app->run(
         $self->listen, $self->host,
         {