v20141106

It is necessary only if user want automatic fashion of activation.
If the users of pyenv-virtualenv doesn't need the feature, they can
omit the configuration safely.

README.md

@@ -28,7 +28,7 @@ From inside that directory you can:
 
         $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
 
-2. **Add `pyenv virtualenv-init` to your shell** to enable activation of virtualenv
+2. **Add `pyenv virtualenv-init` to your shell** to enable activation of virtualenv. This is entirely optional but pretty useful.
 
         $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
 
@@ -114,6 +114,22 @@ You can also activate and deactivate a pyenv virtualenv this way:
     pyenv activate <name>
     pyenv deactivate
 
+
+### Delete existing virtualenv
+
+Removing the directory in `~/.pyenv/versions` will delete the virtualenv, or you can run:
+
+    pyenv uninstall my-virtual-env
+    
+
+### virtualenv and pyvenv
+
+There is [venv](http://docs.python.jp/3/library/venv.html) module available for CPython 3.3 and newer.
+It provides a command-line tool `pyvenv` which is the successor of `virtualenv` and distributed by default.
+
+The `pyenv-virtualenv` uses `pyvenv` if it is available and the `virtualenv` is not available.
+
+
 ### Special environment variables
 
 You can set certain environment variables to control the pyenv-virtualenv.
@@ -133,6 +149,17 @@ You can set certain environment variables to control the pyenv-virtualenv.
 
 ## Version History
 
+#### 20141106
+
+ * Stop creating after `ensurepip` since it has done by `ensurepip` itself
+ * Suppress some useless warnings from `pyenv virtualenv-init`
+
+#### 20141012
+
+ * Fix warnings from `shellcheck` to improve support for POSIX sh (#40)
+ * Do not allow whitespace in `VIRTUALENV_NAME` (#44)
+ * Should not persist `PYENV_DEACTIVATE` after automatic deactivation (#47, #48)
+
 #### 20140705
 
  * Display information on auto-(de)?activation

bin/pyenv-sh-activate

@@ -112,7 +112,7 @@ EOS
   cat <<EOS
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${prefix}";
-source "${prefix}/bin/activate";
+. "${prefix}/bin/activate";
 EOS
   ;;
 esac

bin/pyenv-sh-deactivate

@@ -37,8 +37,10 @@ fish )
   ;;
 esac
 
+prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}"
+
 if [ -n "$VERBOSE" ]; then
-  echo "  echo \"pyenv-virtualenv: deactivate ${PYENV_ACTIVATE##*/}\" 1>&2;"
+  echo "  echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
 fi
 
 if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
@@ -50,7 +52,7 @@ fi
 case "$shell" in
 fish )
   cat <<EOS
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
+  setenv PYENV_DEACTIVATE "$prefix";
   set -e PYENV_ACTIVATE;
   deactivate;
 else;
@@ -58,7 +60,7 @@ EOS
   ;;
 *    )
   cat <<EOS
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  export PYENV_DEACTIVATE="$prefix";
   unset PYENV_ACTIVATE;
   deactivate;
 else

bin/pyenv-virtualenv

@@ -9,7 +9,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20140705"
+PYENV_VIRTUALENV_VERSION="20141106"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -185,28 +185,6 @@ build_package_ensurepip() {
   pyenv-exec python -m ensurepip 2>/dev/null|| {
     build_package_ez_setup "$@" && build_package_get_pip "$@"
   } || return 1
-
-  create_symlinks "$(pyenv-exec python -c 'import sys;v=sys.version_info;sys.stdout.write("python%d.%d"%(v[0],v[1]))')"
-}
-
-create_symlinks() {
-  local suffix="$1"
-
-  local file link
-  shopt -s nullglob
-  for file in "${VIRTUALENV_PATH}/bin"/*; do
-    if [[ "${file##*/}" == *"${suffix}" ]]; then
-      if [[ "${file}" == *"-${suffix}" ]]; then
-        link="${file%%-${suffix}}"
-      else
-        link="${file%%${suffix}}"
-      fi
-      if [ ! -e "${link}" ]; then
-        ( cd "${file%/*}" && ln -fs "${file##*/}" "${link##*/}" )
-      fi
-    fi
-  done
-  shopt -u nullglob
 }
 
 prepare_requirements() {
@@ -297,6 +275,11 @@ if [ -z "${VERSION_NAME}" ] || [ -z "${VIRTUALENV_NAME}" ]; then
   usage 1
 fi
 
+if [ "$VIRTUALENV_NAME" != "${VIRTUALENV_NAME%[[:space:]]*}" ]; then
+  echo "pyenv-virtualenv: no whitespace allowed in virtualenv name." 1>&2
+  exit 1
+fi
+
 # Set VERSION_NAME as default version in this script
 export PYENV_VERSION="${VERSION_NAME}"
 

bin/pyenv-virtualenv-init

@@ -78,17 +78,19 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
   if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
       pyenv deactivate --no-error --verbose
+      set -e PYENV_DEACTIVATE
       return 0
     end
-    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null) ]
       if pyenv deactivate --no-error --verbose
