[Catalyst-commits] r10068 - in Catalyst-Devel/1.00/branches/improved-restarter: . lib/Catalyst

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-05-11 01:15:51 +0000 (Mon, 11 May 2009)
New Revision: 10068

Modified:
   Catalyst-Devel/1.00/branches/improved-restarter/Changes
   Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL
   Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Devel.pm
   Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Helper.pm
Log:
Merge commit 'svn/trunk' into improved-restarter

Conflicts:
	Changes
	Makefile.PL
	lib/Catalyst/Devel.pm
	lib/Catalyst/Helper.pm

Modified: Catalyst-Devel/1.00/branches/improved-restarter/Changes
===================================================================
--- Catalyst-Devel/1.00/branches/improved-restarter/Changes	2009-05-11 00:55:18 UTC (rev 10067)
+++ Catalyst-Devel/1.00/branches/improved-restarter/Changes	2009-05-11 01:15:51 UTC (rev 10068)
@@ -1,6 +1,11 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
-        - kill C3 warning on 5.10, add resources to META.yml (caelum)
+1.13    2009-05-11 02:50
+        - add [-pidfile|-p] option for myapp_server.pl (caelum)
+        - Bump dependency on Config::General (caelum)
+        - On perls with c3 method dispatch, make sure Class::C3 is recent
+          enough to not produce warnings if it is already installed (caelum)
+        - add resources to META.yml (caelum)
 
 1.12    2009-04-26 15:42
         - Remove the deprecated BindLex from the _create.pl help message (rafl)

Modified: Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL
===================================================================
--- Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL	2009-05-11 00:55:18 UTC (rev 10067)
+++ Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL	2009-05-11 01:15:51 UTC (rev 10068)
@@ -8,7 +8,7 @@
 requires 'Catalyst::Plugin::Static::Simple' => '0.16';
 requires 'Catalyst::Plugin::ConfigLoader';
 requires 'Class::Accessor::Fast';
-requires 'Config::General'; # as of 1.07, we use .conf and not .yaml
+requires 'Config::General' => '2.42'; # as of 1.07, we use .conf and not .yaml
 requires 'File::ChangeNotify';
 requires 'File::Copy::Recursive';
 requires 'Module::Install' => '0.64';

Modified: Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Devel.pm
===================================================================
--- Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Devel.pm	2009-05-11 00:55:18 UTC (rev 10067)
+++ Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Devel.pm	2009-05-11 01:15:51 UTC (rev 10068)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION             = '1.12';
+our $VERSION             = '1.13';
 our $CATALYST_SCRIPT_GEN = 33;
 
 =head1 NAME

Modified: Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Helper.pm
===================================================================
--- Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Helper.pm	2009-05-11 00:55:18 UTC (rev 10067)
+++ Catalyst-Devel/1.00/branches/improved-restarter/lib/Catalyst/Helper.pm	2009-05-11 01:15:51 UTC (rev 10068)
@@ -970,6 +970,7 @@
 my $keepalive         = 0;
 my $restart           = $ENV{[% appenv %]_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
 my $background        = 0;
+my $pidfile           = undef;
 
 my $check_interval;
 my $file_regex;
@@ -991,6 +992,7 @@
     'restartdirectory=s@' => \$watch_directory,
     'followsymlinks'      => \$follow_symlinks,
     'background'          => \$background,
+    'pidfile|p=s'         => \$pidfile,
 );
 
 pod2usage(1) if $help;
@@ -1019,6 +1021,7 @@
             'fork'     => $fork,
             keepalive  => $keepalive,
             background => $background,
+            pidfile    => $pidfile,
         }
     );
 };