[Catalyst-commits] r6881 - in trunk/Catalyst-Devel: . lib/Catalyst

[bricas at dev.catalyst.perl.org]

Author: bricas
Date: 2007-09-14 13:38:42 +0100 (Fri, 14 Sep 2007)
New Revision: 6881

Modified:
   trunk/Catalyst-Devel/Changes
   trunk/Catalyst-Devel/lib/Catalyst/Devel.pm
   trunk/Catalyst-Devel/lib/Catalyst/Helper.pm
Log:
restarting engine fixes from willert

Modified: trunk/Catalyst-Devel/Changes
===================================================================
--- trunk/Catalyst-Devel/Changes	2007-09-14 12:38:23 UTC (rev 6880)
+++ trunk/Catalyst-Devel/Changes	2007-09-14 12:38:42 UTC (rev 6881)
@@ -1,7 +1,13 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+1.04	2007-XX-XX
+        - Patched Helper.pm so the correct options for mulitple restart
+          directories and symlink resolution will be set in myapp_server.pl
+          (Sebastian Willert)
+
 1.03    2007-08-10 08:10:00
-        - Patch Helper.pm so Module::Pluggable::Object ignores emacs temp files appropriately for restarting server
+        - Patch Helper.pm so Module::Pluggable::Object ignores emacs temp
+          files appropriately for restarting server
         - Changed default dependency to Catalyst::Runtime
         - Added BindLex example to create script
         - Don't change a manually-specified engine when using the

Modified: trunk/Catalyst-Devel/lib/Catalyst/Devel.pm
===================================================================
--- trunk/Catalyst-Devel/lib/Catalyst/Devel.pm	2007-09-14 12:38:23 UTC (rev 6880)
+++ trunk/Catalyst-Devel/lib/Catalyst/Devel.pm	2007-09-14 12:38:42 UTC (rev 6881)
@@ -3,8 +3,8 @@
 use strict;
 use warnings;
 
-our $VERSION             = '1.03';
-our $CATALYST_SCRIPT_GEN = 30;
+our $VERSION             = '1.04';
+our $CATALYST_SCRIPT_GEN = 31;
 
 =head1 NAME
 

Modified: trunk/Catalyst-Devel/lib/Catalyst/Helper.pm
===================================================================
--- trunk/Catalyst-Devel/lib/Catalyst/Helper.pm	2007-09-14 12:38:23 UTC (rev 6880)
+++ trunk/Catalyst-Devel/lib/Catalyst/Helper.pm	2007-09-14 12:38:42 UTC (rev 6881)
@@ -861,6 +861,7 @@
 my $restart_delay     = 1;
 my $restart_regex     = '(?:/|^)(?!\.#).+(?:\.yml$|\.yaml$|\.pm)$';
 my $restart_directory = undef;
+my $follow_symlinks   = 0;
 
 my @argv = @ARGV;
 
@@ -874,7 +875,8 @@
     'restart|r'           => \$restart,
     'restartdelay|rd=s'   => \$restart_delay,
     'restartregex|rr=s'   => \$restart_regex,
-    'restartdirectory=s'  => \$restart_directory,
+    'restartdirectory=s@' => \$restart_directory,
+    'followsymlinks'      => \$follow_symlinks,
 );
 
 pod2usage(1) if $help;
@@ -898,6 +900,7 @@
     restart_delay     => $restart_delay,
     restart_regex     => qr/$restart_regex/,
     restart_directory => $restart_directory,
+    follow_symlinks   => $follow_symlinks,
 } );
 
 1;
@@ -925,9 +928,10 @@
                       a restart when modified
                       (defaults to '\.yml$|\.yaml$|\.pm$')
    -restartdirectory  the directory to search for
-                      modified files
-                      (defaults to '../')
-
+                      modified files, can be set mulitple times
+                      (defaults to '[SCRIPT_DIR]/..')
+   -follow_symlinks   follow symlinks in search directories
+                      (defaults to false. this is a no-op on Win32)
  See also:
    perldoc Catalyst::Manual
    perldoc Catalyst::Manual::Intro