v20140123

Update README.md

.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,4 +1,6 @@
-# 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 a `pyenv virtualenv` command to create virtualenv for Python
@@ -15,12 +17,16 @@ to manage your virtualenvs.)
 Installing pyenv-virtualenv as a pyenv plugin will give you access to the
 `pyenv virtualenv` command.
 
-    $ git clone git://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
+    $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
 
 This will install the latest development version of pyenv-virtualenv into
-the `~/.pyenv/plugins/pyenv-virtualenv` directory. From that directory, you
+the `~/.pyenv/plugins/pyenv-virtualenv` directory. 
-can check out a specific release tag. To update pyenv-virtualenv, run `git
+**Important note:**  If you installed pyenv into a non-standard directory, make sure that you clone this
-pull` to download the latest changes.
+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)
 
@@ -44,13 +50,13 @@ Or, if you would like to install the latest development release:
 ### 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
+`pyenv virtualenv`, specifying the Python version you want and the name
-virtualenv. For example,
+of the virtualenv directory. For example,
 
-    $ pyenv virtualenv 2.7.5 venv27
+    $ pyenv virtualenv 2.7.6 my-virtual-env-2.7.6
 
-virtualenvs will be created into a directory of the same name
+will create a virtualenv based on Python 2.7.6
-under `~/.pyenv/versions`.
+under `~/.pyenv/versions` in a folder called `my-virtual-env-2.7.6`. 
 
 
 ### Create virtualenv from current version
@@ -60,7 +66,7 @@ virtualenv will be created with given name based on current
 version.
 
     $ pyenv version
-    3.3.2 (set by /home/yyuu/.pyenv/version)
+    3.3.3 (set by /home/yyuu/.pyenv/version)
     $ pyenv virtualenv venv33
 
 
@@ -70,8 +76,25 @@ version.
 
     $ pyenv shell venv27
     $ pyenv virtualenvs
-    * venv27 (created from /home/yyuu/.pyenv/versions/2.7.5)
+    * venv27 (created from /home/yyuu/.pyenv/versions/2.7.6)
-      venv33 (created from /home/yyuu/.pyenv/versions/3.3.2)
+      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.
+
+    $ pyenv shell venv27
+    $ source "$(pyenv prefix venv27)/bin/activate"
+
+You can deactivate the activate'd virtualenv by `pyenv deactivate`.
+
+    $ pyenv deactivate
 
 
 ### Special environment variables
