Merge branch 'improved-restarter'

Conflicts:
	Changes
	lib/Catalyst/Devel.pm

diff --cc Changes
index 84a1137,b9e168c..f276d0a
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,9 -1,30 +1,33 @@@
  This file documents the revision history for Perl extension Catalyst-Devel.
  
 -1.14_02   2009-05-11 04:29
 +        - Remove -p option for pid file, and restore it to the port number,
 +          as it should be -port|-p (t0m)
 +        - Document -pidfile in myapp_server.pl POD (t0m)
 +
++1.14_02 2009-05-11 04:29
+         - Small changes to work with File::ChangeNotify 0.03.
+ 
 -1.14_01   2009-05-11 03:45
++1.14_01 2009-05-11 03:45
+         - This release moves the restarter functionality into a new
+           module Catalyst::Restarter, that is not a Catalyst Engine
+           subclass.
+ 
+           The new restarter is simpler and more reliable, because it
+           does not try to test if a changed piece of code can be
+           compiled. It simply restarts the server whenever it detects
+           changes. This also makes it much faster.
+ 
+           However, this does mean that the server can simply die when
+           a changed file cannot compile. This is different than the
+           old behavior, where the server remained running without
+           incorporating the change.
+ 
+           Finally, the new restarter relies on File::ChangeNotify,
+           which is designed to accomodate per-OS methods of detecting
+           changed files. As of this writing, it currently ships with a
+           file watcher that uses inotify on Linux systems, and a
+           default fallback class that does everything in pure Perl.
+ 
 -
  1.13    2009-05-11 02:50
          - add [-pidfile|-p] option for myapp_server.pl (caelum)
          - Bump dependency on Config::General (caelum)

diff --cc lib/Catalyst/Devel.pm
index 4ddc99b,b161664..1bf6a76
--- 1/lib/Catalyst/Devel.pm
--- 2/lib/Catalyst/Devel.pm
+++ b/lib/Catalyst/Devel.pm
@@@ -3,9 -3,11 +3,11 @@@ package Catalyst::Devel
  use strict;
  use warnings;
  
- our $VERSION             = '1.13';
+ our $VERSION             = '1.14_02';
 -our $CATALYST_SCRIPT_GEN = 35;
 +our $CATALYST_SCRIPT_GEN = 36;
  
+ $VERSION = eval $VERSION;
+ 
  =head1 NAME
  
  Catalyst::Devel - Catalyst Development Tools

diff --cc lib/Catalyst/Helper.pm
index 0e2c49a,ea94da6..231f0c5
--- 1/lib/Catalyst/Helper.pm
--- 2/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@@ -986,12 -987,12 +987,12 @@@ GetOptions
      'port=s'              => \$port,
      'keepalive|k'         => \$keepalive,
      'restart|r'           => \$restart,
-     'restartdelay|rd=s'   => \$restart_delay,
-     'restartregex|rr=s'   => \$restart_regex,
-     'restartdirectory=s@' => \$restart_directory,
+     'restartdelay|rd=s'   => \$check_interval,
+     'restartregex|rr=s'   => \$file_regex,
+     'restartdirectory=s@' => \$watch_directory,
      'followsymlinks'      => \$follow_symlinks,
      'background'          => \$background,
 -    'pidfile|p=s'         => \$pidfile,
 +    'pidfile=s'           => \$pidfile,
  );
  
  pod2usage(1) if $help;