[Catalyst-commits] r12290 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst/Script t/aggregate

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-12-10 09:46:10 +0000 (Thu, 10 Dec 2009)
New Revision: 12290

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Create.pm
   Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_create.t
Log:
Fix RT#52630

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-12-10 09:30:12 UTC (rev 12289)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-12-10 09:46:10 UTC (rev 12290)
@@ -13,6 +13,7 @@
      some apache versions where %ENV{SCRIPT_NAME} is set to the real name of
      the script, by using $ENV{REDIRECT_URL} which contains the non-rewritten
      URI.
+   - Fix usage display when myapp_create.pl is run with no arguments. RT#52630
 
   New features:
    - The __MOP__ hash element is suppressed from being dumped fully

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Create.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Create.pm	2009-12-10 09:30:12 UTC (rev 12289)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Create.pm	2009-12-10 09:46:10 UTC (rev 12290)
@@ -40,13 +40,13 @@
 sub run {
     my ($self) = @_;
 
-    $self->_exit_with_usage if !$self->ARGV->[0];
+    $self->_getopt_full_usage if !$self->ARGV->[0];
 
     my $helper_class = $self->helper_class;
     Class::MOP::load_class($helper_class);
     my $helper = $helper_class->new( { '.newfiles' => !$self->force, mech => $self->mechanize } );
 
-    $self->_exit_with_usage unless $helper->mk_component( $self->application_name, @ARGV );
+    $self->_getopt_full_usage unless $helper->mk_component( $self->application_name, @ARGV );
 
 }
 

Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_create.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_create.t	2009-12-10 09:30:12 UTC (rev 12289)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/unit_core_script_create.t	2009-12-10 09:46:10 UTC (rev 12290)
@@ -12,7 +12,7 @@
     use Moose;
     extends 'Catalyst::Script::Create';
     our $help;
-    sub _exit_with_usage { $help++ }
+    sub _getopt_full_usage { $help++ }
 }
 
 {