v20150119

fix wrong output in test in fish, refs 240a1de

README.md

@@ -3,134 +3,200 @@
 [![Build Status](https://travis-ci.org/yyuu/pyenv-virtualenv.png)](https://travis-ci.org/yyuu/pyenv-virtualenv)
 
 pyenv-virtualenv is a [pyenv](https://github.com/yyuu/pyenv) plugin
-that provides a `pyenv virtualenv` command to create virtualenv for Python
+that provides a `pyenv virtualenv` command to create virtualenvs for Python
 on UNIX-like systems.
 
 (NOTICE: If you are an existing user of [virtualenvwrapper](http://pypi.python.org/pypi/virtualenvwrapper)
 and you love it, [pyenv-virtualenvwrapper](https://github.com/yyuu/pyenv-virtualenvwrapper) may help you
-to manage your virtualenvs.)
+(additionally) to manage your virtualenvs.)
 
 ## Installation
 
 ### Installing as a pyenv plugin
 
-Installing pyenv-virtualenv as a pyenv plugin will give you access to the
-`pyenv virtualenv` command.
-
-    $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
-    $ exec "$SHELL"
-
 This will install the latest development version of pyenv-virtualenv into
 the `~/.pyenv/plugins/pyenv-virtualenv` directory.
-**Important note:**  If you installed pyenv into a non-standard directory, make sure that you clone this
-repo into the 'plugins' directory of wherever you installed into.
+
+**Important note:**  If you installed pyenv into a non-standard directory, make
+sure that you clone this repo into the 'plugins' directory of wherever you
+installed into.
 
 From inside that directory you can:
  - Check out a specific release tag.
- - Get the latest development release by running `git pull` to download the latest changes.
+ - Get the latest development release by running `git pull` to download the
+   latest changes.
+
+1. **Check out pyenv-virtualenv into plugin directory**
+
+        $ 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. This is entirely optional but pretty useful.
+
+        $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
+    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
+    **Pyenv note**: You may also need to add 'eval "$(pyenv init -)"' to your profile if you haven't done so already.
+
+3. **Restart your shell to enable pyenv-virtualenv**
+
+        $ exec "$SHELL"
+
 
 ### Installing with Homebrew (for OS X users)
 
 Mac OS X users can install pyenv-virtualenv with the
-[Homebrew](http://brew.sh) package manager. This
-will give you access to the `pyenv-virtualenv` command. If you have pyenv
+[Homebrew](http://brew.sh) package manager.
+This will give you access to the `pyenv-virtualenv` command. If you have pyenv
 installed, you will also be able to use the `pyenv virtualenv` command.
 
-*This is recommended method of installation if you installed pyenv
+*This is the recommended method of installation if you installed pyenv
  with Homebrew.*
 
-    brew install pyenv-virtualenv
+```
+$ brew install pyenv-virtualenv
+```
 
 Or, if you would like to install the latest development release:
 
-    brew install --HEAD pyenv-virtualenv
+```
+$ brew install --HEAD pyenv-virtualenv
+```
+
+After installation, you'll still need to add `eval "$(pyenv virtualenv-init
+-)"` to your profile (as stated in the caveats). You'll only ever have to do
+this once.
 
 
 ## Usage
 
 ### Using `pyenv virtualenv` with pyenv
 
-To create a virtualenv for the Python version use with pyenv, run
+To create a virtualenv for the Python version used with pyenv, run
 `pyenv virtualenv`, specifying the Python version you want and the name
 of the virtualenv directory. For example,
 
-    $ pyenv virtualenv 2.7.6 my-virtual-env-2.7.6
+```
+$ pyenv virtualenv 2.7.7 my-virtual-env-2.7.7
+```
 
-will create a virtualenv based on Python 2.7.6
-under `~/.pyenv/versions` in a folder called `my-virtual-env-2.7.6`. 
+will create a virtualenv based on Python 2.7.7 under `~/.pyenv/versions` in a
+folder called `my-virtual-env-2.7.7`.
 
 
 ### Create virtualenv from current version
 
-If there is only one argument is given to `pyenv virtualenv`,
-virtualenv will be created with given name based on current
-version.
+If there is only one argument given to `pyenv virtualenv`, the virtualenv will
+be created with the given name based on the current pyenv Python version.
 
-    $ pyenv version
-    3.3.3 (set by /home/yyuu/.pyenv/version)
-    $ pyenv virtualenv venv33
+```
+$ pyenv version
+3.4.2 (set by /home/yyuu/.pyenv/version)
+$ pyenv virtualenv venv34
+```
 
 
 ### List existing virtualenvs
 
-`pyenv virtualenvs` shows you the list of existing virtualenvs.
+`pyenv virtualenvs` shows you the list of existing virtualenvs:
 
-    $ pyenv shell venv27
-    $ pyenv virtualenvs
-    * venv27 (created from /home/yyuu/.pyenv/versions/2.7.6)
-      venv33 (created from /home/yyuu/.pyenv/versions/3.3.3)
+```
+$ pyenv shell venv27
+$ pyenv virtualenvs
+* venv27 (created from /home/yyuu/.pyenv/versions/2.7.7)
+  venv34 (created from /home/yyuu/.pyenv/versions/3.4.1)
+```
 
 
 ### Activate virtualenv
 
-Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might require you to `activate` the virtualenv.
-`pyenv activate` lets you to activate the virtualenv into your shell.
+Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might
+require you to `activate` the virtualenv.
 
-    $ pyenv activate venv27
+`pyenv-virtualenv` will automatically activate/deactivate the virtualenv if
+the `eval "$(pyenv virtualenv-init -)"` is properly configured in your shell.
 
-`pyenv activate` acts almost like following commands.
-The activate'd virtualenv will be persisted as _shell_ version.
+You can also activate and deactivate a pyenv virtualenv manually:
 
-    $ pyenv shell venv27
-    $ source "$(pyenv prefix venv27)/bin/activate"
+    pyenv activate <name>
+    pyenv deactivate
 
-### Deactivate virtualenv
 
-You can `deactivate` the activate'd virtualenv by `pyenv deactivate`.
+### Delete existing virtualenv
 
-    $ pyenv deactivate
+Removing the directory in `~/.pyenv/versions` will delete the virtualenv, or you can run:
 
-Or, there is an alias in `activate` command.
-This is prepared for similality between other `pyenv` commands like `shell` and `local`.
+    pyenv uninstall my-virtual-env
     
-    $ pyenv activate --unset
 
-`pyenv deactivate` acts almost like following commands.
-You can also use virtualenv's `deactivate` in place of `pyenv deactivate`,
-but be careful with the _shell_ version because it will be persisted even if `deactivate` has invoked.
+### virtualenv and pyvenv
+
+There is a [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.
+
+`pyenv-virtualenv` uses `pyvenv` if it is available and the `virtualenv`
+command is not available.
 
-    $ deactivate
-    $ pyenv shell --unset
 
 ### Special environment variables
 
-You can set certain environment variables to control the pyenv-virtualenv.
+You can set certain environment variables to control pyenv-virtualenv.
 
 * `PYENV_VIRTUALENV_CACHE_PATH`, if set, specifies a directory to use for
   caching downloaded package files.
-* `VIRTUALENV_VERSION`, if set, forces pyenv-virtualenv to install desired
-  version of virtualenv. If the virtualenv has not been installed,
+* `VIRTUALENV_VERSION`, if set, forces pyenv-virtualenv to install the desired
+  version of virtualenv. If `virtualenv` has not been installed,
   pyenv-virtualenv will try to install the given version of virtualenv.
-* `EZ_SETUP` and `GET_PIP`, if set and pyvenv is preferred than virtualenv,
-  use `ez_setup.py` and `get_pip.py` at specified location.
-* `EZ_SETUP_URL` and `GET_PIP_URL`, if set and pyvenv is preferred
-  than virtualenv, download `ez_setup.py` and `get_pip.py` from specified URL.
-* `SETUPTOOLS_VERSION` and `PIP_VERSION`, if set and pyvenv is preferred
-  than virtualenv, install specified version of setuptools and pip.
+* `EZ_SETUP` and `GET_PIP`, if set and `pyvenv` is preferred over `virtualenv`,
+  use `ez_setup.py` and `get_pip.py` from the specified location.
+* `EZ_SETUP_URL` and `GET_PIP_URL`, if set and `pyvenv` is preferred over
+  `virtualenv`, download `ez_setup.py` and `get_pip.py` from the specified URL.
+* `SETUPTOOLS_VERSION` and `PIP_VERSION`, if set and `pyvenv` is preferred
+  over `virtualenv`, install the specified version of setuptools and pip.
 
 
 ## Version History
 
+#### 20150119
+
+ * Ignore errors from `pyenv-version-name` since it might fail if there is configuration error (yyuu/pyenv#291)
+ * The _shell_ version set in `activate` should be unset in `deactivate` (#61)
+ * Anaconda has `activate` script nevertheless it is not a virtual environment (#65)
+
+#### 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
+ * Support manual (de)?activation with auto-activation enabled (#32, #34)
+ * Exit as error when (de)?activation failed
+ * Use https://bootstrap.pypa.io/ to install setuptools and pip
+ * Create backup of original virtualenv within `$(pyenv root)/versions` when `--upgrade`
+
+#### 20140615
+
+ * Fix incompatibility issue of `pyenv activate` and `pyenv deactivate` (#26)
+ * Workaround for the issue with pyenv-which-ext (#26)
+
+#### 20140614
+
+ * Add `pyenv virtualenv-init` to enable auto-activation feature (#24)
+ * Create symlinks for executables with version suffix (yyuu/pyenv#182)
+
+#### 20140602
+
+ * Use new style GH raw url to avoid redirects (raw.github.com -> raw.githubusercontent.com)
+ * Repaired virtualenv activation and deactivation for the fish shell (#23)
+
 #### 20140421
 
  * Display error if `pyenv activate` was invoked as a command

bin/pyenv-sh-activate

@@ -14,35 +14,116 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
+unset NOERROR
+unset VERBOSE
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+  "--complete" )
+    # Provide pyenv completions
     echo --unset
     exec pyenv-virtualenvs --bare
-fi
-
-if [ "$1" = "--unset" ]; then
+    ;;
+  "--no-error" )
+    NOERROR=1
+    ;;
+  "--unset" )
     echo "pyenv deactivate"
     exit
-fi
+    ;;
+  "--verbose" )
+    VERBOSE=1
+    ;;
+  * )
+    break
+    ;;
+  esac
+  shift 1
+done
 
+no_shell=
 versions=("$@")
-shell="$(basename "${PYENV_SHELL:-$SHELL}")"
-
-if [ -z "$versions" ]; then
+if [ -z "${versions}" ]; then
+  no_shell=1
   OLDIFS="$IFS"
   IFS=: versions=($(pyenv-version-name))
   IFS="$OLDIFS"
 fi
 
+if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
+  # Backward compatibility issue
+  # https://github.com/yyuu/pyenv-virtualenv/issues/26
+  no_shell=
+fi
+
 if [ "${#versions[@]}" -gt 1 ]; then
-  echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
+  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
+  echo "false"
   exit 1
 fi
 
-pyenv-virtualenv-prefix "${versions}" 1>/dev/null
+if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
+  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
+  echo "false"
+  exit 1
+fi
 
-echo "pyenv shell \"${versions}\""
+shell="$(basename "${PYENV_SHELL:-$SHELL}")"
 case "$shell" in
-fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;;
-*    ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;;
+bash )
+  profile="$HOME/.bash_profile"
+  ;;
+zsh )
+  profile="$HOME/.zshrc"
+  ;;
+ksh )
+  profile="$HOME/.profile"
+  ;;
+fish )
+  profile="$HOME/.config/fish/config.fish"
+  ;;
+* )
+  profile="$HOME/.profile"
+  ;;
+esac
+
+# Display setup instruction if 'pyenv virtualenv-init -' is not found in "$profile"
+if [ -f "$profile" ] && grep -q 'pyenv init -' "$profile" && ! grep -q 'pyenv virtualenv-init -' "$profile"; then
+  pyenv-virtualenv-init >&2 || true
+fi
+
+if [ -n "$VERBOSE" ]; then
+  echo "pyenv-virtualenv: activate ${versions}" 1>&2
+fi
+
+if [ -z "$no_shell" ]; then
+  echo "pyenv shell \"${versions}\";"
+  # shell version set in pyenv-sh-activate should be unset
+  # https://github.com/yyuu/pyenv-virtualenv/issues/61
+  case "$shell" in
+  fish )
+    echo "setenv PYENV_ACTIVATE_SHELL 1;"
+    ;;
+  * )
+    echo "export PYENV_ACTIVATE_SHELL=1;"
+    ;;
+  esac
+fi
+
+prefix="$(pyenv-prefix "${versions}")"
+case "$shell" in
+fish )
+  cat <<EOS
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "${prefix}";
+. "${prefix}/bin/activate.fish";
+EOS
+ ;;
+*    )
+  cat <<EOS
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${prefix}";
+. "${prefix}/bin/activate";
+EOS
+  ;;
 esac

bin/pyenv-sh-deactivate

@@ -9,9 +9,84 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
+unset NOERROR
+unset VERBOSE
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+  "--no-error" )
+    NOERROR=1
+    ;;
+  "--verbose" )
+    VERBOSE=1
+    ;;
+  * )
+    break
+    ;;
+  esac
+  shift 1
+done
+
 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 )
