X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=0d1951640110f173037d62907ee07e6577ee215b;hp=5288ed28c7c963ec0fc03aea6618dbfcd08a4485;hb=bbd9334139a4b16f488c867c9bfb17b35037ad6f;hpb=1667dcb1e5e53009173783b27325c378b47ee375 diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index 5288ed2..0d19516 100644 --- a/lib/Catalyst/Helper.pm +++ b/lib/Catalyst/Helper.pm @@ -2,13 +2,11 @@ package Catalyst::Helper; use strict; use base 'Class::Accessor::Fast'; -use Config; use File::Spec; use File::Path; use IO::File; use FindBin; use Template; -use Catalyst; use Catalyst::Utils; use Catalyst::Exception; @@ -58,30 +56,42 @@ Create the main application skeleton. sub mk_app { my ( $self, $name ) = @_; - return 0 if $name =~ /[^\w\:]/; + + # Needs to be here for PAR + require Catalyst; + + if ( $name =~ /[^\w\:]/ ) { + warn "Error: Invalid application name.\n"; + return 0; + } $self->{name} = $name; $self->{dir} = $name; $self->{dir} =~ s/\:\:/-/g; + $self->{script} = File::Spec->catdir( $self->{dir}, 'script' ); $self->{appprefix} = Catalyst::Utils::appprefix($name); - $self->{startperl} = $Config{startperl}; + $self->{startperl} = '#!/usr/bin/perl -w'; $self->{scriptgen} = $Catalyst::CATALYST_SCRIPT_GEN || 4; $self->{author} = $self->{author} = $ENV{'AUTHOR'} || eval { @{ [ getpwuid($<) ] }[6] } || 'Catalyst developer'; - $self->_mk_dirs; - $self->_mk_appclass; - $self->_mk_build; - $self->_mk_makefile; - $self->_mk_readme; - $self->_mk_changes; - $self->_mk_apptest; + + unless ( $self->{scripts} ) { + $self->_mk_dirs; + $self->_mk_appclass; + $self->_mk_build; + $self->_mk_makefile; + $self->_mk_readme; + $self->_mk_changes; + $self->_mk_apptest; + $self->_mk_images; + $self->_mk_favicon; + $self->_mk_package; + } $self->_mk_cgi; $self->_mk_fastcgi; $self->_mk_server; $self->_mk_test; $self->_mk_create; - $self->_mk_images; - $self->_mk_favicon; return 1; } @@ -210,12 +220,14 @@ sub mk_file { my ( $self, $file, $content ) = @_; if ( -e $file ) { print qq/ exists "$file"\n/; - return 0 unless $self->{'.newfiles'}; - if ( my $f = IO::File->new("< $file") ) { - my $oldcontent = join( '', (<$f>) ); - return 0 if $content eq $oldcontent; + return 0 unless ( $self->{'.newfiles'} || $self->{scripts} ); + if ( $self->{'.newfiles'} ) { + if ( my $f = IO::File->new("< $file") ) { + my $oldcontent = join( '', (<$f>) ); + return 0 if $content eq $oldcontent; + } + $file .= '.new'; } - $file .= '.new'; } if ( my $f = IO::File->new("> $file") ) { binmode $f; @@ -275,7 +287,6 @@ sub render_file { sub _mk_dirs { my $self = shift; $self->mk_dir( $self->{dir} ); - $self->{script} = File::Spec->catdir( $self->{dir}, 'script' ); $self->mk_dir( $self->{script} ); $self->{lib} = File::Spec->catdir( $self->{dir}, 'lib' ); $self->mk_dir( $self->{lib} ); @@ -436,6 +447,14 @@ sub _mk_favicon { } +sub _mk_package { + my $self = shift; + my $script = $self->{script}; + my $appprefix = $self->{appprefix}; + $self->render_file( 'package', "$script\/$appprefix\_package.pl" ); + chmod 0700, "$script/$appprefix\_package.pl"; +} + =head1 HELPERS Helpers are classes that provide two methods. @@ -486,16 +505,24 @@ package [% name %]; use strict; use warnings; -# -Debug activates the debug mode for very useful log messages -# Static::Simple will serve static files from the root directory +# +# Set flags and add plugins for the application +# +# -Debug: activates the debug mode for very useful log messages +# Static::Simple: will serve static files from the applications root directory +# use Catalyst qw/-Debug Static::Simple/; our $VERSION = '0.01'; +# # Configure the application +# __PACKAGE__->config( name => '[% name %]' ); +# # Start the application +# __PACKAGE__->setup; =head1 NAME @@ -518,7 +545,9 @@ Catalyst based application. =cut +# # Output a friendly welcome message +# sub default : Private { my ( $self, $c ) = @_; @@ -526,7 +555,9 @@ sub default : Private { $c->response->body( $c->welcome_message ); } -# Uncomment and modify this end action after adding a View class +# +# Uncomment and modify this end action after adding a View component +# #=item end # #=cut @@ -587,7 +618,6 @@ use strict; use Catalyst::Build; my $build = Catalyst::Build->new( - create_makefile_pl => 'passthrough', license => 'perl', module_name => '[% name %]', requires => { Catalyst => '5.49' }, @@ -624,7 +654,7 @@ plan skip_all => 'set TEST_POD to enable this test' unless $ENV{TEST_POD}; all_pod_coverage_ok(); __cgi__ -[% startperl %] -w +[% startperl %] BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' } @@ -662,7 +692,7 @@ it under the same terms as Perl itself. =cut __fastcgi__ -[% startperl %] -w +[% startperl %] BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' } @@ -674,17 +704,27 @@ use lib "$FindBin::Bin/../lib"; use [% name %]; my $help = 0; -my ( $listen, $nproc ); +my ( $listen, $nproc, $pidfile, $manager, $detach ); GetOptions( - 'help|?' => \$help, - 'listen|l=s' => \$listen, - 'nproc|n=i' => \$nproc, + '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; -[% name %]->run( $listen, { nproc => $nproc } ); +[% name %]->run( + $listen, + { nproc => $nproc, + pidfile => $pidfile, + manager => $manager, + detach => $detach, + } +); 1; @@ -703,7 +743,14 @@ pod2usage(1) if $help; can be HOST:PORT, :PORT or a filesystem path -n -nproc specify number of processes to keep - to serve requests (defaults to 1) + 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::ProcessManager sub-class) + or empty string to disable =head1 DESCRIPTION @@ -722,7 +769,7 @@ it under the same terms as Perl itself. =cut __server__ -[% startperl %] -w +[% startperl %] BEGIN { $ENV{CATALYST_ENGINE} ||= 'HTTP'; @@ -735,10 +782,12 @@ 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$'; @@ -746,10 +795,12 @@ 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 @@ -760,13 +811,17 @@ pod2usage(1) if $help; if ( $restart ) { $ENV{CATALYST_ENGINE} = 'HTTP::Restarter'; } +if ( $debug ) { + $ENV{CATALYST_DEBUG} = 1; +} require [% name %]; [% name %]->run( $port, $host, { - argv => \@argv, - 'fork' => $fork, - restart => $restart, + argv => \@argv, + 'fork' => $fork, + keepalive => $keepalive, + restart => $restart, restart_delay => $restart_delay, restart_regex => qr/$restart_regex/ } ); @@ -782,11 +837,13 @@ require [% name %]; [% appprefix %]_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 @@ -815,16 +872,14 @@ it under the same terms as Perl itself. =cut __test__ -[% startperl %] -w - -BEGIN { $ENV{CATALYST_ENGINE} ||= 'Test' } +[% startperl %] use strict; use Getopt::Long; use Pod::Usage; use FindBin; use lib "$FindBin::Bin/../lib"; -use [% name %]; +use Catalyst::Test '[% name %]'; my $help = 0; @@ -832,7 +887,7 @@ GetOptions( 'help|?' => \$help ); pod2usage(1) if ( $help || !$ARGV[0] ); -print [% name %]->run($ARGV[0])->content . "\n"; +print request($ARGV[0])->content . "\n"; 1; @@ -872,27 +927,27 @@ it under the same terms as Perl itself. =cut __create__ -[% startperl %] -w +[% startperl %] use strict; use Getopt::Long; use Pod::Usage; use Catalyst::Helper; -my $help = 0; -my $nonew = 0; +my $force = 0; +my $help = 0; my $short = 0; GetOptions( - 'help|?' => \$help, - 'nonew' => \$nonew, - 'short' => \$short + 'nonew|force' => \$force, + 'help|?' => \$help, + 'short' => \$short ); pod2usage(1) if ( $help || !$ARGV[0] ); my $helper = - Catalyst::Helper->new( { '.newfiles' => !$nonew, short => $short } ); + Catalyst::Helper->new( { '.newfiles' => !$force, short => $short } ); pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV ); @@ -907,8 +962,8 @@ pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV ); [% appprefix %]_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 - -nonew don't create a .new file where a file to be created exists -short use short types, like C instead of Controller... Examples: @@ -930,11 +985,91 @@ 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<-nonew> option. +This behavior can be suppressed with the C<-force> option. =head1 AUTHOR -Sebastian Riedel, C +Sebastian Riedel, C + +=head1 COPYRIGHT + +Copyright 2004 Sebastian Riedel. All rights reserved. + +This library is free software, you can redistribute it and/or modify +it under the same terms as Perl itself. + +=cut +__package__ +[% startperl %] + +use strict; +use Getopt::Long; +use Pod::Usage; +use Catalyst::PAR; + +my $core = 0; +my $classes = ''; +my $engine = 'CGI'; +my $help = 0; +my $multiarch = 0; +my $output = '[% appprefix %].par'; + +GetOptions( + 'classes=s' => \$classes, + 'core' => \$core, + 'engine=s' => \$engine, + 'help|?' => \$help, + 'multiarch' => \$multiarch, + 'output=s' => \$output +); + +pod2usage(1) if $help; + +Catalyst::PAR->new->package( { + classes => $classes, + core => $core, + engine => $engine, + multiarch => $multiarch, + output => $output, + class => '[% name %]' +} ); + +1; + +=head1 NAME + +[% appprefix %]_package.pl - Package Catalyst Applications + +=head1 SYNOPSIS + +[% appprefix %]_package.pl + + Options: + -classes comma separated list of additional classes to + include in package + -core also include modules bundled with Perl (defaults to false) + -engine engine to use for dependency detection (defaults to CGI) + -help display this help and exits + -multiarch enable multiarch support (defaults to false) + -output name for the par archive (defaults to [% appprefix %].par) + + Examples: + [% appprefix %]_package.pl -engine FastCGI + [% appprefix %]_package.pl -o foo_linux_i386_apache2.par -engine Apache2 + [% appprefix %]_package.pl -classes Test::More,Foo::Bar -o foo.par + + See also: + perldoc Catalyst::Manual + perldoc Catalyst::Manual::Intro + perldoc pp + +=head1 DESCRIPTION + +Package Catalyst Applications with L. + +=head1 AUTHOR + +Sebastian Riedel, C =head1 COPYRIGHT @@ -967,7 +1102,9 @@ Catalyst [% long_type %]. =over 4 -# Uncomment, modify and add new actions to fit your needs +# +# Uncomment and modify this or add new actions to fit your needs +# #=item default # #=cut