[Catalyst-commits] r13516 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst lib/Catalyst/Script

[bricas at dev.catalyst.perl.org]

Author: bricas
Date: 2010-08-23 18:55:43 +0100 (Mon, 23 Aug 2010)
New Revision: 13516

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/Makefile.PL
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Server.pm
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/ScriptRole.pm
Log:
Fix two warnings:
 - Fix warning about "excludes" during role application
 - Fix warning from MooseX::Getopt regarding duplicate "help" aliases


Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2010-08-22 15:04:58 UTC (rev 13515)
+++ Catalyst-Runtime/5.80/trunk/Changes	2010-08-23 17:55:43 UTC (rev 13516)
@@ -14,6 +14,8 @@
   - Fix controllers with no method attributes (where the action definitions
     are entirely contained in config). RT#58057
   - Fix running as a CGI under IIS at non-root locations.
+  - Fix warning about "excludes" during role application
+  - Fix warning from MooseX::Getopt regarding duplicate "help" aliases
 
  Documentation:
   - Fix missing - in the docs when describing the --mechanize option at one

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2010-08-22 15:04:58 UTC (rev 13515)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2010-08-23 17:55:43 UTC (rev 13516)
@@ -46,7 +46,7 @@
 requires 'Task::Weaken';
 requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
 requires 'MRO::Compat';
-requires 'MooseX::Getopt' => '0.25';
+requires 'MooseX::Getopt' => '0.30';
 requires 'MooseX::Types';
 requires 'MooseX::Types::Common::Numeric';
 requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Server.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Server.pm	2010-08-22 15:04:58 UTC (rev 13515)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Script/Server.pm	2010-08-23 17:55:43 UTC (rev 13516)
@@ -13,8 +13,6 @@
 
 with 'Catalyst::ScriptRole';
 
-__PACKAGE__->meta->get_attribute('help')->cmd_aliases('?');
-
 has debug => (
     traits        => [qw(Getopt)],
     cmd_aliases   => 'd',

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/ScriptRole.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/ScriptRole.pm	2010-08-22 15:04:58 UTC (rev 13515)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/ScriptRole.pm	2010-08-23 17:55:43 UTC (rev 13516)
@@ -6,7 +6,7 @@
 use namespace::autoclean;
 
 with 'MooseX::Getopt' => {
-    excludes => [qw/
+    -excludes => [qw/
         _getopt_spec_warnings
         _getopt_spec_exception
         _getopt_full_usage
@@ -20,14 +20,6 @@
     required => 1,
 );
 
-has help => (
-    traits        => ['Getopt'],
-    isa           => Bool,
-    is            => 'ro',
-    documentation => 'Display this help and exit',
-    cmd_aliases   => ['?', 'h'],
-);
-
 sub _getopt_spec_exception {}
 
 sub _getopt_spec_warnings {
@@ -41,11 +33,6 @@
     exit 0;
 }
 
-before run => sub {
-    my $self = shift;
-    $self->_getopt_full_usage if $self->help;
-};
-
 sub run {
     my $self = shift;
     $self->_run_application;