X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScript%2FServer.pm;h=af816938530d5170f5b0f4942945cc9262e3284b;hb=833d661f73c4a976952eab50f7d1df1613886d30;hp=5f3d508dde70f7c4e8dba4e746e6dfb01e87590b;hpb=ee7aabd6613f44e30e6bbc335569711f17607a73;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 5f3d508..af81693 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -10,8 +10,8 @@ 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::Engine::HTTP;
+use namespace::autoclean;
 
 with 'MooseX::Getopt';
 
@@ -20,14 +20,14 @@ has help => (
     cmd_aliases => 'h',
     isa => 'Bool',   
     is => 'ro', 
-    required => 0, 
+    , 
     default => 0,  
 );
 
 has host => ( 
     isa => 'Str',    
     is => 'ro', 
-    required => 0, 
+    , 
     default =>  "localhost" 
 );
 
@@ -36,7 +36,7 @@ has fork => (
     cmd_aliases => 'f',
     isa => 'Bool',
     is => 'ro', 
-    required => 0 
+     
 );
 
 has listen => ( 
@@ -44,7 +44,7 @@ has listen => (
     cmd_aliases => 'l',
     isa => 'Int',
     is => 'ro', 
-    required => 0, 
+    , 
     default => "3000" 
 );
 
@@ -53,7 +53,7 @@ has pidfile => (
     cmd_aliases => 'pid',
     isa => 'Str',    
     is => 'ro', 
-    required => 0 
+     
 );
 
 has keepalive => ( 
@@ -61,7 +61,7 @@ has keepalive => (
     cmd_aliases => 'k',
     isa => 'Bool',   
     is => 'ro', 
-    required => 0, 
+    , 
     default => 0 
 );
 
@@ -70,16 +70,23 @@ has background => (
     cmd_aliases => 'bg',
     isa => 'Bool',   
     is => 'ro', 
-    required => 0 
 );
 
-has app => ( isa => 'Str',    is => 'ro', required => 1 ); # THIS IS FUCKING RETARDED HALP PLZ
+
+has _app => ( 
+    reader   => 'app', 
+    init_arg => 'app',
+    traits => [qw(NoGetopt)],
+    isa => 'Str',    
+    is => 'ro', 
+); 
+
 has restart => (
     traits => [qw(Getopt)],
     cmd_aliases => 'r', 
     isa => 'Bool',   
     is => 'ro', 
-    required => 0 
+     
 );
 
 has restart_delay => ( 
@@ -87,7 +94,7 @@ has restart_delay => (
     cmd_aliases => 'rdel',
     isa => 'Int',    
     is => 'ro', 
-    required => 0 
+     
 );
 
 has restart_regex => ( 
@@ -95,10 +102,16 @@ has restart_regex => (
     cmd_aliases => 'rxp',
     isa => 'Str',    
     is => 'ro', 
-    required => 0 
+     
 );
 
-has follow_symlinks => ( isa => 'Bool',   is => 'ro', required => 0 );
+has follow_symlinks => ( 
+    traits => [qw(Getopt)],
+    cmd_aliases => 'sym',
+    isa => 'Bool',   
+    is => 'ro', 
+     
+);
 
 my @argv = @ARGV;
 
@@ -107,14 +120,15 @@ sub run {
     
     pod2usage() if $self->help;
     my $app = $self->app;
+    warn "App is $app";
     Class::MOP::load_class($app);
     $app->run(
         $self->listen, $self->host,
         {  
-           'fork'     => $self->fork,
-           keepalive  => $self->keepalive,
-           background => $self->background,
-           pidfile    => $self->pidfile,
+           'fork'            => $self->fork,
+           keepalive         => $self->keepalive,
+           background        => $self->background,
+           pidfile           => $self->pidfile,
            keepalive         => $self->keepalive,
            restart           => $self->restart,
            restart_delay     => $self->restart_delay,
@@ -138,27 +152,27 @@ sub run {
 [% appprefix %]_server.pl [options]
 
  Options:
-   -d -debug          force debug mode
-   -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)
-   -k -keepalive      enable keep-alive connections
-   -r -restart        restart when files get modified
+   -d     --debug          force debug mode
+   -f     --fork           handle each request in a new process
                       (defaults to false)
-   -rd -restartdelay  delay between file checks
+   -h     --help           display this help and exits
+          --host           host (defaults to all)
+   -p     --port           port (defaults to 3000)
+   -k     --keepalive      enable keep-alive connections
+   -r     --restart        restart when files get modified
+                       (defaults to false)
+   --rd   --restartdelay  delay between file checks
                       (ignored if you have Linux::Inotify2 installed)
-   -rr -restartregex  regex match files that trigger
+   --rr   --restartregex  regex match files that trigger
                       a restart when modified
                       (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
-   -restartdirectory  the directory to search for
+   --rdir --restartdirectory  the directory to search for
                       modified files, can be set mulitple times
                       (defaults to '[SCRIPT_DIR]/..')
-   -follow_symlinks   follow symlinks in search directories
+   --sym  --follow_symlinks   follow symlinks in search directories
                       (defaults to false. this is a no-op on Win32)
-   -background        run the process in the background
-   -pidfile           specify filename for pid file
+   --bg   --background        run the process in the background
+   --pid  --pidfile           specify filename for pid file
 
  See also:
    perldoc Catalyst::Manual