From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sat, 5 Sep 2009 15:16:00 +0000 (+0000)
Subject: Fix passing correct key, re-add getopt trait as this is needed, my bad
X-Git-Tag: 5.80014_02~69
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ab7eb5a9ca449fce425b881e5f1b82870683c80f;hp=d3082facb5273f9970121638c0385ecfc0f7b090;p=catagits%2FCatalyst-Runtime.git

Fix passing correct key, re-add getopt trait as this is needed, my bad
---

diff --git a/lib/Catalyst/Script/Create.pm b/lib/Catalyst/Script/Create.pm
index f04995d..faf60a0 100644
--- a/lib/Catalyst/Script/Create.pm
+++ b/lib/Catalyst/Script/Create.pm
@@ -7,6 +7,7 @@ use namespace::autoclean;
 with 'Catalyst::ScriptRole';
 
 has force => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'nonew',
     isa => Bool,
     is => 'ro',
@@ -14,6 +15,7 @@ has force => (
 );
 
 has debug => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'd',
     isa => Bool,
     is => 'ro',
@@ -21,6 +23,7 @@ has debug => (
 );
 
 has mechanize => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'mech',
     isa => Bool,
     is => 'ro',
diff --git a/lib/Catalyst/Script/FastCGI.pm b/lib/Catalyst/Script/FastCGI.pm
index f9322d2..edfcea0 100644
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@ -8,6 +8,7 @@ use namespace::autoclean;
 with 'Catalyst::ScriptRole';
 
 has listen => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'l',
     isa => Int,
     is => 'ro',
@@ -15,27 +16,31 @@ has listen => (
 );
 
 has pidfile => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'pid',
     isa => Str,
     is => 'ro',
     documentation => 'Specify a pidfile',
 );
 
-has daemon => ( 
+has daemon => (
+    traits => [qw(Getopt)],
     isa => Bool,   
     is => 'ro', 
     cmd_aliases => 'd', 
     documentation => 'Daemonize',
 );
 
-has manager => ( 
+has manager => (
+    traits => [qw(Getopt)],
     isa => Str,    
     is => 'ro',
     cmd_aliases => 'm',
     documentation => 'Use a different FastCGI manager', # FIXME
 );
 
-has keep_stderr => ( 
+has keep_stderr => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'std', 
     isa => Bool,   
     is => 'ro',  
@@ -43,13 +48,15 @@ has keep_stderr => (
 );
 
 has nproc => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'np',  
     isa => Int,
     is => 'ro',  
     documentation => 'Specify an nproc', # FIXME
 );
 
-has detach => ( 
+has detach => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'det', 
     isa => Bool,   
     is => 'ro',  
diff --git a/lib/Catalyst/Script/Server.pm b/lib/Catalyst/Script/Server.pm
index 718e8c1..87e7b24 100644
--- a/lib/Catalyst/Script/Server.pm
+++ b/lib/Catalyst/Script/Server.pm
@@ -13,6 +13,7 @@ use namespace::autoclean;
 with 'Catalyst::ScriptRole';
 
 has debug => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'd',
     isa => Bool,
     is => 'ro',
@@ -20,6 +21,7 @@ has debug => (
 );
 
 has host => (
+    traits => [qw(Getopt)],
     isa => Str,
     is => 'ro',
     default => 'localhost',
@@ -27,6 +29,7 @@ has host => (
 );
 
 has fork => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'f',
     isa => Bool,
     is => 'ro',
@@ -34,6 +37,7 @@ has fork => (
 );
 
 has listen => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'l',
     isa => Int,
     is => 'ro',
@@ -42,6 +46,7 @@ has listen => (
 );
 
 has pidfile => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'pid',
     isa => Str,
     is => 'ro',
@@ -49,6 +54,7 @@ has pidfile => (
 );
 
 has keepalive => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'k',
     isa => Bool,
     is => 'ro',
@@ -57,6 +63,7 @@ has keepalive => (
 );
 
 has background => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'bg',
     isa => Bool,
     is => 'ro',
@@ -64,6 +71,7 @@ has background => (
 );
 
 has restart => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'r',
     isa => Bool,
     is => 'ro',
@@ -71,6 +79,7 @@ has restart => (
 );
 
 has restart_directory => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'rdir',
     isa => ArrayRef[Str],
     is  => 'ro',
@@ -79,6 +88,7 @@ has restart_directory => (
 );
 
 has restart_delay => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'rdel',
     isa => Int,
     is => 'ro',
diff --git a/lib/Catalyst/ScriptRunner.pm b/lib/Catalyst/ScriptRunner.pm
index 58a65fc..f7e617c 100644
--- a/lib/Catalyst/ScriptRunner.pm
+++ b/lib/Catalyst/ScriptRunner.pm
@@ -13,7 +13,7 @@ sub run {
         $classtoload = "Catalyst::Script::$scriptclass";
         Class::MOP::load_class($classtoload);
     }
-    $classtoload->new_with_options( app => $class )->run;
+    $classtoload->new_with_options( application_name => $class )->run;
 }
 
 __PACKAGE__->meta->make_immutable;