[Catalyst-commits] r10647 - in
Catalyst-Runtime/5.80/branches/better_scripts: lib/Catalyst
lib/Catalyst/Script t t/TestApp t/TestApp/lib
t/TestApp/lib/TestApp t/TestApp/lib/TestApp/Controller
t/TestApp/root t/TestApp/root/static
t/TestApp/root/static/images t/TestApp/script t/TestApp/t
dhoss at dev.catalyst.perl.org
dhoss at dev.catalyst.perl.org
Thu Jun 25 00:54:12 GMT 2009
Author: dhoss
Date: 2009-06-25 00:54:12 +0000 (Thu, 25 Jun 2009)
New Revision: 10647
Added:
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Changes
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Makefile.PL
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/README
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp.pm
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/Controller/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/Controller/Root.pm
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/Model/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/View/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/favicon.ico
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_built.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_built_shadow.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_powered.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_powered_shadow.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_built.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_built_shadow.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_powered.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_powered_shadow.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/catalyst_logo.png
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_cgi.pl
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_create.pl
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_fastcgi.pl
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_test.pl
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/01app.t
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/02pod.t
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/03podcoverage.t
Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/testapp.conf
Catalyst-Runtime/5.80/branches/better_scripts/t/start_fcgi.t
Modified:
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm
Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm
Log:
added a test application to get the new scripts working
created Catalyst::ScriptRunner, Catalyst::Script::*
got Catalyst::Script::FastCGI running
wrote a test for Catalyst::Script::FastCGI, but it fails for some reason
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm 2009-06-25 00:47:45 UTC (rev 10646)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/Script/FastCGI.pm 2009-06-25 00:54:12 UTC (rev 10647)
@@ -1,3 +1,41 @@
package Catalyst::Script::FastCGI;
+BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
+use FindBin qw/$Bin/;
+use lib "$Bin/../lib";
+use Pod::Usage;
+use Moose;
+use namespace::clean -except => [ qw(meta) ];
+
+with 'MooseX::Getopt';
+
+has help => ( isa => 'Bool', is => 'ro', required => 0, default => sub { 0 } );
+has listen => ( isa => 'Int', is => 'ro', required => 1 );
+has pidfile => ( isa => 'Str', is => 'ro', required => 0 );
+has daemon => ( isa => 'Bool', is => 'ro', required => 0, default => sub { 0 } );
+has manager => ( isa => 'Str', is => 'ro', required => 0 );
+has keep_stderr => ( isa => 'Bool', is => 'ro', required => 0 );
+has nproc => ( isa => 'Int', is => 'ro', required => 0 );
+has detach => ( isa => 'Bool', is => 'ro', required => 0, default => sub { 0 } );
+has app => ( isa => 'Str', is => 'ro', required => 1 );
+
+sub run {
+ my $self = shift;
+
+ pod2usage() if $self->help;
+ my $app = $self->app;
+ Class::MOP::load_class($app);
+ $app->new(
+ $self->listen,
+ {
+ nproc => $self->nproc,
+ pidfile => $self->pidfile,
+ manager => $self->manager,
+ detach => $self->detach,
+ keep_stderr => $self->keep_stderr,
+ }
+ );
+
+}
+
1;
Modified: Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm 2009-06-25 00:47:45 UTC (rev 10646)
+++ Catalyst-Runtime/5.80/branches/better_scripts/lib/Catalyst/ScriptRunner.pm 2009-06-25 00:54:12 UTC (rev 10647)
@@ -1,4 +1,10 @@
package Catalyst::ScriptRunner;
use Moose;
+sub run {
+ my ($self, $class, $scriptclass) = @_;
+ my $classtoload = "${class}::Script::$scriptclass";
+ Class::MOP::load_class($classtoload);
+ $classtoload->new_with_options->run;
+}
1;
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Changes
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Changes (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Changes 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,4 @@
+This file documents the revision history for Perl extension TestApp.
+
+0.01 2009-06-24 17:26:08
+ - initial revision, generated by Catalyst
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Makefile.PL (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/Makefile.PL 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,20 @@
+#!/usr/bin/env perl
+# IMPORTANT: if you delete this file your app will not work as
+# expected. You have been warned.
+use inc::Module::Install;
+
+name 'TestApp';
+all_from 'lib/TestApp.pm';
+
+requires 'Catalyst::Runtime' => '5.80004';
+requires 'Catalyst::Plugin::ConfigLoader';
+requires 'Catalyst::Plugin::Static::Simple';
+requires 'Catalyst::Action::RenderView';
+requires 'parent';
+requires 'Config::General'; # This should reflect the config file format you've chosen
+ # See Catalyst::Plugin::ConfigLoader for supported formats
+catalyst;
+
+install_script glob('script/*.pl');
+auto_install;
+WriteAll;
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/README
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/README (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/README 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1 @@
+Run script/testapp_server.pl to test the application.
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/Controller/Root.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/Controller/Root.pm (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp/Controller/Root.pm 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,61 @@
+package TestApp::Controller::Root;
+
+use strict;
+use warnings;
+use parent 'Catalyst::Controller';
+
+#
+# Sets the actions in this controller to be registered with no prefix
+# so they function identically to actions created in MyApp.pm
+#
+__PACKAGE__->config->{namespace} = '';
+
+=head1 NAME
+
+TestApp::Controller::Root - Root Controller for TestApp
+
+=head1 DESCRIPTION
+
+[enter your description here]
+
+=head1 METHODS
+
+=cut
+
+=head2 index
+
+=cut
+
+sub index :Path :Args(0) {
+ my ( $self, $c ) = @_;
+
+ # Hello World
+ $c->response->body( $c->welcome_message );
+}
+
+sub default :Path {
+ my ( $self, $c ) = @_;
+ $c->response->body( 'Page not found' );
+ $c->response->status(404);
+}
+
+=head2 end
+
+Attempt to render a view, if needed.
+
+=cut
+
+sub end : ActionClass('RenderView') {}
+
+=head1 AUTHOR
+
+Devin Austin,,,
+
+=head1 LICENSE
+
+This library is free software. You can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+1;
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp.pm (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/lib/TestApp.pm 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,64 @@
+package TestApp;
+
+use strict;
+use warnings;
+
+use Catalyst::Runtime 5.80;
+
+# Set flags and add plugins for the application
+#
+# -Debug: activates the debug mode for very useful log messages
+# ConfigLoader: will load the configuration from a Config::General file in the
+# application's home directory
+# Static::Simple: will serve static files from the application's root
+# directory
+
+use parent qw/Catalyst/;
+use Catalyst qw/-Debug
+ ConfigLoader
+ Static::Simple/;
+our $VERSION = '0.01';
+
+# Configure the application.
+#
+# Note that settings in testapp.conf (or other external
+# configuration file that you set up manually) take precedence
+# over this when using ConfigLoader. Thus configuration
+# details given here can function as a default configuration,
+# with an external configuration file acting as an override for
+# local deployment.
+
+__PACKAGE__->config( name => 'TestApp' );
+
+# Start the application
+__PACKAGE__->setup();
+
+
+=head1 NAME
+
+TestApp - Catalyst based application
+
+=head1 SYNOPSIS
+
+ script/testapp_server.pl
+
+=head1 DESCRIPTION
+
+[enter your description here]
+
+=head1 SEE ALSO
+
+L<TestApp::Controller::Root>, L<Catalyst>
+
+=head1 AUTHOR
+
+Devin Austin,,,
+
+=head1 LICENSE
+
+This library is free software. You can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+1;
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/favicon.ico
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_built.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_built.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_built_shadow.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_built_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_powered.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_powered.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_powered_shadow.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_120x50_powered_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_built.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_built.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_built_shadow.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_built_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_powered.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_powered.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_powered_shadow.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/btn_88x31_powered_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/catalyst_logo.png
===================================================================
(Binary files differ)
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/root/static/images/catalyst_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_cgi.pl
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_cgi.pl (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_cgi.pl 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,37 @@
+#!/usr/bin/env perl
+
+BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
+
+use strict;
+use warnings;
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+use TestApp;
+
+TestApp->run;
+
+1;
+
+=head1 NAME
+
+testapp_cgi.pl - Catalyst CGI
+
+=head1 SYNOPSIS
+
+See L<Catalyst::Manual>
+
+=head1 DESCRIPTION
+
+Run a Catalyst application as a cgi script.
+
+=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
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_cgi.pl
___________________________________________________________________
Name: svn:executable
+ *
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_create.pl
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_create.pl (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_create.pl 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,85 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use Getopt::Long;
+use Pod::Usage;
+eval "use Catalyst::Helper;";
+
+if ($@) {
+ die <<END;
+To use the Catalyst development tools including catalyst.pl and the
+generated script/myapp_create.pl you need Catalyst::Helper, which is
+part of the Catalyst-Devel distribution. Please install this via a
+vendor package or by running one of -
+
+ perl -MCPAN -e 'install Catalyst::Devel'
+ perl -MCPANPLUS -e 'install Catalyst::Devel'
+END
+}
+
+my $force = 0;
+my $mech = 0;
+my $help = 0;
+
+GetOptions(
+ 'nonew|force' => \$force,
+ 'mech|mechanize' => \$mech,
+ 'help|?' => \$help
+ );
+
+pod2usage(1) if ( $help || !$ARGV[0] );
+
+my $helper = Catalyst::Helper->new( { '.newfiles' => !$force, mech => $mech } );
+
+pod2usage(1) unless $helper->mk_component( 'TestApp', @ARGV );
+
+1;
+
+=head1 NAME
+
+testapp_create.pl - Create a new Catalyst Component
+
+=head1 SYNOPSIS
+
+testapp_create.pl [options] model|view|controller name [helper] [options]
+
+ Options:
+ -force don't create a .new file where a file to be created exists
+ -mechanize use Test::WWW::Mechanize::Catalyst for tests if available
+ -help display this help and exits
+
+ Examples:
+ testapp_create.pl controller My::Controller
+ testapp_create.pl -mechanize controller My::Controller
+ testapp_create.pl view My::View
+ testapp_create.pl view MyView TT
+ testapp_create.pl view TT TT
+ testapp_create.pl model My::Model
+ testapp_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\
+ dbi:SQLite:/tmp/my.db
+ testapp_create.pl model AnotherDB DBIC::Schema MyApp::Schema create=static\
+ dbi:Pg:dbname=foo root 4321
+
+ See also:
+ perldoc Catalyst::Manual
+ perldoc Catalyst::Manual::Intro
+
+=head1 DESCRIPTION
+
+Create a new Catalyst Component.
+
+Existing component files are not overwritten. If any of the component files
+to be created already exist the file will be written with a '.new' suffix.
+This behavior can be suppressed with the C<-force> option.
+
+=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
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_create.pl
___________________________________________________________________
Name: svn:executable
+ *
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_fastcgi.pl
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_fastcgi.pl (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_fastcgi.pl 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,49 @@
+#!/usr/bin/env perl
+
+use FindBin qw/$Bin/;
+
+## because this is a test
+use lib "$Bin/../../../lib";
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('Catalyst','FastCGI');
+
+=head1 NAME
+
+testapp_fastcgi.pl - Catalyst FastCGI
+
+=head1 SYNOPSIS
+
+testapp_fastcgi.pl [options]
+
+ Options:
+ -? -help display this help and exits
+ -l -listen Socket path to listen on
+ (defaults to standard input)
+ can be HOST:PORT, :PORT or a
+ filesystem path
+ -n -nproc specify number of processes to keep
+ to serve requests (defaults to 1,
+ requires -listen)
+ -p -pidfile specify filename for pid file
+ (requires -listen)
+ -d -daemon daemonize (requires -listen)
+ -M -manager specify alternate process manager
+ (FCGI::ProcManager sub-class)
+ or empty string to disable
+ -e -keeperr send error messages to STDOUT, not
+ to the webserver
+
+=head1 DESCRIPTION
+
+Run a Catalyst application as fastcgi.
+
+=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
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_fastcgi.pl
___________________________________________________________________
Name: svn:executable
+ *
Added: 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 (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,141 @@
+package testapp::Script::Server;
+
+use Catalyst::Engine::HTTP;
+use testapp;
+use Moose;
+
+with 'MooseX::GetOpt';
+
+has argv => ( isa => 'ArrayRef', is => 'ro', required => 1 );
+has [qw/ fork background keepalive /] => ( isa => 'Bool', is => 'ro', required => 1, default => 0 );
+has pidfile => ( isa => 'Str', required => 0, is => 'ro' );
+
+sub run {
+ my $self = shift;
+ testapp->run(
+ $port, $host,
+ {
+ argv => $self->argv,
+ 'fork' => $self->fork,
+ keepalive => $self->keepalive,
+ background => $self->background,
+ pidfile => $self->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,
+ );
+
+ $restarter->run_and_watch;
+}
+else {
+ $runner->();
+}
+
+__PACKAGE__->new_with_options->run;
+
+
+
+1;
+
+=head1 NAME
+
+testapp_server.pl - Catalyst Testserver
+
+=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
+
+ See also:
+ perldoc Catalyst::Manual
+ perldoc Catalyst::Manual::Intro
+
+=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
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_server.pl
___________________________________________________________________
Name: svn:executable
+ *
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_test.pl
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_test.pl (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_test.pl 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,53 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use Getopt::Long;
+use Pod::Usage;
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+use Catalyst::Test 'TestApp';
+
+my $help = 0;
+
+GetOptions( 'help|?' => \$help );
+
+pod2usage(1) if ( $help || !$ARGV[0] );
+
+print request($ARGV[0])->content . "\n";
+
+1;
+
+=head1 NAME
+
+testapp_test.pl - Catalyst Test
+
+=head1 SYNOPSIS
+
+testapp_test.pl [options] uri
+
+ Options:
+ -help display this help and exits
+
+ Examples:
+ testapp_test.pl http://localhost/some_action
+ testapp_test.pl /some_action
+
+ See also:
+ perldoc Catalyst::Manual
+ perldoc Catalyst::Manual::Intro
+
+=head1 DESCRIPTION
+
+Run a Catalyst action from the command line.
+
+=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
Property changes on: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/script/testapp_test.pl
___________________________________________________________________
Name: svn:executable
+ *
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/01app.t
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/01app.t (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/01app.t 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,8 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More tests => 2;
+
+BEGIN { use_ok 'Catalyst::Test', '' }
+
+ok( request('/')->is_success, 'Request should succeed' );
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/02pod.t
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/02pod.t (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/02pod.t 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,10 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+
+eval "use Test::Pod 1.14";
+plan skip_all => 'Test::Pod 1.14 required' if $@;
+plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
+
+all_pod_files_ok();
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/03podcoverage.t
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/03podcoverage.t (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/t/03podcoverage.t 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,10 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+
+eval "use Test::Pod::Coverage 1.04";
+plan skip_all => 'Test::Pod::Coverage 1.04 required' if $@;
+plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD};
+
+all_pod_coverage_ok();
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/testapp.conf
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/testapp.conf (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/TestApp/testapp.conf 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,3 @@
+# rename this file to TestApp.yml and put a ':' in front of 'name' if
+# you want to use YAML like in old versions of Catalyst
+name TestApp
Added: Catalyst-Runtime/5.80/branches/better_scripts/t/start_fcgi.t
===================================================================
--- Catalyst-Runtime/5.80/branches/better_scripts/t/start_fcgi.t (rev 0)
+++ Catalyst-Runtime/5.80/branches/better_scripts/t/start_fcgi.t 2009-06-25 00:54:12 UTC (rev 10647)
@@ -0,0 +1,33 @@
+use Test::More tests => 1;
+use strict;
+use warnings;
+
+BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
+use File::Temp qw/ tempdir tmpnam /;
+use FindBin qw/$Bin/;
+use File::Spec;
+use lib "$Bin/TestApp/lib";
+use TestApp;
+use Test::WWW::Mechanize;
+
+my $dir = tempdir(); # CLEANUP => 1 );
+my $devnull = File::Spec->devnull;
+
+my $server_path = File::Spec->catfile('script', 'testapp_fastcgi.pl');
+my $port = int(rand(10000)) + 40000; # get random port between 40000-50000
+
+my $childpid = fork();
+die "fork() error, cannot continue" unless defined($childpid);
+
+if ($childpid == 0) {
+ system("$^X $server_path -p $port > $devnull 2>&1");
+ exit; # just for sure; we should never got here
+}
+
+sleep 10; #wait for catalyst application to start
+my $mech = Test::WWW::Mechanize->new;
+$mech->get_ok( "http://localhost:" . $port );
+
+kill 'KILL', $childpid;
+
+
More information about the Catalyst-commits
mailing list