use Cwd qw(cwd);
use File::Find qw(find);
use File::Spec::Functions qw(
- catdir splitpath splitdir catpath rel2abs abs2rel
+ catdir catfile splitpath splitdir catpath rel2abs abs2rel
);
+use File::Spec::Unix;
use File::Copy qw(copy);
-use File::Path qw(make_path remove_tree);
+use File::Path qw(mkpath rmtree);
use B qw(perlstring);
-our $VERSION = '0.009003'; # 0.9.3
+our $VERSION = '0.009018'; # 0.009.017
$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 {
print "Try `perldoc fatpack` for how to use me\n";
}
+sub script_command_pack {
+ my ($self, $args) = @_;
+
+ my @modules = split /\r?\n/, $self->trace(args => $args);
+ my @packlists = $self->packlists_containing(\@modules);
+
+ my $base = catdir(cwd, 'fatlib');
+ $self->packlists_to_tree($base, \@packlists);
+
+ my $file = shift @$args;
+ print $self->fatpack_file($file);
+}
+
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 $use_file = $file) ||= 'fatpacker.trace';
- if (!$to_stderr and -e $use_file) {
- unlink $use_file or die "Couldn't remove old trace file: $!";
+ $file ||= 'fatpacker.trace';
+
+ if (!$to_stderr and -e $file) {
+ unlink $file or die "Couldn't remove old trace file: $!";
}
my $arg = do {
- if ($file) {
- "=>>${file}"
- } elsif ($to_stderr) {
- "=>&STDERR"
- } else {
- ""
+ if ($to_stderr) {
+ ">&STDERR"
+ } elsif ($file) {
+ ">>${file}"
}
};
- {
- local $ENV{PERL5OPT} = '-MApp::FatPacker::Trace'.$arg;
- system $^X, @$args;
+
+ $self->trace(
+ use => \@additional_use,
+ args => $args,
+ output => $arg,
+ );
+}
+
+sub trace {
+ my ($self, %opts) = @_;
+
+ my $output = $opts{output};
+ 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;
- find(sub {
- return unless $_ eq '.packlist' && -f $_;
- $pack_rev{$_} = $File::Find::name for lines_of $File::Find::name;
+ find({
+ no_chdir => 1,
+ wanted => sub {
+ return unless /[\\\/]\.packlist$/ && -f $_;
+ $pack_rev{$_} = $File::Find::name for lines_of $File::Find::name;
+ },
}, @search);
- chdir($cwd) or die "Couldn't chdir back to ${cwd} after find: $!";
- my %found; @found{map +($pack_rev{$INC{$_}}||()), @targets} = ();
+ my %found; @found{map +($pack_rev{Cwd::abs_path($INC{$_})}||()), @targets} = ();
sort keys %found;
}
sub packlists_to_tree {
my ($self, $where, $packlists) = @_;
- remove_tree $where;
- make_path $where;
+ rmtree $where;
+ mkpath $where;
+ # Build a copy of @INC with dir separator added after each path
+ my @inc = map
+ { catfile($_, '') }
+ @INC;
foreach my $pl (@$packlists) {
- my ($vol, $dirs, $file) = splitpath $pl;
- my @dir_parts = splitdir $dirs;
- my $pack_base;
- PART: foreach my $p (0 .. $#dir_parts) {
- if ($dir_parts[$p] eq 'auto') {
- # $p-2 since it's <wanted path>/$Config{archname}/auto
- $pack_base = catpath $vol, catdir @dir_parts[0..$p-2];
- last PART;
- }
- }
- die "Couldn't figure out base path of packlist ${pl}" unless $pack_base;
foreach my $source (lines_of $pl) {
+ my $base;
+ foreach my $inc_base (@inc) {
+ # XXX Not case-proof (for case ignorant filesystems)
+ if (substr($source,0,length $inc_base) eq $inc_base) {
+ $base = $inc_base;
+ last;
+ }
+ }
+ unless ($base) {
+ die "Couldn't figure out \@INC path of ${source}" if substr($source, -3) eq '.pm';
+ next;
+ }
+
# there is presumably a better way to do "is this under this base?"
# but if so, it's not obvious to me in File::Spec
- next unless substr($source,0,length $pack_base) eq $pack_base;
- my $target = rel2abs( abs2rel($source, $pack_base), $where );
+ my $target = rel2abs( abs2rel($source, $base), $where );
my $target_dir = catpath((splitpath $target)[0,1]);
- make_path $target_dir;
+ mkpath $target_dir;
copy $source => $target;
}
}
sub script_command_file {
my ($self, $args) = @_;
my $file = shift @$args;
+ print $self->fatpack_file($file);
+}
+
+sub fatpack_file {
+ my ($self, $file) = @_;
my $cwd = cwd;
- my @dirs = map rel2abs($_, $cwd), ('lib','fatlib');
+ my @dirs = grep -d, map rel2abs($_, $cwd), ('lib','fatlib');
my %files;
foreach my $dir (@dirs) {
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 {
+ !/\.pm$/ and warn "File ${File::Find::name} isn't a .pm file - can't pack this -- if you hoped we were going to, things may not be what you expected later\n" and return;
+ $files{File::Spec::Unix->abs2rel($File::Find::name,$dir)} = do {
local (@ARGV, $/) = ($File::Find::name); <>
};
+ close ARGV;
}, $dir);
}
my $start = stripspace <<' END_START';
unshift @INC, sub {
if (my $fat = $fatpacked{$_[1]}) {
+ if ($] < 5.008) {
+ return sub {
+ return 0 unless length $fat;
+ $fat =~ s/^([^\n]*\n?)//;
+ $_ = $1;
+ return 1;
+ };
+ }
open my $fh, '<', \$fat
or die "FatPacker error loading $_[1] (could be a perl installation issue?)";
return $fh;
'$fatpacked{'.perlstring($_).qq!} = <<'${name}';\n!
.qq!${data}${name}\n!;
} sort keys %files;
- print join "\n", $start, @segments, $end;
+ my $shebang = "";
+ my $script = "";
+ if ( defined $file and -r $file ) {
+ open my $fh, "<", $file or die("Can't read $file: $!");
+ $shebang = <$fh>;
+ $script = join "", <$fh>;
+ close $fh;
+ unless ( index($shebang, '#!') == 0 ) {
+ $script = $shebang . $script;
+ $shebang = "";
+ }
+ }
+ return join "\n", $shebang, $start, @segments, $end, $script;
}
+=encoding UTF-8
+
=head1 NAME
App::FatPacker - pack your dependencies onto your script file
=head1 SYNOPSIS
+ $ fatpack pack myscript.pl >myscript.packed.pl
+
+Or, with more step-by-step control:
+
$ fatpack trace myscript.pl
$ fatpack packlists-for `cat fatpacker.trace` >packlists
$ fatpack tree `cat packlists`
- $ (fatpack file; cat myscript.pl) >myscript.packed.pl
+ $ fatpack file myscript.pl >myscript.packed.pl
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.1
+The programmatic API for this code is not yet fully decided, hence the 0.9
release version. Expect that to be cleaned up for 1.0.
+=head1 SEE ALSO
+
+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
=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
=cut
1;
+
projects / p5sagit/App-FatPacker.git / blobdiff