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

diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm
index 575f9e7..6191d72 100644 (file)
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -33,7 +33,7 @@ has mechanize => (
 sub run {
     my ($self) = @_;
 
-    $self->_display_help if ( !$ARGV[0] );
+    $self->_exit_with_usage if !$ARGV[0];
 
     my $helper = Catalyst::Helper->new( { '.newfiles' => !$self->force, mech => $self->mech } );
 
@@ -42,7 +42,6 @@ sub run {
 }
 
 __PACKAGE__->meta->make_immutable;
-1;
 
 =head1 NAME
 
@@ -92,3 +91,4 @@ This library is free software, you can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
+

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
+    

diff --git a/t/aggregate/unit_core_script_cgi.t b/t/aggregate/unit_core_script_cgi.t
new file mode 100644 (file)
index 0000000..ba187e1
--- /dev/null
+++ b/t/aggregate/unit_core_script_cgi.t
@@ -0,0 +1,20 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+
+use FindBin qw/$Bin/;
+use lib "$Bin/../lib";
+
+use Test::More;
+use Test::Exception;
+
+use Catalyst::Script::CGI;
+
+local @ARGV;
+lives_ok {
+    Catalyst::Script::CGI->new_with_options(application_name => 'TestAppToTestScripts')->run;
+} "new_with_options";
+shift @TestAppToTestScripts::RUN_ARGS;
+is_deeply \@TestAppToTestScripts::RUN_ARGS, [], "no args";
+
+done_testing;

diff --git a/t/aggregate/unit_core_script_help.t b/t/aggregate/unit_core_script_help.t
new file mode 100644 (file)
index 0000000..0850fd6
--- /dev/null
+++ b/t/aggregate/unit_core_script_help.t
@@ -0,0 +1,29 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+
+use FindBin qw/$Bin/;
+use lib "$Bin/../lib";
+
+{
+    package TestHelpScript;
+    use Moose;
+    with 'Catalyst::ScriptRole';
+    our $help;
+    sub _exit_with_usage { $help++ }
+}
+{
+    local $TestHelpScript::help;
+    local @ARGV = ('-h');
+    TestHelpFromScriptCGI->new_with_options(application_name => 'TestAppToTestScripts')->run;
+    ok $TestHelpFromScriptCGI::help, 1;
+}
+{
+    local $TestHelpScript::help;
+    local @ARGV = ('--help');
+    TestHelpFromScriptCGI->new_with_options(application_name => 'TestAppToTestScripts')->run;
+    is $TestHelpFromScriptCGI::help, 2;
+}
+
+done_testing;