X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRole.pm;h=e5231e7b36a4c245a6a3b548fb73dc5ad3e98477;hb=b6722bdd672b42bbb8f70d77f5495f373b830b3c;hp=6bea8c1a0d35c2058a674a8d7bcfe5f2a8de5489;hpb=532f0516947cf047368e91150ca2ab1cfd4c1e64;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index 6bea8c1..e5231e7 100644
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -3,12 +3,12 @@ use Moose::Role;
 use MooseX::Types::Moose qw/Str Bool/;
 use Pod::Usage;
 use MooseX::Getopt;
-use Catalyst::Engine::Loader;
+use Catalyst::EngineLoader;
 use MooseX::Types::LoadableClass qw/LoadableClass/;
 use namespace::autoclean;
 
 with 'MooseX::Getopt' => {
-    excludes => [qw/
+    -excludes => [qw/
         _getopt_spec_warnings
         _getopt_spec_exception
         _getopt_full_usage
@@ -22,26 +22,19 @@ has application_name => (
     required => 1,
 );
 
-has help => (
-    traits        => ['Getopt'],
-    isa           => Bool,
-    is            => 'ro',
-    documentation => 'Display this help and exit',
-    cmd_aliases   => ['?', 'h'],
-);
-
 has loader_class => (
     isa => LoadableClass,
     is => 'ro',
     coerce => 1,
-    default => 'Catalyst::Engine::Loader',
+    default => 'Catalyst::EngineLoader',
     documentation => 'The class to use to detect and load the PSGI engine',
 );
 
 has _loader => (
     isa => 'Plack::Loader',
     default => sub {
-        shift->loader_class->new
+        my $self = shift;
+        $self->loader_class->new(application_name => $self->application_name);
     },
     handles => {
         load_engine => 'load',
@@ -63,11 +56,6 @@ sub _getopt_full_usage {
     exit 0;
 }
 
-before run => sub {
-    my $self = shift;
-    $self->_getopt_full_usage if $self->help;
-};
-
 sub run {
     my $self = shift;
     $self->_run_application;
@@ -78,7 +66,8 @@ sub _application_args {
 }
 
 sub _plack_loader_args {
-    my @app_args = shift->_application_args;
+    my $self = shift;
+    my @app_args = $self->_application_args;
     return (port => $app_args[0]);
 }