Check the usage of virtualenv(s) before the uninstallation of versions

Restart shell after installation of the plugin to enable `pyenv-sh-*`
commands.

.gitignore

@@ -1,6 +1,6 @@
-/libexec/*.class
-/libexec/*.pyc
-/libexec/*.pyo
-/libexec/__pycache__
+/libexec/pyenv-virtualenv/*/*.class
+/libexec/pyenv-virtualenv/*/*.pyc
+/libexec/pyenv-virtualenv/*/*.pyo
+/libexec/pyenv-virtualenv/*/__pycache__
 *.swo
 *.swp

.travis.yml

@@ -0,0 +1,6 @@
+install: git clone https://github.com/sstephenson/bats.git
+script: bats/bin/bats --tap test
+language: c
+notifications:
+  email:
+    on_success: never

README.md

@@ -1,7 +1,9 @@
-# pyenv-virtualenv (a.k.a. [python-virtualenv](https://github.com/yyuu/python-virtualenv))
+# pyenv-virtualenv
+
+[![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 an `pyenv virtualenv` command to create virtualenv for Python
+that provides a `pyenv virtualenv` command to create virtualenv for Python
 on UNIX-like systems.
 
 (NOTICE: If you are an existing user of [virtualenvwrapper](http://pypi.python.org/pypi/virtualenvwrapper)
@@ -15,31 +17,163 @@ to manage your virtualenvs.)
 Installing pyenv-virtualenv as a pyenv plugin will give you access to the
 `pyenv virtualenv` command.
 
-    $ mkdir -p ~/.pyenv/plugins
-    $ cd ~/.pyenv/plugins
-    $ git clone git://github.com/yyuu/pyenv-virtualenv.git
+    $ 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. From that directory, you
-can check out a specific release tag. To update pyenv-virtualenv, run `git
-pull` to download the latest changes.
+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.
+
+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.
+
+### 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
+installed, you will also be able to use the `pyenv virtualenv` command.
+
+*This is recommended method of installation if you installed pyenv
+ with Homebrew.*
+
+    brew install pyenv-virtualenv
+
+Or, if you would like to install the latest development release:
+
+    brew install --HEAD pyenv-virtualenv
+
 
 ## Usage
 
 ### Using `pyenv virtualenv` with pyenv
 
 To create a virtualenv for the Python version use with pyenv, run
-`pyenv virtualenv` with tha exact name of the version you want to create
-virtualenv. For example,
+`pyenv virtualenv`, specifying the Python version you want and the name
+of the virtualenv directory. For example,
 
-    $ pyenv virtualenv --distribute 2.7.3 venv27
+    $ pyenv virtualenv 2.7.6 my-virtual-env-2.7.6
 
-virtualenvs will be created into a directory of the same name
-under `~/.pyenv/versions`.
+will create a virtualenv based on Python 2.7.6
+under `~/.pyenv/versions` in a folder called `my-virtual-env-2.7.6`. 
+
+
+### 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.
+
+    $ pyenv version
+    3.3.3 (set by /home/yyuu/.pyenv/version)
+    $ pyenv virtualenv venv33
+
+
+### List 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)
+
+
+### 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.
+
+    $ pyenv activate venv27
+
+`pyenv activate` acts almost like following commands.
+The activate'd virtualenv will be persisted as _shell_ version.
+
+    $ pyenv shell venv27
+    $ source "$(pyenv prefix venv27)/bin/activate"
+
+### Deactivate virtualenv
+
+You can `deactivate` the activate'd virtualenv by `pyenv deactivate`.
+
+    $ pyenv deactivate
+
+Or, there is an alias in `activate` command.
+This is prepared for similality between other `pyenv` commands like `shell` and `local`.
+
+    $ 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.
+
+    $ deactivate
+    $ pyenv shell --unset
+
+### Special environment variables
+
+You can set certain environment variables to control the 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,
+  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.
 
 
 ## Version History
 
+#### 20140421
+
+ * Display error if `pyenv activate` was invoked as a command
+ * Fix completion of `pyenv activate` (#15)
+ * Use `virtualenv` instead of `pyvenv` if `-p` has given (yyuu/pyenv#158)
+
+#### 20140123
+
+ * Add `activate` and `deactivate` to make `pyenv-virtualenv` work with [jedi](https://github.com/davidhalter/jedi) (#9)
+ * Use `ensurepip` to install `pip` if it is available
+ * Unset `PIP_REQUIRE_VENV` to avoid problem on the installation of `virtualenv` (#10)
+ * Add tests
+
+#### 20140110.1
+
+ * Fix install script
+
+#### 20140110
+
+ * Support environment variables of `EZ_SETUP` and `GET_PIP`.
+ * Support a short option `-p` of `virtualenv`.
+
+#### 20131216
+
+ * Use latest release of setuptools and pip if the version not given via environment variables.
+
+#### 20130622
+
+ * Removed bundled `virtualenv.py` script. Now pyenv-virtualenv installs `virtualenv` package into source version and then use it.
+ * On Python 3.3+, use `pyvenv` as virtualenv command if `virtualenv` is not available.
+ * Install setuptools and pip into environments created by `pyvenv`.
+
+#### 20130614
+
+ * Add `pyenv virtualenvs` to list all virtualenv versions.
+ * *EXPERIMENTAL*: Add `--upgrade` option to re-create virtualenv with migrating packages
+
+#### 20130527
+
+ * Remove `python-virtualenv` which was no longer used.
+ * Change the installation path of the `virtualenv.py` script. (`./libexec` -> `./libexec/pyenv-virtualenv/${VIRTUALENV_VERSION}`)
+ * Download `virtualenv.py` if desired version has not been installed.
+
 #### 20130507
 
  * Display virtualenv information in `--help` and `--version`

bin/pyenv-activate

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+#
+# Summary: Activate virtual environment
+#
+# Usage: pyenv activate <virtualenv>
+#        pyenv activate --unset
+#
+# Activate a Python virtualenv environment in current shell.
+# This acts almost as same as `pyenv shell`, but this invokes the `activate`
+# script in your shell.
+#
+# <virtualenv> should be a string matching a Python version known to pyenv.
+
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+# Provide pyenv completions
+if [ "$1" = "--complete" ]; then
+  echo --unset
+  exec pyenv-virtualenvs --bare
+fi
+
+{ printf "\x1B[31;1m"
+  echo
+  echo "Failed to activate virtualenv."
+  echo
+  echo "Perhaps pyenv-virtualenv has not been loaded into your shell properly."
+  echo "Please restart current shell and try again."
+  echo
+  printf "\x1B[0m"
+} 1>&2
+exit 1

bin/pyenv-deactivate

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Summary: Deactivate virtual environment
+#
+# Usage: pyenv deactivate
+#
+# Deactivate a Python virtual environment.
+
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+{ printf "\x1B[31;1m"
+  echo
+  echo "Failed to deactivate virtualenv."
+  echo
+  echo "Perhaps pyenv-virtualenv has not been loaded into your shell properly."
+  echo "Please restart current shell and try again."
+  echo
+  printf "\x1B[0m"
+} 1>&2
+exit 1

bin/pyenv-sh-activate

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+#
+# Summary: Activate virtual environment
+#
+# Usage: pyenv activate <virtualenv>
+#        pyenv activate --unset
+#
+# Activate a Python virtualenv environment in current shell.
+# This acts almost as same as `pyenv shell`, but this invokes the `activate`
+# script in your shell.
+#
+# <virtualenv> should be a string matching a Python version known to pyenv.
+
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+# Provide pyenv completions
+if [ "$1" = "--complete" ]; then
+  echo --unset
+  exec pyenv-virtualenvs --bare
+fi
+
+if [ "$1" = "--unset" ]; then
+  echo "pyenv deactivate"
+  exit
+fi
+
+versions=("$@")
+shell="$(basename "${PYENV_SHELL:-$SHELL}")"
+
+if [ -z "$versions" ]; then
+  OLDIFS="$IFS"
+  IFS=: versions=($(pyenv-version-name))
+  IFS="$OLDIFS"
+fi
+
+if [ "${#versions[@]}" -gt 1 ]; then
+  echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
+  exit 1
+fi
+
+pyenv-virtualenv-prefix "${versions}" 1>/dev/null
+
+echo "pyenv shell \"${versions}\""
+case "$shell" in
+fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;;
+*    ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;;
+esac

bin/pyenv-sh-deactivate

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Summary: Deactivate virtual environment
+#
+# Usage: pyenv deactivate
+#
+# Deactivate a Python virtual environment.
+
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+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";;
+esac
+echo "pyenv shell --unset"

bin/pyenv-virtualenv

@@ -2,12 +2,16 @@
 #
 # Summary: Create a Python virtualenv using the pyenv-virtualenv plugin
 #
-# Usage: pyenv virtualenv [VIRTUALENV_OPTIONS] <version> <virtualenv-name>
+# Usage: pyenv virtualenv [-f|--force] [-u|--upgrade] [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="20130507"
+PYENV_VIRTUALENV_VERSION="20140421"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -21,6 +25,9 @@ if [ -z "$PYENV_ROOT" ]; then
   PYENV_ROOT="${HOME}/.pyenv"
 fi
 
+unset PIP_REQUIRE_VENV
+unset PIP_REQUIRE_VIRTUALENV
+
 # Define library functions
 parse_options() {
   OPTIONS=()
@@ -63,90 +70,366 @@ abs_dirname() {
   cd "$cwd"
 }
 
+http() {
+  local method="$1"
+  local url="$2"
+  local file="$3"
+  [ -n "$url" ] || return 1
+
+  if type curl &>/dev/null; then
+    "http_${method}_curl" "$url" "$file"
+  elif type wget &>/dev/null; then
+    "http_${method}_wget" "$url" "$file"
+  else
+    echo "error: please install \`curl\` or \`wget\` and try again" >&2
+    exit 1
+  fi
+}
+
+http_head_curl() {
+  curl -qsILf "$1" >&4 2>&1
+}
+
+http_get_curl() {
+  curl -C - -o "${2:--}" -qsSLf "$1"
+}
+
+http_head_wget() {
+  wget -q --spider "$1" >&4 2>&1
+}
+
+http_get_wget() {
+  wget -nv -c -O "${2:--}" "$1"
+}
+
 version() {
-  local VIRTUALENV_VERSION="$(pyenv-exec python "${VIRTUALENV}" --version || true)"
-  echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${VIRTUALENV_VERSION:-unknown})"
+  detect_venv
+  local version
+  if [ -n "$USE_PYVENV" ]; then
+    version="$(pyenv-which pyvenv 2>/dev/null || true)"
+    version="${version#$(pyenv-root)/versions/}"
+    version="${version%/bin/pyvenv}"
+    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv ${version:-unknown})"
+  else
+    version="$(venv --version 2>/dev/null || true)"
+    echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${version:-unknown})"
+  fi
 }
 
 usage() {
   # We can remove the sed fallback once pyenv 0.2.0 is widely available.
   pyenv-help virtualenv 2>/dev/null || sed -ne '/^#/!q;s/.//;s/.//;1,4d;p' < "$0"
-  pyenv-exec python "${VIRTUALENV}" --help 2>/dev/null || true
+  venv --help 2>/dev/null || true
   [ -z "$1" ] || exit "$1"
 }
 
+detect_venv() {
+  if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
+    HAS_VIRTUALENV=1
+  fi
+  if pyenv-which "pyvenv" 1>/dev/null 2>&1; then
+    HAS_PYVENV=1
+  fi
+  # Use pyvenv only if there is pyvenv, virtualenv is not installed, and `-p` not given
+  if [ -n "${HAS_PYVENV}" ] && [ -z "${HAS_VIRTUALENV}" ] && [ -z "${VIRTUALENV_PYTHON}" ]; then
+    USE_PYVENV=1
+  fi
+}
+
+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"
+  { 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
+        echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
+      fi
+      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.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
+        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"
+  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_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"
+  ## 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"
+      echo
+      echo "Inspect or clean up the original tree at ${UPGRADE_PATH}"
+      echo
+      echo "Package list:"
+      cat "${UPGRADE_LIST}"
+    } 1>&2
+    return 1
+  fi
+  rm -f "${UPGRADE_LIST}"
+  rm -fr "${UPGRADE_PATH}"
+}
+
 PYENV_VIRTUALENV_ROOT="$(abs_dirname "$0")/.."
-VIRTUALENV="${PYENV_VIRTUALENV_ROOT}/libexec/pyenv-virtualenv/virtualenv.py"
-[ -f "${VIRTUALENV}" ] || VIRTUALENV="${PYENV_VIRTUALENV_ROOT}/libexec/python-virtualenv/virtualenv.py" # backward compatibility before v20130307
-[ -f "${VIRTUALENV}" ] || VIRTUALENV="${PYENV_VIRTUALENV_ROOT}/libexec/virtualenv.py"
+if [ -z "${PYENV_VIRTUALENV_CACHE_PATH}" ]; then
+  PYENV_VIRTUALENV_CACHE_PATH="${PYTHON_BUILD_CACHE_PATH:-${PYENV_ROOT}/cache}"
+fi
 VIRTUALENV_OPTIONS=()
 
+unset FORCE
+unset VIRTUALENV_PYTHON
+unset QUIET
+unset UPGRADE
+unset VERBOSE
+
 parse_options "$@"
 for option in "${OPTIONS[@]}"; do
   case "$option" in
+  "f" | "force" )
+    FORCE=true
+    ;;
   "h" | "help" )
     usage 0
     ;;
+  "p" | "python" )
+    VIRTUALENV_PYTHON="${ARGUMENTS[0]}"
+    ARGUMENTS=("${ARGUMENTS[@]:1}") # shift 1
+    ;;
+  "q" | "quiet" )
+    QUIET="--quiet"
+    ;;
+  "u" | "upgrade" )
+    UPGRADE=true
+    ;;
+  "v" | "verbose" )
+    VERBOSE="--verbose"
+    ;;
   "version" )
     version
     exit 0
     ;;
-  * )
-    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+  * ) # virtualenv long options
+    if [[ "$option" == "python="* ]]; then
+      VIRTUALENV_PYTHON="${option#python=}"
+    else
+      VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
+    fi
     ;;
   esac
 done
 
-VERSION_NAME="${ARGUMENTS[0]}"
-[ -n "$VERSION_NAME" ] || usage 1
-
-for script in $(pyenv-hooks virtualenv); do
-  source "$script"
-done
-
-PYTHON_BIN=$(PYENV_VERSION="${VERSION_NAME}" pyenv-which python)
-if [ ! -x "${PYTHON_BIN}" ]; then
-  echo "pyenv-virtualenv: could not obtain python executable: ${PYTHON_BIN}" >&2
+if [[ "${#ARGUMENTS[@]}" == 0 ]]; then
+  echo "pyenv-virtualenv: no virtualenv name given." 1>&2
   exit 1
-fi
-
-# find canonical name of python executable.
-# virtualenv will create "bin/python" executable as same name as its bootstraped python.
-if [ -L "${PYTHON_BIN}" ]; then
-  while [ -L "${PYTHON_BIN}" ]; do # retrieve symlinks
-    PYTHON_BIN="$(dirname "${PYTHON_BIN}")/$(resolve_link "${PYTHON_BIN}")"
-  done
+elif [[ "${#ARGUMENTS[@]}" == 1 ]]; then
+  # If only one argument given, use current version as source version
+  VERSION_NAME="$(pyenv-version-name)"
+  VIRTUALENV_NAME="${ARGUMENTS[0]}"
 else
-# python 2.6 and older don't have "bin/python" as symlink.
-# so we must traverse files like "bin/python*" to obtain canonical name.
-  for python in ${PYENV_ROOT}/versions/${VERSION_NAME}/bin/python*; do
-    if ( basename "$python" | grep '^python[0-9][0-9]*\.[0-9][0-9]*$' && cmp "$PYTHON_BIN" "$python" ) >/dev/null; then
-      PYTHON_BIN="${python}"
-      break
-    fi
-  done
+  # Otherwise, use former as source version, and latter as virtualenv version
+  VERSION_NAME="${ARGUMENTS[0]}"
+  VIRTUALENV_NAME="${ARGUMENTS[1]##*/}"
 fi
 
