[Catalyst-commits] r14107 - trunk/examples/CatalystAdvent/script
dpetrov at dev.catalyst.perl.org
dpetrov at dev.catalyst.perl.org
Tue Sep 27 10:14:04 GMT 2011
Author: dpetrov
Date: 2011-09-27 10:14:04 +0000 (Tue, 27 Sep 2011)
New Revision: 14107
Modified:
trunk/examples/CatalystAdvent/script/catalystadvent_cgi.pl
trunk/examples/CatalystAdvent/script/catalystadvent_create.pl
trunk/examples/CatalystAdvent/script/catalystadvent_fastcgi.pl
trunk/examples/CatalystAdvent/script/catalystadvent_server.pl
trunk/examples/CatalystAdvent/script/catalystadvent_test.pl
Log:
update old scripts
Modified: trunk/examples/CatalystAdvent/script/catalystadvent_cgi.pl
===================================================================
--- trunk/examples/CatalystAdvent/script/catalystadvent_cgi.pl 2011-09-27 10:12:40 UTC (rev 14106)
+++ trunk/examples/CatalystAdvent/script/catalystadvent_cgi.pl 2011-09-27 10:14:04 UTC (rev 14107)
@@ -1,14 +1,8 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('CatalystAdvent', 'CGI');
-use strict;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use CatalystAdvent;
-
-CatalystAdvent->run;
-
1;
=head1 NAME
@@ -21,17 +15,16 @@
=head1 DESCRIPTION
-Run a Catalyst application as cgi.
+Run a Catalyst application as a cgi script.
-=head1 AUTHOR
+=head1 AUTHORS
-Sebastian Riedel, C<sri at oook.de>
+Catalyst Contributors, see Catalyst.pm
=head1 COPYRIGHT
-Copyright 2004 Sebastian Riedel. All rights reserved.
-
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
+
Modified: trunk/examples/CatalystAdvent/script/catalystadvent_create.pl
===================================================================
--- trunk/examples/CatalystAdvent/script/catalystadvent_create.pl 2011-09-27 10:12:40 UTC (rev 14106)
+++ trunk/examples/CatalystAdvent/script/catalystadvent_create.pl 2011-09-27 10:14:04 UTC (rev 14107)
@@ -1,24 +1,11 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
use strict;
-use Getopt::Long;
-use Pod::Usage;
-use Catalyst::Helper;
+use warnings;
-my $force = 0;
-my $help = 0;
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('CatalystAdvent', 'Create');
-GetOptions(
- 'nonew|force' => \$force,
- 'help|?' => \$help
- );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-my $helper = Catalyst::Helper->new( { '.newfiles' => !$force } );
-
-pod2usage(1) unless $helper->mk_component( 'CatalystAdvent', @ARGV );
-
1;
=head1 NAME
@@ -30,21 +17,28 @@
catalystadvent_create.pl [options] model|view|controller name [helper] [options]
Options:
- -force don't create a .new file where a file to be created exists
- -help display this help and exits
+ --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:
catalystadvent_create.pl controller My::Controller
+ catalystadvent_create.pl -mechanize controller My::Controller
catalystadvent_create.pl view My::View
- catalystadvent_create.pl view MyView TT
- catalystadvent_create.pl view TT TT
+ catalystadvent_create.pl view HTML TT
catalystadvent_create.pl model My::Model
- catalystadvent_create.pl model SomeDB CDBI dbi:SQLite:/tmp/my.db
- catalystadvent_create.pl model AnotherDB CDBI dbi:Pg:dbname=foo root 4321
+ catalystadvent_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\
+ dbi:SQLite:/tmp/my.db
+ catalystadvent_create.pl model AnotherDB DBIC::Schema MyApp::Schema create=static\
+ [Loader opts like db_schema, naming] dbi:Pg:dbname=foo root 4321
+ [connect_info opts like quote_char, name_sep]
See also:
perldoc Catalyst::Manual
perldoc Catalyst::Manual::Intro
+ perldoc Catalyst::Helper::Model::DBIC::Schema
+ perldoc Catalyst::Model::DBIC::Schema
+ perldoc Catalyst::View::TT
=head1 DESCRIPTION
@@ -54,15 +48,13 @@
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 AUTHOR
+=head1 AUTHORS
-Sebastian Riedel, C<sri at oook.de>
+Catalyst Contributors, see Catalyst.pm
=head1 COPYRIGHT
-Copyright 2004 Sebastian Riedel. All rights reserved.
-
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
Modified: trunk/examples/CatalystAdvent/script/catalystadvent_fastcgi.pl
===================================================================
--- trunk/examples/CatalystAdvent/script/catalystadvent_fastcgi.pl 2011-09-27 10:12:40 UTC (rev 14106)
+++ trunk/examples/CatalystAdvent/script/catalystadvent_fastcgi.pl 2011-09-27 10:14:04 UTC (rev 14107)
@@ -1,37 +1,8 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('CatalystAdvent', 'FastCGI');
-use strict;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use CatalystAdvent;
-
-my $help = 0;
-my ( $listen, $nproc, $pidfile, $manager, $detach );
-
-GetOptions(
- 'help|?' => \$help,
- 'listen|l=s' => \$listen,
- 'nproc|n=i' => \$nproc,
- 'pidfile|p=s' => \$pidfile,
- 'manager|M=s' => \$manager,
- 'daemon|d' => \$detach,
-);
-
-pod2usage(1) if $help;
-
-CatalystAdvent->run(
- $listen,
- { nproc => $nproc,
- pidfile => $pidfile,
- manager => $manager,
- detach => $detach,
- }
-);
-
1;
=head1 NAME
@@ -41,36 +12,36 @@
=head1 SYNOPSIS
catalystadvent_fastcgi.pl [options]
-
+
Options:
-? -help display this help and exits
- -l -listen Socket path to listen on
+ -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
+ -n --nproc specify number of processes to keep
to serve requests (defaults to 1,
requires -listen)
- -p -pidfile specify filename for pid file
+ -p --pidfile specify filename for pid file
(requires -listen)
- -d -daemon daemonize (requires -listen)
- -M -manager specify alternate process manager
- (FCGI::ProcessManager sub-class)
+ -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 AUTHOR
+=head1 AUTHORS
-Sebastian Riedel, C<sri at oook.de>
+Catalyst Contributors, see Catalyst.pm
=head1 COPYRIGHT
-Copyright 2004 Sebastian Riedel. All rights reserved.
-
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
Modified: trunk/examples/CatalystAdvent/script/catalystadvent_server.pl
===================================================================
--- trunk/examples/CatalystAdvent/script/catalystadvent_server.pl 2011-09-27 10:12:40 UTC (rev 14106)
+++ trunk/examples/CatalystAdvent/script/catalystadvent_server.pl 2011-09-27 10:14:04 UTC (rev 14107)
@@ -1,86 +1,43 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
-BEGIN {
- $ENV{CATALYST_ENGINE} ||= 'HTTP';
- $ENV{CATALYST_SCRIPT_GEN} = 23;
-}
-
-use strict;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-
-my $debug = 0;
-my $fork = 0;
-my $help = 0;
-my $host = undef;
-my $port = 3000;
-my $keepalive = 0;
-my $restart = 0;
-my $restart_delay = 1;
-my $restart_regex = '\.yml$|\.yaml$|\.pm$';
-
-my @argv = @ARGV;
-
-GetOptions(
- 'debug|d' => \$debug,
- 'fork' => \$fork,
- 'help|?' => \$help,
- 'host=s' => \$host,
- 'port=s' => \$port,
- 'keepalive|k' => \$keepalive,
- 'restart|r' => \$restart,
- 'restartdelay|rd=s' => \$restart_delay,
- 'restartregex|rr=s' => \$restart_regex
-);
-
-pod2usage(1) if $help;
-
-if ( $restart ) {
- $ENV{CATALYST_ENGINE} = 'HTTP::Restarter';
+BEGIN {
+ $ENV{CATALYST_SCRIPT_GEN} = 40;
}
-if ( $debug ) {
- $ENV{CATALYST_DEBUG} = 1;
-}
-# This is require instead of use so that the above environment
-# variables can be set at runtime.
-require CatalystAdvent;
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('CatalystAdvent', 'Server');
-CatalystAdvent->run( $port, $host, {
- argv => \@argv,
- 'fork' => $fork,
- keepalive => $keepalive,
- restart => $restart,
- restart_delay => $restart_delay,
- restart_regex => qr/$restart_regex/
-} );
-
1;
=head1 NAME
-catalystadvent_server.pl - Catalyst Testserver
+catalystadvent_server.pl - Catalyst Test Server
=head1 SYNOPSIS
catalystadvent_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 got modified
- (defaults to false)
- -rd -restartdelay delay between file checks
- -rr -restartregex regex match files that trigger
- a restart when modified
- (defaults to '\.yml$|\.yaml$|\.pm$')
+ -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 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
@@ -90,15 +47,14 @@
Run a Catalyst Testserver for this application.
-=head1 AUTHOR
+=head1 AUTHORS
-Sebastian Riedel, C<sri at oook.de>
+Catalyst Contributors, see Catalyst.pm
=head1 COPYRIGHT
-Copyright 2004 Sebastian Riedel. All rights reserved.
-
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
+
Modified: trunk/examples/CatalystAdvent/script/catalystadvent_test.pl
===================================================================
--- trunk/examples/CatalystAdvent/script/catalystadvent_test.pl 2011-09-27 10:12:40 UTC (rev 14106)
+++ trunk/examples/CatalystAdvent/script/catalystadvent_test.pl 2011-09-27 10:14:04 UTC (rev 14107)
@@ -1,20 +1,8 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
-use strict;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use Catalyst::Test 'CatalystAdvent';
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('CatalystAdvent', 'Test');
-my $help = 0;
-
-GetOptions( 'help|?' => \$help );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-print request($ARGV[0])->content . "\n";
-
1;
=head1 NAME
@@ -26,7 +14,7 @@
catalystadvent_test.pl [options] uri
Options:
- -help display this help and exits
+ --help display this help and exits
Examples:
catalystadvent_test.pl http://localhost/some_action
@@ -40,15 +28,13 @@
Run a Catalyst action from the command line.
-=head1 AUTHOR
+=head1 AUTHORS
-Sebastian Riedel, C<sri at oook.de>
+Catalyst Contributors, see Catalyst.pm
=head1 COPYRIGHT
-Copyright 2004 Sebastian Riedel. All rights reserved.
-
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
More information about the Catalyst-commits
mailing list