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=d5560683019802ed76716e530ebded9fc79c4abb;hp=e4cd7f5a5d25a797d86b2fbf5ea9831cbfa6bbf6;hb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460;hpb=a2f2cde95194a17fe2401ae58c92b5494bac599f diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm index e4cd7f5..d556068 100644 --- a/lib/Catalyst/Helper.pm +++ b/lib/Catalyst/Helper.pm @@ -40,7 +40,7 @@ sub get_file { $cache{$class} = eval "package $class; "; } my $data = $cache{$class}; - my @files = split /^__(.+)__\n/m, $data; + my @files = split /^__(.+)__\r?\n/m, $data; shift @files; while (@files) { my ( $name, $content ) = splice @files, 0, 2; @@ -64,7 +64,7 @@ sub mk_app { $self->{appprefix} = lc $self->{dir}; $self->{appprefix} =~ s/-/_/g; $self->{startperl} = $Config{startperl}; - $self->{scriptgen} = $Catalyst::CATALYST_SCRIPT_GEN; + $self->{scriptgen} = $Catalyst::CATALYST_SCRIPT_GEN || 4; $self->{author} = $self->{author} = $ENV{'AUTHOR'} || eval { @{ [ getpwuid($<) ] }[6] } || 'Catalyst developer'; @@ -103,13 +103,12 @@ sub mk_component { my @args = @_; my $class = "Catalyst::Helper::$helper"; eval "require $class"; - - if ( $@ ) { - Catalyst::Exception->throw( - message => qq/Couldn't load helper "$class", "$@"/ - ); + + if ($@) { + Catalyst::Exception->throw( + message => qq/Couldn't load helper "$class", "$@"/ ); } - + if ( $class->can('mk_stuff') ) { return 1 unless $class->mk_stuff( $self, @args ); } @@ -136,7 +135,7 @@ sub mk_component { my @path = split /\:\:/, $name; $file = pop @path; $path = File::Spec->catdir( $path, @path ); - mkpath $path; + mkpath [$path]; } $file = File::Spec->catfile( $path, "$file.pm" ); $self->{file} = $file; @@ -152,13 +151,12 @@ sub mk_component { $comp = 'Controller' if $type eq 'C'; my $class = "Catalyst::Helper::$comp\::$helper"; eval "require $class"; - - if ( $@ ) { - Catalyst::Exception->throw( - message => qq/Couldn't load helper "$class", "$@"/ - ); - } - + + if ($@) { + Catalyst::Exception->throw( + message => qq/Couldn't load helper "$class", "$@"/ ); + } + if ( $class->can('mk_compclass') ) { return 1 unless $class->mk_compclass( $self, @args ); } @@ -191,14 +189,12 @@ sub mk_dir { print qq/ exists "$dir"\n/; return 0; } - if ( mkpath $dir) { + if ( mkpath [$dir] ) { print qq/created "$dir"\n/; return 1; } - - Catalyst::Exception->throw( - message => qq/Couldn't create "$dir", "$!"/ - ); + + Catalyst::Exception->throw( message => qq/Couldn't create "$dir", "$!"/ ); } =head3 mk_file @@ -211,17 +207,20 @@ sub mk_file { my ( $self, $file, $content ) = @_; if ( -e $file ) { print qq/ exists "$file"\n/; - return 0; + return 0 unless $self->{'.newfiles'}; + if ( my $f = IO::File->new("< $file") ) { + my $oldcontent = join( '', (<$f>) ); + return 0 if $content eq $oldcontent; + } + $file .= '.new'; } if ( my $f = IO::File->new("> $file") ) { print $f $content; print qq/created "$file"\n/; return 1; } - - Catalyst::Exception->throw( - message => qq/Couldn't create "$file", "$!"/ - ); + + Catalyst::Exception->throw( message => qq/Couldn't create "$file", "$!"/ ); } =head3 next_test @@ -238,7 +237,7 @@ sub next_test { $prefix = $prefix; $tname = $prefix . '.t'; $self->{prefix} = $prefix; - $prefix = lc $prefix; + $prefix = lc $prefix; $prefix =~ s/-/\//g; $self->{uri} = $prefix; } @@ -261,7 +260,9 @@ sub render_file { my $template = $self->get_file( ( caller(0) )[0], $file ); return 0 unless $template; my $output; - $t->process( \$template, { %{$self}, %$vars }, \$output ); + $t->process( \$template, { %{$self}, %$vars }, \$output ) + || Catalyst::Exception->throw( + message => qq/Couldn't process "$file", / . $t->error() ); $self->mk_file( $path, $output ); } @@ -460,14 +461,27 @@ Catalyst based application. sub default : Private { my ( $self, $c ) = @_; - $c->res->output('Congratulations, [% name %] is on Catalyst!'); + + # Hello World + $c->response->output('Congratulations, [% name %] is on Catalyst!'); } +#=item end +# +#=cut +# +#sub end : Private { +# my ( $self, $c ) = @_; +# +# # Forward to View unless response body is already defined +# $c->forward('MyApp::V::') unless $c->response->body; +#} + =back =head1 AUTHOR -[%author%] +[% author %] =head1 LICENSE @@ -639,14 +653,21 @@ use FindBin; use lib "$FindBin::Bin/../lib"; use [% name %]; +my $fork = 0; my $help = 0; +my $host = undef; my $port = 3000; -GetOptions( 'help|?' => \$help, 'port=s' => \$port ); +GetOptions( + 'fork' => \$fork, + 'help|?' => \$help, + 'host=s' => \$host, + 'port=s' => \$port +); pod2usage(1) if $help; -[% name %]->run($port); +[% name %]->run( $port, $host, $fork ); 1; @@ -659,7 +680,9 @@ pod2usage(1) if $help; [% appprefix %]_server.pl [options] Options: + -f -fork handle each request in a new process -? -help display this help and exits + -host host (defaults to all) -p -port port (defaults to 3000) See also: @@ -748,12 +771,14 @@ use Pod::Usage; use Catalyst::Helper; my $help = 0; +my $nonew = 0; -GetOptions( 'help|?' => \$help ); +GetOptions( 'help|?' => \$help, + 'nonew' => \$nonew ); pod2usage(1) if ( $help || !$ARGV[0] ); -my $helper = Catalyst::Helper->new; +my $helper = Catalyst::Helper->new({'.newfiles' => !$nonew}); pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV ); 1; @@ -768,6 +793,7 @@ pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV ); Options: -help display this help and exits + -nonew don't create a .new file where a file to be created exists Examples: [% appprefix %]_create.pl controller My::Controller @@ -786,6 +812,10 @@ pod2usage(1) unless $helper->mk_component( '[% name %]', @ARGV ); 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 behaviour can be supressed with the C<-nonew> option. + =head1 AUTHOR Sebastian Riedel, C @@ -826,10 +856,13 @@ Catalyst component. sub default : Private { my ( $self, $c ) = @_; - $c->res->output('Congratulations, [% class %] is on Catalyst!'); + + # Hello World + $c->response->output('Congratulations, [% class %] is on Catalyst!'); } =back + [% END %] =head1 AUTHOR