+  echo "if functions -q deactivate;"
+  ;;
+*    )
+  echo "if declare -f deactivate 1>/dev/null 2>&1; then"
+  ;;
+esac
+
+prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}"
+
+if [ -n "$VERBOSE" ]; then
+  echo "  echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
+fi
+
+if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then
+  # shell version set in pyenv-sh-activate should be unset
+  # https://github.com/yyuu/pyenv-virtualenv/issues/61
+  echo "  pyenv shell --unset;"
+  case "$shell" in
+  fish )
+    echo "  set -e PYENV_ACTIVATE_SHELL;"
+    ;;
+  * )
+    echo "  unset PYENV_ACTIVATE_SHELL;"
+    ;;
+  esac
+fi
+
+case "$shell" in
+fish )
+  cat <<EOS
+  setenv PYENV_DEACTIVATE "$prefix";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+else;
+EOS
+  ;;
+*    )
+  cat <<EOS
+  export PYENV_DEACTIVATE="$prefix";
+  unset PYENV_ACTIVATE;
+  deactivate;
+else
+EOS
+  ;;
+esac
+
+if [ -z "$NOERROR" ]; then
+  echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"
+fi
+
+echo "  false;"
+
+case "$shell" in
+fish )
+  echo "end;"
+  ;;
+*    )
+  echo "fi;"
+  ;;
 esac
