X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=9438f050a31c0fc8143139f94e0ca4237d23c4d6;hb=10255473102b269c35c8b9c8d3368bc962aa16e7;hp=d65a2314125319afe14398ed177b5d8e0f44a7c2;hpb=880d1f8b5a10f28ce1142898058a26b6506f1cfe;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index d65a231..9438f05 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use Moose;
+use MooseX::Types::Common::Numeric qw/PositiveInt/;
 use MooseX::Types::Moose qw/ArrayRef Str Bool Int RegexpRef/;
 use namespace::autoclean;
 
@@ -14,91 +15,91 @@ with 'Catalyst::ScriptRole';
 __PACKAGE__->meta->get_attribute('help')->cmd_aliases('?');
 
 has debug => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'd',
-    isa => Bool,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'd',
+    isa           => Bool,
+    is            => 'ro',
     documentation => q{Force debug mode},
 );
 
 has host => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'h',
-    isa => Str,
-    is => 'ro',
-    default => 'localhost',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'h',
+    isa           => Str,
+    is            => 'ro',
+    default       => 'localhost',
     documentation => 'Specify an IP on this host for the server to bind to',
 );
 
 has fork => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'f',
-    isa => Bool,
-    is => 'ro',
-    default => 0,
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'f',
+    isa           => Bool,
+    is            => 'ro',
+    default       => 0,
     documentation => 'Fork the server to be able to serve multiple requests at once',
 );
 
 has port => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'p',
-    isa => Int,
-    is => 'ro',
-    default => 3000,
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'p',
+    isa           => PositiveInt,
+    is            => 'ro',
+    default       => 3000,
     documentation => 'Specify a different listening port (to the default port 3000)',
 );
 
 has pidfile => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'pid',
-    isa => Str,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'pid',
+    isa           => Str,
+    is            => 'ro',
     documentation => 'Specify a pidfile',
 );
 
 has keepalive => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'k',
-    isa => Bool,
-    is => 'ro',
-    default => 0,
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'k',
+    isa           => Bool,
+    is            => 'ro',
+    default       => 0,
     documentation => 'Support keepalive',
 );
 
 has background => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'bg',
-    isa => Bool,
-    is => 'ro',
-    default => 0,
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'bg',
+    isa           => Bool,
+    is            => 'ro',
+    default       => 0,
     documentation => 'Run in the background',
 );
 
 has restart => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'r',
-    isa => Bool,
-    is => 'ro',
-    default => 0,
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'r',
+    isa           => Bool,
+    is            => 'ro',
+    default       => 0,
     documentation => 'use Catalyst::Restarter to detect code changes and restart the application',
 );
 
 has restart_directory => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'rdir',
-    isa => ArrayRef[Str],
-    is  => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'rdir',
+    isa           => ArrayRef[Str],
+    is            => 'ro',
     documentation => 'Restarter directory to watch',
-    predicate => '_has_restart_directory',
+    predicate     => '_has_restart_directory',
 );
 
 has restart_delay => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'rd',
-    isa => Int,
-    is => 'ro',
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'rd',
+    isa           => Int,
+    is            => 'ro',
     documentation => 'Set a restart delay',
-    predicate => '_has_restart_delay',
+    predicate     => '_has_restart_delay',
 );
 
 {
@@ -110,30 +111,30 @@ has restart_delay => (
     MooseX::Getopt::OptionTypeMap->add_option_type_to_map($tc => '=s');
 
     has restart_regex => (
-        traits => [qw(Getopt)],
-        cmd_aliases => 'rr',
-        isa => $tc,
-        coerce => 1,
-        is => 'ro',
+        traits        => [qw(Getopt)],
+        cmd_aliases   => 'rr',
+        isa           => $tc,
+        coerce        => 1,
+        is            => 'ro',
         documentation => 'Restart regex',
-        predicate => '_has_restart_regex',
+        predicate     => '_has_restart_regex',
     );
 }
 
 has follow_symlinks => (
-    traits => [qw(Getopt)],
-    cmd_aliases => 'sym',
-    isa => Bool,
-    is => 'ro',
-    default => 0,
+    traits        => [qw(Getopt)],
+    cmd_aliases   => 'sym',
+    isa           => Bool,
+    is            => 'ro',
+    default       => 0,
     documentation => 'Follow symbolic links',
-    predicate => '_has_follow_symlinks',
+    predicate     => '_has_follow_symlinks',
 );
 
 sub _restarter_args {
     my $self = shift;
 
-    my %args = (
+    return (
         argv => $self->ARGV,
         start_sub => sub { $self->_run_application },
         ($self->_has_follow_symlinks   ? (follow_symlinks => $self->follow_symlinks)   : ()),
@@ -141,8 +142,6 @@ sub _restarter_args {
         ($self->_has_restart_directory ? (directories     => $self->restart_directory) : ()),
         ($self->_has_restart_regex     ? (filter          => $self->restart_regex)     : ()),
     );
-
-    return %args;
 }
 
 sub run {