+        set -e PYENV_DEACTIVATE
         pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
       else
         pyenv activate --no-error --verbose
       end
     end
   else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
+    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null) ]
       pyenv activate --no-error --verbose
     end
   end
@@ -110,19 +112,21 @@ esac
 if [[ "$shell" != "fish" ]]; then
   cat <<EOS
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+    if [ "\$(pyenv version-name)" = "system" ]; then
       pyenv deactivate --no-error --verbose
+      unset PYENV_DEACTIVATE
       return 0
     fi
-    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
       if pyenv deactivate --no-error --verbose; then
+        unset PYENV_DEACTIVATE
         pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
       else
         pyenv activate --no-error --verbose
       fi
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
       pyenv activate --no-error --verbose
     fi
   fi

test/activate.bats

@@ -24,7 +24,7 @@ setup() {
   assert_output <<EOS
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-source "${PYENV_ROOT}/versions/venv/bin/activate";
+. "${PYENV_ROOT}/versions/venv/bin/activate";
 EOS
 }
 
@@ -46,7 +46,7 @@ EOS
 pyenv-virtualenv: activate venv
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-source "${PYENV_ROOT}/versions/venv/bin/activate";
+. "${PYENV_ROOT}/versions/venv/bin/activate";
 EOS
 }
 
@@ -68,7 +68,7 @@ EOS
 pyenv shell "venv";
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-source "${PYENV_ROOT}/versions/venv/bin/activate";
+. "${PYENV_ROOT}/versions/venv/bin/activate";
 EOS
 }
 
@@ -131,7 +131,7 @@ EOS
 pyenv shell "venv27";
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-source "${PYENV_ROOT}/versions/venv27/bin/activate";
+. "${PYENV_ROOT}/versions/venv27/bin/activate";
 EOS
 }
 
@@ -151,7 +151,7 @@ EOS
 pyenv shell "venv27";
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-source "${PYENV_ROOT}/versions/venv27/bin/activate";
+. "${PYENV_ROOT}/versions/venv27/bin/activate";
 EOS
 }
 

test/deactivate.bats

@@ -102,6 +102,25 @@ fi;
 EOS
 }
 
+@test "deactivate virtualenv which has been activated manually" {
+  export PYENV_VIRTUALENV_INIT=1
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  export PYENV_DEACTIVATE="$VIRTUAL_ENV";
+  unset PYENV_ACTIVATE;
+  deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+fi;
+EOS
+}
+
 @test "deactivate virtualenv (fish)" {
   export PYENV_VIRTUALENV_INIT=1
   export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
@@ -177,6 +196,26 @@ else;
 end;
 EOS
 }
+
+@test "deactivate virtualenv which has been activated manually (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+if functions -q deactivate;
+  setenv PYENV_DEACTIVATE "$VIRTUAL_ENV";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+else;
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+end;
+EOS
+}
+
 @test "should fail if deactivate is invoked as a command" {
   run pyenv-deactivate
 

test/init.bats

@@ -32,19 +32,21 @@ load test_helper
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+    if [ "\$(pyenv version-name)" = "system" ]; then
       pyenv deactivate --no-error --verbose
+      unset PYENV_DEACTIVATE
       return 0
     fi
-    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
       if pyenv deactivate --no-error --verbose; then
+        unset PYENV_DEACTIVATE
         pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
       else
         pyenv activate --no-error --verbose
       fi
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
       pyenv activate --no-error --verbose
     fi
   fi
@@ -64,17 +66,19 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
   if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
       pyenv deactivate --no-error --verbose
+      set -e PYENV_DEACTIVATE
       return 0
     end
-    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null) ]
       if pyenv deactivate --no-error --verbose
