Permalink
Browse files

scripts upgraded using catalyst.pl

  • Loading branch information...
zpmorgan committed Nov 1, 2010
1 parent 243fd80 commit 98bfebaccc0e3dac145b11cfbb2e68cd7444afbe
Showing with 62 additions and 194 deletions.
  1. +5 −12 script/basilisk_cgi.pl
  2. +13 −39 script/basilisk_create.pl
  3. +10 −42 script/basilisk_fastcgi.pl
  4. +29 −83 script/basilisk_server.pl
  5. +5 −18 script/basilisk_test.pl
View
@@ -1,14 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
-
-use strict;
-use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use basilisk;
-
-basilisk->run;
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('basilisk', 'CGI');
1;
@@ -30,8 +23,8 @@ =head1 AUTHORS
=head1 COPYRIGHT
-
-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
+
View
@@ -1,38 +1,10 @@
-#!/usr/bin/perl -w
+#!/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( 'basilisk', @ARGV );
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('basilisk', 'Create');
1;
@@ -45,26 +17,28 @@ =head1 SYNOPSIS
basilisk_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:
basilisk_create.pl controller My::Controller
- basilisk_create.pl controller My::Controller BindLex
basilisk_create.pl -mechanize controller My::Controller
basilisk_create.pl view My::View
- basilisk_create.pl view MyView TT
- basilisk_create.pl view TT TT
+ basilisk_create.pl view HTML TT
basilisk_create.pl model My::Model
basilisk_create.pl model SomeDB DBIC::Schema MyApp::Schema create=dynamic\
dbi:SQLite:/tmp/my.db
basilisk_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
@@ -80,7 +54,7 @@ =head1 AUTHORS
=head1 COPYRIGHT
-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
View
@@ -1,39 +1,7 @@
-#!/usr/bin/perl -w
+#!/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 basilisk;
-
-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;
-
-basilisk->run(
- $listen,
- { nproc => $nproc,
- pidfile => $pidfile,
- manager => $manager,
- detach => $detach,
- keep_stderr => $keep_stderr,
- }
-);
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('basilisk', 'FastCGI');
1;
@@ -47,20 +15,20 @@ =head1 SYNOPSIS
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
+ -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
=head1 DESCRIPTION
@@ -73,7 +41,7 @@ =head1 AUTHORS
=head1 COPYRIGHT
-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
View
@@ -1,99 +1,44 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
BEGIN {
- $ENV{CATALYST_ENGINE} ||= 'HTTP';
- $ENV{CATALYST_SCRIPT_GEN} = 32;
- 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{BASILISK_PORT} || $ENV{CATALYST_PORT} || 3000;
-my $keepalive = 0;
-my $restart = $ENV{BASILISK_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
-my $restart_delay = 1;
-my $restart_regex = '(?:/|^)(?!\.#).+(?:\.yml$|\.yaml$|\.conf|\.pm)$';
-my $restart_directory = undef;
-my $follow_symlinks = 0;
-
-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,
- 'restartdirectory=s@' => \$restart_directory,
- 'followsymlinks' => \$follow_symlinks,
-);
-
-pod2usage(1) if $help;
-
-if ( $restart && $ENV{CATALYST_ENGINE} eq 'HTTP' ) {
- $ENV{CATALYST_ENGINE} = 'HTTP::Restarter';
-}
-if ( $debug ) {
- $ENV{CATALYST_DEBUG} = 1;
-}
-
-# This is require instead of use so that the above environment
-# variables can be set at runtime.
-require basilisk;
-
-basilisk->run( $port, $host, {
- argv => \@argv,
- 'fork' => $fork,
- keepalive => $keepalive,
- restart => $restart,
- restart_delay => $restart_delay,
- restart_regex => qr/$restart_regex/,
- restart_directory => $restart_directory,
- follow_symlinks => $follow_symlinks,
-} );
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('basilisk', 'Server');
1;
=head1 NAME
-basilisk_server.pl - Catalyst Testserver
+basilisk_server.pl - Catalyst Test Server
=head1 SYNOPSIS
basilisk_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
- -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)
+ -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
perldoc Catalyst::Manual::Intro
@@ -108,7 +53,8 @@ =head1 AUTHORS
=head1 COPYRIGHT
-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
+
View
@@ -1,20 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use Catalyst::Test 'basilisk';
-
-my $help = 0;
-
-GetOptions( 'help|?' => \$help );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-print request($ARGV[0])->content . "\n";
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('basilisk', 'Test');
1;
@@ -27,7 +14,7 @@ =head1 SYNOPSIS
basilisk_test.pl [options] uri
Options:
- -help display this help and exits
+ --help display this help and exits
Examples:
basilisk_test.pl http://localhost/some_action
@@ -47,7 +34,7 @@ =head1 AUTHORS
=head1 COPYRIGHT
-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

0 comments on commit 98bfeba

Please sign in to comment.