X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper.pm;h=bfdfefc6def01f3e24ff814ffefb8e359d43dd76;hb=2e4a6ec399b96865713c7e08c8dcb10dbd7ec5da;hp=6aa714cbeffeeef98efb2484f26cb8236af545f0;hpb=b1882228082cf4c6c231cacf16b54911b46fc22b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 6aa714c..bfdfefc 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -74,12 +74,12 @@ sub mk_app {
     $self->{author}    = $self->{author} = $ENV{'AUTHOR'}
       || eval { @{ [ getpwuid($<) ] }[6] }
       || 'Catalyst developer';
-      
+
     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 ) {
+    my $gen_makefile = ( $self->{scripts} )  ? 0 : 1;
+    my $gen_app = ( $self->{scripts} || $self->{makefile} ) ? 0 : 1;
+
+    if ($gen_app) {
         $self->_mk_dirs;
         $self->_mk_appclass;
         $self->_mk_readme;
@@ -88,17 +88,17 @@ sub mk_app {
         $self->_mk_images;
         $self->_mk_favicon;
     }
-    if ( $gen_makefile ) { 
+    if ($gen_makefile) {
         $self->_mk_makefile;
     }
-    if ( $gen_scripts ) {
+    if ($gen_scripts) {
         $self->_mk_cgi;
         $self->_mk_fastcgi;
         $self->_mk_server;
         $self->_mk_test;
         $self->_mk_create;
     }
-    return 1;
+    return $self->{dir};
 }
 
 =head3 mk_component
@@ -115,7 +115,8 @@ 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, '..' );
+    die $self->{base};
     unless ( $_[0] =~ /^(?:model|view|controller)$/i ) {
         my $helper = shift;
         my @args   = @_;
@@ -228,9 +229,10 @@ sub mk_file {
     my ( $self, $file, $content ) = @_;
     if ( -e $file ) {
         print qq/ exists "$file"\n/;
-        return 0 unless ( $self->{'.newfiles'}
-                       || $self->{scripts}
-                       || $self->{makefile} );
+        return 0
+          unless ( $self->{'.newfiles'}
+            || $self->{scripts}
+            || $self->{makefile} );
         if ( $self->{'.newfiles'} ) {
             if ( my $f = IO::File->new("< $file") ) {
                 my $oldcontent = join( '', (<$f>) );
@@ -343,13 +345,13 @@ sub _mk_makefile {
     $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' )
-        );
-    }    
+        $self->_deprecate_file(
+            File::Spec->catdir( $self->{dir}, 'Build.PL' ) );
+    }
 }
 
 sub _mk_readme {
@@ -452,7 +454,6 @@ sub _deprecate_file {
     my ( $self, $file ) = @_;
     if ( -e $file ) {
         my $oldcontent;
-        print qq/ deprecating "$file"\n/;
         if ( my $f = IO::File->new("< $file") ) {
             $oldcontent = join( '', (<$f>) );
         }
@@ -465,10 +466,10 @@ sub _deprecate_file {
             print qq/removed "$file"\n/;
             return 1;
         }
-        Catalyst::Exception->throw( 
+        Catalyst::Exception->throw(
             message => qq/Couldn't create "$file", "$!"/ );
     }
-}    
+}
 
 =head1 HELPERS
 
@@ -603,12 +604,14 @@ author('[% author %]');
 version_from('[% path %]');
 license('perl');
 
-requires( Catalyst => '5.57' );
+include('ExtUtils::AutoInstall');
 
-install_script( glob('script/*.pl') );
+requires( Catalyst => '5.58' );
 
 catalyst_files();
 
+install_script( glob('script/*.pl') );
+auto_install();
 &WriteAll;
 __readme__
 Run script/[% appprefix %]_server.pl to test the application.