added MX::Types::Moose, cleaned up moar

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Script / Server.pm

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 619177d..b3776fd 100644 (file)
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -11,7 +11,7 @@ use lib "$Bin/../lib";
 use Pod::Usage;
 use Moose;
 use Catalyst::Restarter;
-#use Catalyst::Engine::HTTP;
+use MooseX::Types::Moose qw/Str Bool Int/;
 use namespace::autoclean;
 
 with 'MooseX::Getopt';
@@ -19,70 +19,66 @@ with 'MooseX::Getopt';
 has debug => (
     traits => [qw(Getopt)],
     cmd_aliases => 'd',
-    isa => 'Bool',
+    isa => Bool,
     is => 'ro',
-    documentation => qq{
-    -d --debug force debug mode
-    }
-
+    documentation => qq{ force debug mode }
 );
 
 has help => (
     traits => [qw(Getopt)],
     cmd_aliases => 'h',
-    isa => 'Bool',
+    isa => Bool,
     is => 'ro',
-    documentation => qq{
-    -h --help display this help and exits
-    },
+    documentation => qq{ display this help and exits },
 );
 
 has host => (
-    isa => 'Str',
+    isa => Str,
     is => 'ro',
-    ,
-    default =>  "localhost"
+    default =>  "localhost",
+    documentation => qq{ specify a host for the server to run on }
 );
 
 has fork => (
     traits => [qw(Getopt)],
     cmd_aliases => 'f',
-    isa => 'Bool',
+    isa => Bool,
     is => 'ro',
-
+    documentation => qq{ fork the server }
 );
 
 has listen => (
     traits => [qw(Getopt)],
     cmd_aliases => 'l',
-    isa => 'Int',
+    isa => Int,
     is => 'ro',
-    ,
-    default => "3000"
+    default => "3000",
+    documentation => qq{ specify a different listening port }
 );
 
 has pidfile => (
     traits => [qw(Getopt)],
     cmd_aliases => 'pid',
-    isa => 'Str',
+    isa => Str,
     is => 'ro',
-
+    documentation => qq{ specify a pidfile }
 );
 
 has keepalive => (
     traits => [qw(Getopt)],
     cmd_aliases => 'k',
-    isa => 'Bool',
+    isa => Bool,
     is => 'ro',
-    ,
+    documentation => qq{ server keepalive },
 
 );
 
 has background => (
     traits => [qw(Getopt)],
     cmd_aliases => 'bg',
-    isa => 'Bool',
+    isa => Bool,
     is => 'ro',
+    documentation => qq{ run in the background }
 );
 
 
@@ -90,16 +86,16 @@ has _app => (
     reader   => 'app',
     init_arg => 'app',
     traits => [qw(NoGetopt)],
-    isa => 'Str',
+    isa => Str,
     is => 'ro',
 );
 
 has restart => (
     traits => [qw(Getopt)],
     cmd_aliases => 'r',
-    isa => 'Bool',
+    isa => Bool,
     is => 'ro',
-
+    documentation => qq{ use Catalyst::Restarter to detect code changes }
 );
 
 has restart_directory => (
@@ -108,30 +104,34 @@ has restart_directory => (
     isa => 'ArrayRef[Str]',
     is  => 'ro',
     predicate => '_has_restart_directory',
+    documentation => qq{ restarter directory to watch }
 );
 
 has restart_delay => (
     traits => [qw(Getopt)],
     cmd_aliases => 'rdel',
-    isa => 'Int',
+    isa => Int,
     is => 'ro',
     predicate => '_has_restart_delay',
+    documentation => qq{ set a restart delay }
 );
 
 has restart_regex => (
     traits => [qw(Getopt)],
     cmd_aliases => 'rxp',
-    isa => 'Str',
+    isa => Str,
     is => 'ro',
     predicate => '_has_restart_regex',
+    documentation => qq{ restart regex }
 );
 
 has follow_symlinks => (
     traits => [qw(Getopt)],
     cmd_aliases => 'sym',
-    isa => 'Bool',
+    isa => Bool,
     is => 'ro',
     predicate => '_has_follow_symlinks',
+    documentation => qq{ follow symbolic links }
 
 );
 
@@ -142,10 +142,9 @@ sub usage {
 
 }
 
-my @argv = @ARGV;
 
 sub run {
-    my $self = shift;
+    my ($self) = shift;
 
     $self->usage if $self->help;
 
@@ -182,7 +181,7 @@ sub run {
         my $restarter = $subclass->new(
             %args,
             start_sub => sub { $self->_run },
-            argv      => $self->ARGV,
+            argv      => \$self->ARGV,
         );
 
         $restarter->run_and_watch;
@@ -214,7 +213,6 @@ sub _run {
 }
 
 
-no Moose;
 __PACKAGE__->meta->make_immutable;
 
 1;