@@ -83,6 +106,8 @@ You can set certain environment variables to control the pyenv-virtualenv.
 * `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
@@ -91,6 +116,26 @@ You can set certain environment variables to control the pyenv-virtualenv.
 
 ## Version History
 
+#### 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.

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

@@ -11,7 +11,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20130622"
+PYENV_VIRTUALENV_VERSION="20140123"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -25,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=()
@@ -100,8 +103,17 @@ http_get_wget() {
 }
 
 version() {
-  local version="$(venv --version 2>/dev/null || true)"
+  detect_venv
-  echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${version:-unknown})"
+  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() {
@@ -111,23 +123,129 @@ usage() {
   [ -z "$1" ] || exit "$1"
 }
 
-virtualenv_is_pyvenv() {
+detect_venv() {
-  # Use pyvenv only if virtualenv is not installed and there is pyvenv
   if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
-    return 1
+    HAS_VIRTUALENV=1
-  else
+  fi
-    pyenv-which "pyvenv" 1>/dev/null 2>&1
+  if pyenv-which "pyvenv" 1>/dev/null 2>&1; then
+    HAS_PYVENV=1
+  fi
+  # Use pyvenv only if virtualenv is not installed and there is pyvenv
+  if [ -n "${HAS_PYVENV}" ] && [ -z "${HAS_VIRTUALENV}" ]; then
+    USE_PYVENV=1
   fi
 }
 
 venv() {
-  if virtualenv_is_pyvenv; then
+  local args=("$@")
-    pyenv-exec pyvenv "$@"
+  if [ -n "${USE_PYVENV}" ]; then
+    pyenv-exec pyvenv "${args[@]}"
+
+    local last="${args[${#args[@]}-1]}"
+    ensurepip "${last##*/}"
   else
-    pyenv-exec virtualenv "$@"
+    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")/.."
 if [ -z "${PYENV_VIRTUALENV_CACHE_PATH}" ]; then
   PYENV_VIRTUALENV_CACHE_PATH="${PYTHON_BUILD_CACHE_PATH:-${PYENV_ROOT}/cache}"
@@ -148,6 +266,10 @@ for option in "${OPTIONS[@]}"; do
   "h" | "help" )
     usage 0
     ;;
+  "p" )
+    VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--python=${ARGUMENTS[0]}"
+    ARGUMENTS=("${ARGUMENTS[@]:1}") # shift 1
+    ;;
   "q" | "quiet" )
     QUIET="--quiet"
     ;;
@@ -168,7 +290,7 @@ for option in "${OPTIONS[@]}"; do
 done
 
 if [[ "${#ARGUMENTS[@]}" == 0 ]]; then
-  echo "pyenv: no virtualenv name given." 1>&2
+  echo "pyenv-virtualenv: no virtualenv name given." 1>&2
   exit 1
 elif [[ "${#ARGUMENTS[@]}" == 1 ]]; then
   # If only one argument given, use current version as source version
@@ -202,7 +324,12 @@ UPGRADE_LIST="${TMP}/pyenv-virtualenv.${SEED}.txt"
 
 VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
 
-if virtualenv_is_pyvenv; then
+unset HAS_VIRTUALENV
+unset HAS_PYVENV
+unset USE_PYVENV
+detect_venv
+
+if [ -n "${USE_PYVENV}" ]; then
   # Unset some arguments not supported by pyvenv
   unset QUIET
   unset VERBOSE
@@ -211,11 +338,10 @@ if virtualenv_is_pyvenv; then
     VIRTUALENV_OPTIONS[${#VIRTUALENV_OPTIONS[*]}]="--upgrade"
   fi
 else
-  pyenv-which "virtualenv" 1>/dev/null 2>&1 || {
+  if [ -z "${HAS_VIRTUALENV}" ]; then
-    VIRTUALENV_VERSION="==${VIRTUALENV_VERSION}"
+    install_virtualenv "${PYENV_VERSION}"
-    pyenv-exec pip install $QUIET $VERBOSE "virtualenv${VIRTUALENV_VERSION%==}"
+    HAS_VIRTUALENV=1
-    pyenv-rehash
+  fi
-  }
 fi
 
 # Unset environment variables which starts with `VIRTUALENV_`.
@@ -239,9 +365,10 @@ after_virtualenv() {
 }
 
 # Load plugin hooks.
-for script in $(pyenv-hooks virtualenv); do
+OLDIFS="$IFS"
-  source "$script"
+IFS=$'\n' scripts=(`pyenv-hooks virtualenv`)
-done
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do source "$script"; done
 
 
 [ -d "${VIRTUALENV_PATH}" ] && PREFIX_EXISTS=1
@@ -250,7 +377,7 @@ done
 # the --force option was specified.
 if [ -d "${VIRTUALENV_PATH}/bin" ]; then
   if [ -z "$FORCE" ]; then
-    echo "pyenv: ${VIRTUALENV_PATH} already exists" 1>&2
+    echo "pyenv-virtualenv: ${VIRTUALENV_PATH} already exists" 1>&2
     read -p "continue with installation? (y/N) "
 
     case "$REPLY" in
@@ -260,8 +387,7 @@ if [ -d "${VIRTUALENV_PATH}/bin" ]; then
   fi
 
   if [ -n "$UPGRADE" ]; then
-    PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec pip freeze >"${UPGRADE_LIST}"
+    prepare_upgrade "${VIRTUALENV_NAME}" "${VIRTUALENV_PATH}"
-    mv -f "${VIRTUALENV_PATH}" "${UPGRADE_PATH}"
   fi
 fi
 
@@ -281,52 +407,11 @@ STATUS=0
 # 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}" && {
+venv $QUIET $VERBOSE "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
-  if virtualenv_is_pyvenv; then
-    [ -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
-    }
-    PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python -c 'import setuptools' 1>/dev/null 2>&1 || {
-      echo "Installing setuptools from ${EZ_SETUP_URL}..." 1>&2
-      http get "${EZ_SETUP_URL}" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python
-    }
-
-    [ -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
-    }
-    PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-which pip 1>/dev/null 2>&1 || {
-      echo "Installing pip from ${GET_PIP_URL}..." 1>&2
-      http get "${GET_PIP_URL}" | PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec python
-    }
-  fi
-} || STATUS="$?"
 
 ## Migrate previously installed packages from requirements.txt
 if [ -n "$UPGRADE" ]; then
-  UPGRADE_STATUS=0
+  upgrade "${VIRTUALENV_NAME}" "${VIRTUALENV_PATH}" || STATUS="$?"
-  PYENV_VERSION="${VIRTUALENV_NAME}" pyenv-exec pip install $QUIET $VERBOSE --requirement "${UPGRADE_LIST}" || UPGRADE_STATUS=$?
-  if [ "$UPGRADE_STATUS" == "0" ]; then
-    rm -f "${UPGRADE_LIST}"
-    rm -fr "${UPGRADE_PATH}"
-  else
-    { 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
-    STATUS="$UPGRADE_STATUS"
-  fi
 fi
 
 # Execute `after_virtualenv` hooks

bin/pyenv-virtualenv-prefix

@@ -35,11 +35,9 @@ 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)"
-    if [ -d "${VIRTUALENV_PREFIX_PATH}" ]; then
+    VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
-      VIRTUALENV_PREFIX_PATHS=("${VIRTUALENV_PREFIX_PATHS[@]}" "$VIRTUALENV_PREFIX_PATH")
-    fi
   else
-    echo "pyenv: version \`${version}' is not a virtualenv" 1>&2
+    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
     exit 1
   fi
 done

install.sh

@@ -1,17 +1,18 @@
 #!/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"
 
-mkdir -p "${BIN_PATH}"
+mkdir -p "$BIN_PATH"
 
-for file in bin/*; do
+install -p bin/* "$BIN_PATH"
-  cp "${file}" "${BIN_PATH}"
-done
-
-echo "Installed pyenv-virtualenv at ${PREFIX}"

test/activate.bats

@@ -0,0 +1,87 @@
+#!/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/deactivate.bats

@@ -0,0 +1,27 @@
+#!/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/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,149 @@
+#!/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 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="20140123"
+}
+
+@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
+}