-VIRTUALENV_NAME="${ARGUMENTS[1]##*/}"
+if [ -z "${VERSION_NAME}" ] || [ -z "${VIRTUALENV_NAME}" ]; then
+  usage 1
+fi
+
+# Set VERSION_NAME as default version in this script
+export PYENV_VERSION="${VERSION_NAME}"
+
+# Source version must exists before creating virtualenv
+pyenv-prefix 1>/dev/null 2>&1 || usage 1
+
+if [ -z "$TMPDIR" ]; then
+  TMP="/tmp"
+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}"
 
-# virtualenv may download distribute/setuptools in current directory.
-# change to cache directory to reuse them between invocation.
-VIRTUALENV_CACHE_PATH="${PYTHON_BUILD_CACHE_PATH:-${PYENV_ROOT}/cache}"
-mkdir -p "${VIRTUALENV_CACHE_PATH}"
-{
-  cd "${VIRTUALENV_CACHE_PATH}"
-  "${PYTHON_BIN}" "${VIRTUALENV}" "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}"
-}
+unset HAS_VIRTUALENV
+unset HAS_PYVENV
+unset USE_PYVENV
+detect_venv
 
-# create symlink of `python' bound for actual executable
-if [ ! -f "$VIRTUALENV_PYTHON_BIN" ]; then
-  if [ -f "${VIRTUALENV_PATH}/bin/$(basename "${PYTHON_BIN}")" ]; then
-    {
-      cd ${VIRTUALENV_PATH}/bin
-      ln -fs "$(basename "${PYTHON_BIN}")" python
-    }
+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}"
+    HAS_VIRTUALENV=1
   fi
 fi
 
