use File::Path qw(mkpath rmtree);
use B qw(perlstring);
-our $VERSION = '0.009006'; # 0.9.6
+our $VERSION = '0.009008'; # 0.9.8
$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;
$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}"
}
};
- if(@additional_use) {
- $arg .= "," . join ",", @additional_use;
- }
+ $self->trace(
+ use => \@additional_use,
+ args => $args,
+ output => $arg,
+ );
+}
- {
- local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$arg;
- system $^X, @$args;
+sub trace {
+ my ($self, %opts) = @_;
+
+ my $capture;
+
+ my $output = $opts{output} || do {
+ $capture++; '>&STDOUT'
+ };
+
+ 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> };
}
}
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;
=cut
1;
+