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=317b170f8563c25baf284fc17aff981699eb8c13;hp=0d1951640110f173037d62907ee07e6577ee215b;hb=614f3ad66ca3dc9715fc2be41806428b1a44cde7;hpb=bbd9334139a4b16f488c867c9bfb17b35037ad6f diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index 0d19516..317b170 100644 --- a/lib/Catalyst/Helper.pm +++ b/lib/Catalyst/Helper.pm @@ -78,14 +78,12 @@ sub mk_app { 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; @@ -258,10 +256,9 @@ sub next_test { $self->{uri} = $prefix; } my $dir = $self->{test_dir}; - my $type = $self->{type}; - $dir = File::Spec->catdir( $dir, $type ); + my $type = lc $self->{type}; $self->mk_dir($dir); - return File::Spec->catfile( $dir, $tname ); + return File::Spec->catfile( $dir, "$type\_$tname" ); } =head3 render_file @@ -299,17 +296,6 @@ sub _mk_dirs { $self->{t} = File::Spec->catdir( $self->{dir}, 't' ); $self->mk_dir( $self->{t} ); - if ( $self->{short} ) { - $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' ) ); - } - else { - $self->mk_dir( File::Spec->catdir( $self->{t}, 'Model' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'View' ) ); - $self->mk_dir( File::Spec->catdir( $self->{t}, 'Controller' ) ); - } - $self->{class} = File::Spec->catdir( split( /\:\:/, $self->{name} ) ); $self->{mod} = File::Spec->catdir( $self->{lib}, $self->{class} ); $self->mk_dir( $self->{mod} ); @@ -339,15 +325,11 @@ 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" ); } @@ -447,14 +429,6 @@ 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. @@ -539,9 +513,7 @@ Catalyst based application. =head1 METHODS -=over 4 - -=item default +=head2 default =cut @@ -558,7 +530,7 @@ sub default : Private { # # Uncomment and modify this end action after adding a View component # -#=item end +#=head2 end # #=cut # @@ -569,8 +541,6 @@ sub default : Private { # $c->forward('View::') unless $c->response->body; #} -=back - =head1 AUTHOR [% author %] @@ -584,52 +554,27 @@ 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' ); +name('[% name %]'); +abstract('Catalyst Application'); +author('[% author %]'); +version_from('[% path %]'); +license('perl'); - unless ( $yn =~ /^y/i ) { - die " *** Cannot install without Module::Build. Exiting ...\n"; - } +requires( Catalyst => '5.57'); - require Cwd; - require File::Spec; - require CPAN; +install_script( glob('script/*.pl') ); +tests( glob('t/*.t'), glob('t/*/*.t') ); - # Save this 'cause CPAN will chdir all over the place. - my $cwd = Cwd::cwd(); - my $makefile = File::Spec->rel2abs($0); +catalyst_files(); - 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( - license => 'perl', - module_name => '[% name %]', - requires => { Catalyst => '5.49' }, - create_makefile_pl => 'passthrough', - script_files => [ glob('script/*') ], - test_files => [ glob('t/*.t'), glob('t/*/*.t') ] -); -$build->create_build_script; +&WriteAll; __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__ @@ -999,86 +944,6 @@ 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 - -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 __compclass__ package [% class %]; @@ -1100,12 +965,10 @@ Catalyst [% long_type %]. [% IF long_type == 'Controller' %] =head1 METHODS -=over 4 - # # Uncomment and modify this or add new actions to fit your needs # -#=item default +#=head2 default # #=cut # @@ -1116,8 +979,6 @@ Catalyst [% long_type %]. # $c->response->body('[% class %] is on Catalyst!'); #} -=back - [% END %] =head1 AUTHOR