[Catalyst-commits] r10376 - in Catalyst-Devel/1.00/trunk: . lib/Catalyst lib/Catalyst/Restarter

[autarch at dev.catalyst.perl.org]

Author: autarch
Date: 2009-05-29 22:28:39 +0000 (Fri, 29 May 2009)
New Revision: 10376

Modified:
   Catalyst-Devel/1.00/trunk/Changes
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter.pm
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter/Win32.pm
Log:
We need to capture @ARGV in the restarter, for the benefit of Win32
only, so that it can re-execute itself with the right
options. Getopt::Long eats @ARGV before we have a chance to get to it.

Modified: Catalyst-Devel/1.00/trunk/Changes
===================================================================
--- Catalyst-Devel/1.00/trunk/Changes	2009-05-29 22:28:22 UTC (rev 10375)
+++ Catalyst-Devel/1.00/trunk/Changes	2009-05-29 22:28:39 UTC (rev 10376)
@@ -1,5 +1,11 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+1.18
+        - More fixes for the Win32 restarter. It was effectively
+          ignoring all command-line options except those related to
+          the restarter itself.
+
+
 1.17    2009-05-24 18:18:17
         - Catalyst::Restarter::Forking loaded the threads and
           Thread::Cancel modules, even though it doesn't need them.

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm	2009-05-29 22:28:22 UTC (rev 10375)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Devel.pm	2009-05-29 22:28:39 UTC (rev 10376)
@@ -4,7 +4,7 @@
 use warnings;
 
 our $VERSION             = '1.17';
-our $CATALYST_SCRIPT_GEN = 38;
+our $CATALYST_SCRIPT_GEN = 39;
 
 $VERSION = eval $VERSION;
 

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2009-05-29 22:28:22 UTC (rev 10375)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2009-05-29 22:28:39 UTC (rev 10376)
@@ -1051,6 +1051,7 @@
     my $restarter = $subclass->new(
         %args,
         start_sub => $runner,
+        argv      => \@argv,
     );
 
     $restarter->run_and_watch;

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter/Win32.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter/Win32.pm	2009-05-29 22:28:22 UTC (rev 10375)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter/Win32.pm	2009-05-29 22:28:39 UTC (rev 10376)
@@ -16,7 +16,7 @@
 
     # This is totally hack-tastic, and is probably much slower, but it
     # does seem to work.
-    my @command = ( $^X, $0, grep { ! /^\-r/ } @ARGV );
+    my @command = ( $^X, $0, grep { ! /^\-r/ } @{ $self->argv } );
 
     my $child = Proc::Background->new(@command);
 

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter.pm	2009-05-29 22:28:22 UTC (rev 10375)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Restarter.pm	2009-05-29 22:28:39 UTC (rev 10376)
@@ -13,6 +13,12 @@
     required => 1,
 );
 
+has argv =>  (
+    is       => 'ro',
+    isa      => 'ArrayRef',
+    required => 1,
+);
+
 has _watcher => (
     is  => 'rw',
     isa => 'File::ChangeNotify::Watcher',