use File::Spec::Functions qw(
catdir splitpath splitdir catpath rel2abs abs2rel
);
+use File::Spec::Unix;
use File::Copy qw(copy);
use File::Path qw(mkpath rmtree);
use B qw(perlstring);
-our $VERSION = '0.009006'; # 0.9.6
+our $VERSION = '0.009012'; # 0.9.012
$VERSION = eval $VERSION;
sub call_parser {
my $self = shift;
- my ( $args, $options ) = @_;
+ my ($args, $options) = @_;
local *ARGV = [ @{$args} ];
- $self->{'option_parser'}->getoptions( @{$options} );
+ $self->{option_parser}->getoptions(@$options);
return [ @ARGV ];
}
sub script_command_trace {
my ($self, $args) = @_;
- $args = $self->call_parser( $args => [
+ $args = $self->call_parser($args => [
'to=s' => \my $file,
'to-stderr' => \my $to_stderr,
'use=s' => \my @additional_use
- ] );
+ ]);
die "Can't use to and to-stderr on same call" if $file && $to_stderr;
$file ||= 'fatpacker.trace';
+
if (!$to_stderr and -e $file) {
unlink $file or die "Couldn't remove old trace file: $!";
}
my $arg = do {
if ($to_stderr) {
- "=>&STDERR"
+ ">&STDERR"
} elsif ($file) {
- "=>>${file}"
+ ">>${file}"
}
};
- if(@additional_use) {
- $arg .= "," . join ",", @additional_use;
- }
+ $self->trace(
+ use => \@additional_use,
+ args => $args,
+ output => $arg,
+ );
+}
- {
- local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$arg;
- system $^X, @$args;
+sub trace {
+ my ($self, %opts) = @_;
+
+ my $capture;
+
+ my $output = $opts{output} || do {
+ $capture++; '>&STDOUT'
+ };
+
+ my $trace_opts = join ',', $output||'>&STDOUT', @{$opts{use}||[]};
+
+ local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace='.$trace_opts;
+
+ my @args = @{$opts{args}||[]};
+
+ if ($output) {
+ # user specified output target, JFDI
+ system $^X, @args;
+ return;
+ } else {
+ # no output target specified, slurp
+ open my $out_fh, '-|', $^X, @args;
+ return do { local $/; <$out_fh> };
}
}
sub packlists_containing {
my ($self, $targets) = @_;
my @targets = @$targets;
- require $_ for @targets;
+ foreach my $t (@targets) {
+ require $t;
+ }
my @search = grep -d $_, map catdir($_, 'auto'), @INC;
my %pack_rev;
my $cwd = cwd;
find(sub {
return unless -f $_;
!/\.pm$/ and warn "File ${File::Find::name} isn't a .pm file - can't pack this and if you hoped we were going to things may not be what you expected later\n" and return;
- $files{abs2rel($File::Find::name,$dir)} = do {
+ $files{File::Spec::Unix->abs2rel($File::Find::name,$dir)} = do {
local (@ARGV, $/) = ($File::Find::name); <>
};
+ close ARGV;
}, $dir);
}
my $start = stripspace <<' END_START';
unshift @INC, sub {
if (my $fat = $fatpacked{$_[1]}) {
+ if ($] < 5.008) {
+ return sub {
+ return 0 unless length $fat;
+ $fat =~ s/^([^\n]*\n?)//;
+ $_ = $1;
+ return 1;
+ };
+ }
open my $fh, '<', \$fat
or die "FatPacker error loading $_[1] (could be a perl installation issue?)";
return $fh;
print join "\n", $start, @segments, $end;
}
+=encoding UTF-8
+
=head1 NAME
App::FatPacker - pack your dependencies onto your script file
=head2 CONTRIBUTORS
-None as yet, though I probably owe lots of people thanks for ideas. Yet
+miyagawa - Tatsuhiko Miyagawa (cpan:MIYAGAWA) <miyagawa@bulknews.net>
+
+tokuhirom - MATSUNO★Tokuhiro (cpan:TOKUHIROM) <tokuhirom@gmail.com>
+
+dg - David Leadbeater (cpan:DGL) <dgl@dgl.cx>
+
+gugod - 劉康民 (cpan:GUGOD) <gugod@cpan.org>
+
+t0m - Tomas Doran (cpan:BOBTFISH) <bobtfish@bobtfish.net>
+
+sawyer - Sawyer X (cpan:XSAWYERX) <xsawyerx@cpan.org>
+
+ether - Karen Etheridge (cpan:ETHER) <ether@cpan.org>
+
+Mithaldu - Christian Walde (cpan:MITHALDU) <walde.christian@googlemail.com>
+
+Many more people are probably owed thanks for ideas. Yet
another doc nit to fix.
=head1 COPYRIGHT