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

README.md

@@ -14,9 +14,14 @@ to manage your virtualenvs.)
 
 ### Installing as a pyenv plugin
 
+Installing pyenv-virtualenv as a pyenv plugin will give you access to the
+`pyenv virtualenv` command.
+
+    $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
+    $ exec "$SHELL"
+
 This will install the latest development version of pyenv-virtualenv into
 the `~/.pyenv/plugins/pyenv-virtualenv` directory. 
-
 **Important note:**  If you installed pyenv into a non-standard directory, make sure that you clone this
 repo into the 'plugins' directory of wherever you installed into.
 
@@ -24,21 +29,6 @@ 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.
 
-1. **Check out pyenv-virtualenv into plugin directory**
-
-        $ git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
-
-2. **Add `pyenv virtualenv-init` to your shell** to enable activation of virtualenv
-
-        $ echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
-
-    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
-
-3. **Restart your shell to the enable pyenv-virtualenv**
-
-        $ exec "$SHELL"
-
-
 ### Installing with Homebrew (for OS X users)
 
 Mac OS X users can install pyenv-virtualenv with the
@@ -49,18 +39,11 @@ 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
-$ brew install pyenv-virtualenv
-```
 
 Or, if you would like to install the latest development release:
 
-```
+    brew install --HEAD pyenv-virtualenv
-$ brew install --HEAD pyenv-virtualenv
-```
-
-After installation, you'll still need to add `eval "$(pyenv virtualenv-init -)"` to your
-profile (as stated in the caveats). You'll only ever have to do this once.
 
 
 ## Usage
@@ -71,12 +54,10 @@ To create a virtualenv for the Python version use with pyenv, run
 `pyenv virtualenv`, specifying the Python version you want and the name
 of the virtualenv directory. For example,
 
-```
+    $ pyenv virtualenv 2.7.6 my-virtual-env-2.7.6
-$ pyenv virtualenv 2.7.7 my-virtual-env-2.7.7
-```
 
-will create a virtualenv based on Python 2.7.7
+will create a virtualenv based on Python 2.7.6
-under `~/.pyenv/versions` in a folder called `my-virtual-env-2.7.7`. 
+under `~/.pyenv/versions` in a folder called `my-virtual-env-2.7.6`. 
 
 
 ### Create virtualenv from current version
@@ -85,29 +66,51 @@ If there is only one argument is given to `pyenv virtualenv`,
 virtualenv will be created with given name based on current
 version.
 
-```
+    $ pyenv version
-$ pyenv version
+    3.3.3 (set by /home/yyuu/.pyenv/version)
-3.4.1 (set by /home/yyuu/.pyenv/version)
+    $ pyenv virtualenv venv33
-$ pyenv virtualenv venv34
-```
 
 
 ### List existing virtualenvs
 
 `pyenv virtualenvs` shows you the list of existing virtualenvs.
 
-```
+    $ pyenv shell venv27
-$ pyenv shell venv27
+    $ pyenv virtualenvs
-$ pyenv virtualenvs
+    * venv27 (created from /home/yyuu/.pyenv/versions/2.7.6)
-* venv27 (created from /home/yyuu/.pyenv/versions/2.7.7)
+      venv33 (created from /home/yyuu/.pyenv/versions/3.3.3)
-  venv34 (created from /home/yyuu/.pyenv/versions/3.4.1)
-```
 
 
 ### Activate virtualenv
 
 Some external tools (e.g. [jedi](https://github.com/davidhalter/jedi)) might require you to `activate` the virtualenv.
-The `pyenv-virtualenv` will automatically activate/deactivate the virtualenv if the `eval "$(pyenv virtualenv-init -)"` is properly configured in your shell.
+`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
 
@@ -128,21 +131,6 @@ You can set certain environment variables to control the pyenv-virtualenv.
 
 ## Version History
 
