X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FModule%2FInstall%2FCatalyst.pm;h=95d97b88199cd76d9903bc0b75db049dd55c3338;hb=b7bdc3ac61ad3810593feaab0b14497226069815;hp=70c03c8d849307e347882a9616cd079434caa35f;hpb=20682ed82be3b342c7a64bdbbb4e2752be3d688c;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Module/Install/Catalyst.pm b/lib/Module/Install/Catalyst.pm
index 70c03c8..95d97b8 100644
--- a/lib/Module/Install/Catalyst.pm
+++ b/lib/Module/Install/Catalyst.pm
@@ -11,6 +11,8 @@ use FindBin;
 use File::Copy::Recursive 'rcopy';
 use File::Spec ();
 
+my $SAFETY = 0;
+
 our @IGNORE =
   qw/Build Build.PL Changes MANIFEST META.yml Makefile.PL Makefile README
   _build blib lib script t inc/;
@@ -35,6 +37,22 @@ L<Module::Install> extension for Catalyst.
 
 =head1 METHODS
 
+=head2 catalyst
+
+=cut
+
+sub catalyst {
+    my $self = shift;
+    print <<EOF;
+*** Module::Install::Catalyst
+EOF
+    $self->catalyst_files;
+    $self->catalyst_par;
+    print <<EOF;
+*** Module::Install::Catalyst finished.
+EOF
+}
+
 =head2 catalyst_files
 
 =cut
@@ -86,9 +104,8 @@ sub catalyst_ignore {
 # Workaround for a namespace conflict
 sub catalyst_par {
     my ( $self, $par ) = @_;
-    print <<EOF;
-*** Module::Install::Catalyst
-EOF
+    return if $SAFETY;
+    $SAFETY++;
     my $name  = $self->name;
     my $usage = $USAGE;
     $usage =~ s/"/\\"/g;
@@ -100,7 +117,6 @@ catalyst_par :: all
 EOF
     print <<EOF;
 Please run "make catalyst_par" to create the PAR package!
-*** Module::Install::Catalyst finished.
 EOF
 }
 
@@ -192,6 +208,7 @@ sub _catalyst_par {
     die "Please install Module::ScanDeps\n" if $@;
 
     my $root = $FindBin::Bin;
+    $class_name =~ s/-/::/g;
     my $path = File::Spec->catfile( 'blib', 'lib', split( '::', $class_name ) );
     $path .= '.pm';
     unless ( -f $path ) {