-echo "pyenv shell --unset"

bin/pyenv-virtualenv

@@ -2,16 +2,14 @@
 #
 # 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
 #
 
-PYENV_VIRTUALENV_VERSION="20140421"
+PYENV_VIRTUALENV_VERSION="20150119"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -124,10 +122,12 @@ usage() {
 }
 
 detect_venv() {
-  if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
+  # Check the existence of executables as a workaround for the issue with pyenv-which-ext
+  # https://github.com/yyuu/pyenv-virtualenv/issues/26
+  if [ -x "$(pyenv-prefix)/bin/virtualenv" ]; then
     HAS_VIRTUALENV=1
   fi
-  if pyenv-which "pyvenv" 1>/dev/null 2>&1; then
+  if [ -x "$(pyenv-prefix)/bin/pyvenv" ]; then
     HAS_PYVENV=1
   fi
   # Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given
@@ -140,110 +140,74 @@ 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
       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
+      [ -n "${EZ_SETUP_URL}" ] || EZ_SETUP_URL="https://bootstrap.pypa.io/ez_setup.py"
       echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
-      fi
       http get "${EZ_SETUP_URL}"
     fi
-  } | PYENV_VERSION="${version}" pyenv-exec python
+  } 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
+  }
 }
 
-install_pip() {
-  local version="$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
-      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.github.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
-        else
-          GET_PIP_URL="https://raw.github.com/pypa/pip/master/contrib/get-pip.py"
-        fi
-      }
-      if [ -n "$VERBOSE" ]; then
+      [ -n "${GET_PIP_URL}" ] || GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
       echo "Installing pip from ${GET_PIP_URL}..." 1>&2