-#### 20140615
-
- * Fix incompatibility issue of `pyenv activate` and `pyenv deactivate` (#26)
- * Workaround for the issue with pyenv-which-ext (#26)
-
-#### 20140614
-
- * Add `pyenv virtualenv-init` to enable auto-activation feature (#24)
- * Create symlinks for executables with version suffix (yyuu/pyenv#182)
-
-#### 20140602
-
- * Use new style GH raw url to avoid redirects (raw.github.com -> raw.githubusercontent.com)
- * Repaired virtualenv activation and deactivation for the fish shell (#23)
-
 #### 20140421
 
  * Display error if `pyenv activate` was invoked as a command

bin/pyenv-sh-activate

@@ -26,19 +26,14 @@ if [ "$1" = "--unset" ]; then
 fi
 
 versions=("$@")
+shell="$(basename "${PYENV_SHELL:-$SHELL}")"
+
 if [ -z "$versions" ]; then
-  no_shell=1
   OLDIFS="$IFS"
   IFS=: versions=($(pyenv-version-name))
   IFS="$OLDIFS"
 fi
 
-if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
-  # Backward compatibility issue
-  # https://github.com/yyuu/pyenv-virtualenv/issues/26
-  no_shell=
-fi
-
 if [ "${#versions[@]}" -gt 1 ]; then
   echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
   exit 1
@@ -46,34 +41,7 @@ fi
 
 pyenv-virtualenv-prefix "${versions}" 1>/dev/null
 
-shell="$(basename "${PYENV_SHELL:-$SHELL}")"
+echo "pyenv shell \"${versions}\""
-case "$shell" in
-bash )
-  profile="$HOME/.bash_profile"
-  ;;
-zsh )
-  profile="$HOME/.zshrc"
-  ;;
-ksh )
-  profile="$HOME/.profile"
-  ;;
-fish )
-  profile="$HOME/.config/fish/config.fish"
-  ;;
-* )
-  profile="$HOME/.profile"
-  ;;
-esac
-
-# Display setup instruction if 'pyenv virtualenv-init -' is not found in "$profile"
-if [ -f "$profile" ] && grep -q 'pyenv init -' "$profile" && ! grep -q 'pyenv virtualenv-init -' "$profile"; then
-  pyenv-virtualenv-init >&2 || true
-fi
-
-if [ -z "$no_shell" ]; then
-  echo "pyenv shell \"${versions}\";"
-fi
-
 case "$shell" in
 fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;;
 *    ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;;

bin/pyenv-sh-deactivate

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

bin/pyenv-virtualenv

