From: Brian Cassidy <bricas@cpan.org>
Date: Fri, 14 Sep 2007 12:38:42 +0000 (+0000)
Subject: restarting engine fixes from willert
X-Git-Tag: 1.09~32
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e0cfc0440806ecf24204333459ac4f873abf9c3;p=catagits%2FCatalyst-Devel.git

restarting engine fixes from willert
---

diff --git a/Changes b/Changes
index 50ddb2e..d826834 100644
--- a/Changes
+++ b/Changes
@@ -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
diff --git a/lib/Catalyst/Devel.pm b/lib/Catalyst/Devel.pm
index de34571..23eaac1 100644
--- a/lib/Catalyst/Devel.pm
+++ b/lib/Catalyst/Devel.pm
@@ -3,8 +3,8 @@ package Catalyst::Devel;
 use strict;
 use warnings;
 
-our $VERSION             = '1.03';
-our $CATALYST_SCRIPT_GEN = 30;
+our $VERSION             = '1.04';
+our $CATALYST_SCRIPT_GEN = 31;
 
 =head1 NAME
 
diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 835c061..055e5ec 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -861,6 +861,7 @@ my $restart           = $ENV{[% appenv %]_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
 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 @@ GetOptions(
     '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 @@ require [% name %];
     restart_delay     => $restart_delay,
     restart_regex     => qr/$restart_regex/,
     restart_directory => $restart_directory,
+    follow_symlinks   => $follow_symlinks,
 } );
 
 1;
@@ -925,9 +928,10 @@ require [% name %];
                       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