[Catalyst-commits] r14350 - in
Catalyst-Authentication-Credential-OpenID/trunk: .
t/Consumer/script t/Provider/script
t0m at dev.catalyst.perl.org
t0m at dev.catalyst.perl.org
Wed Oct 10 16:43:30 GMT 2012
Author: t0m
Date: 2012-10-10 16:43:30 +0000 (Wed, 10 Oct 2012)
New Revision: 14350
Modified:
Catalyst-Authentication-Credential-OpenID/trunk/Changes
Catalyst-Authentication-Credential-OpenID/trunk/Makefile.PL
Catalyst-Authentication-Credential-OpenID/trunk/t/Consumer/script/testapp_server.pl
Catalyst-Authentication-Credential-OpenID/trunk/t/Provider/script/testapp_server.pl
Log:
Drop Catalyst::Engine::HTTP dependency. RT#70417
Modified: Catalyst-Authentication-Credential-OpenID/trunk/Changes
===================================================================
--- Catalyst-Authentication-Credential-OpenID/trunk/Changes 2012-10-09 07:51:21 UTC (rev 14349)
+++ Catalyst-Authentication-Credential-OpenID/trunk/Changes 2012-10-10 16:43:30 UTC (rev 14350)
@@ -1,5 +1,7 @@
Revision history for Catalyst::Authentication::Credential::OpenID
+ - Drop Catalyst::Engine::HTTP dependency. RT#70417
+
0.18 Sat Aug 18 16:19:00 BST 2012
- Fix RT#79072, fixing dist Makefile.PL
Modified: Catalyst-Authentication-Credential-OpenID/trunk/Makefile.PL
===================================================================
--- Catalyst-Authentication-Credential-OpenID/trunk/Makefile.PL 2012-10-09 07:51:21 UTC (rev 14349)
+++ Catalyst-Authentication-Credential-OpenID/trunk/Makefile.PL 2012-10-10 16:43:30 UTC (rev 14350)
@@ -17,7 +17,6 @@
requires "Catalyst::Plugin::Authentication";
requires "Catalyst::Plugin::Session::Store::FastMmap" => "0.05";
requires "Catalyst::Plugin::Session::State::Cookie" => "0.08";
-requires "Catalyst::Engine::HTTP" => undef;
recommends "Config::General" => "2";
recommends "YAML" => "0.6";
Modified: Catalyst-Authentication-Credential-OpenID/trunk/t/Consumer/script/testapp_server.pl
===================================================================
--- Catalyst-Authentication-Credential-OpenID/trunk/t/Consumer/script/testapp_server.pl 2012-10-09 07:51:21 UTC (rev 14349)
+++ Catalyst-Authentication-Credential-OpenID/trunk/t/Consumer/script/testapp_server.pl 2012-10-10 16:43:30 UTC (rev 14350)
@@ -1,144 +1,43 @@
#!/usr/bin/env perl
BEGIN {
- $ENV{CATALYST_ENGINE} ||= 'HTTP';
- $ENV{CATALYST_SCRIPT_GEN} = 39;
- require Catalyst::Engine::HTTP;
+ $ENV{CATALYST_SCRIPT_GEN} = 40;
}
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('TestApp', 'Server');
-my $debug = 0;
-my $fork = 0;
-my $help = 0;
-my $host = undef;
-my $port = $ENV{TESTAPP_PORT} || $ENV{CATALYST_PORT} || 3000;
-my $keepalive = 0;
-my $restart = $ENV{TESTAPP_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
-my $background = 0;
-my $pidfile = undef;
-
-my $check_interval;
-my $file_regex;
-my $watch_directory;
-my $follow_symlinks;
-
-my @argv = @ARGV;
-
-GetOptions(
- 'debug|d' => \$debug,
- 'fork|f' => \$fork,
- 'help|?' => \$help,
- 'host=s' => \$host,
- 'port|p=s' => \$port,
- 'keepalive|k' => \$keepalive,
- 'restart|r' => \$restart,
- 'restartdelay|rd=s' => \$check_interval,
- 'restartregex|rr=s' => \$file_regex,
- 'restartdirectory=s@' => \$watch_directory,
- 'followsymlinks' => \$follow_symlinks,
- 'background' => \$background,
- 'pidfile=s' => \$pidfile,
-);
-
-pod2usage(1) if $help;
-
-if ( $debug ) {
- $ENV{CATALYST_DEBUG} = 1;
-}
-
-# If we load this here, then in the case of a restarter, it does not
-# need to be reloaded for each restart.
-require Catalyst;
-
-# If this isn't done, then the Catalyst::Devel tests for the restarter
-# fail.
-$| = 1 if $ENV{HARNESS_ACTIVE};
-
-my $runner = sub {
- # This is require instead of use so that the above environment
- # variables can be set at runtime.
- require TestApp;
-
- TestApp->run(
- $port, $host,
- {
- argv => \@argv,
- 'fork' => $fork,
- keepalive => $keepalive,
- background => $background,
- pidfile => $pidfile,
- }
- );
-};
-
-if ( $restart ) {
- die "Cannot run in the background and also watch for changed files.\n"
- if $background;
-
- require Catalyst::Restarter;
-
- my $subclass = Catalyst::Restarter->pick_subclass;
-
- my %args;
- $args{follow_symlinks} = 1
- if $follow_symlinks;
- $args{directories} = $watch_directory
- if defined $watch_directory;
- $args{sleep_interval} = $check_interval
- if defined $check_interval;
- $args{filter} = qr/$file_regex/
- if defined $file_regex;
-
- my $restarter = $subclass->new(
- %args,
- start_sub => $runner,
- argv => \@argv,
- );
-
- $restarter->run_and_watch;
-}
-else {
- $runner->();
-}
-
1;
=head1 NAME
-testapp_server.pl - Catalyst Testserver
+testapp_server.pl - Catalyst Test Server
=head1 SYNOPSIS
testapp_server.pl [options]
- Options:
- -d -debug force debug mode
- -f -fork handle each request in a new process
- (defaults to false)
- -? -help display this help and exits
- -host host (defaults to all)
- -p -port port (defaults to 3000)
- -k -keepalive enable keep-alive connections
- -r -restart restart when files get modified
- (defaults to false)
- -rd -restartdelay delay between file checks
- (ignored if you have Linux::Inotify2 installed)
- -rr -restartregex regex match files that trigger
- a restart when modified
- (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
- -restartdirectory the directory to search for
- 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)
- -background run the process in the background
- -pidfile specify filename for pid file
+ -d --debug force debug mode
+ -f --fork handle each request in a new process
+ (defaults to false)
+ -? --help display this help and exits
+ -h --host host (defaults to all)
+ -p --port port (defaults to 3000)
+ -k --keepalive enable keep-alive connections
+ -r --restart restart when files get modified
+ (defaults to false)
+ -rd --restart_delay delay between file checks
+ (ignored if you have Linux::Inotify2 installed)
+ -rr --restart_regex regex match files that trigger
+ a restart when modified
+ (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
+ --restart_directory the directory to search for
+ modified files, can be set multiple times
+ (defaults to '[SCRIPT_DIR]/..')
+ --follow_symlinks follow symlinks in search directories
+ (defaults to false. this is a no-op on Win32)
+ --background run the process in the background
+ --pidfile specify filename for pid file
See also:
perldoc Catalyst::Manual
@@ -158,3 +57,4 @@
it under the same terms as Perl itself.
=cut
+
Modified: Catalyst-Authentication-Credential-OpenID/trunk/t/Provider/script/testapp_server.pl
===================================================================
--- Catalyst-Authentication-Credential-OpenID/trunk/t/Provider/script/testapp_server.pl 2012-10-09 07:51:21 UTC (rev 14349)
+++ Catalyst-Authentication-Credential-OpenID/trunk/t/Provider/script/testapp_server.pl 2012-10-10 16:43:30 UTC (rev 14350)
@@ -1,144 +1,43 @@
#!/usr/bin/env perl
BEGIN {
- $ENV{CATALYST_ENGINE} ||= 'HTTP';
- $ENV{CATALYST_SCRIPT_GEN} = 39;
- require Catalyst::Engine::HTTP;
+ $ENV{CATALYST_SCRIPT_GEN} = 40;
}
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('TestApp', 'Server');
-my $debug = 0;
-my $fork = 0;
-my $help = 0;
-my $host = undef;
-my $port = $ENV{TESTAPP_PORT} || $ENV{CATALYST_PORT} || 3000;
-my $keepalive = 0;
-my $restart = $ENV{TESTAPP_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
-my $background = 0;
-my $pidfile = undef;
-
-my $check_interval;
-my $file_regex;
-my $watch_directory;
-my $follow_symlinks;
-
-my @argv = @ARGV;
-
-GetOptions(
- 'debug|d' => \$debug,
- 'fork|f' => \$fork,
- 'help|?' => \$help,
- 'host=s' => \$host,
- 'port|p=s' => \$port,
- 'keepalive|k' => \$keepalive,
- 'restart|r' => \$restart,
- 'restartdelay|rd=s' => \$check_interval,
- 'restartregex|rr=s' => \$file_regex,
- 'restartdirectory=s@' => \$watch_directory,
- 'followsymlinks' => \$follow_symlinks,
- 'background' => \$background,
- 'pidfile=s' => \$pidfile,
-);
-
-pod2usage(1) if $help;
-
-if ( $debug ) {
- $ENV{CATALYST_DEBUG} = 1;
-}
-
-# If we load this here, then in the case of a restarter, it does not
-# need to be reloaded for each restart.
-require Catalyst;
-
-# If this isn't done, then the Catalyst::Devel tests for the restarter
-# fail.
-$| = 1 if $ENV{HARNESS_ACTIVE};
-
-my $runner = sub {
- # This is require instead of use so that the above environment
- # variables can be set at runtime.
- require TestApp;
-
- TestApp->run(
- $port, $host,
- {
- argv => \@argv,
- 'fork' => $fork,
- keepalive => $keepalive,
- background => $background,
- pidfile => $pidfile,
- }
- );
-};
-
-if ( $restart ) {
- die "Cannot run in the background and also watch for changed files.\n"
- if $background;
-
- require Catalyst::Restarter;
-
- my $subclass = Catalyst::Restarter->pick_subclass;
-
- my %args;
- $args{follow_symlinks} = 1
- if $follow_symlinks;
- $args{directories} = $watch_directory
- if defined $watch_directory;
- $args{sleep_interval} = $check_interval
- if defined $check_interval;
- $args{filter} = qr/$file_regex/
- if defined $file_regex;
-
- my $restarter = $subclass->new(
- %args,
- start_sub => $runner,
- argv => \@argv,
- );
-
- $restarter->run_and_watch;
-}
-else {
- $runner->();
-}
-
1;
=head1 NAME
-testapp_server.pl - Catalyst Testserver
+testapp_server.pl - Catalyst Test Server
=head1 SYNOPSIS
testapp_server.pl [options]
- Options:
- -d -debug force debug mode
- -f -fork handle each request in a new process
- (defaults to false)
- -? -help display this help and exits
- -host host (defaults to all)
- -p -port port (defaults to 3000)
- -k -keepalive enable keep-alive connections
- -r -restart restart when files get modified
- (defaults to false)
- -rd -restartdelay delay between file checks
- (ignored if you have Linux::Inotify2 installed)
- -rr -restartregex regex match files that trigger
- a restart when modified
- (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
- -restartdirectory the directory to search for
- 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)
- -background run the process in the background
- -pidfile specify filename for pid file
+ -d --debug force debug mode
+ -f --fork handle each request in a new process
+ (defaults to false)
+ -? --help display this help and exits
+ -h --host host (defaults to all)
+ -p --port port (defaults to 3000)
+ -k --keepalive enable keep-alive connections
+ -r --restart restart when files get modified
+ (defaults to false)
+ -rd --restart_delay delay between file checks
+ (ignored if you have Linux::Inotify2 installed)
+ -rr --restart_regex regex match files that trigger
+ a restart when modified
+ (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
+ --restart_directory the directory to search for
+ modified files, can be set multiple times
+ (defaults to '[SCRIPT_DIR]/..')
+ --follow_symlinks follow symlinks in search directories
+ (defaults to false. this is a no-op on Win32)
+ --background run the process in the background
+ --pidfile specify filename for pid file
See also:
perldoc Catalyst::Manual
@@ -158,3 +57,4 @@
it under the same terms as Perl itself.
=cut
+
More information about the Catalyst-commits
mailing list