X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FApp%2FFatPacker.pm;h=433cc0f80592c678e3638876b78462b8bb917872;hb=878b80daf5eac90cbd019cd0e38b35ee7a0b7492;hp=ccd01769c6c473c3964032b83784ba2488a63a66;hpb=7a3662c8657b2d0b15a467e7b09cbd449bc5bb03;p=p5sagit%2FApp-FatPacker.git

diff --git a/lib/App/FatPacker.pm b/lib/App/FatPacker.pm
index ccd0176..433cc0f 100644
--- a/lib/App/FatPacker.pm
+++ b/lib/App/FatPacker.pm
@@ -13,16 +13,16 @@ 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.009007'; # 0.9.7
 
 $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 ];
 }
@@ -69,46 +69,57 @@ sub script_command_help {
 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}"
     }
   };
 
   $self->trace(
-    use    => \@additional_use,
-    args   => $args,
+    use => \@additional_use,
+    args => $args,
     output => $arg,
   );
 }
 
 sub trace {
   my ($self, %opts) = @_;
-  my $use = $opts{'use'};
-  my $args = $opts{'args'};
-  my $output = $opts{'output'};
 
-  if(@$use) {
-    $output .= "," . join ",", @$use;
-  }
+  my $capture;
+
+  my $output = $opts{output} || do {
+    $capture++; '>&STDOUT'
+  };
 
-  {
-    local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$output;
-    system $^X, @$args;
+  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> };
   }
 }