+        set -e PYENV_DEACTIVATE
         pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
       else
         pyenv activate --no-error --verbose
       end
     end
   else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
+    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null) ]
       pyenv activate --no-error --verbose
     end
   end
@@ -89,19 +93,21 @@ EOS
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+    if [ "\$(pyenv version-name)" = "system" ]; then
       pyenv deactivate --no-error --verbose
+      unset PYENV_DEACTIVATE
       return 0
     fi
-    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
       if pyenv deactivate --no-error --verbose; then
+        unset PYENV_DEACTIVATE
         pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
       else
         pyenv activate --no-error --verbose
       fi
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null)" ]; then
       pyenv activate --no-error --verbose
     fi
   fi

test/pip.bats

@@ -26,8 +26,7 @@ unstub_pyenv() {
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
-  stub pyenv-exec "python -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip3.4"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub pyenv-exec "python -m ensurepip : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -54,8 +53,7 @@ OUT
   stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";mkdir -p \${PYENV_ROOT}/versions/venv/bin"
   stub pyenv-exec "python -m ensurepip : false"
   stub pyenv-exec "python */ez_setup.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/easy_install"
-  stub pyenv-exec "python */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip3.3"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
+  stub pyenv-exec "python */get-pip.py : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\";touch \${PYENV_ROOT}/versions/venv/bin/pip"
   stub curl true
   stub curl true
 

test/pyvenv.bats

@@ -27,7 +27,6 @@ unstub_pyenv() {
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "pyvenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -51,7 +50,6 @@ OUT
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
 
   create_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -78,7 +76,6 @@ OUT
   stub pyenv-exec "python -m ensurepip : false"
   stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
   stub curl true
   stub curl true
 
@@ -109,7 +106,6 @@ OUT
   stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "virtualenv --python=python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -135,7 +131,6 @@ OUT
   stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "virtualenv --python=python3 ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
   stub pyenv-exec "python -m ensurepip : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
 
   remove_executable "3.4.1" "virtualenv"
   create_executable "3.4.1" "pyvenv"
@@ -163,7 +158,6 @@ OUT
   stub pyenv-exec "python -m ensurepip : false"
   stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
   stub curl true
   stub curl true
 

test/version.bats

@@ -4,7 +4,7 @@ load test_helper
 
 setup() {
   export PYENV_ROOT="${TMP}/pyenv"
-  export PYENV_VIRTUALENV_VERSION="20140705"
+  export PYENV_VIRTUALENV_VERSION="20141106"
 }
 
 @test "display virtualenv version" {

test/virtualenv.bats

@@ -30,7 +30,6 @@ unstub_pyenv() {
   stub pyenv-exec "python -m ensurepip : false"
   stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
   stub curl true
   stub curl true
 
@@ -57,7 +56,6 @@ OUT
   stub pyenv-exec "python -m ensurepip : false"
   stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
   stub curl true
   stub curl true
 
@@ -85,7 +83,6 @@ OUT
   stub pyenv-exec "python -m ensurepip : false"
   stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
   stub curl true
   stub curl true
 
@@ -113,7 +110,6 @@ OUT
   stub pyenv-exec "python -m ensurepip : false"
   stub pyenv-exec "python */ez_setup.py : true"
   stub pyenv-exec "python */get-pip.py : true"
-  stub pyenv-exec "python -c * : echo ${PYENV_VERSION%.*}"
   stub curl true
   stub curl true
 
@@ -132,3 +128,21 @@ OUT
   unstub pyenv-exec
   unstub curl
 }
+
+@test "no whitespace allowed in virtualenv name" {
+  run pyenv-virtualenv "3.2.1" "foo bar"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: no whitespace allowed in virtualenv name.
+OUT
+}
+
+@test "no tab allowed in virtualenv name" {
+  run pyenv-virtualenv "3.2.1" "foo	bar baz"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: no whitespace allowed in virtualenv name.
+OUT
+}