r69726 - in /branches/upstream/liblocal-lib-perl/current: Changes MANIFEST META.yml Makefile.PL lib/local/lib.pm t/stackable.t
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Sat Feb 26 10:13:26 UTC 2011
Author: ghedo-guest
Date: Sat Feb 26 10:11:36 2011
New Revision: 69726
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=69726
Log:
[svn-upgrade] new version liblocal-lib-perl (1.008004)
Added:
branches/upstream/liblocal-lib-perl/current/t/stackable.t
Modified:
branches/upstream/liblocal-lib-perl/current/Changes
branches/upstream/liblocal-lib-perl/current/MANIFEST
branches/upstream/liblocal-lib-perl/current/META.yml
branches/upstream/liblocal-lib-perl/current/Makefile.PL
branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm
Modified: branches/upstream/liblocal-lib-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/Changes?rev=69726&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/Changes (original)
+++ branches/upstream/liblocal-lib-perl/current/Changes Sat Feb 26 10:11:36 2011
@@ -1,9 +1,23 @@
Revision history for local::lib
-1.008001
+1.008004 2011-02-24
+
+ - Fix stackable tests on win32 by canonicalizing the path ahead of time
+
+1.008003 2011-02-23
+
+ - Fix tests with stacking l::ls.
+
+1.008002 2011-02-23
+
+ - Add local::lib stacking support.
+ - Add activation/deactivation support.
+
+1.008001 2011-01-09
- Bootstrap Module::Build just like ExtUtils::MakeMaker
-1.008000
+1.008000 2011-01-05
+
- Remove redundant prereqs now that Module::Build 0.36 is required
- Makefile.PL avoids CPAN client configuration when not required
- print_environment_vars_for() refactored with separate function
Modified: branches/upstream/liblocal-lib-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/MANIFEST?rev=69726&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/MANIFEST (original)
+++ branches/upstream/liblocal-lib-perl/current/MANIFEST Sat Feb 26 10:11:36 2011
@@ -27,3 +27,4 @@
t/install.t
t/lib-core-only.t
t/pipeline.t
+t/stackable.t
Modified: branches/upstream/liblocal-lib-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/META.yml?rev=69726&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/META.yml (original)
+++ branches/upstream/liblocal-lib-perl/current/META.yml Sat Feb 26 10:11:36 2011
@@ -25,5 +25,8 @@
Module::Build: 0.36
perl: 5.8.1
resources:
+ bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=local-lib
+ homepage: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/local-lib.git
license: http://dev.perl.org/licenses/
-version: 1.008001
+ repository: git://git.shadowcat.co.uk/p5sagit/local-lib.git
+version: 1.008004
Modified: branches/upstream/liblocal-lib-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/Makefile.PL?rev=69726&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/Makefile.PL (original)
+++ branches/upstream/liblocal-lib-perl/current/Makefile.PL Sat Feb 26 10:11:36 2011
@@ -251,4 +251,9 @@
auto_install;
}
chdir($cwd);
+resources(
+ repository => 'git://git.shadowcat.co.uk/p5sagit/local-lib.git',
+ homepage => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/local-lib.git',
+ bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=local-lib',
+);
WriteAll;
Modified: branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm?rev=69726&op=diff
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm (original)
+++ branches/upstream/liblocal-lib-perl/current/lib/local/lib.pm Sat Feb 26 10:11:36 2011
@@ -11,9 +11,15 @@
use Carp ();
use Config;
-our $VERSION = '1.008001'; # 1.8.1
-
-our @KNOWN_FLAGS = qw(--self-contained);
+our $VERSION = '1.008004'; # 1.8.4
+
+our @KNOWN_FLAGS = qw(--self-contained --deactivate --deactivate-all);
+
+sub DEACTIVATE_ONE () { 1 }
+sub DEACTIVATE_ALL () { 2 }
+
+sub INTERPOLATE_ENV () { 1 }
+sub LITERAL_ENV () { 0 }
sub import {
my ($class, @args) = @_;
@@ -51,8 +57,16 @@
die "FATAL: The local::lib --self-contained flag has never worked reliably and the original author, Mark Stosberg, was unable or unwilling to maintain it. As such, this flag has been removed from the local::lib codebase in order to prevent misunderstandings and potentially broken builds. The local::lib authors recommend that you look at the lib::core::only module shipped with this distribution in order to create a more robust environment that is equivalent to what --self-contained provided (although quite possibly not what you originally thought it provided due to the poor quality of the documentation, for which we apologise).\n";
}
+ my $deactivating = 0;
+ if ($arg_store{deactivate}) {
+ $deactivating = DEACTIVATE_ONE;
+ }
+ if ($arg_store{'deactivate-all'}) {
+ $deactivating = DEACTIVATE_ALL;
+ }
+
$arg_store{path} = $class->resolve_path($arg_store{path});
- $class->setup_local_lib_for($arg_store{path});
+ $class->setup_local_lib_for($arg_store{path}, $deactivating);
for (@INC) { # Untaint @INC
next if ref; # Skip entry if it is an ARRAY, CODE, blessed, etc.
@@ -188,13 +202,32 @@
=cut
sub setup_local_lib_for {
- my ($class, $path) = @_;
+ my ($class, $path, $deactivating) = @_;
+
+ my $interpolate = LITERAL_ENV;
+ my @active_lls = $class->active_paths;
+
$path = $class->ensure_dir_structure_for($path);
+
+ if (! $deactivating) {
+ if (@active_lls && $active_lls[-1] eq $path) {
+ exit 0 if $0 eq '-';
+ return; # Asked to add what's already at the top of the stack
+ } elsif (grep { $_ eq $path} @active_lls) {
+ # Asked to add a dir that's lower in the stack -- so we remove it from
+ # where it is, and then add it back at the top.
+ $class->setup_env_hash_for($path, DEACTIVATE_ONE);
+ # Which means we can no longer output "PERL5LIB=...:$PERL5LIB" stuff
+ # anymore because we're taking something *out*.
+ $interpolate = INTERPOLATE_ENV;
+ }
+ }
+
if ($0 eq '-') {
- $class->print_environment_vars_for($path);
+ $class->print_environment_vars_for($path, $deactivating, $interpolate);
exit 0;
} else {
- $class->setup_env_hash_for($path);
+ $class->setup_env_hash_for($path, $deactivating);
@INC = _uniq(split($Config{path_sep}, $ENV{PERL5LIB}), @INC);
}
}
@@ -226,9 +259,6 @@
return $path;
}
-
-sub INTERPOLATE_ENV () { 1 }
-sub LITERAL_ENV () { 0 }
sub guess_shelltype {
my $shellbin = 'sh';
@@ -266,13 +296,13 @@
}
sub print_environment_vars_for {
- my ($class, $path) = @_;
- print $class->environment_vars_string_for($path);
+ my ($class, $path, $deactivating, $interpolate) = @_;
+ print $class->environment_vars_string_for($path, $deactivating, $interpolate);
}
sub environment_vars_string_for {
- my ($class, $path) = @_;
- my @envs = $class->build_environment_vars_for($path, LITERAL_ENV);
+ my ($class, $path, $deactivating, $interpolate) = @_;
+ my @envs = $class->build_environment_vars_for($path, $deactivating, $interpolate);
my $out = '';
# rather basic csh detection, goes on the assumption that something won't
@@ -285,7 +315,7 @@
while (@envs) {
my ($name, $value) = (shift(@envs), shift(@envs));
- $value =~ s/(\\")/\\$1/g;
+ $value =~ s/(\\")/\\$1/g if defined $value;
$out .= $class->${\"build_${shelltype}_env_declaration"}($name, $value);
}
return $out;
@@ -297,31 +327,51 @@
sub build_bourne_env_declaration {
my $class = shift;
my($name, $value) = @_;
- return qq{export ${name}="${value}"\n};
+ return defined($value) ? qq{export ${name}="${value}";\n} : qq{unset ${name};\n};
}
sub build_csh_env_declaration {
my $class = shift;
my($name, $value) = @_;
- return qq{setenv ${name} "${value}"\n};
+ return defined($value) ? qq{setenv ${name} "${value}"\n} : qq{unsetenv ${name}\n};
}
sub build_win32_env_declaration {
my $class = shift;
my($name, $value) = @_;
- return qq{set ${name}=${value}\n};
+ return defined($value) ? qq{set ${name}=${value}\n} : qq{set ${name}=\n};
}
sub setup_env_hash_for {
- my ($class, $path) = @_;
- my %envs = $class->build_environment_vars_for($path, INTERPOLATE_ENV);
+ my ($class, $path, $deactivating) = @_;
+ my %envs = $class->build_environment_vars_for($path, $deactivating, INTERPOLATE_ENV);
@ENV{keys %envs} = values %envs;
}
sub build_environment_vars_for {
+ my ($class, $path, $deactivating, $interpolate) = @_;
+
+ if ($deactivating == DEACTIVATE_ONE) {
+ return $class->build_deactivate_environment_vars_for($path, $interpolate);
+ } elsif ($deactivating == DEACTIVATE_ALL) {
+ return $class->build_deact_all_environment_vars_for($path, $interpolate);
+ } else {
+ return $class->build_activate_environment_vars_for($path, $interpolate);
+ }
+}
+
+sub build_activate_environment_vars_for {
my ($class, $path, $interpolate) = @_;
return (
- PERL_LOCAL_LIB_ROOT => $path,
+ PERL_LOCAL_LIB_ROOT => join($Config{path_sep},
+ (($ENV{PERL_LOCAL_LIB_ROOT}||()) ?
+ ($interpolate == INTERPOLATE_ENV
+ ? ($ENV{PERL_LOCAL_LIB_ROOT}||())
+ : (($^O ne 'MSWin32') ? '$PERL_LOCAL_LIB_ROOT'
+ : '%PERL_LOCAL_LIB_ROOT%' ))
+ : ()),
+ $path
+ ),
PERL_MB_OPT => "--install_base ${path}",
PERL_MM_OPT => "INSTALL_BASE=${path}",
PERL5LIB => join($Config{path_sep},
@@ -342,6 +392,94 @@
)
}
+sub active_paths {
+ my ($class) = @_;
+
+ return () unless defined $ENV{PERL_LOCAL_LIB_ROOT};
+ return split /\Q$Config{path_sep}/, $ENV{PERL_LOCAL_LIB_ROOT};
+}
+
+sub build_deactivate_environment_vars_for {
+ my ($class, $path, $interpolate) = @_;
+
+ my @active_lls = $class->active_paths;
+
+ if (!grep { $_ eq $path } @active_lls) {
+ warn "Tried to deactivate inactive local::lib '$path'\n";
+ return ();
+ }
+
+ my @new_ll_root = grep { $_ ne $path } @active_lls;
+ my @new_perl5lib = grep {
+ $_ ne $class->install_base_arch_path($path) &&
+ $_ ne $class->install_base_perl_path($path)
+ } split /\Q$Config{path_sep}/, $ENV{PERL5LIB};
+
+ my %env = (
+ PERL_LOCAL_LIB_ROOT => (@new_ll_root ?
+ join($Config{path_sep}, @new_ll_root) : undef
+ ),
+ PERL5LIB => (@new_perl5lib ?
+ join($Config{path_sep}, @new_perl5lib) : undef
+ ),
+ PATH => join($Config{path_sep},
+ grep { $_ ne $class->install_base_bin_path($path) }
+ split /\Q$Config{path_sep}/, $ENV{PATH}
+ ),
+ );
+
+ # If removing ourselves from the "top of the stack", set install paths to
+ # correspond with the new top of stack.
+ if ($active_lls[-1] eq $path) {
+ if (@active_lls > 1) {
+ my $new_top = $active_lls[-2];
+ %env = (%env,
+ PERL_MB_OPT => "--install_base ${new_top}",
+ PERL_MM_OPT => "INSTALL_BASE=${new_top}",
+ );
+ } else {
+ %env = (%env,
+ PERL_MB_OPT => undef,
+ PERL_MM_OPT => undef,
+ );
+ }
+ }
+
+ return %env;
+}
+
+sub build_deact_all_environment_vars_for {
+ my ($class, $path, $interpolate) = @_;
+
+ my @active_lls = $class->active_paths;
+
+ my @new_perl5lib = split /\Q$Config{path_sep}/, $ENV{PERL5LIB};
+ my @new_path = split /\Q$Config{path_sep}/, $ENV{PATH};
+
+ for my $path (@active_lls) {
+ @new_perl5lib = grep {
+ $_ ne $class->install_base_arch_path($path) &&
+ $_ ne $class->install_base_perl_path($path)
+ } @new_perl5lib;
+
+ @new_path = grep {
+ $_ ne $class->install_base_bin_path($path)
+ } @new_path;
+ }
+
+ my %env = (
+ PERL_LOCAL_LIB_ROOT => undef,
+ PERL_MM_OPT => undef,
+ PERL_MB_OPT => undef,
+ PERL5LIB => (@new_perl5lib ?
+ join($Config{path_sep}, @new_perl5lib) : undef
+ ),
+ PATH => join($Config{path_sep}, @new_path),
+ );
+
+ return %env;
+}
+
=begin testing
#:: test classmethod
@@ -463,6 +601,22 @@
cd ../mydir2
... REPEAT ...
+If you are working with several C<local::lib> environments, you may want to
+remove some of them from the current environment without disturbing the others.
+You can deactivate one environment like this (using bourne sh):
+
+ eval $(perl -Mlocal::lib=--deactivate,~/path)
+
+which will generate and run the commands needed to remove C<~/path> from your
+various search paths. Whichever environment was B<activated most recently> will
+remain the target for module installations. That is, if you activate
+C<~/path_A> and then you activate C<~/path_B>, new modules you install will go
+in C<~/path_B>. If you deactivate C<~/path_B> then modules will be installed
+into C<~/pathA> -- but if you deactivate C<~/path_A> then they will still be
+installed in C<~/pathB> because pathB was activated later.
+
+You can also ask C<local::lib> to clean itself completely out of the current
+shell's environment with the C<--deactivate-all> option.
For multiple environments for multiple apps you may need to include a modified
version of the C<< use FindBin >> instructions in the "In code" sample above.
If you did something like the above, you have a set of Perl modules at C<<
@@ -565,6 +719,22 @@
there are a number of caveats, and the best approach is always to perform a
build against a clean perl (i.e. site and vendor as close to empty as possible).
+=head1 OPTIONS
+
+Options are values that can be passed to the C<local::lib> import besides the
+directory to use. They are specified as C<use local::lib '--option'[, path];>
+or C<perl -Mlocal::lib=--option[,path]>.
+
+=head2 --deactivate
+
+Remove the chosen path (or the default path) from the module search paths if it
+was added by C<local::lib>, instead of adding it.
+
+=head2 --deactivate-all
+
+Remove all directories that were added to search paths by C<local::lib> from the
+search paths.
+
=head1 METHODS
=head2 ensure_dir_structure_for
@@ -618,6 +788,19 @@
Constructs the C<%ENV> keys for the given path, by calling
L</build_environment_vars_for>.
+
+=head2 active_paths
+
+=over 4
+
+=item Arguments: None
+
+=item Return value: @paths
+
+=back
+
+Returns a list of active C<local::lib> paths, according to the
+C<PERL_LOCAL_LIB_ROOT> environment variable.
=head2 install_base_perl_path
@@ -829,6 +1012,9 @@
Brazilian L<portuguese translation|POD2::PT_BR::local::lib> and minor doc patches contributed by Breno
G. de Oliveira <garu at cpan.org>.
+Improvements to stacking multiple local::lib dirs and removing them from the
+environment later on contributed by Andrew Rodland <arodland at cpan.org>.
+
=head1 COPYRIGHT
Copyright (c) 2007 - 2010 the local::lib L</AUTHOR> and L</CONTRIBUTORS> as
Added: branches/upstream/liblocal-lib-perl/current/t/stackable.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocal-lib-perl/current/t/stackable.t?rev=69726&op=file
==============================================================================
--- branches/upstream/liblocal-lib-perl/current/t/stackable.t (added)
+++ branches/upstream/liblocal-lib-perl/current/t/stackable.t Sat Feb 26 10:11:36 2011
@@ -1,0 +1,47 @@
+use strict;
+use warnings;
+use Test::More;
+use File::Temp qw(tempdir);
+use Cwd;
+
+plan tests => 19;
+
+use local::lib ();
+
+my $dir1 = tempdir('test_local_lib-XXXXX', DIR => Cwd::abs_path('t'), CLEANUP => 1);
+$dir1 = local::lib->ensure_dir_structure_for($dir1);
+
+my $dir2 = tempdir('test_local_lib-XXXXX', DIR => Cwd::abs_path('t'), CLEANUP => 1);
+$dir2 = local::lib->ensure_dir_structure_for($dir2);
+
+my $prev_active = () = local::lib->active_paths;
+
+local::lib->import($dir1);
+is +() = local::lib->active_paths, $prev_active + 1, 'one active path';
+like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir1/, 'added one dir in root';
+like $ENV{PERL5LIB}, qr/\Q$dir1/, 'added one dir in lib';
+like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first path is installation target';
+
+local::lib->import($dir1);
+is +() = local::lib->active_paths, $prev_active + 1, 'still one active path after adding it twice';
+
+local::lib->import($dir2);
+is +() = local::lib->active_paths, $prev_active + 2, 'two active paths';
+like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir2/, 'added another dir in root';
+like $ENV{PERL5LIB}, qr/\Q$dir2/, 'added another dir in lib';
+like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir1/, 'first dir is still in root';
+like $ENV{PERL5LIB}, qr/\Q$dir1/, 'first dir is still in lib';
+like $ENV{PERL_MM_OPT}, qr/\Q$dir2/, 'second path is installation target';
+
+local::lib->import($dir1);
+my @active = local::lib->active_paths;
+is @active, $prev_active + 2, 'still two active dirs after re-adding first';
+is $active[-1], $dir1, 'first dir was re-added on top';
+like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first path is installation target again';
+
+local::lib->import('--deactivate', $dir2);
+unlike $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir2/, 'second dir was removed from root';
+unlike $ENV{PERL5LIB}, qr/\Q$dir2/, 'second dir was removed from lib';
+like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir1/, q{first dir didn't go away from root};
+like $ENV{PERL5LIB}, qr/\Q$dir1/, q{first dir didn't go away from lib};
+like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first dir stays installation target';
More information about the Pkg-perl-cvs-commits
mailing list