-pyenv-rehash
+# Unset environment variables which starts with `VIRTUALENV_`.
+# These variables are reserved for virtualenv.
+unset VIRTUALENV_VERSION
+
+
+# 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.
+declare -a before_hooks after_hooks
+
+before_virtualenv() {
+  local hook="$1"
+  before_hooks["${#before_hooks[@]}"]="$hook"
+}
+
+after_virtualenv() {
+  local hook="$1"
+  after_hooks["${#after_hooks[@]}"]="$hook"
+}
+
+# Load plugin hooks.
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`pyenv-hooks virtualenv`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do source "$script"; done
+
+
+[ -d "${VIRTUALENV_PATH}" ] && PREFIX_EXISTS=1
+
+# If the virtualenv exists, prompt for confirmation unless
+# the --force option was specified.
+if [ -d "${VIRTUALENV_PATH}/bin" ]; then
+  if [ -z "$FORCE" ]; then
+    echo "pyenv-virtualenv: ${VIRTUALENV_PATH} already exists" 1>&2
+    read -p "continue with installation? (y/N) "
+
+    case "$REPLY" in
+    y* | Y* ) ;;
+    * ) exit 1 ;;
+    esac
+  fi
+
+  if [ -n "$UPGRADE" ]; then
+    prepare_upgrade "${VIRTUALENV_NAME}" "${VIRTUALENV_PATH}"
+  fi
+fi
+
+# Execute `before_virtualenv` hooks.
+for hook in "${before_hooks[@]}"; do eval "$hook"; done
+
+# Plan cleanup on unsuccessful installation.
+cleanup() {
+  [ -z "${PREFIX_EXISTS}" ] && rm -rf "$VIRTUALENV_PATH"
+}
+
+trap cleanup SIGINT
+
+# Invoke virtualenv and record exit status in $STATUS.
+STATUS=0
+# virtualenv may download distribute/setuptools in current directory.
+# change to cache directory to reuse them between invocation.
+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
+
+# Execute `after_virtualenv` hooks
+for hook in "${after_hooks[@]}"; do eval "$hook"; done
+
+# Run `pyenv-rehash` after a successful installation.
+if [ "$STATUS" == "0" ]; then
+  pyenv-rehash
+else
+  cleanup
+fi
+
+exit "$STATUS"

