X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=04d537253d911d03d7651d43a94f0600a6dca7e8;hb=410d96eb61df4f4c5beecb9bf7a6757e7e19ce24;hp=8c469a6ba4683f271b7f85d224198fa0a1da11cb;hpb=4b3881d482a3a87ae5a1cd92bd3f11ad57d2d032;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 8c469a6..04d5372 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -10,135 +10,212 @@ use FindBin qw/$Bin/;
 use lib "$Bin/../lib";
 use Pod::Usage;
 use Moose;
-use Catalyst::Engine::HTTP;
-use namespace::clean -except => [ qw(meta) ];
+use Catalyst::Restarter;
+use MooseX::Types::Moose qw/Str Bool Int/;
+use namespace::autoclean;
 
 with 'MooseX::Getopt';
+#extends qw(MooseX::App::Cmd);
 
-has help => ( 
+has debug => (
+    traits => [qw(Getopt)],
+    cmd_aliases => 'd',
+    isa => Bool,
+    is => 'ro',
+    documentation => qq{ force debug mode }
+);
+
+has help => (
     traits => [qw(Getopt)],
     cmd_aliases => 'h',
-    isa => 'Bool',   
-    is => 'ro', 
-    required => 0, 
-    default => 0,  
+    isa => Bool,
+    is => 'ro',
+    documentation => qq{ display this help and exits },
 );
 
-has host => ( 
-    isa => 'Str',    
-    is => 'ro', 
-    required => 0, 
-    default =>  "localhost" 
+has host => (
+    isa => Str,
+    is => 'ro',
+    default =>  "localhost",
+    documentation => qq{ specify a host for the server to run on }
 );
 
-has fork => ( 
+has fork => (
     traits => [qw(Getopt)],
     cmd_aliases => 'f',
-    isa => 'Bool',
-    is => 'ro', 
-    required => 0 
+    isa => Bool,
+    is => 'ro',
+    documentation => qq{ fork the server }
 );
 
-has listen => ( 
+has listen => (
     traits => [qw(Getopt)],
     cmd_aliases => 'l',
-    isa => 'Int',
-    is => 'ro', 
-    required => 0, 
-    default => "3000" 
+    isa => Int,
+    is => 'ro',
+    default => "3000",
+    documentation => qq{ specify a different listening port }
 );
 
-has pidfile => ( 
+has pidfile => (
     traits => [qw(Getopt)],
     cmd_aliases => 'pid',
-    isa => 'Str',    
-    is => 'ro', 
-    required => 0 
+    isa => Str,
+    is => 'ro',
+    documentation => qq{ specify a pidfile }
 );
 
-has keepalive => ( 
+has keepalive => (
     traits => [qw(Getopt)],
     cmd_aliases => 'k',
-    isa => 'Bool',   
-    is => 'ro', 
-    required => 0, 
-    default => 0 
+    isa => Bool,
+    is => 'ro',
+    documentation => qq{ server keepalive },
+
 );
 
-has background => ( 
+has background => (
     traits => [qw(Getopt)],
     cmd_aliases => 'bg',
-    isa => 'Bool',   
-    is => 'ro', 
-    required => 0 
+    isa => Bool,
+    is => 'ro',
+    documentation => qq{ run in the background }
 );
 
-has app => ( 
+
+has _app => (
+    reader   => 'app',
+    init_arg => 'app',
     traits => [qw(NoGetopt)],
-    isa => 'Str',    
-    is => 'ro', 
-    required => 1,
-); 
+    isa => Str,
+    is => 'ro',
+);
 
 has restart => (
     traits => [qw(Getopt)],
-    cmd_aliases => 'r', 
-    isa => 'Bool',   
-    is => 'ro', 
-    required => 0 
+    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 => 'ArrayRef[Str]',
+    is  => 'ro',
+    predicate => '_has_restart_directory',
+    documentation => qq{ restarter directory to watch }
 );
 
-has restart_delay => ( 
+has restart_delay => (
     traits => [qw(Getopt)],
     cmd_aliases => 'rdel',
-    isa => 'Int',    
-    is => 'ro', 
-    required => 0 
+    isa => Int,
+    is => 'ro',
+    predicate => '_has_restart_delay',
+    documentation => qq{ set a restart delay }
 );
 
-has restart_regex => ( 
+has restart_regex => (
     traits => [qw(Getopt)],
     cmd_aliases => 'rxp',
-    isa => 'Str',    
-    is => 'ro', 
-    required => 0 
+    isa => Str,
+    is => 'ro',
+    predicate => '_has_restart_regex',
+    documentation => qq{ restart regex }
 );
 
-has follow_symlinks => ( 
+has follow_symlinks => (
     traits => [qw(Getopt)],
     cmd_aliases => 'sym',
-    isa => 'Bool',   
-    is => 'ro', 
-    required => 0 
+    isa => Bool,
+    is => 'ro',
+    predicate => '_has_follow_symlinks',
+    documentation => qq{ follow symbolic links }
+
 );
 
-my @argv = @ARGV;
+sub usage {
+    my ($self) = shift;
+
+    return pod2usage();
+
+}
+
 
 sub run {
-    my $self = shift;
-    
-    pod2usage() if $self->help;
+    my ($self) = shift;
+
+    $self->usage if $self->help;
+
+    if ( $self->debug ) {
+        $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;
+
+        require Catalyst::Restarter;
+
+        my $subclass = Catalyst::Restarter->pick_subclass;
+
+        my %args;
+        $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 => sub { $self->_run },
+            argv      => \$self->ARGV,
+        );
+
+        $restarter->run_and_watch;
+    }
+    else {
+        $self->_run;
+    }
+
+
+}
+
+sub _run {
+    my ($self) = shift;
+
     my $app = $self->app;
     Class::MOP::load_class($app);
+
     $app->run(
         $self->listen, $self->host,
-        {  
+        {
            'fork'            => $self->fork,
            keepalive         => $self->keepalive,
            background        => $self->background,
            pidfile           => $self->pidfile,
            keepalive         => $self->keepalive,
-           restart           => $self->restart,
-           restart_delay     => $self->restart_delay,
-           restart_regex     => qr/$self->restart_regex/,
-# FIXME    restart_directory => $self->restart_directory,
            follow_symlinks   => $self->follow_symlinks,
-        }  
+        }
     );
-
 }
 
 
+__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME