And start the app correctly(ish) under the restarter - really not sure args are perse...

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

diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 04d5372..e40da5e 100644 (file)
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -2,42 +2,30 @@ package Catalyst::Script::Server;
 
 BEGIN {
     $ENV{CATALYST_ENGINE} ||= 'HTTP';
-    $ENV{CATALYST_SCRIPT_GEN} = 31;
     require Catalyst::Engine::HTTP;
 }
 
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use Pod::Usage;
 use Moose;
 use Catalyst::Restarter;
-use MooseX::Types::Moose qw/Str Bool Int/;
+use MooseX::Types::Moose qw/ArrayRef Str Bool Int/;
 use namespace::autoclean;
 
-with 'MooseX::Getopt';
-#extends qw(MooseX::App::Cmd);
+with 'Catalyst::ScriptRole';
 
 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',
-    documentation => qq{ display this help and exits },
+    documentation => q{Force debug mode},
 );
 
 has host => (
+    traits => [qw(Getopt)],
     isa => Str,
     is => 'ro',
-    default =>  "localhost",
-    documentation => qq{ specify a host for the server to run on }
+    default => 'localhost',
+    documentation => 'Specify a host for the server to run on',
 );
 
 has fork => (
@@ -45,7 +33,7 @@ has fork => (
     cmd_aliases => 'f',
     isa => Bool,
     is => 'ro',
-    documentation => qq{ fork the server }
+    documentation => 'Fork the server',
 );
 
 has listen => (
@@ -53,8 +41,8 @@ has listen => (
     cmd_aliases => 'l',
     isa => Int,
     is => 'ro',
-    default => "3000",
-    documentation => qq{ specify a different listening port }
+    default => 3000,
+    documentation => 'Specify a different listening port',
 );
 
 has pidfile => (
@@ -62,7 +50,7 @@ has pidfile => (
     cmd_aliases => 'pid',
     isa => Str,
     is => 'ro',
-    documentation => qq{ specify a pidfile }
+    documentation => 'Specify a pidfile',
 );
 
 has keepalive => (
@@ -70,7 +58,7 @@ has keepalive => (
     cmd_aliases => 'k',
     isa => Bool,
     is => 'ro',
-    documentation => qq{ server keepalive },
+    documentation => 'Server keepalive',
 
 );
 
@@ -79,16 +67,7 @@ has background => (
     cmd_aliases => 'bg',
     isa => Bool,
     is => 'ro',
-    documentation => qq{ run in the background }
-);
-
-
-has _app => (
-    reader   => 'app',
-    init_arg => 'app',
-    traits => [qw(NoGetopt)],
-    isa => Str,
-    is => 'ro',
+    documentation => 'Run in the background',
 );
 
 has restart => (
@@ -96,16 +75,16 @@ has restart => (
     cmd_aliases => 'r',
     isa => Bool,
     is => 'ro',
-    documentation => qq{ use Catalyst::Restarter to detect code changes }
+    documentation => 'use Catalyst::Restarter to detect code changes',
 );
 
 has restart_directory => (
     traits => [qw(Getopt)],
     cmd_aliases => 'rdir',
-    isa => 'ArrayRef[Str]',
+    isa => ArrayRef[Str],
     is  => 'ro',
     predicate => '_has_restart_directory',
-    documentation => qq{ restarter directory to watch }
+    documentation => 'Restarter directory to watch',
 );
 
 has restart_delay => (
@@ -114,7 +93,7 @@ has restart_delay => (
     isa => Int,
     is => 'ro',
     predicate => '_has_restart_delay',
-    documentation => qq{ set a restart delay }
+    documentation => 'Set a restart delay',
 );
 
 has restart_regex => (
@@ -123,7 +102,7 @@ has restart_regex => (
     isa => Str,
     is => 'ro',
     predicate => '_has_restart_regex',
-    documentation => qq{ restart regex }
+    documentation => 'Restart regex',
 );
 
 has follow_symlinks => (
@@ -132,23 +111,13 @@ has follow_symlinks => (
     isa => Bool,
     is => 'ro',
     predicate => '_has_follow_symlinks',
-    documentation => qq{ follow symbolic links }
+    documentation => 'Follow symbolic links',
 
 );
 
-sub usage {
-    my ($self) = shift;
-
-    return pod2usage();
-
-}
-
-
 sub run {
     my ($self) = shift;
 
-    $self->usage if $self->help;
-
     if ( $self->debug ) {
         $ENV{CATALYST_DEBUG} = 1;
     }
@@ -181,50 +150,48 @@ sub run {
 
         my $restarter = $subclass->new(
             %args,
-            start_sub => sub { $self->_run },
-            argv      => \$self->ARGV,
+            start_sub => sub { $self->_run_application },
+            argv      => $self->ARGV,
         );
 
         $restarter->run_and_watch;
     }
     else {
-        $self->_run;
+        $self->_run_application;
     }
 
 
 }
 
-sub _run {
+sub _application_args {
     my ($self) = shift;
-
-    my $app = $self->app;
-    Class::MOP::load_class($app);
-
-    $app->run(
-        $self->listen, $self->host,
+    return (
+        $self->listen,
+        $self->host,
         {
-           'fork'            => $self->fork,
-           keepalive         => $self->keepalive,
-           background        => $self->background,
-           pidfile           => $self->pidfile,
-           keepalive         => $self->keepalive,
-           follow_symlinks   => $self->follow_symlinks,
-        }
+           map { $_ => $self->$_ } qw/
+                fork
+                keepalive
+                background
+                pidfile
+                keepalive
+                follow_symlinks
+            /,
+        },
     );
 }
 
-
 __PACKAGE__->meta->make_immutable;
 
 1;
 
 =head1 NAME
 
-[% appprefix %]_server.pl - Catalyst Testserver
+Catalyst::Script::Server - Catalyst test server
 
 =head1 SYNOPSIS
 
-[% appprefix %]_server.pl [options]
+ myapp_server.pl [options]
 
  Options:
    -d     --debug          force debug mode
@@ -255,7 +222,7 @@ __PACKAGE__->meta->make_immutable;
 
 =head1 DESCRIPTION
 
-Run a Catalyst Testserver for this application.
+Run a Catalyst test server for this application.
 
 =head1 AUTHORS