bin/pyenv-virtualenv-prefix

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+#
+# Summary: Display real_prefix for a Python virtualenv version
+# Usage: pyenv virtualenv-prefix [<virtualenv>]
+#
+
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
+if [ -n "$1" ]; then
+  versions=($@)
+  IFS=: PYENV_VERSION="${versions[*]}"
+  export PYENV_VERSION
+else
+  IFS=: versions=($(pyenv-version-name))
+fi
+
+real_prefix() { # virtualenv
+  local version="$1"
+  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.real_prefix)' 2>/dev/null
+}
+
+base_prefix() { # pyvenv
+  # FIXME: non-pyvenv versions also have sys.base_prefix
+  local version="$1"
+  PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;print(sys.base_prefix)' 2>/dev/null
+}
+
+VIRTUALENV_PREFIX_PATHS=()
+for version in "${versions[@]}"; do
+  PREFIX="$(pyenv-prefix "${version}")"
+  if [ -f "${PREFIX}/bin/activate" ]; then
+    VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"
+    VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
+  else
+    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
+    exit 1
+  fi
+done
+
+IFS=: echo "${VIRTUALENV_PREFIX_PATHS[*]}"

bin/pyenv-virtualenvs

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# Summary: List all Python virtualenvs found in `$PYENV_ROOT/versions/*'.
+#
+# Usage: pyenv virtualenvs [--bare]
+#
+
+set -e
+[ -n "$PYENV_DEBUG" ] && set -x
+
+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
+if [ "$1" = "--bare" ]; then
+  hit_prefix=""
+  miss_prefix=""
+  current_versions=()
+  print_origin=""
+else
+  hit_prefix="* "
+  miss_prefix="  "
+  current_versions=($(IFS=:; for version in $(pyenv-version-name); do echo "$version"; done))
+  print_origin="1"
+fi
+
+array_exists() {
+  local x car="$1"
+  shift
+  for x in "$@"; do
+    [ "${x}" = "${car}" ] && return 0
+  done
+  return 1
+}
+
+print_version() {
+  if [ -n "${print_origin}" ]; then
+    local version_origin="$2"
+  else
+    local version_origin=""
+  fi
+  if array_exists "$1" "${current_versions[@]}"; then
+    echo "${hit_prefix}${1}${version_origin}"
+  else
+    echo "${miss_prefix}${1}${version_origin}"
+  fi
+}
+
+for version in $(pyenv-versions --bare); do
+  if [[ "${version}" != "system" ]]; then
+    virtualenv_prefix="$(pyenv-virtualenv-prefix "${version}" 2>/dev/null || true)"
+    if [ -d "${virtualenv_prefix}" ]; then
+      print_version "${version}" " (created from ${virtualenv_prefix})"
+    fi
+  fi
+done

bin/python-virtualenv

