[Catalyst-commits] r11313 - in Catalyst-Runtime/5.80/branches/better_scripts: . lib/Catalyst lib/Catalyst/Script

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-09-05 15:16:00 +0000 (Sat, 05 Sep 2009)
New Revision: 11313

Modified:
   Catalyst-Runtime/5.80/branches/better_scripts/
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
   Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm
Log:
 r11320 at tomas-dorans-macbook-pro:  t0m | 2009-09-05 12:38:54 +0100
 Fix passing correct key, re-add getopt trait as this is needed, my bad



Property changes on: Catalyst-Runtime/5.80/branches/better_scripts
___________________________________________________________________
Name: svk:merge
   - 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/compres:7999
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/context_go:8001
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:8533
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/Catalyst-Test-Updates:8363
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/add_captures_to_visit:9546
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/trunk:10614
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Runtime-better_scripts:11291
8a9521aa-ff93-41d6-9f87-b05cafcdab40:/local/cat/Catalyst-Runtime/5.80/trunk:8157
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
   + 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/compres:7999
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/context_go:8001
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:8533
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/Catalyst-Test-Updates:8363
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/add_captures_to_visit:9546
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/trunk:10614
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Runtime-better_scripts:11320
8a9521aa-ff93-41d6-9f87-b05cafcdab40:/local/cat/Catalyst-Runtime/5.80/trunk:8157
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442

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-09-05 15:15:50 UTC (rev 11312)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Create.pm	2009-09-05 15:16:00 UTC (rev 11313)
@@ -7,6 +7,7 @@
 with 'Catalyst::ScriptRole';
 
 has force => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'nonew',
     isa => Bool,
     is => 'ro',
@@ -14,6 +15,7 @@
 );
 
 has debug => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'd',
     isa => Bool,
     is => 'ro',
@@ -21,6 +23,7 @@
 );
 
 has mechanize => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'mech',
     isa => Bool,
     is => 'ro',

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm	2009-09-05 15:15:50 UTC (rev 11312)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm	2009-09-05 15:16:00 UTC (rev 11313)
@@ -8,6 +8,7 @@
 with 'Catalyst::ScriptRole';
 
 has listen => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'l',
     isa => Int,
     is => 'ro',
@@ -15,27 +16,31 @@
 );
 
 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 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',  

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm	2009-09-05 15:15:50 UTC (rev 11312)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm	2009-09-05 15:16:00 UTC (rev 11313)
@@ -13,6 +13,7 @@
 with 'Catalyst::ScriptRole';
 
 has debug => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'd',
     isa => Bool,
     is => 'ro',
@@ -20,6 +21,7 @@
 );
 
 has host => (
+    traits => [qw(Getopt)],
     isa => Str,
     is => 'ro',
     default => 'localhost',
@@ -27,6 +29,7 @@
 );
 
 has fork => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'f',
     isa => Bool,
     is => 'ro',
@@ -34,6 +37,7 @@
 );
 
 has listen => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'l',
     isa => Int,
     is => 'ro',
@@ -42,6 +46,7 @@
 );
 
 has pidfile => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'pid',
     isa => Str,
     is => 'ro',
@@ -49,6 +54,7 @@
 );
 
 has keepalive => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'k',
     isa => Bool,
     is => 'ro',
@@ -57,6 +63,7 @@
 );
 
 has background => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'bg',
     isa => Bool,
     is => 'ro',
@@ -64,6 +71,7 @@
 );
 
 has restart => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'r',
     isa => Bool,
     is => 'ro',
@@ -71,6 +79,7 @@
 );
 
 has restart_directory => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'rdir',
     isa => ArrayRef[Str],
     is  => 'ro',
@@ -79,6 +88,7 @@
 );
 
 has restart_delay => (
+    traits => [qw(Getopt)],
     cmd_aliases => 'rdel',
     isa => Int,
     is => 'ro',

Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm	2009-09-05 15:15:50 UTC (rev 11312)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm	2009-09-05 15:16:00 UTC (rev 11313)
@@ -13,7 +13,7 @@
         $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;