From: Matt S Trout <mst@shadowcat.co.uk>
Date: Thu, 12 Jul 2012 13:29:17 +0000 (+0000)
Subject: clean up and simplify tracing code
X-Git-Tag: v0.9.7~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FApp-FatPacker.git;a=commitdiff_plain;h=69667cc81452c69c9c68779adf8127266cb836a3

clean up and simplify tracing code
---

diff --git a/lib/App/FatPacker.pm b/lib/App/FatPacker.pm
index c225ac7..a6585cc 100644
--- a/lib/App/FatPacker.pm
+++ b/lib/App/FatPacker.pm
@@ -4,7 +4,6 @@ use strict;
 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(
@@ -20,10 +19,10 @@ $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 ];
 }
@@ -70,15 +69,16 @@ 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: $!";
   }
@@ -99,39 +99,28 @@ sub script_command_trace {
 
 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 {