From: Michael Andreen Date: Tue, 3 Aug 2010 18:30:52 +0000 (+0200) Subject: Merge updates from new catalyst.pl X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=c018a7ccbb1fd8bdec5c8f97b151686ae933870b Merge updates from new catalyst.pl --- diff --git a/lib/Catalyst/Plugin/Authentication/Store/NDWeb.pm b/lib/Catalyst/Plugin/Authentication/Store/NDWeb.pm index 351e838..2182077 100644 --- a/lib/Catalyst/Plugin/Authentication/Store/NDWeb.pm +++ b/lib/Catalyst/Plugin/Authentication/Store/NDWeb.pm @@ -3,6 +3,7 @@ package Catalyst::Plugin::Authentication::Store::NDWeb; use strict; use warnings; use Moose; +use MRO::Compat; use NDWeb::Auth::User; @@ -13,24 +14,15 @@ our $VERSION= "0.104"; sub setup { my $c = shift; - $c->default_auth_store( - Catalyst::Plugin::Authentication::Store::NDWeb->new( - ) - ); + $c->default_auth_store( + Catalyst::Plugin::Authentication::Store::NDWeb->new( + ) + ); - $c->NEXT::setup(@_); + $c->next::method(@_); } -sub new { - my ( $class ) = @_; - - my $self = { - }; - - bless $self, $class; -} - sub from_session { my ( $self, $c, $frozenuser ) = @_; @@ -58,7 +50,7 @@ sub user_supports { NDWeb::User->supports( @_ ); } -__PACKAGE__; +__PACKAGE__->meta->make_immutable; __END__ diff --git a/lib/NDWeb.pm b/lib/NDWeb.pm index 952f872..51c5e7f 100644 --- a/lib/NDWeb.pm +++ b/lib/NDWeb.pm @@ -1,7 +1,6 @@ package NDWeb; - -use strict; -use warnings; +use Moose; +use namespace::autoclean; use Catalyst::Runtime 5.80; @@ -39,7 +38,10 @@ use Catalyst qw/ PageCache /; +extends 'Catalyst'; + our $VERSION = '0.01'; +$VERSION = eval $VERSION; sub signal_bots { system 'killall','-USR1', 'ndbot.pl'; @@ -47,14 +49,18 @@ sub signal_bots { # Configure the application. # -# Note that settings in ndweb.yml (or other external +# Note that settings in ndweb.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 => 'NDWeb' ); +__PACKAGE__->config( + name => 'NDWeb', + # Disable deprecated behavior needed by old applications + disable_component_resolution_regex_fallback => 1, +); __PACKAGE__->config->{'Plugin::Authentication'}{'use_session'} = 1; __PACKAGE__->config(session => { storage => "/tmp/ndweb-$>/session", @@ -62,7 +68,7 @@ __PACKAGE__->config(session => { expires => 300, verify_address => 1, }); -__PACKAGE__->config( cache => { +__PACKAGE__->config( "Plugin::Cache" => { backend => { class => "Cache::FileCache", cache_root => "/tmp/ndweb-$>", diff --git a/ndweb.conf b/ndweb.conf new file mode 100644 index 0000000..72857c9 --- /dev/null +++ b/ndweb.conf @@ -0,0 +1,3 @@ +# rename this file to ndweb.yml and put a ':' after 'name' if +# you want to use YAML like in old versions of Catalyst +name NDWeb diff --git a/ndweb.yml b/ndweb.yml deleted file mode 100644 index bd6aeb6..0000000 --- a/ndweb.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -name: NDWeb diff --git a/script/ndweb_cgi.pl b/script/ndweb_cgi.pl index a008db6..6cb069b 100755 --- a/script/ndweb_cgi.pl +++ b/script/ndweb_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 NDWeb; - -NDWeb->run; +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('NDWeb', 'CGI'); 1; @@ -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/ndweb_create.pl b/script/ndweb_create.pl index 9293c49..11668e7 100755 --- a/script/ndweb_create.pl +++ b/script/ndweb_create.pl @@ -2,37 +2,9 @@ use strict; use warnings; -use Getopt::Long; -use Pod::Usage; -eval "use Catalyst::Helper;"; -if ($@) { - die < \$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( 'NDWeb', @ARGV ); +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('NDWeb', 'Create'); 1; @@ -45,9 +17,9 @@ ndweb_create.pl - Create a new Catalyst Component ndweb_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: ndweb_create.pl controller My::Controller diff --git a/script/ndweb_fastcgi.pl b/script/ndweb_fastcgi.pl index ed91a41..20e6665 100755 --- a/script/ndweb_fastcgi.pl +++ b/script/ndweb_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 NDWeb; - -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; - -NDWeb->run( - $listen, - { nproc => $nproc, - pidfile => $pidfile, - manager => $manager, - detach => $detach, - keep_stderr => $keep_stderr, - } -); +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('NDWeb', 'FastCGI'); 1; @@ -47,20 +15,20 @@ ndweb_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 + -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 diff --git a/script/ndweb_server.pl b/script/ndweb_server.pl index 940cf86..d019a5e 100755 --- a/script/ndweb_server.pl +++ b/script/ndweb_server.pl @@ -1,148 +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"; - -#Need to preload, otherwise the first hit is slow -use CGI qw/:standard/; -escapeHTML(''); - -my $debug = 0; -my $fork = 0; -my $help = 0; -my $host = undef; -my $port = $ENV{NDWEB_PORT} || $ENV{CATALYST_PORT} || 3000; -my $keepalive = 0; -my $restart = $ENV{NDWEB_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 NDWeb; - - NDWeb->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('NDWeb', 'Server'); 1; =head1 NAME -ndweb_server.pl - Catalyst Testserver +ndweb_server.pl - Catalyst Test Server =head1 SYNOPSIS ndweb_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 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 @@ -162,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/ndweb_test.pl b/script/ndweb_test.pl index adfe2f3..9b7ec40 100755 --- a/script/ndweb_test.pl +++ b/script/ndweb_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 'NDWeb'; - -my $help = 0; - -GetOptions( 'help|?' => \$help ); - -pod2usage(1) if ( $help || !$ARGV[0] ); - -print request($ARGV[0])->content . "\n"; +use Catalyst::ScriptRunner; +Catalyst::ScriptRunner->run('NDWeb', 'Test'); 1; @@ -27,7 +14,7 @@ ndweb_test.pl - Catalyst Test ndweb_test.pl [options] uri Options: - -help display this help and exits + --help display this help and exits Examples: ndweb_test.pl http://localhost/some_action