X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FApp%2FFatPacker.pm;h=84f391025874286830851ab71979ccfd94c3b9a1;hb=3e4ff43e440565ad645e9f05a7e57f8ad56deed0;hp=e742f6ac572f8d44ed41440e823adde5922dba5d;hpb=330208685b5d89310db66f485c954f31edf7d0ac;p=p5sagit%2FApp-FatPacker.git

diff --git a/lib/App/FatPacker.pm b/lib/App/FatPacker.pm
index e742f6a..84f3910 100644
--- a/lib/App/FatPacker.pm
+++ b/lib/App/FatPacker.pm
@@ -14,7 +14,7 @@ use File::Copy qw(copy);
 use File::Path qw(mkpath rmtree);
 use B qw(perlstring);
 
-our $VERSION = '0.009018'; # 0.009.017
+our $VERSION = '0.010002'; # 0.10.2
 
 $VERSION = eval $VERSION;
 
@@ -117,7 +117,8 @@ sub trace {
   my $output = $opts{output};
   my $trace_opts = join ',', $output||'>&STDOUT', @{$opts{use}||[]};
 
-  local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace='.$trace_opts;
+  local $ENV{PERL5OPT} = join ' ',
+    ($ENV{PERL5OPT}||()), '-MApp::FatPacker::Trace='.$trace_opts;
 
   my @args = @{$opts{args}||[]};
 
@@ -142,8 +143,11 @@ sub script_command_packlists_for {
 sub packlists_containing {
   my ($self, $targets) = @_;
   my @targets = @$targets;
-  foreach my $t (@targets) {
-    require $t;
+  {
+    local @INC = ('lib', @INC);
+    foreach my $t (@targets) {
+      require $t;
+    }
   }
   my @search = grep -d $_, map catdir($_, 'auto'), @INC;
   my %pack_rev;
@@ -268,13 +272,13 @@ sub fatpack_end {
   return stripspace <<'  END_END';
     s/^  //mg for values %fatpacked;
 
-    my $class = "${\\%fatpacked}";
+    my $class = 'FatPacked::'.(0+\%fatpacked);
+    no strict 'refs';
     *{"${class}::files"} = sub { keys %{$_[0]} };
 
     if ($] < 5.008) {
-
       *{"${class}::INC"} = sub {
-         if (my $fat = $fatpacked{$_[1]}) {
+         if (my $fat = $_[0]{$_[1]}) {
            return sub {
              return 0 unless length $fat;
              $fat =~ s/^([^\n]*\n?)//;
@@ -283,20 +287,18 @@ sub fatpack_end {
            };
          }
          return;
-      }
+      };
     }
 
     else {
-
       *{"${class}::INC"} = sub {
-  	if (my $fat = $_[0]{$_[1]}) {
+        if (my $fat = $_[0]{$_[1]}) {
           open my $fh, '<', \$fat
             or die "FatPacker error loading $_[1] (could be a perl installation issue?)";
           return $fh;
         }
         return;
       };
-
     }
 
     unshift @INC, bless \%fatpacked, $class;
@@ -336,7 +338,7 @@ Or, with more step-by-step control:
 
 See the documentation for the L<fatpack> script itself for more information.
 
-The programmatic API for this code is not yet fully decided, hence the 0.9
+The programmatic API for this code is not yet fully decided, hence the 0.x
 release version. Expect that to be cleaned up for 1.0.
 
 =head1 SEE ALSO
@@ -345,7 +347,7 @@ L<article for Perl Advent 2012|http://www.perladvent.org/2012/2012-12-14.html>
 
 =head1 SUPPORT
 
-Your current best avenue is to come annoy annoy mst on #toolchain on
+Your current best avenue is to come annoy mst on #toolchain on
 irc.perl.org. There should be a non-IRC means of support by 1.0.
 
 =head1 AUTHOR
@@ -372,6 +374,10 @@ Mithaldu - Christian Walde (cpan:MITHALDU) <walde.christian@googlemail.com>
 
 dolmen - Olivier Mengué (cpan:DOLMEN) <dolmen@cpan.org>
 
+djerius - Diab Jerius (cpan:DJERIUS) <djerius@cpan.org>
+
+haarg - Graham Knop (cpan:HAARG> <haarg@haarg.org>
+
 Many more people are probably owed thanks for ideas. Yet
 another doc nit to fix.