-      fi
       http get "${GET_PIP_URL}"
     fi
-  } | PYENV_VERSION="${version}" pyenv-exec python
+  } 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
+  }
 }
 
-install_virtualenv() {
-  local version="$1"
-  VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
-  PYENV_VERSION="${version}" pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
+build_package_ensurepip() {
+  pyenv-exec python -m ensurepip 2>/dev/null|| {
+    build_package_ez_setup "$@" && build_package_get_pip "$@"
+  } || return 1
 }
 
-ensurepip() {
-  local version="$1"
-  if PYENV_VERSION="${version}" pyenv-exec python -m ensurepip 2>/dev/null; then
-    local PREFIX_PATH="$(pyenv-prefix "${version}")"
-    if [ ! -e "${PREFIX_PATH}/bin/pip" ]; then
-      local pip="$(PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;v=sys.version_info;sys.stdout.write("pip%d.%d"%(v[0],v[1]))')"
-      if [ -e "${PREFIX_PATH}/bin/${pip}" ]; then
-        ( cd "${PREFIX_PATH}/bin" && ln -fs "${pip}" "pip" )
-      fi
-    fi
-  else
-    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
-  fi
+prepare_requirements() {
+  pyenv-exec pip freeze > "${REQUIREMENTS}"
+  mv -f "${VIRTUALENV_PATH}" "${VIRTUALENV_ORIG}"
 }
 
-prepare_upgrade() {
-  local version="$1"
-  local prefix="$2"
-  PYENV_VERSION="${version}" pyenv-exec pip freeze >"${UPGRADE_LIST}"
-  mv -f "${prefix}" "${UPGRADE_PATH}"
-}
-
-upgrade() {
-  local version="$1"
-  local prefix="$2"
+install_requirements() {
+  if [ -f "${REQUIREMENTS}" ]; then
     ## 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"
+    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}"
-    } 1>&2
+      cat "${REQUIREMENTS}" | sed 's/^/ * /'
       return 1
+    } 1>&2
+    rm -f "${REQUIREMENTS}"
+    rm -fr "${VIRTUALENV_ORIG}"
   fi
-  rm -f "${UPGRADE_LIST}"
-  rm -fr "${UPGRADE_PATH}"
 }
 
 PYENV_VIRTUALENV_ROOT="$(abs_dirname "$0")/.."
@@ -311,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}"
 
@@ -323,10 +292,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
@@ -334,20 +299,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
@@ -357,6 +333,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.
@@ -395,7 +380,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
 
@@ -417,10 +402,11 @@ mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
 cd "${PYENV_VIRTUALENV_CACHE_PATH}"
 venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
 
+## Install setuptools and pip
+PYENV_VERSION="${VIRTUALENV_NAME}" build_package_ensurepip
+
 ## Migrate previously installed packages from requirements.txt
-if [ -n "$UPGRADE" ]; then
-  upgrade "${VIRTUALENV_NAME}" "${VIRTUALENV_PATH}" || STATUS="$?"
-fi
+PYENV_VERSION="${VIRTUALENV_NAME}" install_requirements || true
 
 # Execute `after_virtualenv` hooks
 for hook in "${after_hooks[@]}"; do eval "$hook"; done

bin/pyenv-virtualenv-init

