X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FScriptRole.pm;h=1cd745f927a4bde517727e7095a0f89331ce661c;hb=2c298960a7602044a287c444e3f421d628202b76;hp=bea26ded79189f908cfcc7bc0606ca84587c28cd;hpb=12aa6ca498dc2e3e37277388245d0b198677e8fe;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index bea26de..1cd745f 100644
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -2,9 +2,16 @@ package Catalyst::ScriptRole;
 use Moose::Role;
 use MooseX::Types::Moose qw/Str Bool/;
 use Pod::Usage;
+use MooseX::Getopt;
 use namespace::autoclean;
 
-with 'MooseX::Getopt';
+with 'MooseX::Getopt' => {
+    excludes => [qw/
+        _getopt_spec_warnings
+        _getopt_spec_exception
+        _getopt_full_usage
+    /],
+};
 
 has application_name => (
     traits => ['NoGetopt'],
@@ -15,13 +22,20 @@ has application_name => (
 
 has help => (
     traits => ['Getopt'],
-    cmd_aliases => 'h',
     isa => Bool,
     is => 'ro',
     documentation => q{Display this help and exit},
+    cmd_aliases => ['?', 'h'],
 );
 
-sub _exit_with_usage {
+sub _getopt_spec_exception {}
+
+sub _getopt_spec_warnings {
+    shift;
+    warn @_;
+}
+
+sub _getopt_full_usage {
     my $self = shift;
     pod2usage();
     exit 0;
@@ -29,7 +43,7 @@ sub _exit_with_usage {
 
 before run => sub {
     my $self = shift;
-    $self->_exit_with_usage if $self->help;
+    $self->_getopt_full_usage if $self->help;
 };
 
 sub run {
@@ -48,25 +62,6 @@ sub _run_application {
     $app->run($self->_application_args);
 }
 
-# GROSS HACK, temporary until MX::Getopt gets some proper refactoring and unfucking..
-around '_parse_argv' => sub {
-    my ($orig, $self, @args) = @_;
-    my %data = eval { $self->$orig(@args) };
-    $self->_exit_with_usage($@) if $@;
-    $data{usage} = Catalyst::ScriptRole::Useage->new(code => sub { shift; $self->_exit_with_usage(@_) });
-    return %data;
-};
-
-# This package is going away.
-package # Hide from PAUSE
-    Catalyst::ScriptRole::Useage;
-use Moose;
-use namespace::autoclean;
-
-has code => ( is => 'ro', required => 1 );
-
-sub die { shift->code->(@_) }
-
 1;
 
 =head1 NAME
@@ -78,11 +73,11 @@ Catalyst::ScriptRole - Common functionality for Catalyst scripts.
     package MyApp::Script::Foo;
     use Moose;
     use namespace::autoclean;
-    
-    with 'Catalyst::Script::Role';
-    
+
+    with 'Catalyst::ScriptRole';
+
      sub _application_args { ... }
-    
+
 =head1 DESCRIPTION
 
 Role with the common functionality of Catalyst scripts.
@@ -115,4 +110,4 @@ This library is free software, you can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
-    
+