@@ -11,7 +11,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20140615"
+PYENV_VIRTUALENV_VERSION="20140421"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -124,12 +124,10 @@ usage() {
 }
 
 detect_venv() {
-  # Check the existence of executables as a workaround for the issue with pyenv-which-ext
+  if pyenv-which "virtualenv" 1>/dev/null 2>&1; then
-  # https://github.com/yyuu/pyenv-virtualenv/issues/26
-  if [ -x "$(pyenv-prefix)/bin/virtualenv" ]; then
     HAS_VIRTUALENV=1
   fi
-  if [ -x "$(pyenv-prefix)/bin/pyvenv" ]; then
+  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
@@ -183,9 +181,9 @@ install_pip() {
     else
       [ -n "${GET_PIP_URL}" ] || {
         if [ -n "${PIP_VERSION}" ]; then
-          GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+          GET_PIP_URL="https://raw.github.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
         else
-          GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py"
+          GET_PIP_URL="https://raw.github.com/pypa/pip/master/contrib/get-pip.py"
         fi
       }
       if [ -n "$VERBOSE" ]; then
@@ -204,35 +202,22 @@ install_virtualenv() {
 
 ensurepip() {
   local version="$1"
-  PYENV_VERSION="${version}" pyenv-exec python -m ensurepip 2>/dev/null || {
+  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
-}
-
-create_symlinks() {
-  local version="$1"
-  local suffix="$(PYENV_VERSION="${version}" pyenv-exec python -c 'import sys;v=sys.version_info;sys.stdout.write("%d.%d"%(v[0],v[1]))')"
-
-  local file link
-  shopt -s nullglob
-  for file in "${VIRTUALENV_PATH}/bin"/*; do
-    if [[ "${file##*/}" == *"${suffix}" ]]; then
-      if [[ "${file}" == *"-${suffix}" ]]; then
-        link="${file%%-${suffix}}"
-      else
-        link="${file%%${suffix}}"
-      fi
-      if [ ! -e "${link}" ]; then
-        ( cd "${file%/*}" && ln -fs "${file##*/}" "${link##*/}" )
-      fi
-    fi
-  done
-  shopt -u nullglob
 }
 
 prepare_upgrade() {
@@ -437,8 +422,6 @@ if [ -n "$UPGRADE" ]; then
   upgrade "${VIRTUALENV_NAME}" "${VIRTUALENV_PATH}" || STATUS="$?"
 fi
 
-create_symlinks "${VIRTUALENV_NAME}"
-
 # Execute `after_virtualenv` hooks
 for hook in "${after_hooks[@]}"; do eval "$hook"; done
 

bin/pyenv-virtualenv-init

@@ -1,115 +0,0 @@
-#!/usr/bin/env bash
-# Summary: Configure the shell environment for pyenv-virtualenv
-# Usage: eval "$(pyenv virtualenv-init - [<shell>])"
-#
-# Automatically activates a Python virtualenv environment based on current
-# pyenv version.
-#
-
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-print=""
-for args in "$@"
-do
-  if [ "$args" = "-" ]; then
-    print=1
-    shift
-  fi
-done
-
-shell="$1"
-if [ -z "$shell" ]; then
-  shell="$(ps c -p "$PPID" -o 'ucomm=' 2>/dev/null || true)"
-  shell="${shell##-}"
-  shell="${shell%% *}"
-  shell="$(basename "${shell:-$SHELL}")"
-fi
-
-if [ -z "$print" ]; then
-  case "$shell" in
-  bash )
-    profile='~/.bash_profile'
-    ;;
-  zsh )
-    profile='~/.zshrc'
-    ;;
-  ksh )
-    profile='~/.profile'
-    ;;
-  fish )
-    profile='~/.config/fish/config.fish'
-    ;;
-  * )
-    profile='your profile'
-    ;;
-  esac
-
-  { echo "# Load pyenv-virtualenv automatically by adding"
-    echo "# the following to ${profile}:"
-    echo
-    case "$shell" in
-    fish )
-      echo 'status --is-interactive; and . (pyenv virtualenv-init -|psub)'
-      ;;
-    * )
-      echo 'eval "$(pyenv virtualenv-init -)"'
-      ;;
-    esac
-    echo
-  } >&2
-
-  exit 1
-fi
-
-case "$shell" in
-bash )
-  cat <<EOS
-export PYENV_VIRTUALENV_INIT=1
-_pyenv_virtualenv_hook() {
-  if [[ "\$(pyenv version-name)" == "system" ]]; then
-    pyenv deactivate || true;
-  elif [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then
-    pyenv deactivate || true;
-    pyenv activate 2>/dev/null || true
-  fi
-};
-if ! [[ "\$PROMPT_COMMAND" =~ _pyenv_virtualenv_hook ]]; then
-  PROMPT_COMMAND="_pyenv_virtualenv_hook;\$PROMPT_COMMAND";
-fi
-EOS
-  ;;
-fish )
-  cat <<EOS
-setenv PYENV_VIRTUALENV_INIT=1;
-function _pyenv_virtualenv_hook --on-event fish_prompt;
-  if [ (pyenv version-name) = "system" ]
-    eval (pyenv sh-deactivate); or true
-  else if [ "\$VIRTUAL_ENV" != (pyenv prefix) ]
-    eval (pyenv sh-deactivate); or true
-    eval (pyenv sh-activate 2>/dev/null); or true
-  end
-end
-EOS
-  ;;
-zsh )
-  cat <<EOS
-export PYENV_VIRTUALENV_INIT=1
-_pyenv_virtualenv_hook() {
-  if [[ "\$(pyenv version-name)" == "system" ]]; then
-    pyenv deactivate || true
-  elif [[ "\$VIRTUAL_ENV" != "\$(pyenv prefix)" ]]; then
-    pyenv deactivate || true
-    pyenv activate 2>/dev/null || true
-  fi
-}
-typeset -a precmd_functions
-if [[ -z \$precmd_functions[(r)_pyenv_virtualenv_hook] ]]; then
-  precmd_functions+=_pyenv_virtualenv_hook;
-fi
-EOS
-  ;;
-* )
-  # FIXME: what should i do here??
-  ;;
-esac

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

@@ -12,7 +12,10 @@ if [ -z "${PREFIX}" ]; then
 fi
 
 BIN_PATH="${PREFIX}/bin"
+ETC_PATH="${PREFIX}/etc/pyenv.d"
 
 mkdir -p "$BIN_PATH"