@@ -0,0 +1,157 @@
+#!/usr/bin/env bash
+# Summary: Configure the shell environment for pyenv-virtualenv
+# Usage: eval "$(pyenv virtualenv-init - [<shell>])"
+#
+# Automatically activates a Python virtualenv environment based on current
+# pyenv version.
+#
+
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+print=""
+for args in "$@"
+do
+  if [ "$args" = "-" ]; then
+    print=1
+    shift
+  fi
+done
+
+shell="$1"
+if [ -z "$shell" ]; then
+  shell="$(ps c -p "$PPID" -o 'ucomm=' 2>/dev/null || true)"
+  shell="${shell##-}"
+  shell="${shell%% *}"
+  shell="$(basename "${shell:-$SHELL}")"
+fi
+
+if [ -z "$print" ]; then
+  case "$shell" in
+  bash )
+    profile='~/.bash_profile'
+    ;;
+  zsh )
+    profile='~/.zshrc'
+    ;;
+  ksh )
+    profile='~/.profile'
+    ;;
+  fish )
+    profile='~/.config/fish/config.fish'
+    ;;
+  * )
+    profile='your profile'
+    ;;
+  esac
+
+  { echo "# Load pyenv-virtualenv automatically by adding"
+    echo "# the following to ${profile}:"
+    echo
+    case "$shell" in
+    fish )
+      echo 'status --is-interactive; and . (pyenv virtualenv-init -|psub)'
+      ;;
+    * )
+      echo 'eval "$(pyenv virtualenv-init -)"'
+      ;;
+    esac
+    echo
+  } >&2
+
+  exit 1
+fi
+
+case "$shell" in
+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;
+  set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
+  if [ -n "\$PYENV_ACTIVATE" ]
+    if [ "(pyenv version-name 2>/dev/null; or true)" = "system" ]
+      pyenv deactivate --no-error --verbose
+      set -e PYENV_DEACTIVATE
+      return 0
+    end
+    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
+      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" ]
+      pyenv activate --no-error --verbose
+    end
+  end
+end
+EOS
+ ;;
+ksh )
+  cat <<EOS
+function _pyenv_virtualenv_hook() {
+EOS
+  ;;
+* )
+  cat <<EOS
+_pyenv_virtualenv_hook() {
+EOS
+  ;;
+esac
+
+if [[ "$shell" != "fish" ]]; then
+  cat <<EOS
+  if [ -n "\$PYENV_ACTIVATE" ]; then
+    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
+      pyenv deactivate --no-error --verbose
+      unset PYENV_DEACTIVATE
+      return 0
+    fi
+    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; 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" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+      pyenv activate --no-error --verbose
+    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
+    ;;
+  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
+fi

bin/pyenv-virtualenv-prefix

@@ -32,10 +32,20 @@ base_prefix() { # pyvenv
 
 VIRTUALENV_PREFIX_PATHS=()
 for version in "${versions[@]}"; do
+  if [ "$version" = "system" ]; then
+    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+    exit 1
+  fi
   PREFIX="$(pyenv-prefix "${version}")"
   if [ -f "${PREFIX}/bin/activate" ]; then
+    # Anaconda has `activate` script nevertheless it is not a virtual environment (#65)
+    if [ -f "${PREFIX}/bin/conda" ]; then
+      echo "pyenv-virtualenv: version \`${version}' is an anaconda/miniconda" 1>&2
+      exit 1
+    else
       VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
       VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
+    fi
   else
     echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
     exit 1

test/activate.bats

@@ -3,10 +3,13 @@
 load test_helper
 
 setup() {
+  export HOME="${TMP}"
   export PYENV_ROOT="${TMP}/pyenv"
 }
 
 @test "activate virtualenv from current version" {
+  export PYENV_VIRTUALENV_INIT=1
+
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
@@ -19,12 +22,60 @@ setup() {
 
   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";
+. "${PYENV_ROOT}/versions/venv/bin/activate";
+EOS
+}
+
+@test "activate virtualenv from current version (verbose)" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-version-name "echo venv"
+  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv-virtualenv: activate venv
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
+. "${PYENV_ROOT}/versions/venv/bin/activate";
+EOS
+}
+
+@test "activate virtualenv from current version (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  stub pyenv-version-name "echo venv"
+  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv";
+export PYENV_ACTIVATE_SHELL=1;
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
+. "${PYENV_ROOT}/versions/venv/bin/activate";
 EOS
 }
 
 @test "activate virtualenv from current version (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
@@ -37,24 +88,116 @@ 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_ROOT}/versions/venv/bin/activate.fish";
+EOS
+}
+
+@test "activate virtualenv from current version (fish) (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  stub pyenv-version-name "echo venv"
+  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
+
+  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
+
+  unstub pyenv-version-name
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv";
+setenv PYENV_ACTIVATE_SHELL 1;
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
+. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
 EOS
 }
 
 @test "activate virtualenv from command-line argument" {
+  export PYENV_VIRTUALENV_INIT=1
+
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
-  run pyenv-sh-activate "venv27"
+  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
 
   unstub pyenv-virtualenv-prefix
   unstub pyenv-prefix
 
   assert_success
   assert_output <<EOS
-pyenv shell "venv27"
-source "${PYENV_ROOT}/versions/venv27/bin/activate"
+pyenv shell "venv27";
+export PYENV_ACTIVATE_SHELL=1;
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
+. "${PYENV_ROOT}/versions/venv27/bin/activate";
+EOS
+}
+
+@test "activate virtualenv from command-line argument (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+
+  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv27";
+export PYENV_ACTIVATE_SHELL=1;
+unset PYENV_DEACTIVATE;
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
+. "${PYENV_ROOT}/versions/venv27/bin/activate";
+EOS
+}
+
+@test "activate virtualenv from command-line argument (fish)" {
+  export PYENV_VIRTUALENV_INIT=1
+
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+
+  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv27";
+setenv PYENV_ACTIVATE_SHELL 1;
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
+. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
+EOS
+}
+
+@test "activate virtualenv from command-line argument (fish) (without pyenv-virtualenv-init)" {
+  export PYENV_VIRTUALENV_INIT=
+
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+
+  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate "venv27"
+
+  unstub pyenv-virtualenv-prefix
+  unstub pyenv-prefix
+
+  assert_success
+  assert_output <<EOS
+pyenv shell "venv27";
+setenv PYENV_ACTIVATE_SHELL 1;
+set -e PYENV_DEACTIVATE;
+setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv27";
+. "${PYENV_ROOT}/versions/venv27/bin/activate.fish";
 EOS
 }
 
