debug message for params

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

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index e86d6d5..700f4af 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;
@@ -34,6 +35,8 @@ sub mk_app {
     $self->_mk_dirs;
     $self->_mk_appclass;
     $self->_mk_makefile;
+    $self->_mk_readme;
+    $self->_mk_changes;
     $self->_mk_apptest;
     $self->_mk_server;
     $self->_mk_test;
@@ -143,39 +146,34 @@ sub mk_file {
 
 sub next_test {
     my ( $self, $tname ) = @_;
-    my $dir = $self->{test_dir};
-    my $num = '01';
-    for my $i (<$dir/*.t>) {
-        $i =~ /(\d+)[^\/]*.t$/;
-        my $j = $1 || $num;
-        $num = $j if $j > $num;
-    }
-    $num++;
-    $num = sprintf '%02d', $num;
-    if ($tname) { $tname = "$num$tname.t" }
+    if ($tname) { $tname = "$tname.t" }
     else {
         my $name   = $self->{name};
-        my $type   = $self->{type};
         my $prefix = $name;
         $prefix =~ s/::/_/g;
         $prefix         = lc $prefix;
-        $tname          = lc( $num . $type . '_' . $prefix . '.t' );
+        $tname          = $prefix . '.t';
         $self->{prefix} = $prefix;
     }
-    return "$dir/$tname";
+    my $dir  = $self->{test_dir};
+    my $type = lc $self->{type};
+    return File::Spec->catfile( $dir, $type, $tname );
 }
 
 sub _mk_dirs {
     my $self = shift;
     $self->mk_dir( $self->{dir} );
-    $self->{bin} = File::Spec->catdir( $self->{dir}, 'bin' );
-    $self->mk_dir( $self->{bin} );
+    $self->{script} = File::Spec->catdir( $self->{dir}, 'script' );
+    $self->mk_dir( $self->{script} );
     $self->{lib} = File::Spec->catdir( $self->{dir}, 'lib' );
     $self->mk_dir( $self->{lib} );
     $self->{root} = File::Spec->catdir( $self->{dir}, 'root' );
     $self->mk_dir( $self->{root} );
     $self->{t} = File::Spec->catdir( $self->{dir}, 't' );
     $self->mk_dir( $self->{t} );
+    $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' ) );
     $self->{class} = File::Spec->catdir( split( /\:\:/, $self->{name} ) );
     $self->{mod} = File::Spec->catdir( $self->{lib}, $self->{class} );
     $self->mk_dir( $self->{mod} );
@@ -253,11 +251,33 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     NAME         => '$name',
     VERSION_FROM => 'lib/$class.pm',
-    PREREQ_PM    => { Catalyst => 0 }
+    PREREQ_PM    => { Catalyst => 0 },
+    test         => { TESTS => join ' ', ( glob('t/*.t'), glob('t/*/*.t') ) }
 );
 EOF
 }
 
+sub _mk_readme {
+    my $self = shift;
+    my $dir  = $self->{dir};
+    $self->mk_file( "$dir\/README", <<"EOF");
+Run script/server.pl to test the application.
+EOF
+}
+
+sub _mk_changes {
+    my $self = shift;
+    my $name = $self->{name};
+    my $dir  = $self->{dir};
+    my $time = localtime time;
+    $self->mk_file( "$dir\/Changes", <<"EOF");
+This file documents the revision history for Perl extension $name.
+
+0.01  $time
+        - initial revision, generated by Catalyst
+EOF
+}
+
 sub _mk_apptest {
     my $self = shift;
     my $t    = $self->{t};
@@ -280,11 +300,11 @@ EOF
 }
 
 sub _mk_server {
-    my $self = shift;
-    my $name = $self->{name};
-    my $bin  = $self->{bin};
-    $self->mk_file( "$bin\/server", <<"EOF");
-#!/usr/bin/perl -w
+    my $self   = shift;
+    my $name   = $self->{name};
+    my $script = $self->{script};
+    $self->mk_file( "$script\/server.pl", <<"EOF");
+$Config{startperl} -w
 
 use strict;
 use Getopt::Long;
@@ -311,7 +331,7 @@ server - Catalyst Testserver
 
 =head1 SYNOPSIS
 
-server [options]
+server.pl [options]
 
  Options:
    -? -help    display this help and exits
@@ -338,15 +358,15 @@ the same terms as perl itself.
 
 =cut
 EOF
-    chmod 0700, "$bin/server";
+    chmod 0700, "$script/server.pl";
 }
 
 sub _mk_test {
-    my $self = shift;
-    my $name = $self->{name};
-    my $bin  = $self->{bin};
-    $self->mk_file( "$bin/test", <<"EOF");
-#!/usr/bin/perl -w
+    my $self   = shift;
+    my $name   = $self->{name};
+    my $script = $self->{script};
+    $self->mk_file( "$script/test.pl", <<"EOF");
+$Config{startperl} -w
 
 use strict;
 use Getopt::Long;
@@ -374,14 +394,14 @@ test - Catalyst Test
 
 =head1 SYNOPSIS
 
-test [options] uri
+test.pl [options] uri
 
  Options:
    -help    display this help and exits
 
  Examples:
-   perl test http://localhost/some_action
-   perl test /some_action
+   test.pl http://localhost/some_action
+   test.pl /some_action
 
  See also:
    perldoc Catalyst::Manual
@@ -404,15 +424,15 @@ the same terms as perl itself.
 
 =cut
 EOF
-    chmod 0700, "$bin/test";
+    chmod 0700, "$script/test.pl";
 }
 
 sub _mk_create {
-    my $self = shift;
-    my $name = $self->{name};
-    my $bin  = $self->{bin};
-    $self->mk_file( "$bin\/create", <<"EOF");
-#!/usr/bin/perl -w
+    my $self   = shift;
+    my $name   = $self->{name};
+    my $script = $self->{script};
+    $self->mk_file( "$script\/create.pl", <<"EOF");
+$Config{startperl} -w
 
 use strict;
 use Getopt::Long;
@@ -437,19 +457,19 @@ create - Create a new Catalyst Component
 
 =head1 SYNOPSIS
 
-create [options] model|view|controller name [helper] [options]
+create.pl [options] model|view|controller name [helper] [options]
 
  Options:
    -help    display this help and exits
 
  Examples:
-   perl create controller My::Controller
-   perl create view My::View
-   perl create view MyView TT
-   perl create view TT TT
-   perl create model My::Model
-   perl create model SomeDB CDBI dbi:SQLite:/tmp/my.db
-   perl create model AnotherDB CDBI dbi:Pg:dbname=foo root 4321
+   create.pl controller My::Controller
+   create.pl view My::View
+   create.pl view MyView TT
+   create.pl view TT TT
+   create.pl model My::Model
+   create.pl model SomeDB CDBI dbi:SQLite:/tmp/my.db
+   create.pl model AnotherDB CDBI dbi:Pg:dbname=foo root 4321
 
  See also:
    perldoc Catalyst::Manual
@@ -472,7 +492,7 @@ the same terms as perl itself.
 
 =cut
 EOF
-    chmod 0700, "$bin/create";
+    chmod 0700, "$script/create.pl";
 }
 
 sub _mk_compclass {