[Catalyst-commits] r10653 - in
Catalyst-Runtime/5.80/branches/better_scripts:
lib/Catalyst/Script t t/TestApp/script
dhoss at dev.catalyst.perl.org
dhoss at dev.catalyst.perl.org
Thu Jun 25 02:03:01 GMT 2009
Author: dhoss
Date: 2009-06-25 02:03:00 +0000 (Thu, 25 Jun 2009)
New Revision: 10653
Modified:
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl
Catalyst-Runtime/5.80/branches/better_scripts/t/start_dev_server.t
Log:
fixed Server and testapp_server.pl. Test still wonky
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm 2009-06-25 01:41:39 UTC (rev 10652)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/Server.pm 2009-06-25 02:03:00 UTC (rev 10653)
@@ -1,53 +1,43 @@
package Catalyst::Script::Server;
-=head1 NAME
-testapp_server.pl - Catalyst Testserver
+use FindBin qw/$Bin/;
+use lib "$Bin/../lib";
+use Pod::Usage;
+use Moose;
+use Catalyst::Engine::HTTP;
+use namespace::clean -except => [ qw(meta) ];
-=head1 SYNOPSIS
+with 'MooseX::Getopt';
-testapp_server.pl [options]
+has help => ( isa => 'Bool', is => 'ro', required => 0, default => sub { 0 } );
+has host => ( isa => 'Str', is => 'ro', required => 0 );
+has fork => ( isa => 'Bool', is => 'ro', required => 0 );
+has listen => ( isa => 'Int', is => 'ro', required => 0, default => sub{ 3000 } );
+has pidfile => ( isa => 'Str', is => 'ro', required => 0 );
+has keepalive => ( isa => 'Bool', is => 'ro', required => 0, default => sub { 0 } );
+has background => ( isa => 'Bool', is => 'ro', required => 0 );
+has app => ( isa => 'Str', is => 'ro', required => 1 );
- 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
+my @argv = @ARGV;
- See also:
- perldoc Catalyst::Manual
- perldoc Catalyst::Manual::Intro
+sub run {
+ my $self = shift;
+
+ pod2usage() if $self->help;
+ my $app = $self->app;
+ Class::MOP::load_class($app);
+ $app->run(
+ $self->listen, $self->host,
+ {
+ 'fork' => $self->fork,
+ keepalive => $self->keepalive,
+ background => $self->background,
+ pidfile => $self->pidfile,
+ }
+ );
-=head1 DESCRIPTION
+}
-Run a Catalyst Testserver for this application.
-=head1 AUTHORS
-
-Catalyst Contributors, see Catalyst.pm
-
-=head1 COPYRIGHT
-
-This library is free software. You can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
-
1;
Modified: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl 2009-06-25 01:41:39 UTC (rev 10652)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl 2009-06-25 02:03:00 UTC (rev 10653)
@@ -1,6 +1,11 @@
#!/usr/bin/env perl
use FindBin qw/$Bin/;
+BEGIN {
+ $ENV{CATALYST_ENGINE} ||= 'HTTP';
+ $ENV{CATALYST_SCRIPT_GEN} = 31;
+ require Catalyst::Engine::HTTP;
+}
## because this is a test
use lib "$Bin/../../../lib";
Modified: Catalyst-Runtime/5.80/branches/better_scripts/t/start_dev_server.t
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/start_dev_server.t 2009-06-25 01:41:39 UTC (rev 10652)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/start_dev_server.t 2009-06-25 02:03:00 UTC (rev 10653)
@@ -8,7 +8,11 @@
use lib "$Bin/TestApp/lib";
use TestApp;
use Test::WWW::Mechanize;
-
+BEGIN {
+ $ENV{CATALYST_ENGINE} ||= 'HTTP';
+ $ENV{CATALYST_SCRIPT_GEN} = 31;
+ require Catalyst::Engine::HTTP;
+}
my $dir = tempdir(); # CLEANUP => 1 );
my $devnull = File::Spec->devnull;
More information about the Catalyst-commits
mailing list