Updated makefile template

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

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 57a5a2d..49122a4 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -117,7 +117,6 @@ sub mk_component {
       || eval { @{ [ getpwuid($<) ] }[6] }
       || 'A clever guy';
     $self->{base} ||= File::Spec->catdir( $FindBin::Bin, '..' );
-    die $self->{base};
     unless ( $_[0] =~ /^(?:model|view|controller)$/i ) {
         my $helper = shift;
         my @args   = @_;
@@ -556,6 +555,8 @@ Catalyst based application.
 
 =head1 METHODS
 
+=cut
+
 =head2 default
 
 =cut
@@ -599,21 +600,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');
-
-include('ExtUtils::AutoInstall');
+name '[% dir %]';
+all_from '[% path %]';
 
-requires( Catalyst => '5.58' );
+requires Catalyst => '5.62';
 
-catalyst_files();
+catalyst;
 
-install_script( glob('script/*.pl') );
-auto_install();
-&WriteAll;
+install_script glob('script/*.pl');
+auto_install;
+WriteAll;
 __readme__
 Run script/[% appprefix %]_server.pl to test the application.
 __changes__
@@ -623,7 +619,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__
@@ -804,6 +800,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, {