Merge pull request #27 from orkunkaraduman/dev

v1.13
orkunkaraduman · Jan 17, 2017 · 28236ca · 28236ca
2 parents 3d7fe2c + 6ef9952
commit 28236ca
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,7 @@
+1.13	2017-01-17
+		- Added AUTOMATED_TESTING in Piv for noninteractive testing
+		- Used PERL5LIB in Virtualenv::activate
+
 1.12	2017-01-07
 		- App::Virtualenv::Utils is deprecated
 		- Noninteractive piv create/install/remove

diff --git a/README b/README
@@ -2,7 +2,7 @@ NAME
     App::Virtualenv - Perl virtual environment
 
 VERSION
-    version 1.12
+    version 1.13
 
 SYNOPSIS
     Perl virtual environment

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ App::Virtualenv - Perl virtual environment
 
 # VERSION
 
-version 1.12
+version 1.13
 
 # SYNOPSIS
 

diff --git a/lib/App/Virtualenv.pm b/lib/App/Virtualenv.pm
@@ -5,7 +5,7 @@ App::Virtualenv - Perl virtual environment
 
 =head1 VERSION
 
-version 1.12
+version 1.13
 
 =head1 SYNOPSIS
 
@@ -125,7 +125,7 @@ BEGIN
 {
 	require Exporter;
 	# set the version for version checking
-	our $VERSION     = '1.12';
+	our $VERSION     = '1.13';
 	# Inherit from Exporter to export functions and variables
 	our @ISA         = qw(Exporter);
 	# Functions and variables which are exported by default
@@ -138,10 +138,15 @@ BEGIN
 sub activate
 {
 	my ($virtualenvPath) = @_;
-	$virtualenvPath = getVirtualenvPath() if not defined $virtualenvPath;
-	$virtualenvPath = binVirtualenvPath() if not defined $virtualenvPath;
-	$virtualenvPath = Cwd::realpath($virtualenvPath);
+	$virtualenvPath = getVirtualenvPath() if not validVirtualenvPath($virtualenvPath);
+	$virtualenvPath = binVirtualenvPath() if not validVirtualenvPath($virtualenvPath);
+	for (split(":", defined($ENV{PERL5LIB})? $ENV{PERL5LIB}: ""))
+	{
+		last if validVirtualenvPath($virtualenvPath);
+		$virtualenvPath = "$_/../..";
+	}
 	return if not validVirtualenvPath($virtualenvPath);
+	$virtualenvPath = Cwd::realpath($virtualenvPath);
 
 	deactivate(1);
 

diff --git a/lib/App/Virtualenv/Module.pm b/lib/App/Virtualenv/Module.pm
@@ -5,7 +5,7 @@ App::Virtualenv::Module - Module management for Perl virtual environment
 
 =head1 VERSION
 
-version 1.12
+version 1.13
 
 =head1 SYNOPSIS
 
@@ -34,7 +34,7 @@ BEGIN
 {
 	require Exporter;
 	# set the version for version checking
-	our $VERSION     = '1.12';
+	our $VERSION     = '1.13';
 	# Inherit from Exporter to export functions and variables
 	our @ISA         = qw(Exporter);
 	# Functions and variables which are exported by default
@@ -50,8 +50,14 @@ my $cb = CPANPLUS::Backend->new();
 
 sub reloadInst
 {
-	my @perl5lib = split(":", defined $ENV{PERL5LIB}? $ENV{PERL5LIB}: "");
-	$inst = ExtUtils::Installed->new(inc_override => [($perl5lib[0]? ("$perl5lib[0]/$Config{version}/$Config{archname}", "$perl5lib[0]/$Config{version}", "$perl5lib[0]/$Config{archname}", "$perl5lib[0]"): ($Config{sitearch}, $Config{sitelib}))]);
+	my $perl5lib;
+	for (split(":", defined($ENV{PERL5LIB})? $ENV{PERL5LIB}: ""))
+	{
+		$perl5lib = $_;
+		last if App::Virtualenv::validVirtualenvPath("$_/../..");
+		$perl5lib = undef;
+	}
+	$inst = ExtUtils::Installed->new(inc_override => [($perl5lib? ("$perl5lib/$Config{version}/$Config{archname}", "$perl5lib/$Config{version}", "$perl5lib/$Config{archname}", "$perl5lib"): ($Config{sitearch}, $Config{sitelib}))]);
 	return $inst;
 }
 

diff --git a/lib/App/Virtualenv/Piv.pm b/lib/App/Virtualenv/Piv.pm
@@ -5,7 +5,7 @@ App::Virtualenv::Piv - Perl in Virtual environment
 
 =head1 VERSION
 
-version 1.12
+version 1.13
 
 =head1 SYNOPSIS
 
@@ -31,7 +31,7 @@ BEGIN
 {
 	require Exporter;
 	# set the version for version checking
-	our $VERSION     = '1.12';
+	our $VERSION     = '1.13';
 	# Inherit from Exporter to export functions and variables
 	our @ISA         = qw(Exporter);
 	# Functions and variables which are exported by default
@@ -84,6 +84,7 @@ sub main
 			App::Virtualenv::activate2();
 			$ENV{PERL_MM_USE_DEFAULT} = 1;
 			$ENV{NONINTERACTIVE_TESTING} = 1;
+			$ENV{AUTOMATED_TESTING} = 1;
 			my $force = defined($args->{'-f'})? 1: 0;
 			my $test = defined($args->{'-t'})? 1: 0;
 			my $soft = defined($args->{'-s'})? 1: 0;
@@ -98,6 +99,7 @@ sub main
 			App::Virtualenv::activate2();
 			$ENV{PERL_MM_USE_DEFAULT} = 1;
 			$ENV{NONINTERACTIVE_TESTING} = 1;
+			$ENV{AUTOMATED_TESTING} = 1;
 			my $force = defined($args->{'-f'})? 1: 0;
 			my $verbose = defined($args->{'-v'})? 1: 0;
 			my @modules = @{$args->{parameters}};