Fix issues with manual activation of virtual environments (#34)

Use `PYENV_DEACTIVATE` to store which virtualenv has been deactivated (fixes #32)

README.md

@@ -109,6 +109,11 @@ $ pyenv virtualenvs
 Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might require you to `activate` the virtualenv.
 The `pyenv-virtualenv` will automatically activate/deactivate the virtualenv if the `eval "$(pyenv virtualenv-init -)"` is properly configured in your shell.
 
+You can also activate and deactivate a pyenv virtualenv this way:
+
+    pyenv activate <name>
+    pyenv deactivate
+
 ### Special environment variables
 
 You can set certain environment variables to control the pyenv-virtualenv.

bin/pyenv-sh-activate

@@ -75,6 +75,18 @@ if [ -z "$no_shell" ]; then
 fi
 
 case "$shell" in
-fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;;
-*    ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;;
+fish )
+  cat <<EOS
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "$(pyenv-prefix "${versions}")";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
+EOS
+ ;;
+*    )
+  cat <<EOS
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="$(pyenv-prefix "${versions}")";
+source "\${PYENV_ACTIVATE}/bin/activate";
+EOS
+  ;;
 esac

bin/pyenv-sh-deactivate

@@ -11,12 +11,28 @@ set -e
 
 shell="$(basename "${PYENV_SHELL:-$SHELL}")"
 case "$shell" in
-fish ) echo "functions -q deactivate; and deactivate;";;
-*    ) echo "declare -f deactivate 1>/dev/null 2>&1 && deactivate;";;
+fish )
+  cat <<EOS
+if functions -q deactivate
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+end;
+EOS
+  ;;
+*    )
+  cat <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+fi;
+EOS
+  ;;
 esac
 
 if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
   # Backward compatibility issue
   # https://github.com/yyuu/pyenv-virtualenv/issues/26
-  echo "pyenv shell --unset"
+  echo "pyenv shell --unset;"
 fi

bin/pyenv-virtualenv

@@ -2,12 +2,10 @@
 #
 # Summary: Create a Python virtualenv using the pyenv-virtualenv plugin
 #
-# Usage: pyenv virtualenv [-f|--force] [-u|--upgrade] [VIRTUALENV_OPTIONS] <version> <virtualenv-name>
+# Usage: pyenv virtualenv [-f|--force] [VIRTUALENV_OPTIONS] <version> <virtualenv-name>
 #        pyenv virtualenv --version
 #        pyenv virtualenv --help
 #
-#   -u/--upgrade     Upgrade existing virtualenv to use new version of Python,
-#                    assuming Python has been upgraded in-place.
 #   -f/--force       Install even if the version appears to be installed already
 #
 
@@ -142,81 +140,57 @@ venv() {
   local args=("$@")
   if [ -n "${USE_PYVENV}" ]; then
     pyenv-exec pyvenv "${args[@]}"
-
-    local last="${args[${#args[@]}-1]}"
-    ensurepip "${last##*/}"
   else
     pyenv-exec virtualenv "${args[@]}"
   fi
 }
 
