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(
$VERSION = eval $VERSION;
-my $option_parser = Getopt::Long::Parser->new(
- config => [ qw(require_order pass_through bundling no_auto_abbrev) ]
-);
-
sub call_parser {
- local *ARGV = [ @{$_[0]} ];
- $option_parser->getoptions(@{$_[1]});
- [ @ARGV ];
+ my $self = shift;
+ my ( $args, $options ) = @_;
+
+ local *ARGV = [ @{$args} ];
+ $self->{'option_parser'}->getoptions( @{$options} );
+
+ return [ @ARGV ];
}
sub lines_of {
}
sub import {
- $_[1] eq '-run_script'
+ $_[1] && $_[1] eq '-run_script'
and return shift->new->run_script;
}
-sub new { bless({}, $_[0]) }
+sub new {
+ bless {
+ option_parser => Getopt::Long::Parser->new(
+ config => [ qw(require_order pass_through bundling no_auto_abbrev) ]
+ ),
+ }, $_[0];
+}
sub run_script {
my ($self, $args) = @_;
my @args = $args ? @$args : @ARGV;
(my $cmd = shift @args || 'help') =~ s/-/_/g;
+
if (my $meth = $self->can("script_command_${cmd}")) {
$self->$meth(\@args);
} else {
sub script_command_trace {
my ($self, $args) = @_;
-
- $args = 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;
}
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,
+ );
+}
+
+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';
+
+ # raise capture flag
+ $capture++;
}
- {
- local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$arg;
- 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 {
=cut
1;
+