X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=3b8679396ea1175739c8dbfcb68540393152b858;hb=0ff7106c9f4652163ca58c84130de0fee52ea2f9;hp=59b832141b96c0b1f5105a6566797744a39b8a37;hpb=0710604fb69f44a3aeb66daf7863ea4eba69db0d;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index 59b8321..3b86793 100644 --- a/lib/Catalyst/Helper.pm +++ b/lib/Catalyst/Helper.pm @@ -8,7 +8,6 @@ use File::Path; use IO::File; use FindBin; use Template; -use Catalyst; use Catalyst::Utils; use Catalyst::Exception; @@ -58,32 +57,50 @@ 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} = "#!$Config{perlpath} -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; - $self->_mk_cgi; - $self->_mk_fastcgi; - $self->_mk_jsan; - $self->_mk_server; - $self->_mk_test; - $self->_mk_create; - $self->_mk_images; - $self->_mk_favicon; - return 1; + + my $gen_scripts = ( $self->{makefile} ) ? 0 : 1; + my $gen_makefile = ( $self->{scripts} ) ? 0 : 1; + my $gen_app = ( $self->{scripts} || $self->{makefile} ) ? 0 : 1; + + if ($gen_app) { + $self->_mk_dirs; + $self->_mk_config; + $self->_mk_appclass; + $self->_mk_readme; + $self->_mk_changes; + $self->_mk_apptest; + $self->_mk_images; + $self->_mk_favicon; + } + if ($gen_makefile) { + $self->_mk_makefile; + } + if ($gen_scripts) { + $self->_mk_cgi; + $self->_mk_fastcgi; + $self->_mk_server; + $self->_mk_test; + $self->_mk_create; + } + return $self->{dir}; } =head3 mk_component @@ -100,8 +117,8 @@ sub mk_component { $self->{author} = $self->{author} = $ENV{'AUTHOR'} || eval { @{ [ getpwuid($<) ] }[6] } || 'A clever guy'; - $self->{base} = File::Spec->catdir( $FindBin::Bin, '..' ); - unless ( $_[0] =~ /^(?:model|m|view|v|controller|c)$/i ) { + $self->{base} ||= File::Spec->catdir( $FindBin::Bin, '..' ); + unless ( $_[0] =~ /^(?:model|view|controller)$/i ) { my $helper = shift; my @args = @_; my $class = "Catalyst::Helper::$helper"; @@ -122,15 +139,20 @@ sub mk_component { my $helper = shift; my @args = @_; return 0 if $name =~ /[^\w\:]/; - $type = 'M' if $type =~ /model|m/i; - $type = 'V' if $type =~ /view|v/i; - $type = 'C' if $type =~ /controller|c/i; + $type = lc $type; + $self->{long_type} = ucfirst $type; + $type = 'M' if $type =~ /model/i; + $type = 'V' if $type =~ /view/i; + $type = 'C' if $type =~ /controller/i; + my $appdir = File::Spec->catdir( split /\:\:/, $app ); + my $test_path = + File::Spec->catdir( $FindBin::Bin, '..', 'lib', $appdir, 'C' ); + $type = $self->{long_type} unless -d $test_path; $self->{type} = $type; $self->{name} = $name; $self->{class} = "$app\::$type\::$name"; # Class - my $appdir = File::Spec->catdir( split /\:\:/, $app ); my $path = File::Spec->catdir( $FindBin::Bin, '..', 'lib', $appdir, $type ); my $file = $name; @@ -138,8 +160,8 @@ sub mk_component { my @path = split /\:\:/, $name; $file = pop @path; $path = File::Spec->catdir( $path, @path ); - mkpath [$path]; } + $self->mk_dir($path); $file = File::Spec->catfile( $path, "$file.pm" ); $self->{file} = $file; @@ -149,9 +171,7 @@ sub mk_component { # Helper if ($helper) { - my $comp = 'Model'; - $comp = 'View' if $type eq 'V'; - $comp = 'Controller' if $type eq 'C'; + my $comp = $self->{long_type}; my $class = "Catalyst::Helper::$comp\::$helper"; eval "require $class"; @@ -210,12 +230,17 @@ 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} + || $self->{makefile} ); + 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; @@ -246,8 +271,9 @@ sub next_test { $self->{uri} = $prefix; } my $dir = $self->{test_dir}; - my $type = $self->{type}; - return File::Spec->catfile( $dir, $type, $tname ); + my $type = lc $self->{type}; + $self->mk_dir($dir); + return File::Spec->catfile( $dir, "$type\_$tname" ); } =head3 render_file @@ -273,7 +299,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} ); @@ -283,22 +308,29 @@ sub _mk_dirs { $self->mk_dir( $self->{static} ); $self->{images} = File::Spec->catdir( $self->{static}, 'images' ); $self->mk_dir( $self->{images} ); - $self->{static} = File::Spec->catdir( $self->{static}, 'js' ); - $self->mk_dir( $self->{static} ); $self->{t} = File::Spec->catdir( $self->{dir}, 't' ); $self->mk_dir( $self->{t} ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'M' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'V' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'C' ) ); + $self->{class} = File::Spec->catdir( split( /\:\:/, $self->{name} ) ); $self->{mod} = File::Spec->catdir( $self->{lib}, $self->{class} ); $self->mk_dir( $self->{mod} ); - $self->{m} = File::Spec->catdir( $self->{mod}, 'M' ); - $self->mk_dir( $self->{m} ); - $self->{v} = File::Spec->catdir( $self->{mod}, 'V' ); - $self->mk_dir( $self->{v} ); - $self->{c} = File::Spec->catdir( $self->{mod}, 'C' ); - $self->mk_dir( $self->{c} ); + + if ( $self->{short} ) { + $self->{m} = File::Spec->catdir( $self->{mod}, 'M' ); + $self->mk_dir( $self->{m} ); + $self->{v} = File::Spec->catdir( $self->{mod}, 'V' ); + $self->mk_dir( $self->{v} ); + $self->{c} = File::Spec->catdir( $self->{mod}, 'C' ); + $self->mk_dir( $self->{c} ); + } + else { + $self->{m} = File::Spec->catdir( $self->{mod}, 'Model' ); + $self->mk_dir( $self->{m} ); + $self->{v} = File::Spec->catdir( $self->{mod}, 'View' ); + $self->mk_dir( $self->{v} ); + $self->{c} = File::Spec->catdir( $self->{mod}, 'Controller' ); + $self->mk_dir( $self->{c} ); + } $self->{base} = File::Spec->rel2abs( $self->{dir} ); } @@ -308,16 +340,27 @@ sub _mk_appclass { $self->render_file( 'appclass', "$mod.pm" ); } -sub _mk_build { - my $self = shift; - my $dir = $self->{dir}; - $self->render_file( 'build', "$dir\/Build.PL" ); -} - sub _mk_makefile { my $self = shift; - my $dir = $self->{dir}; + $self->{path} = File::Spec->catfile( 'lib', split( '::', $self->{name} ) ); + $self->{path} .= '.pm'; + my $dir = $self->{dir}; $self->render_file( 'makefile', "$dir\/Makefile.PL" ); + + if ( $self->{makefile} ) { + + # deprecate the old Build.PL file when regenerating Makefile.PL + $self->_deprecate_file( + File::Spec->catdir( $self->{dir}, 'Build.PL' ) ); + } +} + +sub _mk_config { + my $self = shift; + my $dir = $self->{dir}; + my $appprefix = $self->{appprefix}; + $self->render_file( 'config', + File::Spec->catfile( $dir, "$appprefix.json" ) ); } sub _mk_readme { @@ -357,14 +400,6 @@ sub _mk_fastcgi { chmod 0700, "$script/$appprefix\_fastcgi.pl"; } -sub _mk_jsan { - my $self = shift; - my $script = $self->{script}; - my $appprefix = $self->{appprefix}; - $self->render_file( 'jsan', "$script\/$appprefix\_jsan.pl" ); - chmod 0700, "$script/$appprefix\_jsan.pl"; -} - sub _mk_server { my $self = shift; my $script = $self->{script}; @@ -424,6 +459,27 @@ sub _mk_favicon { } +sub _deprecate_file { + my ( $self, $file ) = @_; + if ( -e $file ) { + my $oldcontent; + if ( my $f = IO::File->new("< $file") ) { + $oldcontent = join( '', (<$f>) ); + } + my $newfile = $file . '.deprecated'; + if ( my $f = IO::File->new("> $newfile") ) { + binmode $f; + print $f $oldcontent; + print qq/created "$newfile"\n/; + unlink $file; + print qq/removed "$file"\n/; + return 1; + } + Catalyst::Exception->throw( + message => qq/Couldn't create "$file", "$!"/ ); + } +} + =head1 HELPERS Helpers are classes that provide two methods. @@ -474,16 +530,20 @@ 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 application's 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 @@ -500,13 +560,15 @@ Catalyst based application. =head1 METHODS -=over 4 +=cut -=item default +=head2 default =cut +# # Output a friendly welcome message +# sub default : Private { my ( $self, $c ) = @_; @@ -514,8 +576,10 @@ sub default : Private { $c->response->body( $c->welcome_message ); } -# Uncomment and modify this end action after adding a View class -#=item end +# +# Uncomment and modify this end action after adding a View component +# +#=head2 end # #=cut # @@ -523,11 +587,9 @@ sub default : Private { # my ( $self, $c ) = @_; # # # Forward to View unless response body is already defined -# $c->forward('MyApp::V::') unless $c->response->body; +# $c->forward( $c->view('') ) unless $c->response->body; #} -=back - =head1 AUTHOR [% author %] @@ -541,58 +603,32 @@ it under the same terms as Perl itself. 1; __makefile__ - unless ( eval "use Module::Build::Compat 0.02; 1" ) { - print "This module requires Module::Build to install itself.\n"; +use inc::Module::Install; - require ExtUtils::MakeMaker; - my $yn = - ExtUtils::MakeMaker::prompt( ' Install Module::Build now from CPAN?', 'y' ); - - unless ( $yn =~ /^y/i ) { - die " *** Cannot install without Module::Build. Exiting ...\n"; - } +name '[% dir %]'; +all_from '[% path %]'; - require Cwd; - require File::Spec; - require CPAN; +requires Catalyst => '5.62'; - # Save this 'cause CPAN will chdir all over the place. - my $cwd = Cwd::cwd(); - my $makefile = File::Spec->rel2abs($0); +catalyst; - CPAN::Shell->install('Module::Build::Compat') - or die " *** Cannot install without Module::Build. Exiting ...\n"; - - chdir $cwd or die "Cannot chdir() back to $cwd: $!"; - } - eval "use Module::Build::Compat 0.02; 1" or die $@; - use lib '_build/lib'; - Module::Build::Compat->run_build_pl( args => \@ARGV ); - require Module::Build; - Module::Build::Compat->write_makefile( build_class => 'Module::Build' ); -__build__ -use strict; -use Catalyst::Build; - -my $build = Catalyst::Build->new( - create_makefile_pl => 'passthrough', - license => 'perl', - module_name => '[% name %]', - requires => { Catalyst => '5.10' }, - create_makefile_pl => 'passthrough', - script_files => [ glob('script/*') ], - test_files => [ glob('t/*.t'), glob('t/*/*.t') ] -); -$build->create_build_script; +install_script glob('script/*.pl'); +auto_install; +WriteAll; +__config__ +{ + "name": "[% name %]" +} __readme__ Run script/[% appprefix %]_server.pl to test the application. __changes__ This file documents the revision history for Perl extension [% name %]. + 0.01 [% time %] - initial revision, generated by Catalyst __apptest__ use Test::More tests => 2; -use_ok( Catalyst::Test, '[% name %]' ); +BEGIN { use_ok( Catalyst::Test, '[% name %]' ); } ok( request('/')->is_success ); __podtest__ @@ -612,7 +648,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' } @@ -650,94 +686,69 @@ it under the same terms as Perl itself. =cut __fastcgi__ -[% startperl %] -w +[% startperl %] BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' } use strict; +use Getopt::Long; +use Pod::Usage; use FindBin; use lib "$FindBin::Bin/../lib"; use [% name %]; -[% name %]->run; - -1; - -=head1 NAME - -[% appprefix %]_fastcgi.pl - Catalyst FastCGI - -=head1 SYNOPSIS - -See L - -=head1 DESCRIPTION - -Run a Catalyst application as fastcgi. - -=head1 AUTHOR - -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 -__jsan__ -[% startperl %] -w - -use strict; -use Catalyst; -use Catalyst::Utils; -use File::Spec; -use FindBin; -use lib "$FindBin::Bin/../lib"; - -# Needed for home detection -{ - no warnings 'all'; - sub Catalyst::setup {} - require [% name %]; -} +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, +); -my $home = Catalyst::Utils::home('[% name %]'); -$ENV{JSAN_PREFIX} ||= File::Spec->catdir( $home, 'root', 'static', 'js' ); +pod2usage(1) if $help; -# JSAN shell -eval 'require JSAN'; -die "Please install JSAN\n" if $@; -JSAN->control; +[% name %]->run( + $listen, + { nproc => $nproc, + pidfile => $pidfile, + manager => $manager, + detach => $detach, + } +); 1; =head1 NAME -[% appprefix %]_jsan.pl - JSAN shell +[% appprefix %]_fastcgi.pl - Catalyst FastCGI =head1 SYNOPSIS -[% appprefix %]_jsan.pl [options] - - Examples: - jsan> index - jsan> install Test.Simple - - See also: - perldoc Catalyst::Manual - perldoc Catalyst::Manual::Intro - +[% appprefix %]_fastcgi.pl [options] + + Options: + -? -help display this help and exits + -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 + 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::ProcManager sub-class) + or empty string to disable =head1 DESCRIPTION -Install JavaScript libraries from the JSAN shell. - -=head1 SEE ALSO - -L, L +Run a Catalyst application as fastcgi. =head1 AUTHOR @@ -752,7 +763,7 @@ it under the same terms as Perl itself. =cut __server__ -[% startperl %] -w +[% startperl %] BEGIN { $ENV{CATALYST_ENGINE} ||= 'HTTP'; @@ -764,23 +775,26 @@ use Getopt::Long; use Pod::Usage; use FindBin; use lib "$FindBin::Bin/../lib"; -use [% name %]; +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 $restart_regex = '\.yml$|\.yaml$|\.json|\.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 @@ -788,10 +802,22 @@ GetOptions( pod2usage(1) if $help; +if ( $restart ) { + $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 [% 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/ } ); @@ -807,17 +833,19 @@ pod2usage(1) if $help; [% 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 -rr -restartregex regex match files that trigger a restart when modified - (defaults to '\.yml$|\.yaml$|\.pm$') + (defaults to '\.yml$|\.yaml$|\.json|\.pm$') See also: perldoc Catalyst::Manual @@ -840,16 +868,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; @@ -857,7 +883,7 @@ GetOptions( 'help|?' => \$help ); pod2usage(1) if ( $help || !$ARGV[0] ); -print [% name %]->run($ARGV[0])->content . "\n"; +print request($ARGV[0])->content . "\n"; 1; @@ -897,22 +923,25 @@ 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; -GetOptions( 'help|?' => \$help, - 'nonew' => \$nonew ); +GetOptions( + 'nonew|force' => \$force, + 'help|?' => \$help + ); pod2usage(1) if ( $help || !$ARGV[0] ); -my $helper = Catalyst::Helper->new({'.newfiles' => !$nonew}); +my $helper = Catalyst::Helper->new( { '.newfiles' => !$force } ); + pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV ); 1; @@ -926,8 +955,8 @@ pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV ); [% appprefix %]_create.pl [options] model|view|controller name [helper] [options] Options: - -help display this help and exits - -nonew don't create a .new file where a file to be created exists + -force don't create a .new file where a file to be created exists + -help display this help and exits Examples: [% appprefix %]_create.pl controller My::Controller @@ -948,11 +977,11 @@ 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 @@ -967,11 +996,11 @@ package [% class %]; use strict; use warnings; -use base 'Catalyst::Base'; +use base 'Catalyst::[% long_type %]'; =head1 NAME -[% class %] - Catalyst component +[% class %] - Catalyst [% long_type %] =head1 SYNOPSIS @@ -979,14 +1008,16 @@ See L<[% app %]> =head1 DESCRIPTION -Catalyst component. -[% IF type == 'C' %] +Catalyst [% long_type %]. +[% IF long_type == 'Controller' %] =head1 METHODS -=over 4 +=cut -# Uncomment, modify and add new actions to fit your needs -#=item default +# +# Uncomment and modify this or add new actions to fit your needs +# +#=head2 default # #=cut # @@ -997,8 +1028,6 @@ Catalyst component. # $c->response->body('[% class %] is on Catalyst!'); #} -=back - [% END %] =head1 AUTHOR @@ -1013,7 +1042,7 @@ it under the same terms as Perl itself. 1; __comptest__ -[% IF type == 'C' %] +[% IF long_type == 'Controller' %] use Test::More tests => 3; use_ok( Catalyst::Test, '[% app %]' ); use_ok('[% class %]');