X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FModule%2FInstall%2FCatalyst.pm;h=e4f4264d036846a07671c49bb98f84b4776dacec;hb=951da69cf3ddde283b6d5a082c1287ce345a51ac;hp=416dd37ee2c7dcccdede5a928786960e7eeaf819;hpb=a2e038a1e9cbc0f1ea32b7087e6b47efe3af082f;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Module/Install/Catalyst.pm b/lib/Module/Install/Catalyst.pm index 416dd37..e4f4264 100644 --- a/lib/Module/Install/Catalyst.pm +++ b/lib/Module/Install/Catalyst.pm @@ -10,9 +10,11 @@ use File::Spec (); our @IGNORE = qw/Build Build.PL Changes MANIFEST META.yml Makefile.PL Makefile README _build blib lib script t inc/; +our @CLASSES = (); our $ENGINE = 'CGI'; our $CORE = 0; our $MULTIARCH = 0; +our $USAGE; =head1 NAME @@ -76,23 +78,88 @@ sub catalyst_ignore { =cut -sub catalyst_par { +# Workaround for a namespace conflict +sub catalyst_par { Catalyst::Module::Install::_catalyst_par(@_) } + +=head2 catalyst_par_core($core) + +=cut + +sub catalyst_par_core { + my ( $self, $core ) = @_; + $core ? ( $CORE = $core ) : $core++; +} + +=head2 catalyst_par_classes(@clases) + +=cut + +sub catalyst_par_classes { + my ( $self, @classes ) = @_; + push @CLASSES, @classes; +} + +=head2 catalyst_par_engine($engine) + +=cut + +sub catalyst_par_engine { + my ( $self, $engine ) = @_; + $ENGINE = $engine; +} + +=head2 catalyst_par_multiarch($multiarch) + +=cut + +sub catalyst_par_multiarch { + my ( $self, $multiarch ) = @_; + $multiarch ? ( $MULTIARCH = $multiarch ) : $multiarch++; +} + +=head2 catalyst_par_usage($usage) + +=cut + +sub catalyst_par_usage { + my ( $self, $usage ) = @_; + $USAGE = $usage; +} + +package Catalyst::Module::Install; + +use strict; +use FindBin; +use File::Copy::Recursive 'rmove'; +use File::Spec (); + +sub _catalyst_par { my ( $self, $par ) = @_; - $par ||= 'application.par'; - my $engine = $ENGINE || 'CGI'; + my $name = $self->name; + $name =~ s/::/_/g; + $name = lc $name; + $par ||= "$name.par"; + my $engine = $Module::Install::Catalyst::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 ) ); + $path .= '.pm'; + unless ( -f $path ) { + print qq/Not writing PAR, "$path" doesn't exist\n/; + return 0; + } + print qq/Writing PAR "$par"\n/; chdir File::Spec->catdir( $root, 'blib' ); my $par_pl = 'par.pl'; @@ -101,37 +168,78 @@ sub catalyst_par { my $version = $Catalyst::VERSION; my $class = $self->name; - my $tmp_file = IO::File->new("> $par_pl"); + my $classes = ''; + $classes .= " require $_;\n" for @Catalyst::Module::Install::CLASSES; + + unlink $par_pl; + + my $usage = $Module::Install::Catalyst::USAGE || <<"EOF"; +Usage: + parl $par [script] [arg1 arg2 arg3...] + $name [script] [arg1 arg2 arg3...] +EOF + + 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::PAR; -require Catalyst::Build; -require Catalyst::Test; -require Catalyst::Engine::HTTP; -require Catalyst::Engine::CGI; -require Catalyst::Controller; -require Catalyst::Model; -require Catalyst::View; +if ( \$ENV{PAR_PROGNAME} ) { + my \$zip = \$PAR::LibCache{\$ENV{PAR_PROGNAME}} + || Archive::Zip->new(__FILE__); + if (\@ARGV == 0 ) { + 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; # Create package - local $SIG{__WARN__} = sub { }; - open my $olderr, '>&STDERR'; - open STDERR, '>', File::Spec->devnull; + # local $SIG{__WARN__} = sub { }; + # open my $olderr, '>&STDERR'; + # open STDERR, '>', File::Spec->devnull; my %opt = ( 'x' => 1, 'n' => 0, 'o' => $par, 'a' => [ grep( !/par.pl/, glob '.' ) ], 'p' => 1, - 'B' => $CORE, - 'm' => $MULTIARCH + 'B' => $Module::Install::Catalyst::CORE, + 'm' => $Module::Install::Catalyst::MULTIARCH ); App::Packer::PAR->new( frontend => 'Module::ScanDeps', @@ -140,38 +248,13 @@ EOF backopts => \%opt, args => ['par.pl'], )->go; - open STDERR, '>&', $olderr; - - unlink $par_pl; - chdir $root; - rmove File::Spec->catfile( 'blib', $par ), $par; -} -=head2 catalyst_par_core($core) + # open STDERR, '>&', $olderr; -=cut - -sub catalyst_par_core { - my ( $self, $core ) = @_; - $CORE = $core; -} - -=head2 catalyst_par_engine($engine) - -=cut - -sub catalyst_par_engine { - my ( $self, $engine ) = @_; - $ENGINE = $engine; -} - -=head2 catalyst_par_multiarch($multiarch) - -=cut - -sub catalyst_par_multiarch { - my ( $self, $multiarch ) = @_; - $MULTIARCH = $multiarch; + # unlink $par_pl; + chdir $root; + rmove( File::Spec->catfile( 'blib', $par ), $par ); + return 1; } =head1 AUTHOR