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

diff --git a/lib/App/FatPacker.pm b/lib/App/FatPacker.pm
index 62a1612..ccd0176 100644
--- a/lib/App/FatPacker.pm
+++ b/lib/App/FatPacker.pm
@@ -17,14 +17,14 @@ our $VERSION = '0.009006'; # 0.9.6
 
 $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 {
@@ -38,16 +38,23 @@ sub stripspace {
 }
 
 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 {
@@ -61,12 +68,12 @@ sub script_command_help {
 
 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;
 
@@ -82,12 +89,25 @@ sub script_command_trace {
     }
   };
 
-  if(@additional_use) {
-    $arg .= "," . join ",", @additional_use;
+  $self->trace(
+    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;
   }
 
   {
-    local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$arg;
+    local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$output;
     system $^X, @$args;
   }
 }
@@ -237,3 +257,4 @@ as perl itself.
 =cut
 
 1;
+