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

diff --git a/lib/App/FatPacker.pm b/lib/App/FatPacker.pm
index ccd0176..3a0bf06 100644
--- a/lib/App/FatPacker.pm
+++ b/lib/App/FatPacker.pm
@@ -2,27 +2,27 @@ package App::FatPacker;
 
 use strict;
 use warnings FATAL => 'all';
-use 5.008001;
 use Getopt::Long;
 use Cwd qw(cwd);
 use File::Find qw(find);
 use File::Spec::Functions qw(
   catdir splitpath splitdir catpath rel2abs abs2rel
 );
+use File::Spec::Unix;
 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.009012'; # 0.9.012
 
 $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'
+  };
+
+  my $trace_opts = join ',', $output||'>&STDOUT', @{$opts{use}||[]};
 
-  {
-    local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$output;
-    system $^X, @$args;
+  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> };
   }
 }
 
@@ -122,7 +133,9 @@ sub script_command_packlists_for {
 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;
@@ -179,9 +192,10 @@ sub script_command_file {
     find(sub {
       return unless -f $_;
       !/\.pm$/ and warn "File ${File::Find::name} isn't a .pm file - can't pack this and if you hoped we were going to things may not be what you expected later\n" and return;
-      $files{abs2rel($File::Find::name,$dir)} = do {
+      $files{File::Spec::Unix->abs2rel($File::Find::name,$dir)} = do {
         local (@ARGV, $/) = ($File::Find::name); <>
       };
+      close ARGV;
     }, $dir);
   }
   my $start = stripspace <<'  END_START';
@@ -195,6 +209,14 @@ sub script_command_file {
 
     unshift @INC, sub {
       if (my $fat = $fatpacked{$_[1]}) {
+        if ($] < 5.008) {
+          return sub {
+            return 0 unless length $fat;
+            $text =~ s/^([^\n]*\n?)//;
+            $_ = $1;
+            return 1;
+          };
+        }
         open my $fh, '<', \$fat
           or die "FatPacker error loading $_[1] (could be a perl installation issue?)";
         return $fh;
@@ -214,6 +236,8 @@ sub script_command_file {
   print join "\n", $start, @segments, $end;
 }
 
+=encoding UTF-8
+
 =head1 NAME
 
 App::FatPacker - pack your dependencies onto your script file
@@ -241,7 +265,23 @@ Matt S. Trout (mst) <mst@shadowcat.co.uk>
 
 =head2 CONTRIBUTORS
 
-None as yet, though I probably owe lots of people thanks for ideas. Yet
+miyagawa - Tatsuhiko Miyagawa (cpan:MIYAGAWA) <miyagawa@bulknews.net>
+
+tokuhirom - MATSUNO★Tokuhiro (cpan:TOKUHIROM) <tokuhirom@gmail.com>
+
+dg - David Leadbeater (cpan:DGL) <dgl@dgl.cx>
+
+gugod - 劉康民 (cpan:GUGOD) <gugod@cpan.org>
+
+t0m - Tomas Doran (cpan:BOBTFISH) <bobtfish@bobtfish.net>
+
+sawyer - Sawyer X (cpan:XSAWYERX) <xsawyerx@cpan.org>
+
+ether - Karen Etheridge (cpan:ETHER) <ether@cpan.org>
+
+Mithaldu - Christian Walde (cpan:MITHALDU) <walde.christian@googlemail.com>
+
+Many more people are probably owed thanks for ideas. Yet
 another doc nit to fix.
 
 =head1 COPYRIGHT