Merge pull request #24 from orkunkaraduman/dev

v1.11
orkunkaraduman · Dec 15, 2016 · baa6aaf · baa6aaf
2 parents bdd55bc + 96b188c
commit baa6aaf
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 101 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,8 @@
+1.11	2016-12-15
+		- App::Virtualenv::Module::inPerLib() fix
+		- App::Virtualenv::activate2() added
+		- Perl v5.14 for all modules
+
 1.10	2016-12-10
 		- Version, POD and README fixes for v1.09
 		- Improved local library and Perl library module checks

diff --git a/Makefile.PL b/Makefile.PL
@@ -1,6 +1,5 @@
 use strict;
 use warnings;
-use v5.10;
 use ExtUtils::MakeMaker;
 
 

diff --git a/README b/README
@@ -1,91 +1,74 @@
 NAME
-
     App::Virtualenv - Perl virtual environment
 
 VERSION
-
-    version 1.10
+    version 1.11
 
 SYNOPSIS
-
     Perl virtual environment
 
 DESCRIPTION
-
     App::Virtualenv is a Perl package to create isolated Perl virtual
     environments, like Python virtual environment.
 
 USAGE
-
   virtualenv.pl
-
     creates new Perl virtual environment
 
         virtualenv.pl [*environment_path*]
 
   activate
-
     activates Perl virtual environment
 
         source *environment_path*/bin/activate
 
   deactivate
-
     deactivates activated Perl virtual environment
 
         deactivate
 
   sh.pl
-
     runs Unix shell under Perl virtual environment
 
         [*environment_path*/bin/]sh.pl [*argument*]...
 
   perl.pl
-
     runs Perl language interpreter under Perl virtual environment
 
         [*environment_path*/bin/]perl.pl [*argument*]...
 
   piv.pl
-
     Perl in Virtual environment
 
         [*environment_path*/bin/]piv.pl [-*argument*]... [--*argument*
         *value*]... *command* [*parameter*]...
 
    Commands
-
    piv virtualenv
-
     creates new Perl virtual environment
 
         piv virtualenv [-e] [*environment_path*]
 
             -e Empty virtual environment
 
    piv sh
-
     runs Unix shell under Perl virtual environment
 
         [*environment_path*/bin/]piv sh [*argument*]...
 
    piv perl
-
     runs Perl language interpreter under Perl virtual environment
 
         [*environment_path*/bin/]piv perl [*argument*]...
 
    piv list
-
     lists installed packages under Perl virtual environment
 
         [*environment_path*/bin/]piv list [-1]
 
             -1 One column list
 
    piv install
-
     installs or upgrades packages under Perl virtual environment
 
         [*environment_path*/bin/]piv install [-f] [-t] [-s] [-v]
@@ -100,7 +83,6 @@ USAGE
             -v Verbose
 
    piv remove
-
     removes packages under Perl virtual environment
 
         [*environment_path*/bin/]piv remove [-f] [-v] *package*...
@@ -110,7 +92,6 @@ USAGE
             -v Verbose
 
 INSTALLATION
-
     To install this module type the following
 
             perl Makefile.PL
@@ -123,7 +104,6 @@ INSTALLATION
             cpan -i App::Virtualenv
 
 DEPENDENCIES
-
     This module requires these other modules and libraries:
 
     *   local::lib
@@ -143,11 +123,9 @@ DEPENDENCIES
     *   CPANPLUS
 
 AUTHOR
-
     Orkun Karaduman <orkunkaraduman@gmail.com>
 
 COPYRIGHT AND LICENSE
-
     Copyright (C) 2016 Orkun Karaduman <orkunkaraduman@gmail.com>
 
     This program is free software: you can redistribute it and/or modify it

