[Catalyst-commits] r11922 - in Catalyst-Runtime/5.80/branches/better_scripts: lib/Catalyst lib/Catalyst/Script t/aggregate

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-11-19 23:32:24 +0000 (Thu, 19 Nov 2009)
New Revision: 11922

Added:
   Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_cgi.t
   Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_help.t
Modified:
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm
Log:
Unified help display, at the cost of having lost the info about what you fucked up. Neither of these are particularly helpful, but this is at least uniform

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm	2009-11-19 22:23:58 UTC (rev 11921)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm	2009-11-19 23:32:24 UTC (rev 11922)
@@ -33,7 +33,7 @@
 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 @@
 }
 
 __PACKAGE__->meta->make_immutable;
-1;
 
 =head1 NAME
 
@@ -92,3 +91,4 @@
 it under the same terms as Perl itself.
 
 =cut
+

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm	2009-11-19 22:23:58 UTC (rev 11921)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRole.pm	2009-11-19 23:32:24 UTC (rev 11922)
@@ -21,7 +21,7 @@
     documentation => q{Display this help and exit},
 );
 
-sub _display_help {
+sub _exit_with_usage {
     my $self = shift;
     pod2usage();
     exit 0;
@@ -29,7 +29,7 @@
 
 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 @@
     $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 @@
 it under the same terms as Perl itself.
 
 =cut
-    
\ No newline at end of file
+    

Added: Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_cgi.t
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_cgi.t	                        (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_cgi.t	2009-11-19 23:32:24 UTC (rev 11922)
@@ -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;

Added: Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_help.t
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_help.t	                        (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/aggregate/unit_core_script_help.t	2009-11-19 23:32:24 UTC (rev 11922)
@@ -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;