use warnings FATAL => 'all';
use 5.008001;
use Getopt::Long;
-use Capture::Tiny ();
use Cwd qw(cwd);
use File::Find qw(find);
use File::Spec::Functions qw(
use File::Path qw(mkpath rmtree);
use B qw(perlstring);
-our $VERSION = '0.009006'; # 0.9.6
+our $VERSION = '0.009009'; # 0.9.9
$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}"
}
};
$self->trace(
- use => \@additional_use,
- args => $args,
+ use => \@additional_use,
+ args => $args,
output => $arg,
);
}
sub trace {
my ($self, %opts) = @_;
- my $use = defined $opts{'use'} ? $opts{'use'} : [];
- my $args = defined $opts{'args'} ? $opts{'args'} : [];
- my $output = $opts{'output'};
+
my $capture;
- # if the user doesn't provide output, they want to actually
- # capture the output and receive it back
- if (!$output) {
- # throw to STDOUT to differ from STDERR
- $output .= '>&STDOUT';
+ my $output = $opts{output} || do {
+ $capture++; '>&STDOUT'
+ };
- # raise capture flag
- $capture++;
- }
+ my $trace_opts = join ',', $output||'>&STDOUT', @{$opts{use}||[]};
- if(@$use) {
- $output .= "," . join ",", @$use;
- }
+ local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace='.$trace_opts;
- my $trace_sub = sub {
- local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace='.$output;
- system $^X, @$args;
- };
+ my @args = @{$opts{args}||[]};
- if ($capture) {
- # capture both STDOUT and STDERR so we could throw away STDERR
- # STDOUT will contain the trace
- # STDERR will contain the "syntax OK" statement
- my ($stdout, $stderr) = Capture::Tiny::capture {$trace_sub->()};
- return $stdout;
+ if ($output) {
+ # user specified output target, JFDI
+ system $^X, @args;
+ return;
} else {
- $trace_sub->();
- }
+ # no output target specified, slurp
+ open my $out_fh, '-|', $^X, @args;
+ return do { local $/; <$out_fh> };
+ }
}
sub script_command_packlists_for {
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;
=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>
+
+Many more people are probably owed thanks for ideas. Yet
another doc nit to fix.
=head1 COPYRIGHT