Unified help display, at the cost of having lost the info about what you fucked up...

[catagits/Catalyst-Runtime.git] / lib / Catalyst / ScriptRole.pm

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index aa319f3..dd0a7d5 100644 (file)
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -21,7 +21,7 @@ has help => (
     documentation => q{Display this help and exit},
 );
 
-sub _display_help {
+sub _exit_with_usage {
     my $self = shift;
     pod2usage();
     exit 0;
@@ -29,7 +29,7 @@ sub _display_help {
 
 before run => sub {
     my $self = shift;
-    $self->_display_help if $self->help;
+    $self->_exit_with_usage if $self->help;
 };
 
 sub run {
@@ -48,6 +48,25 @@ 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
@@ -72,4 +91,4 @@ This library is free software, you can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
-    
\ No newline at end of file
+