X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRole.pm;h=f8a12da1583a10205008e1db28e62287f2764543;hp=ac79b433c5e88e526b6145ff7402a935e99959f2;hb=e7399d8baa841cb6525daa2c20d88f70ba42474c;hpb=44d28c7d3def77dbf71d53b97362247a7329a513

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index ac79b43..f8a12da 100644
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -1,32 +1,54 @@
 package Catalyst::ScriptRole;
 use Moose::Role;
-use Plack::Runner;
-use MooseX::Types::Moose qw/Str Bool/;
 use Pod::Usage;
 use MooseX::Getopt;
+use Catalyst::EngineLoader;
+use Moose::Util::TypeConstraints;
+use Catalyst::Utils qw/ ensure_class_loaded /;
+use Class::Load 'load_class';
 use namespace::autoclean;
 
+subtype 'Catalyst::ScriptRole::LoadableClass',
+  as 'ClassName';
+coerce 'Catalyst::ScriptRole::LoadableClass',
+  from 'Str',
+  via { ensure_class_loaded($_); 1 };
+
 with 'MooseX::Getopt' => {
-    excludes => [qw/
+    -version => 0.48,
+    -excludes => [qw/
         _getopt_spec_warnings
         _getopt_spec_exception
-        _getopt_full_usage
+        print_usage_text
     /],
 };
 
 has application_name => (
     traits   => ['NoGetopt'],
-    isa      => Str,
+    isa      => 'Str',
     is       => 'ro',
     required => 1,
 );
 
-has help => (
-    traits        => ['Getopt'],
-    isa           => Bool,
-    is            => 'ro',
-    documentation => 'Display this help and exit',
-    cmd_aliases   => ['?', 'h'],
+has loader_class => (
+    isa => 'Catalyst::ScriptRole::LoadableClass',
+    is => 'ro',
+    coerce => 1,
+    default => 'Catalyst::EngineLoader',
+    documentation => 'The class to use to detect and load the PSGI engine',
+);
+
+has _loader => (
+    isa => 'Plack::Loader',
+    default => sub {
+        my $self = shift;
+        $self->loader_class->new(application_name => $self->application_name);
+    },
+    handles => {
+        load_engine => 'load',
+        autoload_engine => 'auto',
+    },
+    lazy => 1,
 );
 
 sub _getopt_spec_exception {}
@@ -36,32 +58,45 @@ sub _getopt_spec_warnings {
     warn @_;
 }
 
-sub _getopt_full_usage {
+sub print_usage_text {
     my $self = shift;
     pod2usage();
     exit 0;
 }
 
-before run => sub {
-    my $self = shift;
-    $self->_getopt_full_usage if $self->help;
-};
-
 sub run {
     my $self = shift;
     $self->_run_application;
 }
 
 sub _application_args {
-    ()
+    my $self = shift;
+    return {
+        argv => $self->ARGV,
+        extra_argv => $self->extra_argv,
+    }
 }
 
+sub _plack_loader_args {
+    my $self = shift;
+    my @app_args = $self->_application_args;
+    return (port => $app_args[0]);
+}
+
+sub _plack_engine_name {}
+
 sub _run_application {
     my $self = shift;
     my $app = $self->application_name;
-    Class::MOP::load_class($app);
-    my $psgi_app = $app->run($self->_application_args);
-    Plack::Runner->run('--app' => $psgi_app);
+    load_class($app);
+    my $server;
+    if (my $e = $self->_plack_engine_name ) {
+        $server = $self->load_engine($e, $self->_plack_loader_args);
+    }
+    else {
+        $server = $self->autoload_engine($self->_plack_loader_args);
+    }
+    $app->run($self->_application_args, $server);
 }
 
 1;
@@ -90,6 +125,10 @@ Role with the common functionality of Catalyst scripts.
 
 The method invoked to run the application.
 
+=head2 print_usage_text
+
+Prints out the usage text for the script you tried to invoke.
+
 =head1 ATTRIBUTES
 
 =head2 application_name