diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/mga_mirrors_cgi.pl | 15 | ||||
| -rwxr-xr-x | script/mga_mirrors_create.pl | 49 | ||||
| -rwxr-xr-x | script/mga_mirrors_fastcgi.pl | 57 | ||||
| -rwxr-xr-x | script/mga_mirrors_server.pl | 152 | ||||
| -rwxr-xr-x | script/mga_mirrors_test.pl | 19 |
5 files changed, 58 insertions, 234 deletions
diff --git a/script/mga_mirrors_cgi.pl b/script/mga_mirrors_cgi.pl index c33a0e6..d5ef4cc 100755 --- a/script/mga_mirrors_cgi.pl +++ b/script/mga_mirrors_cgi.pl @@ -1,14 +1,7 @@ #!/usr/bin/env perl -BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' } - -use strict; -use warnings; -use FindBin; -use lib "$FindBin::Bin/../lib"; -use MGA::Mirrors; - -MGA::Mirrors->run; +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('MGA::Mirrors', 'CGI'); 1; @@ -22,7 +15,7 @@ See L<Catalyst::Manual> =head1 DESCRIPTION -Run a Catalyst application as a cgi script. +Run a Catalyst application as a CGI script. =head1 AUTHORS @@ -30,8 +23,8 @@ 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 + diff --git a/script/mga_mirrors_create.pl b/script/mga_mirrors_create.pl index 8229a0f..43b905a 100755 --- a/script/mga_mirrors_create.pl +++ b/script/mga_mirrors_create.pl @@ -2,37 +2,9 @@ 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( 'MGA::Mirrors', @ARGV ); +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('MGA::Mirrors', 'Create'); 1; @@ -45,25 +17,28 @@ mga_mirrors_create.pl - Create a new Catalyst Component mga_mirrors_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 + --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: mga_mirrors_create.pl controller My::Controller - mga_mirrors_create.pl -mechanize controller My::Controller + mga_mirrors_create.pl --mechanize controller My::Controller mga_mirrors_create.pl view My::View - mga_mirrors_create.pl view MyView TT - mga_mirrors_create.pl view TT TT + mga_mirrors_create.pl view HTML TT mga_mirrors_create.pl model My::Model mga_mirrors_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\ dbi:SQLite:/tmp/my.db mga_mirrors_create.pl model AnotherDB DBIC::Schema MyApp::Schema create=static\ - dbi:Pg:dbname=foo root 4321 + [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 diff --git a/script/mga_mirrors_fastcgi.pl b/script/mga_mirrors_fastcgi.pl index 42887fe..3d16f7b 100755 --- a/script/mga_mirrors_fastcgi.pl +++ b/script/mga_mirrors_fastcgi.pl @@ -1,39 +1,7 @@ #!/usr/bin/env perl -BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' } - -use strict; -use warnings; -use Getopt::Long; -use Pod::Usage; -use FindBin; -use lib "$FindBin::Bin/../lib"; -use MGA::Mirrors; - -my $help = 0; -my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr ); - -GetOptions( - 'help|?' => \$help, - 'listen|l=s' => \$listen, - 'nproc|n=i' => \$nproc, - 'pidfile|p=s' => \$pidfile, - 'manager|M=s' => \$manager, - 'daemon|d' => \$detach, - 'keeperr|e' => \$keep_stderr, -); - -pod2usage(1) if $help; - -MGA::Mirrors->run( - $listen, - { nproc => $nproc, - pidfile => $pidfile, - manager => $manager, - detach => $detach, - keep_stderr => $keep_stderr, - } -); +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('MGA::Mirrors', 'FastCGI'); 1; @@ -46,26 +14,27 @@ mga_mirrors_fastcgi.pl - Catalyst FastCGI mga_mirrors_fastcgi.pl [options] Options: - -? -help display this help and exits - -l -listen Socket path to listen on + -? --help display this help and exit + -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 - (requires -listen) - -d -daemon daemonize (requires -listen) - -M -manager specify alternate process manager + 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 + -e --keeperr send error messages to STDOUT, not to the webserver + --proc_title Set the process title (if possible) =head1 DESCRIPTION -Run a Catalyst application as fastcgi. +Run a Catalyst application as FastCGI. =head1 AUTHORS diff --git a/script/mga_mirrors_server.pl b/script/mga_mirrors_server.pl index fdf863d..b16ed1f 100755 --- a/script/mga_mirrors_server.pl +++ b/script/mga_mirrors_server.pl @@ -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"; - -my $debug = 0; -my $fork = 0; -my $help = 0; -my $host = undef; -my $port = $ENV{MGA_MIRRORS_PORT} || $ENV{CATALYST_PORT} || 3000; -my $keepalive = 0; -my $restart = $ENV{MGA_MIRRORS_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 MGA::Mirrors; - - MGA::Mirrors->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->(); -} +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('MGA::Mirrors', 'Server'); 1; =head1 NAME -mga_mirrors_server.pl - Catalyst Testserver +mga_mirrors_server.pl - Catalyst Test Server =head1 SYNOPSIS mga_mirrors_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 @@ This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut + diff --git a/script/mga_mirrors_test.pl b/script/mga_mirrors_test.pl index d7e52d8..7229b7d 100755 --- a/script/mga_mirrors_test.pl +++ b/script/mga_mirrors_test.pl @@ -1,20 +1,7 @@ #!/usr/bin/env perl -use strict; -use warnings; -use Getopt::Long; -use Pod::Usage; -use FindBin; -use lib "$FindBin::Bin/../lib"; -use Catalyst::Test 'MGA::Mirrors'; - -my $help = 0; - -GetOptions( 'help|?' => \$help ); - -pod2usage(1) if ( $help || !$ARGV[0] ); - -print request($ARGV[0])->content . "\n"; +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('MGA::Mirrors', 'Test'); 1; @@ -27,7 +14,7 @@ mga_mirrors_test.pl - Catalyst Test mga_mirrors_test.pl [options] uri Options: - -help display this help and exits + --help display this help and exits Examples: mga_mirrors_test.pl http://localhost/some_action |