@@ -75,6 +218,23 @@ EOS
   unstub pyenv-virtualenv-prefix
 
   assert_failure
+  assert_output <<EOS
+pyenv-virtualenv: version \`3.3.3' is not a virtualenv
+false
+EOS
+}
+
+@test "should fail if the version is not a virtualenv (no-error)" {
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
+
+  run pyenv-sh-activate --no-error "3.3.3"
+
+  unstub pyenv-virtualenv-prefix
+
+  assert_failure
+  assert_output <<EOS
+false
+EOS
 }
 
 @test "should fail if there are multiple versions" {
@@ -83,6 +243,16 @@ EOS
   assert_failure
   assert_output <<EOS
 pyenv-virtualenv: cannot activate multiple versions at once: venv venv27
+false
+EOS
+}
+
+@test "should fail if there are multiple versions (no-error)" {
+  run pyenv-sh-activate --no-error "venv" "venv27"
+
+  assert_failure
+  assert_output <<EOS
+false
 EOS
 }
 

test/deactivate.bats

@@ -7,22 +7,216 @@ setup() {
 }
 
 @test "deactivate virtualenv" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
   PYENV_SHELL="bash" run pyenv-sh-deactivate
 
   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;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+fi;
+EOS
+}
+
+@test "deactivate virtualenv (verbose)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --verbose
+
+  assert_success
+  assert_output <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  echo "pyenv-virtualenv: deactivate venv" 1>&2;
+  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+fi;
+EOS
+}
+
+@test "deactivate virtualenv (no-error)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
+
+  assert_success
+  assert_output <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+else
+  false;
+fi;
+EOS
+}
+
+@test "deactivate virtualenv (with shell activation)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=1
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  pyenv shell --unset;
+  unset PYENV_ACTIVATE_SHELL;
+  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+else
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+fi;
+EOS
+}
+
+@test "deactivate virtualenv (with shell activation) (no-error)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=1
+
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
+
+  assert_success
+  assert_output <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  pyenv shell --unset;
+  unset PYENV_ACTIVATE_SHELL;
+  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+else
+  false;
+fi;
+EOS
+}
+
+@test "deactivate virtualenv which has been activated manually" {
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  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_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
   PYENV_SHELL="fish" run pyenv-sh-deactivate
 
   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;
+else;
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+end;
+EOS
+}
+
+@test "deactivate virtualenv (fish) (no-error)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
+
+  assert_success
+  assert_output <<EOS
+if functions -q deactivate;
+  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+else;
+  false;
+end;
+EOS
+}
+
+@test "deactivate virtualenv (fish) (with shell activation)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=1
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+if functions -q deactivate;
+  pyenv shell --unset;
+  set -e PYENV_ACTIVATE_SHELL;
+  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+else;
+  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
+  false;
+end;
+EOS
+}
+
+@test "deactivate virtualenv (fish) (with shell activation) (no-error)" {
+  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=1
+
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
+
+  assert_success
+  assert_output <<EOS
+if functions -q deactivate;
+  pyenv shell --unset;
+  set -e PYENV_ACTIVATE_SHELL;
+  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+else;
+  false;
+end;
+EOS
+}
+
+@test "deactivate virtualenv which has been activated manually (fish)" {
+  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
+  export PYENV_ACTIVATE_SHELL=
+
+  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/hooks.bats

@@ -13,14 +13,16 @@ setup() {
 before_virtualenv 'echo before: \$VIRTUALENV_PATH'
 after_virtualenv 'echo after: \$STATUS'
 OUT
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
-  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \
-                   "pyvenv : false"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.2.1'"
   stub pyenv-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=3.2.1 \"\$@\""
   stub pyenv-rehash "echo rehashed"
 
-  mkdir -p "${PYENV_ROOT}/versions/3.2.1"
+  create_executable "3.2.1" "virtualenv"
+  remove_executable "3.2.1" "pyvenv"
+
   run pyenv-virtualenv "3.2.1" venv
 
   assert_success

test/init.bats

@@ -0,0 +1,121 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "detect parent shell" {
+  root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
+  SHELL=/bin/false run pyenv-virtualenv-init -
+  assert_success
+  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
+}
+
+@test "sh-compatible instructions" {
+  run pyenv-virtualenv-init bash
+  assert [ "$status" -eq 1 ]
+  assert_output_contains 'eval "$(pyenv virtualenv-init -)"'
+
+  run pyenv-virtualenv-init zsh
+  assert [ "$status" -eq 1 ]
+  assert_output_contains 'eval "$(pyenv virtualenv-init -)"'
+}
+
+@test "fish instructions" {
+  run pyenv-virtualenv-init fish
+  assert [ "$status" -eq 1 ]
+  assert_output_contains 'status --is-interactive; and . (pyenv virtualenv-init -|psub)'
+}
+
+@test "outputs bash-specific syntax" {
+  run pyenv-virtualenv-init - bash
+  assert_success
+  assert_output <<EOS
+export PYENV_VIRTUALENV_INIT=1;
+_pyenv_virtualenv_hook() {
+  if [ -n "\$PYENV_ACTIVATE" ]; then
+    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
+      pyenv deactivate --no-error --verbose
+      unset PYENV_DEACTIVATE
+      return 0
+    fi
+    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; 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" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+      pyenv activate --no-error --verbose
+    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 <<EOS
+setenv PYENV_VIRTUALENV_INIT 1;
+function _pyenv_virtualenv_hook --on-event fish_prompt;
+  set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true)
+  if [ -n "\$PYENV_ACTIVATE" ]
+    if [ "(pyenv version-name 2>/dev/null; or true)" = "system" ]
+      pyenv deactivate --no-error --verbose
+      set -e PYENV_DEACTIVATE
+      return 0
+    end
+    if [ "\$PYENV_ACTIVATE" != "\$PYENV_PREFIX" ]
+      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" ]
+      pyenv activate --no-error --verbose
+    end
+  end
+end
+EOS
+}
+
+@test "outputs zsh-specific syntax" {
+  run pyenv-virtualenv-init - zsh
+  assert_success
+  assert_output <<EOS
+export PYENV_VIRTUALENV_INIT=1;
+_pyenv_virtualenv_hook() {
+  if [ -n "\$PYENV_ACTIVATE" ]; then
+    if [ "\$(pyenv version-name 2>/dev/null || true)" = "system" ]; then
+      pyenv deactivate --no-error --verbose
+      unset PYENV_DEACTIVATE
+      return 0
+    fi
+    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; 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" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix 2>/dev/null || true)" ]; then
+      pyenv activate --no-error --verbose
+    fi
+  fi
+};
+typeset -a precmd_functions
+if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
+  precmd_functions+=_pyenv_virtualenv_hook;
+fi
+EOS
+}

test/installer.bats

@@ -9,9 +9,12 @@ load test_helper
 
   cd usr
 
+  assert [ -x bin/pyenv-activate ]
+  assert [ -x bin/pyenv-deactivate ]
   assert [ -x bin/pyenv-sh-activate ]
   assert [ -x bin/pyenv-sh-deactivate ]
   assert [ -x bin/pyenv-virtualenv ]
+  assert [ -x bin/pyenv-virtualenv-init ]
   assert [ -x bin/pyenv-virtualenv-prefix ]
   assert [ -x bin/pyenv-virtualenvs ]
 }

test/pip.bats

@@ -0,0 +1,78 @@
+#!/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/pip"
+
+  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/pip"
+  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,185 +7,175 @@ 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-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-hooks "virtualenv : echo"
   stub pyenv-rehash " : echo rehashed"
 }
 
 unstub_pyenv() {
-  unset PYENV_VERSION
   unstub pyenv-version-name
   unstub pyenv-prefix
   unstub pyenv-hooks
   unstub pyenv-rehash
 }
 
-create_executable() {
-  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
-  touch "${PYENV_ROOT}/versions/$1/bin/$2"
-  chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
-}
-
-remove_executable() {
-  rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
-  
-}
-
 @test "use pyvenv if virtualenv is not available" {
-  stub_pyenv "3.4.0"
-  stub pyenv-which "virtualenv : false" \
-                   "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" \
-                  "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip3.4\";echo PYENV_VERSION=\${PYENV_VERSION} ensurepip" \
-                  "echo pip3.4"
-  stub pyenv-prefix "venv : echo '${PYENV_ROOT}/versions/venv'"
+  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} \"\$@\""
+  stub pyenv-exec "python -m ensurepip : true"
+
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
 
   run pyenv-virtualenv venv
 
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
-
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 pyvenv ${PYENV_ROOT}/versions/venv
-PYENV_VERSION=venv ensurepip
+PYENV_VERSION=3.4.1 pyvenv ${PYENV_ROOT}/versions/venv
 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.0"
-  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \
-                   "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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 "virtualenv ${PYENV_ROOT}/versions/venv : echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "python -m ensurepip : true"
+
+  create_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
 
   run pyenv-virtualenv venv
 
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
-
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 virtualenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
+
+  unstub_pyenv
+  unstub pyenv-exec
 }
 
 @test "install virtualenv if pyvenv is not avaialble" {
-  stub_pyenv "3.2.1"
-  stub pyenv-which "virtualenv : false" \
-                   "pyvenv : false"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" \
-                  "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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 "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 curl true
+  stub curl true
+
+  remove_executable "3.2.1" "virtualenv"
+  remove_executable "3.2.1" "pyvenv"
 
   run pyenv-virtualenv venv
 
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
-
   assert_success
   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.0"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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 "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"
+
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
 
   run pyenv-virtualenv -p python3 venv
 
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
-
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 pip install virtualenv
-PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
+
+  unstub_pyenv
+  unstub pyenv-exec
 }
 
 @test "install virtualenv if --python has given" {
-  stub_pyenv "3.4.0"
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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 "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"
+
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
 
   run pyenv-virtualenv --python=python3 venv
 
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
-
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.0 pip install virtualenv
-PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
+
+  unstub_pyenv
+  unstub pyenv-exec
 }
 
 @test "install virtualenv with unsetting troublesome pip options" {
-  stub_pyenv "3.2.1"
-  stub pyenv-which "virtualenv : false" \
-                   "pyvenv : false"
-  stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" \
-                  "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  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 "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 curl true
+  stub curl true
+
+  remove_executable "3.2.1" "virtualenv"
+  remove_executable "3.2.1" "pyvenv"
 
   PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv
 
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
-
   assert_success
   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
-}
-
-@test "install pip without using ensurepip" {
-  stub_pyenv "3.3.0"
-  stub pyenv-which "virtualenv : false" \
-                   "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'" \
-                   "pip : echo no pip; false"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" \
-                  "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false" \
-                  "echo PYENV_VERSION=\${PYENV_VERSION} no setuptools; false" \
-                  "echo PYENV_VERSION=\${PYENV_VERSION} setuptools" \
-                  "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip\";echo PYENV_VERSION=\${PYENV_VERSION} pip"
-  stub curl "echo ez_setup.py" \
-            "echo get_pip.py"
-
-  run pyenv-virtualenv venv
 
   unstub_pyenv
-  unstub pyenv-which
   unstub pyenv-exec
-
-  assert_success
-  assert_output <<OUT
-PYENV_VERSION=3.3.0 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 curl
 }

test/test_helper.bash

@@ -96,3 +96,13 @@ assert_output_contains() {
     } | flunk
   }
 }
+
+create_executable() {
+  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
+  touch "${PYENV_ROOT}/versions/$1/bin/$2"
+  chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
+}
+
+remove_executable() {
+  rm -f "${PYENV_ROOT}/versions/$1/bin/$2"
+}

test/version.bats

@@ -4,34 +4,40 @@ load test_helper
 
 setup() {
   export PYENV_ROOT="${TMP}/pyenv"
-  export PYENV_VIRTUALENV_VERSION="20140421"
+  export PYENV_VIRTUALENV_VERSION="20150119"
 }
 
 @test "display virtualenv version" {
-  stub pyenv-which "virtualenv : true"
-  stub pyenv-which "pyvenv : true"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/2.7.7'"
   stub pyenv-exec "virtualenv --version : echo \"1.11\""
 
-  run pyenv-virtualenv --version
+  create_executable "2.7.7" "virtualenv"
+  remove_executable "2.7.7" "pyvenv"
 
-  unstub pyenv-which
-  unstub pyenv-exec
+  run pyenv-virtualenv --version
 
   assert_success
   assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)"
+
+  unstub pyenv-prefix
+  unstub pyenv-exec
 }
 
 @test "display pyvenv version" {
-  stub pyenv-which "virtualenv : false"
-  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\""
-  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.3.3/bin/pyvenv\""
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/3.4.1'"
+  stub pyenv-which "pyvenv : echo \"${PYENV_ROOT}/versions/3.4.1/bin/pyvenv\""
   stub pyenv-root "echo \"${PYENV_ROOT}\""
 
+  remove_executable "3.4.1" "virtualenv"
+  create_executable "3.4.1" "pyvenv"
+
   run pyenv-virtualenv --version
 
-  unstub pyenv-which
-  unstub pyenv-root
-
   assert_success
-  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.3.3)"
+  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.4.1)"
+
+  unstub pyenv-prefix
+  unstub pyenv-root
 }

test/virtualenv-prefix.bats

@@ -102,6 +102,19 @@ ${PYENV_ROOT}/versions/3.3.3:${PYENV_ROOT}/versions/3.4.0
 OUT
 }
 
+@test "should fail if the version is the system" {
+  stub pyenv-version-name "echo system"
+
+  PYENV_VERSION="system" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`system' is not a virtualenv
+OUT
+}
+
 @test "should fail if the version is not a virtualenv" {
   stub pyenv-version-name "echo 3.4.0"
   stub pyenv-prefix "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""

test/virtualenv.bats

@@ -7,88 +7,142 @@ setup() {
 }
 
 stub_pyenv() {
-  export PYENV_VERSION="$1"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
-  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \
-                   "pyvenv : false"
+  create_executable "${PYENV_VERSION}" "virtualenv"
+  remove_executable "${PYENV_VERSION}" "pyvenv"
+
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-hooks "virtualenv : echo"
   stub pyenv-rehash " : echo rehashed"
 }
 
 unstub_pyenv() {
-  unset PYENV_VERSION
   unstub pyenv-prefix
-  unstub pyenv-which
   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} \"\$@\""
+  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 curl true
+  stub curl true
 
   run pyenv-virtualenv "3.2.1" "venv"
 
-  unstub_pyenv
-  unstub pyenv-exec
-
   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 "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 curl true
+  stub curl true
 
   run pyenv-virtualenv venv
 
-  unstub_pyenv
-  unstub pyenv-version-name
-  unstub pyenv-exec
-
   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 "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 curl true
+  stub curl true
 
   run pyenv-virtualenv -v -p python venv
 
-  unstub_pyenv
-  unstub pyenv-version-name
-  unstub pyenv-exec
-
   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 "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 curl true
+  stub curl true
 
   run pyenv-virtualenv --verbose --python=python venv
 
-  unstub_pyenv
-  unstub pyenv-version-name
-  unstub pyenv-exec
-
   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 "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
 }