-install_setuptools() {
-  local version="$1"
+build_package_ez_setup() {
+  local ez_setup="${PYENV_VIRTUALENV_CACHE_PATH}/ez_setup.py"
+  rm -f "${ez_setup}"
   { if [ "${EZ_SETUP+defined}" ] && [ -f "${EZ_SETUP}" ]; then
-      if [ -n "$VERBOSE" ]; then
-        echo "Installing setuptools from ${EZ_SETUP}..." 1>&2
-      fi
+      echo "Installing setuptools from ${EZ_SETUP}..." 1>&2
       cat "${EZ_SETUP}"
     else
-      [ -n "${EZ_SETUP_URL}" ] || {
-        if [ -n "${SETUPTOOLS_VERSION}" ]; then
-          EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
-        else
-          EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py"
-        fi
-      }
-      if [ -n "$VERBOSE" ]; then
-        echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
-      fi
+      [ -n "${EZ_SETUP_URL}" ] || EZ_SETUP_URL="https://bootstrap.pypa.io/ez_setup.py"
+      echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
       http get "${EZ_SETUP_URL}"
     fi
-  } | PYENV_VERSION="${version}" pyenv-exec python
-}
-
-install_pip() {
-  local version="$1"
-  { if [ "${GET_PIP+defined}" ] && [ -f "${GET_PIP}" ]; then
-      if [ -n "$VERBOSE" ]; then
-        echo "Installing pip from ${GET_PIP}..." 1>&2
-      fi
-      cat "${GET_PIP}"
-    else
-      [ -n "${GET_PIP_URL}" ] || {
-        if [ -n "${PIP_VERSION}" ]; then
-          GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
-        else
-          GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py"
-        fi
-      }
-      if [ -n "$VERBOSE" ]; then
-        echo "Installing pip from ${GET_PIP_URL}..." 1>&2
-      fi
-      http get "${GET_PIP_URL}"
-    fi
-  } | PYENV_VERSION="${version}" pyenv-exec python
-}
-
-install_virtualenv() {
-  local version="$1"
-  VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
-  PYENV_VERSION="${version}" pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
-}
-
-ensurepip() {
-  local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -m ensurepip 2>/dev/null || {
-    PYENV_VERSION="${version}" pyenv-exec python -c "import setuptools" 1>/dev/null 2>&1 || {
-      install_setuptools "${version}"
-    } 1>&2
-    PYENV_VERSION="${version}" pyenv-which pip 1>/dev/null 2>&1 || {
-      install_pip "${version}"
-    } 1>&2
+  } 1> "${ez_setup}"
+  pyenv-exec python "${ez_setup}" ${EZ_SETUP_OPTS} 1>&2 || {
+    echo "error: failed to install setuptools via ez_setup.py" >&2
+    return 1
   }
 }
 
+build_package_get_pip() {
+  local get_pip="${PYENV_VIRTUALENV_CACHE_PATH}/get-pip.py"
+  rm -f "${get_pip}"
+  { if [ "${GET_PIP+defined}" ] && [ -f "${GET_PIP}" ]; then
+      echo "Installing pip from ${GET_PIP}..." 1>&2
+      cat "${GET_PIP}"
+    else
+      [ -n "${GET_PIP_URL}" ] || GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
+      echo "Installing pip from ${GET_PIP_URL}..." 1>&2
+      http get "${GET_PIP_URL}"
+    fi
+  } 1> "${get_pip}"
+  pyenv-exec python "${get_pip}" ${GET_PIP_OPTS} 1>&2 || {
+    echo "error: failed to install pip via get-pip.py" >&2
+    return 1
+  }
+}
+
+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 version="$1"
-  local suffix="$(PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;v=sys.version_info;sys.stdout.write("%d.%d"%(v[0],v[1]))')"
+  local suffix="$1"
 
   local file link
   shopt -s nullglob
@@ -235,30 +209,27 @@ create_symlinks() {
   shopt -u nullglob
 }
 
-prepare_upgrade() {
-  local version="$1"
-  local prefix="$2"
-  PYENV_VERSION="${version}" pyenv-exec pip freeze >"${UPGRADE_LIST}"
-  mv -f "${prefix}" "${UPGRADE_PATH}"
+prepare_requirements() {
+  pyenv-exec pip freeze > "${REQUIREMENTS}"
+  mv -f "${VIRTUALENV_PATH}" "${VIRTUALENV_ORIG}"
 }
 
-upgrade() {
-  local version="$1"
-  local prefix="$2"
-  ## Migrate previously installed packages from requirements.txt
-  if ! PYENV_VERSION="${version}" pyenv-exec pip install $QUIET $VERBOSE --requirement "${UPGRADE_LIST}"; then
-    { echo
-      echo "UPGRADE FAILED"
+install_requirements() {
+  if [ -f "${REQUIREMENTS}" ]; then
+    ## Migrate previously installed packages from requirements.txt
+    pyenv-exec pip install $QUIET $VERBOSE --requirement "${REQUIREMENTS}" || {
       echo
-      echo "Inspect or clean up the original tree at ${UPGRADE_PATH}"
+      echo "PIP INSTALL FAILED"
+      echo
+      echo "Inspect or clean up the original tree at ${VIRTUALENV_ORIG}"
       echo
       echo "Package list:"
-      cat "${UPGRADE_LIST}"
+      cat "${REQUIREMENTS}" | sed 's/^/ * /'
+      return 1
     } 1>&2
-    return 1
+    rm -f "${REQUIREMENTS}"
+    rm -fr "${VIRTUALENV_ORIG}"
   fi
-  rm -f "${UPGRADE_LIST}"
-  rm -fr "${UPGRADE_PATH}"
 }
 
 PYENV_VIRTUALENV_ROOT="$(abs_dirname "$0")/.."
@@ -338,10 +309,6 @@ else
   TMP="${TMPDIR%/}"
 fi
 
-SEED="$(date "+%Y%m%d%H%M%S").$$"
-UPGRADE_PATH="${TMP}/pyenv-virtualenv.${SEED}"
-UPGRADE_LIST="${TMP}/pyenv-virtualenv.${SEED}.txt"
-
 VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
 
 unset HAS_VIRTUALENV
@@ -349,20 +316,31 @@ unset HAS_PYVENV
 unset USE_PYVENV
 detect_venv
 
+SEED="$(date "+%Y%m%d%H%M%S").$$"
+VIRTUALENV_ORIG="${VIRTUALENV_PATH}.${SEED}"
+REQUIREMENTS="${TMP}/requirements.${SEED}.txt"
+
+# Upgrade existing virtualenv
+if [ -n "$UPGRADE" ]; then
+  FORCE=1
+  # pyvenv has `--upgrade` by default
+  if [ -n "${USE_PYVENV}" ]; then
+    unset UPGRADE
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--upgrade"
+  fi
+fi
+
 if [ -n "${USE_PYVENV}" ]; then
   # Unset some arguments not supported by pyvenv
   unset QUIET
   unset VERBOSE
-  if [ -n "$UPGRADE" ]; then
-    unset UPGRADE
-    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--upgrade"
-  fi
 else
   if [ -n "${VIRTUALENV_PYTHON}" ]; then
     VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${VIRTUALENV_PYTHON}"
   fi
   if [ -z "${HAS_VIRTUALENV}" ]; then
-    install_virtualenv "${PYENV_VERSION}"
+    VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
+    pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
     HAS_VIRTUALENV=1
   fi
 fi
@@ -372,6 +350,15 @@ fi
 unset VIRTUALENV_VERSION
 
 
+# Download specified version of ez_setup.py/get-pip.py
+if [ -n "${SETUPTOOLS_VERSION}" ]; then
+  EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
+fi
+if [ -n "${PIP_VERSION}" ]; then
+  GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+fi
+
+
 # Define `before_virtualenv` and `after_virtualenv` functions that allow
 # plugin hooks to register a string of code for execution before or
 # after the installation process.
@@ -410,7 +397,7 @@ if [ -d "${VIRTUALENV_PATH}/bin" ]; then
   fi
 
   if [ -n "$UPGRADE" ]; then
-    prepare_upgrade "${VIRTUALENV_NAME}" "${VIRTUALENV_PATH}"
+    PYENV_VERSION="${VIRTUALENV_NAME}" prepare_requirements
   fi
 fi
 
@@ -432,12 +419,11 @@ mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
 venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
 
-## Migrate previously installed packages from requirements.txt
-if [ -n "$UPGRADE" ]; then
-  upgrade "${VIRTUALENV_NAME}" "${VIRTUALENV_PATH}" || STATUS="$?"
-fi
+## Install setuptools and pip
+PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
 
-create_symlinks "${VIRTUALENV_NAME}"
+## Migrate previously installed packages from requirements.txt
+PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
 
 # Execute `after_virtualenv` hooks
 for hook in "${after_hooks[@]}"; do eval "$hook"; done

bin/pyenv-virtualenv-init

@@ -63,53 +63,84 @@ if [ -z "$print" ]; then
 fi
 
 case "$shell" in
-bash )
+fish )
+  echo "setenv PYENV_VIRTUALENV_INIT 1;"
+  ;;
+* )
+  echo "export PYENV_VIRTUALENV_INIT=1;"
+  ;;
+esac
+
+case "$shell" in
+fish )
+  cat <<EOS
+function _pyenv_virtualenv_hook --on-event fish_prompt;
+  if [ -n "\$PYENV_ACTIVATE" ]
+    if [ (pyenv version-name) = "system" ]
+      eval (pyenv sh-deactivate); or true
+      return 0
+    end
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
+      eval (pyenv sh-deactivate); or true
+      eval (pyenv sh-activate 2>/dev/null); or true
+    end
+  else
+    if [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
+      eval (pyenv sh-activate 2>/dev/null); or true
+    end
+  end
+end
+EOS
+ ;;
+ksh )
+  cat <<EOS
+function _pyenv_virtualenv_hook() {
+EOS
+  ;;
+* )
   cat <<EOS