+mkdir -p "$ETC_PATH"
 
 install -p bin/* "$BIN_PATH"
+cp -RPp etc/pyenv.d/* "$ETC_PATH"

test/activate.bats

@@ -3,13 +3,10 @@
 load test_helper
 
 setup() {
-  export HOME="${TMP}"
   export PYENV_ROOT="${TMP}/pyenv"
 }
 
 @test "activate virtualenv from current version" {
-  export PYENV_VIRTUALENV_INIT=1
-
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
@@ -22,33 +19,12 @@ setup() {
 
   assert_success
   assert_output <<EOS
-source "${PYENV_ROOT}/versions/venv/bin/activate"
+pyenv shell "venv"
-EOS
-}
-
-@test "activate virtualenv from current version (without pyenv-virtualenv-init)" {
-  export PYENV_VIRTUALENV_INIT=
-
-  stub pyenv-version-name "echo venv"
-  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-
-  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate
-
-  unstub pyenv-version-name
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-pyenv shell "venv";
 source "${PYENV_ROOT}/versions/venv/bin/activate"
 EOS
 }
 
 @test "activate virtualenv from current version (fish)" {
-  export PYENV_VIRTUALENV_INIT=1
-
   stub pyenv-version-name "echo venv"
   stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
   stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
@@ -61,33 +37,12 @@ EOS
 
   assert_success
   assert_output <<EOS
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish"
+pyenv shell "venv"
-EOS
-}
-
-@test "activate virtualenv from current version (fish) (without pyenv-virtualenv-init)" {
-  export PYENV_VIRTUALENV_INIT=
-
-  stub pyenv-version-name "echo venv"
-  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-
-  PYENV_SHELL="fish" PYENV_VERSION="venv" run pyenv-sh-activate
-
-  unstub pyenv-version-name
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-pyenv shell "venv";
 . "${PYENV_ROOT}/versions/venv/bin/activate.fish"
 EOS
 }
 
 @test "activate virtualenv from command-line argument" {
-  export PYENV_VIRTUALENV_INIT=1
-
   stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
   stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
 
@@ -98,25 +53,7 @@ EOS
 
   assert_success
   assert_output <<EOS
-pyenv shell "venv27";
+pyenv shell "venv27"
-source "${PYENV_ROOT}/versions/venv27/bin/activate"
-EOS
-}
-
-@test "activate virtualenv from command-line argument (without pyenv-virtualenv-init)" {
-  export PYENV_VIRTUALENV_INIT=
-
-  stub pyenv-virtualenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-  stub pyenv-prefix "venv27 : echo \"${PYENV_ROOT}/versions/venv27\""
-
-  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/deactivate.bats

@@ -7,47 +7,21 @@ setup() {
 }
 
 @test "deactivate virtualenv" {
-  export PYENV_VIRTUALENV_INIT=1
-
   PYENV_SHELL="bash" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
-declare -f deactivate 1>/dev/null 2>&1 && deactivate;
+declare -f deactivate 1>/dev/null 2>&1 && deactivate
-EOS
-}
-
-@test "deactivate virtualenv (without pyenv-virtualenv-init)" {
-  export PYENV_VIRTUALENV_INIT=
-
-  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)" {
-  export PYENV_VIRTUALENV_INIT=1
-
   PYENV_SHELL="fish" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
-functions -q deactivate; and deactivate;
+functions -q deactivate; and deactivate
-EOS
-}
-
-@test "deactivate virtualenv (fish) (without pyenv-virtualenv-init)" {
-  export PYENV_VIRTUALENV_INIT=
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate
-
-  assert_success
-  assert_output <<EOS
-functions -q deactivate; and deactivate;
 pyenv shell --unset
 EOS
 }

test/hooks.bats

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

test/init.bats

@@ -1,44 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "detect parent shell" {
-  root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
-  SHELL=/bin/false run pyenv-virtualenv-init -
-  assert_success
-  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
-}
-
-@test "sh-compatible instructions" {
-  run pyenv-virtualenv-init bash
-  assert [ "$status" -eq 1 ]
-  assert_output_contains 'eval "$(pyenv virtualenv-init -)"'
-
-  run pyenv-virtualenv-init zsh
-  assert [ "$status" -eq 1 ]
-  assert_output_contains 'eval "$(pyenv virtualenv-init -)"'
-}
-
-@test "fish instructions" {
-  run pyenv-virtualenv-init fish
-  assert [ "$status" -eq 1 ]
-  assert_output_contains 'status --is-interactive; and . (pyenv virtualenv-init -|psub)'
-}
-
-@test "outputs bash-specific syntax" {
-  run pyenv-virtualenv-init - bash
-  assert_success
-  assert_output_contains '  PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";'
-}
-
-@test "outputs fish-specific syntax" {
-  run pyenv-virtualenv-init - fish
-  assert_success
-  assert_output_contains 'function _pyenv_virtualenv_hook --on-event fish_prompt;'
-}
-
-@test "outputs zsh-specific syntax" {
-  run pyenv-virtualenv-init - zsh
-  assert_success
-  assert_output_contains '  precmd_functions+=_pyenv_virtualenv_hook;'
-}

test/installer.bats

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

test/pyvenv.bats

@@ -9,7 +9,7 @@ setup() {
 stub_pyenv() {
   export PYENV_VERSION="$1"
   stub pyenv-version-name "echo \${PYENV_VERSION}"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
   stub pyenv-hooks "virtualenv : echo"
   stub pyenv-rehash " : echo rehashed"
 }
@@ -22,179 +22,170 @@ unstub_pyenv() {
   unstub pyenv-rehash
 }
 
-@test "use pyvenv if virtualenv is not available" {
+create_executable() {
-  stub_pyenv "3.4.1"
+  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  touch "${PYENV_ROOT}/versions/$1/bin/$2"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  chmod +x "${PYENV_ROOT}/versions/$1/bin/$2"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+}
-  stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip3.4\";echo PYENV_VERSION=\${PYENV_VERSION} ensurepip"
-  stub pyenv-exec "echo 3.4"
 
-  remove_executable "3.4.1" "virtualenv"
+remove_executable() {
-  create_executable "3.4.1" "pyvenv"
+  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.1 pyvenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.0 pyvenv ${PYENV_ROOT}/versions/venv
 PYENV_VERSION=venv ensurepip
 rehashed
 OUT
   assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
-
-  unstub_pyenv
-  unstub pyenv-exec
 }
 
 @test "not use pyvenv if virtualenv is available" {
-  stub_pyenv "3.4.1"
+  stub_pyenv "3.4.0"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+                   "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.4"
-
-  create_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
 
   run pyenv-virtualenv venv
 
+  unstub_pyenv
+  unstub pyenv-which
+  unstub pyenv-exec
+
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.1 virtualenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.0 virtualenv ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
-
-  unstub_pyenv
-  unstub pyenv-exec
 }
 
 @test "install virtualenv if pyvenv is not avaialble" {
   stub_pyenv "3.2.1"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-which "virtualenv : false" \
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+                   "pyvenv : false"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" \
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+                  "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
-
-  remove_executable "3.2.1" "virtualenv"
-  remove_executable "3.2.1" "pyvenv"
 
   run pyenv-virtualenv venv
 
+  unstub_pyenv
+  unstub pyenv-which
+  unstub pyenv-exec
+
   assert_success
   assert_output <<OUT
 PYENV_VERSION=3.2.1 pip install virtualenv
 PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
-
-  unstub_pyenv
-  unstub pyenv-exec
 }
 
 @test "install virtualenv if -p has given" {
-  stub_pyenv "3.4.1"
+  stub_pyenv "3.4.0"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-which "virtualenv : false"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  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} \"\$@\""
-  stub pyenv-exec "echo 3.4"
-
-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
 
   run pyenv-virtualenv -p python3 venv
 
+  unstub_pyenv
+  unstub pyenv-which
+  unstub pyenv-exec
+
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.4.0 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
-
-  unstub_pyenv
-  unstub pyenv-exec
 }
 
 @test "install virtualenv if --python has given" {
-  stub_pyenv "3.4.1"
+  stub_pyenv "3.4.0"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-which "virtualenv : false"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  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} \"\$@\""
-  stub pyenv-exec "echo 3.4"
-
-  remove_executable "3.4.1" "virtualenv"
-  create_executable "3.4.1" "pyvenv"
 
   run pyenv-virtualenv --python=python3 venv
 
+  unstub_pyenv
+  unstub pyenv-which
+  unstub pyenv-exec
+
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.4.1 pip install virtualenv
+PYENV_VERSION=3.4.0 pip install virtualenv
-PYENV_VERSION=3.4.1 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.4.0 virtualenv --python=python3 ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
-
-  unstub_pyenv
-  unstub pyenv-exec
 }
 
 @test "install virtualenv with unsetting troublesome pip options" {
   stub_pyenv "3.2.1"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-which "virtualenv : false" \
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+                   "pyvenv : false"
-  stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" \
-  stub pyenv-exec "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+                  "echo PIP_REQUIRE_VENV=\${PIP_REQUIRE_VENV} PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
-
-  remove_executable "3.2.1" "virtualenv"
-  remove_executable "3.2.1" "pyvenv"
 
   PIP_REQUIRE_VENV="true" run pyenv-virtualenv venv
 
+  unstub_pyenv
+  unstub pyenv-which
+  unstub pyenv-exec
+
   assert_success
   assert_output <<OUT
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 pip install virtualenv
 PIP_REQUIRE_VENV= PYENV_VERSION=3.2.1 virtualenv ${PYENV_ROOT}/versions/venv
 rehashed
 OUT
-
-  unstub_pyenv
-  unstub pyenv-exec
 }
 
 @test "install pip without using ensurepip" {
-  stub_pyenv "3.3.5"
+  stub_pyenv "3.3.0"
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+  stub pyenv-which "virtualenv : false" \
-  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
+                   "pyvenv : echo '${PYENV_ROOT}/versions/bin/pyvenv'" \
-  stub pyenv-which "pip : echo no pip; false"
+                   "pip : echo no pip; false"
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
+  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\"" \
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false"
+                  "echo PYENV_VERSION=\${PYENV_VERSION} no ensurepip; false" \
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} no setuptools; false"
+                  "echo PYENV_VERSION=\${PYENV_VERSION} no setuptools; false" \
-  stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} setuptools"
+                  "echo PYENV_VERSION=\${PYENV_VERSION} setuptools" \
-  stub pyenv-exec "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip\";echo PYENV_VERSION=\${PYENV_VERSION} pip"
+                  "bin=\"${PYENV_ROOT}/versions/venv/bin\";mkdir -p \"\$bin\";touch \"\$bin/pip\";echo PYENV_VERSION=\${PYENV_VERSION} pip"
-  stub pyenv-exec "echo 3.3"
+  stub curl "echo ez_setup.py" \
-  stub curl "echo ez_setup.py"
+            "echo get_pip.py"
-  stub curl "echo get_pip.py"
-
-  remove_executable "3.3.5" "virtualenv"
-  create_executable "3.3.5" "pyvenv"
 
   run pyenv-virtualenv venv
 
+  unstub_pyenv
+  unstub pyenv-which
+  unstub pyenv-exec
+
   assert_success
   assert_output <<OUT
-PYENV_VERSION=3.3.5 pyvenv ${PYENV_ROOT}/versions/venv
+PYENV_VERSION=3.3.0 pyvenv ${PYENV_ROOT}/versions/venv
 PYENV_VERSION=venv no ensurepip
 PYENV_VERSION=venv setuptools
 PYENV_VERSION=venv pip
 rehashed
 OUT
   assert [ -e "${PYENV_ROOT}/versions/venv/bin/pip" ]
-
-  unstub_pyenv
-  unstub pyenv-which
-  unstub pyenv-exec
 }

test/test_helper.bash

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

test/version.bats

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

test/virtualenv.bats

@@ -8,13 +8,9 @@ setup() {
 
 stub_pyenv() {
   export PYENV_VERSION="$1"
-
+  stub pyenv-prefix " : echo '${PYENV_ROOT}/versions/\${PYENV_VERSION}'"
-  create_executable "${PYENV_VERSION}" "virtualenv"
+  stub pyenv-which "virtualenv : echo '${PYENV_ROOT}/versions/bin/virtualenv'" \
-  remove_executable "${PYENV_VERSION}" "pyvenv"
+                   "pyvenv : false"
-
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
-  stub pyenv-prefix "echo '${PYENV_ROOT}/versions/${PYENV_VERSION}'"
   stub pyenv-hooks "virtualenv : echo"
   stub pyenv-rehash " : echo rehashed"
 }
@@ -22,6 +18,7 @@ stub_pyenv() {
 unstub_pyenv() {
   unset PYENV_VERSION
   unstub pyenv-prefix
+  unstub pyenv-which
   unstub pyenv-hooks
   unstub pyenv-rehash
 }
@@ -29,73 +26,69 @@ unstub_pyenv() {
 @test "create virtualenv from given version" {
   stub_pyenv "3.2.1"
   stub pyenv-exec "echo PYENV_VERSION=\${PYENV_VERSION} \"\$@\""
-  stub pyenv-exec "echo 3.2"
 
   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
-
-  unstub_pyenv
-  unstub pyenv-exec
 }
 
 @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} \"\$@\""
-  stub pyenv-exec "echo 3.2"
 
   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
-
-  unstub_pyenv
-  unstub pyenv-version-name
-  unstub pyenv-exec
 }
 
 @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} \"\$@\""
-  stub pyenv-exec "echo 3.2"
 
   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
-
-  unstub_pyenv
-  unstub pyenv-version-name
-  unstub pyenv-exec
 }
 
 @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} \"\$@\""
-  stub pyenv-exec "echo 3.2"
 
   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
-
-  unstub_pyenv
-  unstub pyenv-version-name
-  unstub pyenv-exec
 }