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(
}
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,
- args => $args,
);
}
sub trace {
my ($self, %opts) = @_;
+ my $use = defined $opts{'use'} ? $opts{'use'} : [];
+ my $args = defined $opts{'args'} ? $opts{'args'} : [];
my $output = $opts{'output'};
- my $args = $opts{'args'};
+ 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';
+
+ # raise capture flag
+ $capture++;
+ }
- {
- local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$output;
- system $^X, @$args;
+ if(@$use) {
+ $output .= "," . join ",", @$use;
}
+
+ my $trace_sub = sub {
+ local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace='.$output;
+ system $^X, @$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;
+ } else {
+ $trace_sub->();
+ }
}
sub script_command_packlists_for {