-export PYENV_VIRTUALENV_INIT=1
 _pyenv_virtualenv_hook() {
-  if [[ "\$(pyenv version-name)" == "system" ]]; then
-    pyenv deactivate || true;
-  elif [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then
-    pyenv deactivate || true;
-    pyenv activate 2>/dev/null || true
+EOS
+  ;;
+esac
+
+if [[ "$shell" != "fish" ]]; then
+  cat <<EOS
+  if [ -n "\$PYENV_ACTIVATE" ]; then
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+      pyenv deactivate || true
+      return 0
+    fi
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv deactivate || true
+      pyenv activate 2>/dev/null || true
+    fi
+  else
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv activate 2>/dev/null || true
+    fi
   fi
 };
+EOS
+
+  case "$shell" in
+  bash )
+    cat <<EOS
 if ! [[ "\$PROMPT_COMMAND" =~ _pyenv_virtualenv_hook ]]; then
   PROMPT_COMMAND="_pyenv_virtualenv_hook;\$PROMPT_COMMAND";
 fi
 EOS
-  ;;
-fish )
-  cat <<EOS
-setenv PYENV_VIRTUALENV_INIT=1;
-function _pyenv_virtualenv_hook --on-event fish_prompt;
-  if [ (pyenv version-name) = "system" ]
-    eval (pyenv sh-deactivate); or true
-  else if [ "\$VIRTUAL_ENV" != (pyenv prefix) ]
-    eval (pyenv sh-deactivate); or true
-    eval (pyenv sh-activate 2>/dev/null); or true
-  end
-end
-EOS
-  ;;
-zsh )
-  cat <<EOS
-export PYENV_VIRTUALENV_INIT=1
-_pyenv_virtualenv_hook() {
-  if [[ "\$(pyenv version-name)" == "system" ]]; then
-    pyenv deactivate || true
-  elif [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then
-    pyenv deactivate || true
-    pyenv activate 2>/dev/null || true
-  fi
-}
+    ;;
+  zsh )
+    cat <<EOS
 typeset -a precmd_functions
 if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
   precmd_functions+=_pyenv_virtualenv_hook;
 fi
 EOS