diff --git a/README.cl b/README.cl
@@ -1,91 +1,74 @@
 [1mNAME[0m
-
     App::Virtualenv - Perl virtual environment
 
 [1mVERSION[0m
-
-    version 1.10
+    version 1.11
 
 [1mSYNOPSIS[0m
-
     Perl virtual environment
 
 [1mDESCRIPTION[0m
-
     App::Virtualenv is a Perl package to create isolated Perl virtual
     environments, like Python virtual environment.
 
 [1mUSAGE[0m
-
   [1mvirtualenv.pl[0m
-
     creates new Perl virtual environment
 
         [1mvirtualenv.pl[0m [[33menvironment_path[0m]
 
   [1mactivate[0m
-
     activates Perl virtual environment
 
         source [33menvironment_path[0m/bin/[1mactivate[0m
 
   [1mdeactivate[0m
-
     deactivates activated Perl virtual environment
 
         [1mdeactivate[0m
 
   [1msh.pl[0m
-
     runs Unix shell under Perl virtual environment
 
         [[33menvironment_path[0m/bin/][1msh.pl[0m [[33margument[0m]...
 
   [1mperl.pl[0m
-
     runs Perl language interpreter under Perl virtual environment
 
         [[33menvironment_path[0m/bin/][1mperl.pl[0m [[33margument[0m]...
 
   [1mpiv.pl[0m
-
     Perl in Virtual environment
 
         [[33menvironment_path[0m/bin/][1mpiv.pl[0m [-[33margument[0m]... [--[33margument[0m [33mvalue[0m]...
         [33mcommand[0m [[33mparameter[0m]...
 
    Commands
-
    piv virtualenv
-
     creates new Perl virtual environment
 
         [1mpiv virtualenv[0m [-e] [[33menvironment_path[0m]
 
             [1m-e[0m Empty virtual environment
 
    piv sh
-
     runs Unix shell under Perl virtual environment
 
         [[33menvironment_path[0m/bin/][1mpiv sh[0m [[33margument[0m]...
 
    piv perl
-
     runs Perl language interpreter under Perl virtual environment
 
         [[33menvironment_path[0m/bin/][1mpiv perl[0m [[33margument[0m]...
 
    piv list
-
     lists installed packages under Perl virtual environment
 
         [[33menvironment_path[0m/bin/][1mpiv list[0m [-1]
 
             [1m-1[0m One column list
 
    piv install
-
     installs or upgrades packages under Perl virtual environment
 
         [[33menvironment_path[0m/bin/][1mpiv install[0m [-f] [-t] [-s] [-v] [33mpackage[0m...
@@ -99,7 +82,6 @@
             [1m-v[0m Verbose
 
    piv remove
-
     removes packages under Perl virtual environment
 
         [[33menvironment_path[0m/bin/][1mpiv remove[0m [-f] [-v] [33mpackage[0m...
@@ -109,7 +91,6 @@
             [1m-v[0m Verbose
 
 [1mINSTALLATION[0m
-
     To install this module type the following
 
             perl Makefile.PL
@@ -122,7 +103,6 @@
             cpan -i App::Virtualenv
 
 [1mDEPENDENCIES[0m
-
     This module requires these other modules and libraries:
 
     *   local::lib
@@ -142,11 +122,9 @@
     *   CPANPLUS
 
 [1mAUTHOR[0m
-
     Orkun Karaduman <orkunkaraduman@gmail.com>
 
 [1mCOPYRIGHT AND LICENSE[0m
-
     Copyright (C) 2016 Orkun Karaduman <orkunkaraduman@gmail.com>
 
     This program is free software: you can redistribute it and/or modify it

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

diff --git a/bin/test.pl b/bin/test.pl
@@ -15,9 +15,9 @@ =head1 SYNOPSIS
 use strict;
 use warnings;
 no warnings qw(qw utf8);
-use v5.10;
-use open qw(:std :locale);
+use v5.14;
 use utf8;
+use open qw(:std :locale);
 use Config;
 use FindBin;
 use Data::Dumper;
@@ -29,13 +29,7 @@ =head1 SYNOPSIS
 use App::Virtualenv::Piv;
 
 
-my $inst = ExtUtils::Installed->new;
-my @a = $inst->directory_tree("Net::Twitter", "all");
-say Dumper(\@a);
-exit;
-#exit App::Virtualenv::Module::install(force => 1, modules => ['ExtUtils::Installed']);
-#exit App::Virtualenv::Piv::main(@ARGV);
-#exit App::Virtualenv::perl("-I${FindBin::Bin}/../lib", "-MApp::Virtualenv::Module", "-e exit App::Virtualenv::Module::${ARGV[0]}('${ARGV[1]}');");
+exit 0;
 __END__
 =head1 AUTHOR
 

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.10
+version 1.11
 
 =head1 SYNOPSIS
 
@@ -228,7 +228,7 @@ CPANPLUS
 use strict;
 use warnings;
 no warnings qw(qw utf8);
-use v5.10;
+use v5.14;
 use utf8;
 use Config;
 use FindBin;
@@ -242,7 +242,7 @@ BEGIN
 {
 	require Exporter;
 	# set the version for version checking
-	our $VERSION     = '1.10';
+	our $VERSION     = '1.11';
 	# Inherit from Exporter to export functions and variables
 	our @ISA         = qw(Exporter);
 	# Functions and variables which are exported by default
@@ -281,11 +281,25 @@ sub activate
 	$ENV{PERL_MM_OPT} = "INSTALL_BASE=$virtualenvPath";
 
 	$ENV{_OLD_PERL_VIRTUAL_PS1} = $ENV{PS1};
-	$ENV{PS1} = "(" . basename($virtualenvPath) . ") ".((defined $ENV{PS1})? $ENV{PS1}: "");
+	$ENV{PS1} = "(".basename($virtualenvPath).") ".((defined $ENV{PS1})? $ENV{PS1}: "");
 
 	return $virtualenvPath;
 }
 
+sub activate2
+{
+	my $oldVirtualenvPath = getVirtualenvPath();
+	my $virtualenvPath = activate();
+	if (defined $virtualenvPath)
+	{
+		say STDERR "Perl virtual environment path: $virtualenvPath" if not defined $oldVirtualenvPath or $oldVirtualenvPath ne $virtualenvPath;
+	} else
+	{
+		say STDERR "Perl virtual environment is not activated";
+	}
+	return $virtualenvPath;
+}
+
 sub deactivate
 {
 	my ($nondestructive) = @_;