@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-
-PYTHON_VIRTUALENV_VERSION="20130507"
-
-set -E
-exec 3<&2 # preserve original stderr at fd 3
-
-
-lib() {
-  parse_options() {
-    OPTIONS=()
-    ARGUMENTS=()
-    local arg option index
-
-    for arg in "$@"; do
-      if [ "${arg:0:1}" = "-" ]; then
-        if [ "${arg:1:1}" = "-" ]; then
-          OPTIONS[${#OPTIONS[*]}]="${arg:2}"
-        else
-          index=1
-          while option="${arg:$index:1}"; do
-            [ -n "$option" ] || break
-            OPTIONS[${#OPTIONS[*]}]="$option"
-            index=$(($index+1))
-          done
-        fi
-      else
-        ARGUMENTS[${#ARGUMENTS[*]}]="$arg"
-      fi
-    done
-  }
-
-  resolve_link() {
-    $(type -p greadlink readlink | head -1) "$1"
-  }
-
-  abs_dirname() {
-    local cwd="$(pwd)"
-    local path="$1"
-
-    while [ -n "$path" ]; do
-      cd "${path%/*}"
-      local name="${path##*/}"
-      path="$(resolve_link "$name" || true)"
-    done
-
-    pwd
-    cd "$cwd"
-  }
-
-  if [ "$1" == "--$FUNCNAME" ]; then
-    declare -f "$FUNCNAME"
-    echo "$FUNCNAME \"\$1\";"
-    exit
-  fi
-}
-lib "$1"
-
-version() {
-  echo "python-virtualenv ${PYTHON_VIRTUALENV_VERSION}"
-}
-
-usage() {
-  { version
-    echo "usage: python-virtualenv [-v|--verbose] [VIRTUALENV_OPTIONS] python_bin virtualenv_path"
-  } >&2
-
-  if [ -z "$1" ]; then
-    exit 1
-  fi
-}
-
-unset VERBOSE
-PYTHON_VIRTUALENV_ROOT="$(abs_dirname "$0")/.."
-VIRTUALENV_OPTIONS=()
-
-parse_options "$@"
-
-for option in "${OPTIONS[@]}"; do
-  case "$option" in
-  "h" | "help" )
-    usage without_exiting
-    { echo
-      echo "  -v/--verbose     Verbose mode: print compilation status to stdout"
-      echo
-    } >&2
-    exit 0
-    ;;
-  "v" | "verbose" )
-    VERBOSE=true
-    ;;
-  "version" )
-    version
-    exit 0
-    ;;
-  * )
-    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--$option"
-    ;;
-  esac
-done
-
-PYTHON_BIN="${ARGUMENTS[0]}"
-if [ -z "${PYTHON_BIN}" ]; then
-  usage
-elif [ ! -x "${PYTHON_BIN}" ]; then
-  echo "python-virtualenv: given python is not an executable: ${PYTHON_BIN}" >&2
-  exit 1
-fi
-
-VIRTUALENV_PATH="${ARGUMENTS[1]}"
-if [ -z "$VIRTUALENV_PATH" ]; then
-  usage
-fi
-
-VIRTUALENV_PYTHON_BIN="${VIRTUALENV_PATH}/bin/python"
-
-# create virtualenv
-VIRTUALENV="${PYTHON_VIRTUALENV_ROOT}/libexec/python-virtualenv/virtualenv.py"
-[ -f "${VIRTUALENV}" ] || VIRTUALENV="${PYTHON_VIRTUALENV_ROOT}/libexec/virtualenv.py"
-"${PYTHON_BIN}" "${VIRTUALENV}" "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}"
-
-# create symlink of `python' bound for actual executable
-if [ ! -f "$VIRTUALENV_PYTHON_BIN" ]; then
-  if [ -f "${VIRTUALENV_PATH}/bin/$(basename "${PYTHON_BIN}")" ]; then
-    {
-      cd ${VIRTUALENV_PATH}/bin
-      ln -fs "$(basename "${PYTHON_BIN}")" python
-    }
-  fi
-fi

etc/pyenv.d/uninstall/virtualenv.bash

@@ -0,0 +1,25 @@
+VERSION_NAME="${DEFINITION##*/}"
+PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
+
+if ! pyenv-virtualenv-prefix "${VERSION_NAME}" 1>/dev/null 2>&1; then
+  OLDIFS="$IFS"
+  IFS=$'\n' virtualenvs=($(pyenv-virtualenvs --bare))
+  IFS="$OLDIFS"
+
+  declare -a dependencies
+  for venv in "${virtualenvs[@]}"; do
+    venv_prefix="$(pyenv-virtualenv-prefix "${venv}" 2>/dev/null || true)"
+    if [ -d "${venv_prefix}" ] && [ "${PREFIX}" = "${venv_prefix}" ]; then
+      dependencies[${#dependencies[*]}]="${venv}"
+    fi
+  done
+
+  if [ -z "$FORCE" ] && [ -n "$dependencies" ]; then
+    echo "pyenv: ${#dependencies[@]} virtualenv(s) is depending on $PREFIX." >&2
+    read -p "continue with uninstallation? (y/N) "
+    case "$REPLY" in
+    y* | Y* ) ;;
+    * ) exit 1 ;;
+    esac
+  fi
+fi

install.sh

@@ -1,23 +1,21 @@
 #!/bin/sh
+# Usage: PREFIX=/usr/local ./install.sh
+#
+# Installs pyenv-virtualenv under $PREFIX.
 
 set -e
 
+cd "$(dirname "$0")"
+
 if [ -z "${PREFIX}" ]; then
   PREFIX="/usr/local"
 fi
 
 BIN_PATH="${PREFIX}/bin"
-LIBEXEC_PATH="${PREFIX}/libexec/pyenv-virtualenv"
+ETC_PATH="${PREFIX}/etc/pyenv.d"
 
-mkdir -p "${BIN_PATH}"
-mkdir -p "${LIBEXEC_PATH}"
+mkdir -p "$BIN_PATH"
+mkdir -p "$ETC_PATH"
 
-for file in bin/*; do
-  cp "${file}" "${BIN_PATH}"
-done
-
-for file in libexec/*; do
-  cp "${file}" "${LIBEXEC_PATH}"
-done
-
-echo "Installed pyenv-virtualenv at ${PREFIX}"
+install -p bin/* "$BIN_PATH"
+cp -RPp etc/pyenv.d/* "$ETC_PATH"

test/activate.bats

@@ -0,0 +1,93 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "activate virtualenv from current version" {
+  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"
+source "${PYENV_ROOT}/versions/venv/bin/activate"
+EOS
+}
+
+@test "activate virtualenv from current version (fish)" {
+  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"
+. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
+EOS
+}
+
+@test "activate virtualenv from command-line argument" {
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+
+  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"
+EOS
+}
+
+@test "unset invokes deactivate" {
+  run pyenv-sh-activate --unset
+
+  assert_success
+  assert_output <<EOS
+pyenv deactivate
+EOS
+}
+
+@test "should fail if the version is not a virtualenv" {
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
+
+  run pyenv-sh-activate "3.3.3"
+
+  unstub pyenv-virtualenv-prefix
+
+  assert_failure
+}
+
+@test "should fail if there are multiple versions" {
+  run pyenv-sh-activate "venv" "venv27"
+
+  assert_failure
+  assert_output <<EOS
+pyenv-virtualenv: cannot activate multiple versions at once: venv venv27
+EOS
+}
+
+@test "should fail if activate is invoked as a command" {
+  run pyenv-activate
+
+  assert_failure
+}

test/deactivate.bats

@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+@test "deactivate virtualenv" {
+  PYENV_SHELL="bash" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+declare -f deactivate 1>/dev/null 2>&1 && deactivate
+pyenv shell --unset
+EOS
+}
+
+@test "deactivate virtualenv (fish)" {
+  PYENV_SHELL="fish" run pyenv-sh-deactivate
+
+  assert_success
+  assert_output <<EOS
+functions -q deactivate; and deactivate
+pyenv shell --unset
+EOS
+}
+
+@test "should fail if deactivate is invoked as a command" {
+  run pyenv-deactivate
+
+  assert_failure
+}

test/hooks.bats

@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+  export HOOK_PATH="${TMP}/i has hooks"
+  mkdir -p "$HOOK_PATH"
+}
+
+@test "pyenv-virtualenv hooks" {
+  cat > "${HOOK_PATH}/virtualenv.bash" <<OUT
+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-hooks "virtualenv : echo '$HOOK_PATH'/virtualenv.bash"
+  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-rehash "echo rehashed"
+
+  mkdir -p "${PYENV_ROOT}/versions/3.2.1"
+  run pyenv-virtualenv "3.2.1" venv
+
+  assert_success
+  assert_output <<-OUT
+before: ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
+after: 0
+rehashed
+OUT
+}

test/installer.bats

@@ -0,0 +1,45 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "installs pyenv-virtualenv into PREFIX" {
+  cd "$TMP"
+  PREFIX="${PWD}/usr" run "${BATS_TEST_DIRNAME}/../install.sh"
+  assert_success ""
+
+  cd usr
+
+  assert [ -x bin/pyenv-sh-activate ]
+  assert [ -x bin/pyenv-sh-deactivate ]
+  assert [ -x bin/pyenv-virtualenv ]
+  assert [ -x bin/pyenv-virtualenv-prefix ]
+  assert [ -x bin/pyenv-virtualenvs ]
+}
+
+@test "overwrites old installation" {
+  cd "$TMP"
+  mkdir -p bin
+  touch bin/pyenv-virtualenv
+
+  PREFIX="$PWD" run "${BATS_TEST_DIRNAME}/../install.sh"
+  assert_success ""
+
+  assert [ -x bin/pyenv-virtualenv ]
+  run grep "virtualenv" bin/pyenv-virtualenv
+  assert_success
+}
+
+@test "unrelated files are untouched" {
+  cd "$TMP"
+  mkdir -p bin share/bananas
+  chmod g-w bin
+  touch bin/bananas
+
+  PREFIX="$PWD" run "${BATS_TEST_DIRNAME}/../install.sh"
+  assert_success ""
+
+  assert [ -e bin/bananas ]
+
+  run ls -ld bin
+  assert_equal "r-x" "${output:4:3}"
+}

test/pyvenv.bats

@@ -0,0 +1,191 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+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"
+  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'"
+
+  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
+rehashed
+OUT
+  assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
+}
+
+@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} \"\$@\""
+
+  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
+rehashed
+OUT
+}
+
+@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} \"\$@\""
+
+  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
+rehashed
+OUT
+}
+
+@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} \"\$@\""
+
+  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
+rehashed
+OUT
+}
+
+@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} \"\$@\""
+
+  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
+rehashed
+OUT
+}
+
+@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} \"\$@\""
+
+  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
+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" ]
+}

test/stubs/stub

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+set -e
+
+status=0
+program="${0##*/}"
+PROGRAM="$(echo "$program" | tr a-z- A-Z_)"
+[ -n "$TMPDIR" ] || TMPDIR="/tmp"
+
+_STUB_PLAN="${PROGRAM}_STUB_PLAN"
+_STUB_RUN="${PROGRAM}_STUB_RUN"
+_STUB_INDEX="${PROGRAM}_STUB_INDEX"
+_STUB_RESULT="${PROGRAM}_STUB_RESULT"
+_STUB_END="${PROGRAM}_STUB_END"
+_STUB_DEBUG="${PROGRAM}_STUB_DEBUG"
+
+if [ -n "${!_STUB_DEBUG}" ]; then
+  echo "$program" "$@" >&${!_STUB_DEBUG}
+fi
+
+[ -e "${!_STUB_PLAN}" ] || exit 1
+[ -n "${!_STUB_RUN}" ] || eval "${_STUB_RUN}"="${TMPDIR}/${program}-stub-run"
+
+
+# Initialize or load the stub run information.
+eval "${_STUB_INDEX}"=1
+eval "${_STUB_RESULT}"=0
+[ ! -e "${!_STUB_RUN}" ] || source "${!_STUB_RUN}"
+
+
+# Loop over each line in the plan.
+index=0
+while IFS= read -r line; do
+  index=$(($index + 1))
+
+  if [ -z "${!_STUB_END}" ] && [ $index -eq "${!_STUB_INDEX}" ]; then
+    # We found the plan line we're interested in.
+    # Start off by assuming success.
+    result=0
+
+    # Split the line into an array of arguments to
+    # match and a command to run to produce output.
+    command=" $line"
+    if [ "$command" != "${command/ : }" ]; then
+      patterns="${command%% : *}"
+      command="${command#* : }"
+    fi
+
+    # Naively split patterns by whitespace for now.
+    # In the future, use a sed script to split while
+    # respecting quoting.
+    set -f
+    patterns=($patterns)
+    set +f
+    arguments=("$@")
+
+    # Match the expected argument patterns to actual
+    # arguments.
+    for (( i=0; i<${#patterns[@]}; i++ )); do
+      pattern="${patterns[$i]}"
+      argument="${arguments[$i]}"
+
+      case "$argument" in
+        $pattern ) ;;
+        * ) result=1 ;;
+      esac
+    done
+
+    # If the arguments matched, evaluate the command
+    # in a subshell. Otherwise, log the failure.
+    if [ $result -eq 0 ] ; then
+      set +e
+      ( eval "$command" )
+      status="$?"
+      set -e
+    else
+      eval "${_STUB_RESULT}"=1
+    fi
+  fi
+done < "${!_STUB_PLAN}"
+
+
+if [ -n "${!_STUB_END}" ]; then
+  # Clean up the run file.
+  rm -f "${!_STUB_RUN}"
+
+  # If the number of lines in the plan is larger than
+  # the requested index, we failed.
+  if [ $index -ge "${!_STUB_INDEX}" ]; then
+    eval "${_STUB_RESULT}"=1
+  fi
+
+  # Return the result.
+  exit "${!_STUB_RESULT}"
+
+else
+  # If the requested index is larger than the number
+  # of lines in the plan file, we failed.
+  if [ "${!_STUB_INDEX}" -gt $index ]; then
+    eval "${_STUB_RESULT}"=1
+  fi
+
+  # Write out the run information.
+  { echo "${_STUB_INDEX}=$((${!_STUB_INDEX} + 1))"
+    echo "${_STUB_RESULT}=${!_STUB_RESULT}"
+  } > "${!_STUB_RUN}"
+
+  exit "$status"
+
+fi

test/test_helper.bash

@@ -0,0 +1,98 @@
+export TMP="$BATS_TEST_DIRNAME/tmp"
+
+PATH=/usr/bin:/usr/sbin:/bin/:/sbin
+PATH="$BATS_TEST_DIRNAME/../bin:$PATH"
+PATH="$TMP/bin:$PATH"
+export PATH
+
+teardown() {
+  rm -fr "$TMP"/*
+}
+
+stub() {
+  local program="$1"
+  local prefix="$(echo "$program" | tr a-z- A-Z_)"
+  shift
+
+  export "${prefix}_STUB_PLAN"="${TMP}/${program}-stub-plan"
+  export "${prefix}_STUB_RUN"="${TMP}/${program}-stub-run"
+  export "${prefix}_STUB_END"=
+
+  mkdir -p "${TMP}/bin"
+  ln -sf "${BATS_TEST_DIRNAME}/stubs/stub" "${TMP}/bin/${program}"
+
+  touch "${TMP}/${program}-stub-plan"
+  for arg in "$@"; do printf "%s\n" "$arg" >> "${TMP}/${program}-stub-plan"; done
+}
+
+unstub() {
+  local program="$1"
+  local prefix="$(echo "$program" | tr a-z- A-Z_)"
+  local path="${TMP}/bin/${program}"
+
+  export "${prefix}_STUB_END"=1
+
+  local STATUS=0
+  "$path" || STATUS="$?"
+
+  rm -f "$path"
+  rm -f "${TMP}/${program}-stub-plan" "${TMP}/${program}-stub-run"
+  return "$STATUS"
+}
+
+assert() {
+  if ! "$@"; then
+    flunk "failed: $@"
+  fi
+}
+
+flunk() {
+  { if [ "$#" -eq 0 ]; then cat -
+    else echo "$@"
+    fi
+  } | sed "s:${TMP}:\${TMP}:g" >&2
+  return 1
+}
+
+assert_success() {
+  if [ "$status" -ne 0 ]; then
+    { echo "command failed with exit status $status"
+      echo "output: $output"
+    } | flunk
+  elif [ "$#" -gt 0 ]; then
+    assert_output "$1"
+  fi
+}
+
+assert_failure() {
+  if [ "$status" -eq 0 ]; then
+    flunk "expected failed exit status"
+  elif [ "$#" -gt 0 ]; then
+    assert_output "$1"
+  fi
+}
+
+assert_equal() {
+  if [ "$1" != "$2" ]; then
+    { echo "expected: $1"
+      echo "actual:   $2"
+    } | flunk
+  fi
+}
+
+assert_output() {
+  local expected
+  if [ $# -eq 0 ]; then expected="$(cat -)"
+  else expected="$1"
+  fi
+  assert_equal "$expected" "$output"
+}
+
+assert_output_contains() {
+  local expected="$1"
+  echo "$output" | grep -F "$expected" >/dev/null || {
+    { echo "expected output to contain $expected"
+      echo "actual: $output"
+    } | flunk
+  }
+}

test/tmp/.gitignore

@@ -0,0 +1 @@
+*

test/version.bats

@@ -0,0 +1,37 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+  export PYENV_VIRTUALENV_VERSION="20140421"
+}
+
+@test "display virtualenv version" {
+  stub pyenv-which "virtualenv : true"
+  stub pyenv-which "pyvenv : true"
+  stub pyenv-exec "virtualenv --version : echo \"1.11\""
+
+  run pyenv-virtualenv --version
+
+  unstub pyenv-which
+  unstub pyenv-exec
+
+  assert_success
+  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv 1.11)"
+}
+
+@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-root "echo \"${PYENV_ROOT}\""
+
+  run pyenv-virtualenv --version
+
+  unstub pyenv-which
+  unstub pyenv-root
+
+  assert_success
+  assert_output "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (pyvenv 3.3.3)"
+}

test/virtualenv-prefix.bats

@@ -0,0 +1,145 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+create_virtualenv() {
+  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
+  touch "${PYENV_ROOT}/versions/$1/bin/activate"
+}
+
+remove_virtualenv() {
+  rm -fr "${PYENV_ROOT}/versions/$1"
+}
+
+@test "display prefix with using sys.real_prefix" {
+  stub pyenv-version-name "echo venv27"
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
+  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\""
+  create_virtualenv "venv27"
+
+  PYENV_VERSION="venv27" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-exec
+  remove_virtualenv "venv27"
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/2.7.6
+OUT
+}
+
+@test "display prefixes with using sys.real_prefix" {
+  stub pyenv-version-name "echo venv27:venv32"
+  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\"" \
+                    "venv32 : echo \"${PYENV_ROOT}/versions/venv32\""
+  stub pyenv-exec "echo \"${PYENV_ROOT}/versions/2.7.6\"" \
+                  "echo \"${PYENV_ROOT}/versions/3.2.1\""
+  create_virtualenv "venv27"
+  create_virtualenv "venv32"
+
+  PYENV_VERSION="venv27:venv32" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-exec
+  remove_virtualenv "venv27"
+  remove_virtualenv "venv32"
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/2.7.6:${PYENV_ROOT}/versions/3.2.1
+OUT
+}
+
+@test "display prefix with using sys.base_prefix" {
+  stub pyenv-version-name "echo venv33"
+  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\""
+  stub pyenv-exec "false" \
+                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
+  create_virtualenv "venv33"
+
+  PYENV_VERSION="venv33" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-exec
+  remove_virtualenv "venv33"
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/3.3.3
+OUT
+}
+
+@test "display prefixes with using sys.base_prefix" {
+  stub pyenv-version-name "echo venv33:venv34"
+  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
+                    "venv34 : echo \"${PYENV_ROOT}/versions/venv34\""
+  stub pyenv-exec "false" \
+                  "echo \"${PYENV_ROOT}/versions/3.3.3\"" \
+                  "false" \
+                  "echo \"${PYENV_ROOT}/versions/3.4.0\""
+  create_virtualenv "venv33"
+  create_virtualenv "venv34"
+
+  PYENV_VERSION="venv33:venv34" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-exec
+  remove_virtualenv "venv33"
+  remove_virtualenv "venv34"
+
+  assert_success
+  assert_output <<OUT
+${PYENV_ROOT}/versions/3.3.3:${PYENV_ROOT}/versions/3.4.0
+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\""
+  mkdir -p "${PYENV_ROOT}/versions/3.4.0"
+
+  PYENV_VERSION="3.4.0" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  rmdir "${PYENV_ROOT}/versions/3.4.0"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`3.4.0' is not a virtualenv
+OUT
+}
+
+@test "should fail if one of the versions is not a virtualenv" {
+  stub pyenv-version-name "echo venv33:3.4.0"
+  stub pyenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/venv33\"" \
+                    "3.4.0 : echo \"${PYENV_ROOT}/versions/3.4.0\""
+  stub pyenv-exec "false" \
+                  "echo \"${PYENV_ROOT}/versions/3.3.3\""
+  create_virtualenv "venv33"
+  mkdir -p "${PYENV_ROOT}/versions/3.4.0"
+
+  PYENV_VERSION="venv33:3.4.0" run pyenv-virtualenv-prefix
+
+  unstub pyenv-version-name
+  unstub pyenv-prefix
+  unstub pyenv-exec
+  remove_virtualenv "venv33"
+  rmdir "${PYENV_ROOT}/versions/3.4.0"
+
+  assert_failure
+  assert_output <<OUT
+pyenv-virtualenv: version \`3.4.0' is not a virtualenv
+OUT
+}
+
+

test/virtualenv.bats

@@ -0,0 +1,94 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+}
+
+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"
+  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} \"\$@\""
+
+  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
+rehashed
+OUT
+}
+
+@test "create virtualenv from current version" {
+  stub_pyenv "3.2.1"
+  stub pyenv-version-name "echo \${PYENV_VERSION}"
+  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+
+  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
+rehashed
+OUT
+}
+
+@test "create virtualenv with short options" {
+  stub_pyenv "3.2.1"
+  stub pyenv-version-name "echo \${PYENV_VERSION}"
+  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+
+  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
+rehashed
+OUT
+}
+
+@test "create virtualenv with long options" {
+  stub_pyenv "3.2.1"
+  stub pyenv-version-name "echo \${PYENV_VERSION}"
+  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+
+  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
+rehashed
+OUT
+}

test/virtualenvs.bats

@@ -0,0 +1,68 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  export PYENV_ROOT="${TMP}/pyenv"
+  mkdir -p "${PYENV_ROOT}/versions/2.7.6"
+  mkdir -p "${PYENV_ROOT}/versions/3.3.3"
+  mkdir -p "${PYENV_ROOT}/versions/venv27"
+  mkdir -p "${PYENV_ROOT}/versions/venv33"
+}
+
+@test "list virtual environments only" {
+  stub pyenv-version-name ": echo system"
+  stub pyenv-versions "--bare : echo \"system\";echo \"2.7.6\";echo \"3.3.3\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "2.7.6 : false"
+  stub pyenv-virtualenv-prefix "3.3.3 : false"
+  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/2.7.6\""
+  stub pyenv-virtualenv-prefix "venv33 : echo \"${PYENV_ROOT}/versions/3.3.3\""
+
+  run pyenv-virtualenvs
+
+  unstub pyenv-version-name
+  unstub pyenv-versions
+  unstub pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+  venv27 (created from ${PYENV_ROOT}/versions/2.7.6)
+  venv33 (created from ${PYENV_ROOT}/versions/3.3.3)
+OUT
+}
+
+@test "list virtual environments with hit prefix" {
+  stub pyenv-version-name ": echo venv33"
+  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
+  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
+
+  run pyenv-virtualenvs
+
+  unstub pyenv-version-name
+  unstub pyenv-versions
+  unstub pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+  venv27 (created from /usr)
+* venv33 (created from /usr)
+OUT
+}
+
+@test "list virtual environments with --bare" {
+  stub pyenv-versions "--bare : echo \"system\";echo \"venv27\";echo \"venv33\""
+  stub pyenv-virtualenv-prefix "venv27 : echo \"/usr\""
+  stub pyenv-virtualenv-prefix "venv33 : echo \"/usr\""
+
+  run pyenv-virtualenvs --bare
+
+  unstub pyenv-versions
+  unstub pyenv-virtualenv-prefix
+
+  assert_success
+  assert_output <<OUT
+venv27
+venv33
+OUT
+}