-  ;;
-* )
-  # FIXME: what should i do here??
-  ;;
-esac
+    ;;
+  * )
+    # FIXME: what should i do here??
+    ;;
+  esac
+fi

test/activate.bats

@@ -22,7 +22,9 @@ setup() {
 
   assert_success
   assert_output <<EOS
-source "${PYENV_ROOT}/versions/venv/bin/activate"
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -42,7 +44,9 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv shell "venv";
-source "${PYENV_ROOT}/versions/venv/bin/activate"
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -61,7 +65,9 @@ EOS
 
   assert_success
   assert_output <<EOS
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -81,7 +87,9 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv shell "venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -99,7 +107,9 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv shell "venv27";
-source "${PYENV_ROOT}/versions/venv27/bin/activate"
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -117,7 +127,9 @@ EOS
   assert_success
   assert_output <<EOS
 pyenv shell "venv27";
-source "${PYENV_ROOT}/versions/venv27/bin/activate"
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 

test/deactivate.bats

@@ -13,7 +13,11 @@ setup() {
 
   assert_success
   assert_output <<EOS
-declare -f deactivate 1>/dev/null 2>&1 && deactivate;
+if declare -f deactivate 1>/dev/null 2>&1; then
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+fi;
 EOS
 }
 
@@ -24,8 +28,12 @@ EOS
 
   assert_success
   assert_output <<EOS
-declare -f deactivate 1>/dev/null 2>&1 && deactivate;
-pyenv shell --unset
+if declare -f deactivate 1>/dev/null 2>&1; then
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+fi;
+pyenv shell --unset;
 EOS
 }
 
