Updated PAR support to use "make catalyst_par", packages are no longer written by...

[catagits/Catalyst-Runtime.git] / lib / Module / Install / Catalyst.pm

diff --git a/lib/Module/Install/Catalyst.pm b/lib/Module/Install/Catalyst.pm
index 066d979..70c03c8 100644 (file)
--- a/lib/Module/Install/Catalyst.pm
+++ b/lib/Module/Install/Catalyst.pm
@@ -1,7 +1,11 @@
 package Module::Install::Catalyst;
 
 use strict;
-use base 'Module::Install::Base';
+
+our @ISA;
+require Module::Install::Base;
+@ISA = qw/Module::Install::Base/;
+
 use File::Find;
 use FindBin;
 use File::Copy::Recursive 'rcopy';
@@ -14,6 +18,8 @@ our @CLASSES   = ();
 our $ENGINE    = 'CGI';
 our $CORE      = 0;
 our $MULTIARCH = 0;
+our $SCRIPT;
+our $USAGE;
 
 =head1 NAME
 
@@ -48,7 +54,7 @@ sub catalyst_files {
         push @files, $name;
     }
     closedir CATDIR;
-    my @path = split '::', $self->name;
+    my @path = split '-', $self->name;
     for my $orig (@files) {
         my $path = File::Spec->catdir( 'blib', 'lib', @path, $orig );
         rcopy( $orig, $path );
@@ -78,7 +84,25 @@ sub catalyst_ignore {
 =cut
 
 # Workaround for a namespace conflict
-sub catalyst_par { Catalyst::Module::Install::_catalyst_par(@_) }
+sub catalyst_par {
+    my ( $self, $par ) = @_;
+    print <<EOF;
+*** Module::Install::Catalyst
+EOF
+    my $name  = $self->name;
+    my $usage = $USAGE;
+    $usage =~ s/"/\\"/g;
+    my $class_string = join "', '", @CLASSES;
+    $class_string = "'$class_string'" if $class_string;
+    $self->postamble(<<EOF);
+catalyst_par :: all
+\t\$(NOECHO) \$(PERL) -Ilib -Minc::Module::Install -MModule::Install::Catalyst -e"Catalyst::Module::Install::_catalyst_par( '$par', '$name', { CLASSES => [$class_string], CORE => $CORE, ENGINE => '$ENGINE', MULTIARCH => $MULTIARCH, SCRIPT => '$SCRIPT', USAGE => q#$usage# } )"
+EOF
+    print <<EOF;
+Please run "make catalyst_par" to create the PAR package!
+*** Module::Install::Catalyst finished.
+EOF
+}
 
 =head2 catalyst_par_core($core)
 
@@ -86,7 +110,7 @@ sub catalyst_par { Catalyst::Module::Install::_catalyst_par(@_) }
 
 sub catalyst_par_core {
     my ( $self, $core ) = @_;
-    $CORE = $core;
+    $core ? ( $CORE = $core ) : $CORE++;
 }
 
 =head2 catalyst_par_classes(@clases)
@@ -113,7 +137,25 @@ sub catalyst_par_engine {
 
 sub catalyst_par_multiarch {
     my ( $self, $multiarch ) = @_;
-    $MULTIARCH = $multiarch;
+    $multiarch ? ( $MULTIARCH = $multiarch ) : $MULTIARCH++;
+}
+
+=head2 catalyst_par_script($script)
+
+=cut
+
+sub catalyst_par_script {
+    my ( $self, $script ) = @_;
+    $SCRIPT = $script;
+}
+
+=head2 catalyst_par_usage($usage)
+
+=cut
+
+sub catalyst_par_usage {
+    my ( $self, $usage ) = @_;
+    $USAGE = $usage;
 }
 
 package Catalyst::Module::Install;
@@ -124,26 +166,33 @@ use File::Copy::Recursive 'rmove';
 use File::Spec ();
 
 sub _catalyst_par {
-    my ( $self, $par ) = @_;
+    my ( $par, $class_name, $opts ) = @_;
+
+    my $ENGINE    = $opts->{ENGINE};
+    my $CLASSES   = $opts->{CLASSES} || [];
+    my $USAGE     = $opts->{USAGE};
+    my $SCRIPT    = $opts->{SCRIPT};
+    my $MULTIARCH = $opts->{MULTIARCH};
+    my $CORE      = $opts->{CORE};
 
-    my $name = $self->name;
+    my $name = $class_name;
     $name =~ s/::/_/g;
     $name = lc $name;
     $par ||= "$name.par";
-    my $engine = $Module::Install::Catalyst::ENGINE || 'CGI';
+    my $engine = $ENGINE || 'CGI';
 
     # Check for PAR
     eval "use PAR ()";
-    die "Please install PAR" if $@;
+    die "Please install PAR\n" if $@;
     eval "use PAR::Packer ()";
-    die "Please install PAR::Packer" if $@;
+    die "Please install PAR::Packer\n" if $@;
     eval "use App::Packer::PAR ()";
-    die "Please install App::Packer::PAR" if $@;
+    die "Please install App::Packer::PAR\n" if $@;
     eval "use Module::ScanDeps ()";
-    die "Please install Module::ScanDeps" if $@;
+    die "Please install Module::ScanDeps\n" if $@;
 
     my $root = $FindBin::Bin;
-    my $path = File::Spec->catfile( 'blib', 'lib', split( '::', $self->name ) );
+    my $path = File::Spec->catfile( 'blib', 'lib', split( '::', $class_name ) );
     $path .= '.pm';
     unless ( -f $path ) {
         print qq/Not writing PAR, "$path" doesn't exist\n/;
@@ -156,25 +205,71 @@ sub _catalyst_par {
     unlink $par_pl;
 
     my $version = $Catalyst::VERSION;
-    my $class   = $self->name;
+    my $class   = $class_name;
 
     my $classes = '';
-    $classes .= "require $_;\n" for @Catalyst::Module::Install::CLASSES;
-    my $tmp_file = IO::File->new(" > $par_pl ");
+    $classes .= "    require $_;\n" for @$CLASSES;
+
+    unlink $par_pl;
+
+    my $usage = $USAGE || <<"EOF";
+Usage:
+    [parl] $name\[.par] [script] [arguments]
+
+  Examples:
+    parl $name.par $name\_server.pl -r
+    myapp $name\_cgi.pl
+EOF
+
+    my $script   = $SCRIPT;
+    my $tmp_file = IO::File->new("> $par_pl ");
     print $tmp_file <<"EOF";
-die "$class on Catalyst $version\n" if \$0 !~ /par.pl\.\\w+\$/;
-BEGIN { \$ENV{CATALYST_ENGINE} = '$engine' };
-use lib "lib";
-require $class;
-import $class;
-require Catalyst::Helper;
-require Catalyst::Test;
-require Catalyst::Engine::HTTP;
-require Catalyst::Engine::CGI;
-require Catalyst::Controller;
-require Catalyst::Model;
-require Catalyst::View;
-$classes
+if ( \$ENV{PAR_PROGNAME} ) {
+    my \$zip = \$PAR::LibCache{\$ENV{PAR_PROGNAME}}
+        || Archive::Zip->new(__FILE__);
+    my \$script = '$script';
+    \$ARGV[0] ||= \$script if \$script;
+    if ( ( \@ARGV == 0 ) || ( \$ARGV[0] eq '-h' ) || ( \$ARGV[0] eq '-help' )) {
+        my \@members = \$zip->membersMatching('.*script/.*\.pl');
+        my \$list = "  Available scripts:\\n";
+        for my \$member ( \@members ) {
+            my \$name = \$member->fileName;
+            \$name =~ /(\\w+\\.pl)\$/;
+            \$name = \$1;
+            next if \$name =~ /^main\.pl\$/;
+            next if \$name =~ /^par\.pl\$/;
+            \$list .= "    \$name\\n";
+        }
+        die <<"END";
+$usage
+\$list
+END
+    }
+    my \$file = shift \@ARGV;
+    \$file =~ s/^.*[\\/\\\\]//;
+    \$file =~ s/\\.[^.]*\$//i;
+    my \$member = eval { \$zip->memberNamed("./script/\$file.pl") };
+    die qq/Can't open perl script "\$file"\n/ unless \$member;
+    PAR::_run_member( \$member, 1 );
+}
+else {
+    require lib;
+    import lib 'lib';
+    \$ENV{CATALYST_ENGINE} = '$engine';
+    require $class;
+    import $class;
+    require Catalyst::Helper;
+    require Catalyst::Test;
+    require Catalyst::Engine::HTTP;
+    require Catalyst::Engine::CGI;
+    require Catalyst::Controller;
+    require Catalyst::Model;
+    require Catalyst::View;
+    require Getopt::Long;
+    require Pod::Usage;
+    require Pod::Text;
+    $classes
+}
 EOF
     $tmp_file->close;
 
@@ -188,8 +283,8 @@ EOF
         'o' => $par,
         'a' => [ grep( !/par.pl/, glob '.' ) ],
         'p' => 1,
-        'B' => $Module::Install::Catalyst::CORE,
-        'm' => $Module::Install::Catalyst::MULTIARCH
+        'B' => $CORE,
+        'm' => $MULTIARCH
     );
     App::Packer::PAR->new(
         frontend  => 'Module::ScanDeps',