- Fixes for rt.cpan #17322 and #17331

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Helper.pm

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 2ad1fdf..8d3fbb7 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -2,6 +2,7 @@ package Catalyst::Helper;
 
 use strict;
 use base 'Class::Accessor::Fast';
+use Config;
 use File::Spec;
 use File::Path;
 use IO::File;
@@ -69,7 +70,7 @@ sub mk_app {
     $self->{dir} =~ s/\:\:/-/g;
     $self->{script}    = File::Spec->catdir( $self->{dir}, 'script' );
     $self->{appprefix} = Catalyst::Utils::appprefix($name);
-    $self->{startperl} = '#!/usr/bin/perl -w';
+    $self->{startperl} = "#!$Config{perlpath} -w";
     $self->{scriptgen} = $Catalyst::CATALYST_SCRIPT_GEN || 4;
     $self->{author}    = $self->{author} = $ENV{'AUTHOR'}
       || eval { @{ [ getpwuid($<) ] }[6] }
@@ -98,7 +99,7 @@ sub mk_app {
         $self->_mk_test;
         $self->_mk_create;
     }
-    return 1;
+    return $self->{dir};
 }
 
 =head3 mk_component
@@ -115,7 +116,7 @@ sub mk_component {
     $self->{author} = $self->{author} = $ENV{'AUTHOR'}
       || eval { @{ [ getpwuid($<) ] }[6] }
       || 'A clever guy';
-    $self->{base} = File::Spec->catdir( $FindBin::Bin, '..' );
+    $self->{base} ||= File::Spec->catdir( $FindBin::Bin, '..' );
     unless ( $_[0] =~ /^(?:model|view|controller)$/i ) {
         my $helper = shift;
         my @args   = @_;
@@ -524,7 +525,8 @@ use warnings;
 # 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
+# Static::Simple: will serve static files from the application's root 
+# directory
 #
 use Catalyst qw/-Debug Static::Simple/;
 
@@ -533,7 +535,7 @@ our $VERSION = '0.01';
 #
 # Configure the application
 #
-__PACKAGE__->config( name => '[% name %]' );
+__PACKAGE__->config( { name => '[% name %]' } );
 
 #
 # Start the application
@@ -554,6 +556,8 @@ Catalyst based application.
 
 =head1 METHODS
 
+=cut
+
 =head2 default
 
 =cut
@@ -597,19 +601,16 @@ it under the same terms as Perl itself.
 __makefile__
 use inc::Module::Install;
 
-name('[% dir %]');
-abstract('Catalyst Application');
-author('[% author %]');
-version_from('[% path %]');
-license('perl');
-
-requires( Catalyst => '5.57' );
+name '[% dir %]';
+all_from '[% path %]';
 
-install_script( glob('script/*.pl') );
+requires Catalyst => '5.62';
 
-catalyst_files();
+catalyst;
 
-&WriteAll;
+install_script glob('script/*.pl');
+auto_install;
+WriteAll;
 __readme__
 Run script/[% appprefix %]_server.pl to test the application.
 __changes__
@@ -619,7 +620,7 @@ This file documents the revision history for Perl extension [% name %].
         - 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__
@@ -734,7 +735,7 @@ pod2usage(1) if $help;
                  (requires -listen)
    -d -daemon    daemonize (requires -listen)
    -M -manager   specify alternate process manager
-                 (FCGI::ProcessManager sub-class)
+                 (FCGI::ProcManager sub-class)
                  or empty string to disable
 
 =head1 DESCRIPTION
@@ -800,6 +801,8 @@ 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, {