@@ -36,7 +44,11 @@ EOS
 
   assert_success
   assert_output <<EOS
-functions -q deactivate; and deactivate;
+if functions -q deactivate
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+end;
 EOS
 }
 
@@ -47,8 +59,12 @@ EOS
 
   assert_success
   assert_output <<EOS
-functions -q deactivate; and deactivate;
-pyenv shell --unset
+if functions -q deactivate
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+end;
+pyenv shell --unset;
 EOS
 }
 

test/init.bats

@@ -28,17 +28,78 @@ load test_helper
 @test "outputs bash-specific syntax" {
   run pyenv-virtualenv-init - bash
   assert_success
-  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
+  assert_output <<EOS
+export PYENV_VIRTUALENV_INIT=1;
+_pyenv_virtualenv_hook() {
+  if [ -n "\$PYENV_ACTIVATE" ]; then
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+      pyenv deactivate || true
+      return 0
+    fi
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv deactivate || true
+      pyenv activate 2>/dev/null || true
+    fi
+  else
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv activate 2>/dev/null || true
+    fi
+  fi
+};
+if ! [[ "\$PROMPT_COMMAND" =~ _pyenv_virtualenv_hook ]]; then
+  PROMPT_COMMAND="_pyenv_virtualenv_hook;\$PROMPT_COMMAND";
+fi
+EOS
 }
 
 @test "outputs fish-specific syntax" {
   run pyenv-virtualenv-init - fish
   assert_success
-  assert_output_contains 'function _pyenv_virtualenv_hook --on-event fish_prompt;'
+  assert_output <<EOS
+setenv PYENV_VIRTUALENV_INIT 1;
+function _pyenv_virtualenv_hook --on-event fish_prompt;
+  if [ -n "\$PYENV_ACTIVATE" ]
+    if [ (pyenv version-name) = "system" ]
+      eval (pyenv sh-deactivate); or true
+      return 0
+    end
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
+      eval (pyenv sh-deactivate); or true
+      eval (pyenv sh-activate 2>/dev/null); or true
+    end
+  else
+    if [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
+      eval (pyenv sh-activate 2>/dev/null); or true
+    end
+  end
+end
+EOS
 }
 
 @test "outputs zsh-specific syntax" {
   run pyenv-virtualenv-init - zsh
   assert_success
-  assert_output_contains '  precmd_functions+=_pyenv_virtualenv_hook;'
+  assert_output <<EOS
+export PYENV_VIRTUALENV_INIT=1;
+_pyenv_virtualenv_hook() {
+  if [ -n "\$PYENV_ACTIVATE" ]; then
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+      pyenv deactivate || true
+      return 0
+    fi
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv deactivate || true
+      pyenv activate 2>/dev/null || true
+    fi
+  else
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv activate 2>/dev/null || true
+    fi
+  fi
+};
+typeset -a precmd_functions
+if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
+  precmd_functions+=_pyenv_virtualenv_hook;
+fi
+EOS
 }

test/pip.bats

@@ -0,0 +1,80 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+stub_pyenv() {
+  stub pyenv-version-name "echo \${PYENV_VERSION}"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-hooks "virtualenv : echo"
+  stub pyenv-rehash " : echo rehashed"
+}
+
+unstub_pyenv() {
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-hooks
+  unstub pyenv-rehash
+}
+
+@test "install pip with ensurepip" {
+  export PYENV_VERSION="3.4.1"
+  stub_pyenv "${PYENV_VERSION}"
+  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%.*}"
+
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
+
+  run pyenv-virtualenv venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=venv python -m ensurepip
+rehashed
+OUT
+  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
+
+  unstub_pyenv
+  unstub pyenv-exec
+}
+
+@test "install pip without using ensurepip" {
+  export PYENV_VERSION="3.3.5"
+  stub_pyenv "${PYENV_VERSION}"
+  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 : 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 curl true
+  stub curl true
+
+  remove_executable "3.3.5" "virtualenv"
+  create_executable "3.3.5" "pyvenv"
+
+  run pyenv-virtualenv venv
+
+  assert_success
+  assert_output <<OUT
+PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+PYENV_VERSION=venv python ${TMP}/pyenv/cache/ez_setup.py
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
+PYENV_VERSION=venv python ${TMP}/pyenv/cache/get-pip.py
+rehashed
+OUT
+  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
+
+  unstub_pyenv
+  unstub pyenv-exec
+}

test/pyvenv.bats

@@ -7,7 +7,6 @@ setup() {
 }
 
 stub_pyenv() {
-  export PYENV_VERSION="$1"
   stub pyenv-version-name "echo \${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-hooks "virtualenv : echo"
@@ -15,7 +14,6 @@ stub_pyenv() {
 }
 
 unstub_pyenv() {
-  unset PYENV_VERSION
   unstub pyenv-version-name
   unstub pyenv-prefix
   unstub pyenv-hooks
@@ -23,12 +21,13 @@ unstub_pyenv() {
 }
 
 @test "use pyvenv if virtualenv is not available" {
-  stub_pyenv "3.4.1"
+  export PYENV_VERSION="3.4.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip3.4\";echo PYENV_VERSION=\${PYENV_VERSION} ensurepip"
-  stub pyenv-exec "echo 3.4"
+  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"
@@ -38,21 +37,21 @@ unstub_pyenv() {
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
-PYENV_VERSION=venv ensurepip
 rehashed
 OUT
-  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
 
   unstub_pyenv
   unstub pyenv-exec
 }
 
 @test "not use pyvenv if virtualenv is available" {
-  stub_pyenv "3.4.1"
+  export PYENV_VERSION="3.4.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.4"
+  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"
@@ -70,12 +69,18 @@ OUT
 }
 
 @test "install virtualenv if pyvenv is not avaialble" {
-  stub_pyenv "3.2.1"
+  export PYENV_VERSION="3.2.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
+  stub pyenv-exec "pip install virtualenv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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
 
   remove_executable "3.2.1" "virtualenv"
   remove_executable "3.2.1" "pyvenv"
@@ -86,20 +91,25 @@ OUT
   assert_output <<OUT
 PYENV_VERSION=3.2.1 pip install virtualenv
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
 
   unstub_pyenv
   unstub pyenv-exec
+  unstub curl
 }
 
 @test "install virtualenv if -p has given" {
-  stub_pyenv "3.4.1"
+  export PYENV_VERSION="3.4.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.4"
+  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"
@@ -118,12 +128,14 @@ OUT
 }
 
 @test "install virtualenv if --python has given" {
-  stub_pyenv "3.4.1"
+  export PYENV_VERSION="3.4.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.4"
+  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"
@@ -142,12 +154,18 @@ OUT
 }
 
 @test "install virtualenv with unsetting troublesome pip options" {
-  stub_pyenv "3.2.1"
+  export PYENV_VERSION="3.2.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
+  stub pyenv-exec "pip install virtualenv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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
 
   remove_executable "3.2.1" "virtualenv"
   remove_executable "3.2.1" "pyvenv"
@@ -158,43 +176,12 @@ OUT
   assert_output <<OUT
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
 
   unstub_pyenv
   unstub pyenv-exec
-}
-
-@test "install pip without using ensurepip" {
-  stub_pyenv "3.3.5"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-which "pip : echo no pip; false"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no setuptools; false"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} setuptools"
-  stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip\";echo PYENV_VERSION=\${PYENV_VERSION} pip"
-  stub pyenv-exec "echo 3.3"
-  stub curl "echo ez_setup.py"
-  stub curl "echo get_pip.py"
-
-  remove_executable "3.3.5" "virtualenv"
-  create_executable "3.3.5" "pyvenv"
-
-  run pyenv-virtualenv venv
-
-  assert_success
-  assert_output <<OUT
-PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
-PYENV_VERSION=venv no ensurepip
-PYENV_VERSION=venv setuptools
-PYENV_VERSION=venv pip
-rehashed
-OUT
-  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
-
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
+  unstub curl
 }

test/virtualenv.bats

@@ -7,8 +7,6 @@ setup() {
 }
 
 stub_pyenv() {
-  export PYENV_VERSION="$1"
-
   create_executable "${PYENV_VERSION}" "virtualenv"
   remove_executable "${PYENV_VERSION}" "pyvenv"
 
@@ -20,82 +18,117 @@ stub_pyenv() {
 }
 
 unstub_pyenv() {
-  unset PYENV_VERSION
   unstub pyenv-prefix
   unstub pyenv-hooks
   unstub pyenv-rehash
 }
 
 @test "create virtualenv from given version" {
-  stub_pyenv "3.2.1"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
+  export PYENV_VERSION="3.2.1"
+  stub_pyenv "${PYENV_VERSION}"
+  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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
 
   run pyenv-virtualenv "3.2.1" "venv"
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
 
   unstub_pyenv
   unstub pyenv-exec
+  unstub curl
 }
 
 @test "create virtualenv from current version" {
-  stub_pyenv "3.2.1"
+  export PYENV_VERSION="3.2.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
+  stub pyenv-exec "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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
 
   run pyenv-virtualenv venv
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
 
   unstub_pyenv
   unstub pyenv-version-name
   unstub pyenv-exec
+  unstub curl
 }
 
 @test "create virtualenv with short options" {
-  stub_pyenv "3.2.1"
+  export PYENV_VERSION="3.2.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
+  stub pyenv-exec "virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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
 
   run pyenv-virtualenv -v -p python venv
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
 
   unstub_pyenv
   unstub pyenv-version-name
   unstub pyenv-exec
+  unstub curl
 }
 
 @test "create virtualenv with long options" {
-  stub_pyenv "3.2.1"
+  export PYENV_VERSION="3.2.1"
+  stub_pyenv "${PYENV_VERSION}"
   stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
+  stub pyenv-exec "virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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
 
   run pyenv-virtualenv --verbose --python=python venv
 
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 virtualenv --verbose --python=python ${PYENV_ROOT}/versions/venv
+Installing setuptools from https://bootstrap.pypa.io/ez_setup.py...
+Installing pip from https://bootstrap.pypa.io/get-pip.py...
 rehashed
 OUT
 
   unstub_pyenv
   unstub pyenv-version-name
   unstub pyenv-exec
+  unstub curl
 }