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

README.md

@@ -114,22 +114,6 @@ You can also activate and deactivate a pyenv virtualenv this way:
     pyenv activate <name>
     pyenv deactivate
 
-
-### Delete existing virtualenv
-
-Removing the directory in `~/.pyenv/versions` will delete the virtualenv, or you can run:
-
-    pyenv uninstall my-virtual-env
-    
-
-### virtualenv and pyvenv
-
-There is [venv](http://docs.python.jp/3/library/venv.html) module available for CPython 3.3 and newer.
-It provides a command-line tool `pyvenv` which is the successor of `virtualenv` and distributed by default.
-
-The `pyenv-virtualenv` uses `pyvenv` if it is available and the `virtualenv` is not available.
-
-
 ### Special environment variables
 
 You can set certain environment variables to control the pyenv-virtualenv.
@@ -149,20 +133,6 @@ You can set certain environment variables to control the pyenv-virtualenv.
 
 ## Version History
 
-#### 20141012
-
- * Fix warnings from `shellcheck` to improve support for POSIX sh (#40)
- * Do not allow whitespace in `VIRTUALENV_NAME` (#44)
- * Should not persist `PYENV_DEACTIVATE` after automatic deactivation (#47, #48)
-
-#### 20140705
-
- * Display information on auto-(de)?activation
- * Support manual (de)?activation with auto-activation enabled (#32, #34)
- * Exit as error when (de)?activation failed
- * Use https://bootstrap.pypa.io/ to install setuptools and pip
- * Create backup of original virtualenv within `$(pyenv root)/versions` when `--upgrade`
-
 #### 20140615
 
  * Fix incompatibility issue of `pyenv activate` and `pyenv deactivate` (#26)

bin/pyenv-sh-activate

@@ -14,32 +14,16 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-unset NOERROR
-unset VERBOSE
+# Provide pyenv completions
+if [ "$1" = "--complete" ]; then
+  echo --unset
+  exec pyenv-virtualenvs --bare
+fi
 
-while [ $# -gt 0 ]; do
-  case "$1" in
-  "--complete" )
-    # Provide pyenv completions
-    echo --unset
-    exec pyenv-virtualenvs --bare
-    ;;
-  "--no-error" )
-    NOERROR=1
-    ;;
-  "--unset" )
-    echo "pyenv deactivate"
-    exit
-    ;;
-  "--verbose" )
-    VERBOSE=1
-    ;;
-  * )
-    break
-    ;;
-  esac
-  shift 1
-done
+if [ "$1" = "--unset" ]; then
+  echo "pyenv deactivate"
+  exit
+fi
 
 versions=("$@")
 if [ -z "$versions" ]; then
@@ -56,16 +40,11 @@ if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
 fi
 
 if [ "${#versions[@]}" -gt 1 ]; then
-  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
-  echo "false"
+  echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
   exit 1
 fi
 
-if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
-  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
-  echo "false"
-  exit 1
-fi
+pyenv-virtualenv-prefix "${versions}" 1>/dev/null
 
 shell="$(basename "${PYENV_SHELL:-$SHELL}")"
 case "$shell" in
@@ -91,28 +70,23 @@ if [ -f "$profile" ] && grep -q 'pyenv init -' "$profile" && ! grep -q 'pyenv vi
   pyenv-virtualenv-init >&2 || true
 fi
 
-if [ -n "$VERBOSE" ]; then
-  echo "pyenv-virtualenv: activate ${versions}" 1>&2
-fi
-
 if [ -z "$no_shell" ]; then
   echo "pyenv shell \"${versions}\";"
 fi
 
-prefix="$(pyenv-prefix "${versions}")"
 case "$shell" in
 fish )
   cat <<EOS
 set -e PYENV_DEACTIVATE;
-setenv PYENV_ACTIVATE "${prefix}";
-. "${prefix}/bin/activate.fish";
+setenv PYENV_ACTIVATE "$(pyenv-prefix "${versions}")";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
  ;;
 *    )
   cat <<EOS
 unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${prefix}";
-. "${prefix}/bin/activate";
+export PYENV_ACTIVATE="$(pyenv-prefix "${versions}")";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
   ;;
 esac

bin/pyenv-sh-deactivate

@@ -9,76 +9,30 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-unset NOERROR
-unset VERBOSE
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-  "--no-error" )
-    NOERROR=1
-    ;;
-  "--verbose" )
-    VERBOSE=1
-    ;;
-  * )
-    break
-    ;;
-  esac
-  shift 1
-done
-
 shell="$(basename "${PYENV_SHELL:-$SHELL}")"
 case "$shell" in
 fish )
-  echo "if functions -q deactivate;"
+  cat <<EOS
+if functions -q deactivate
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
+  deactivate;
+end;
+EOS
   ;;
 *    )
-  echo "if declare -f deactivate 1>/dev/null 2>&1; then"
+  cat <<EOS
+if declare -f deactivate 1>/dev/null 2>&1; then
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
+  deactivate;
+fi;
+EOS
   ;;
 esac
 
-prefix="${PYENV_ACTIVATE:-${VIRTUAL_ENV}}"
-
-if [ -n "$VERBOSE" ]; then
-  echo "  echo \"pyenv-virtualenv: deactivate ${prefix##*/}\" 1>&2;"
-fi
-
 if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
   # Backward compatibility issue
   # https://github.com/yyuu/pyenv-virtualenv/issues/26
-  echo "  pyenv shell --unset;"
+  echo "pyenv shell --unset;"
 fi
-
-case "$shell" in
-fish )
-  cat <<EOS
-  setenv PYENV_DEACTIVATE "$prefix";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-EOS
-  ;;
-*    )
-  cat <<EOS
-  export PYENV_DEACTIVATE="$prefix";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-EOS
-  ;;
-esac
-
-if [ -z "$NOERROR" ]; then
-  echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"
-fi
-
-echo "  false;"
-
-case "$shell" in
-fish )
-  echo "end;"
-  ;;
-*    )
-  echo "fi;"
-  ;;
-esac

bin/pyenv-virtualenv

@@ -9,7 +9,7 @@
 #   -f/--force       Install even if the version appears to be installed already
 #
 
-PYENV_VIRTUALENV_VERSION="20141012"
+PYENV_VIRTUALENV_VERSION="20140615"
 
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -297,11 +297,6 @@ if [ -z "${VERSION_NAME}" ] || [ -z "${VIRTUALENV_NAME}" ]; then
   usage 1
 fi
 
-if [ "$VIRTUALENV_NAME" != "${VIRTUALENV_NAME%[[:space:]]*}" ]; then
-  echo "pyenv-virtualenv: no whitespace allowed in virtualenv name." 1>&2
-  exit 1
-fi
-
 # Set VERSION_NAME as default version in this script
 export PYENV_VERSION="${VERSION_NAME}"
 

bin/pyenv-virtualenv-init

@@ -77,21 +77,16 @@ fish )
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
-      pyenv deactivate --no-error --verbose
-      set -e PYENV_DEACTIVATE
+      eval (pyenv sh-deactivate); or true
       return 0
     end
     if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
-      if pyenv deactivate --no-error --verbose
-        set -e PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
+      eval (pyenv sh-deactivate); or true
+      eval (pyenv sh-activate 2>/dev/null); or true
     end
   else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
-      pyenv activate --no-error --verbose
+    if [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
+      eval (pyenv sh-activate 2>/dev/null); or true
     end
   end
 end
@@ -112,22 +107,17 @@ esac
 if [[ "$shell" != "fish" ]]; then
   cat <<EOS
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name)" = "system" ]; then
-      pyenv deactivate --no-error --verbose
-      unset PYENV_DEACTIVATE
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+      pyenv deactivate || true
       return 0
     fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then
-      if pyenv deactivate --no-error --verbose; then
-        unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      fi
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv deactivate || true
+      pyenv activate 2>/dev/null || true
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then
-      pyenv activate --no-error --verbose
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv activate 2>/dev/null || true
     fi
   fi
 };

bin/pyenv-virtualenv-prefix

@@ -32,10 +32,6 @@ base_prefix() { # pyvenv
 
 VIRTUALENV_PREFIX_PATHS=()
 for version in "${versions[@]}"; do
-  if [ "$version" = "system" ]; then
-    echo "pyenv-virtualenv: version \`${version}' is not a virtualenv" 1>&2
-    exit 1
-  fi
   PREFIX="$(pyenv-prefix "${version}")"
   if [ -f "${PREFIX}/bin/activate" ]; then
     VIRTUALENV_PREFIX_PATH="$(real_prefix "${version}" || base_prefix "${version}" || true)"

test/activate.bats

@@ -24,29 +24,7 @@ setup() {
   assert_output <<EOS
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
-EOS
-}
-
-@test "activate virtualenv from current version (verbose)" {
-  export PYENV_VIRTUALENV_INIT=1
-
-  stub pyenv-version-name "echo venv"
-  stub pyenv-virtualenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-  stub pyenv-prefix "venv : echo \"${PYENV_ROOT}/versions/venv\""
-
-  PYENV_SHELL="bash" PYENV_VERSION="venv" run pyenv-sh-activate --verbose
-
-  unstub pyenv-version-name
-  unstub pyenv-virtualenv-prefix
-  unstub pyenv-prefix
-
-  assert_success
-  assert_output <<EOS
-pyenv-virtualenv: activate venv
-unset PYENV_DEACTIVATE;
-export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -68,7 +46,7 @@ EOS
 pyenv shell "venv";
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -89,7 +67,7 @@ EOS
   assert_output <<EOS
 set -e PYENV_DEACTIVATE;
 setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -111,7 +89,7 @@ EOS
 pyenv shell "venv";
 set -e PYENV_DEACTIVATE;
 setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -131,7 +109,7 @@ EOS
 pyenv shell "venv27";
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -151,7 +129,7 @@ EOS
 pyenv shell "venv27";
 unset PYENV_DEACTIVATE;
 export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
-. "${PYENV_ROOT}/versions/venv27/bin/activate";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -172,23 +150,6 @@ EOS
   unstub pyenv-virtualenv-prefix
 
   assert_failure
-  assert_output <<EOS
-pyenv-virtualenv: version \`3.3.3' is not a virtualenv
-false
-EOS
-}
-
-@test "should fail if the version is not a virtualenv (no-error)" {
-  stub pyenv-virtualenv-prefix "3.3.3 : false"
-
-  run pyenv-sh-activate --no-error "3.3.3"
-
-  unstub pyenv-virtualenv-prefix
-
-  assert_failure
-  assert_output <<EOS
-false
-EOS
 }
 
 @test "should fail if there are multiple versions" {
@@ -197,16 +158,6 @@ EOS
   assert_failure
   assert_output <<EOS
 pyenv-virtualenv: cannot activate multiple versions at once: venv venv27
-false
-EOS
-}
-
-@test "should fail if there are multiple versions (no-error)" {
-  run pyenv-sh-activate --no-error "venv" "venv27"
-
-  assert_failure
-  assert_output <<EOS
-false
 EOS
 }
 

test/deactivate.bats

@@ -8,211 +8,63 @@ setup() {
 
 @test "deactivate virtualenv" {
   export PYENV_VIRTUALENV_INIT=1
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
   unset PYENV_ACTIVATE;
   deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv (verbose)" {
-  export PYENV_VIRTUALENV_INIT=1
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --verbose
-
-  assert_success
-  assert_output <<EOS
-if declare -f deactivate 1>/dev/null 2>&1; then
-  echo "pyenv-virtualenv: deactivate venv" 1>&2;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv (no-error)" {
-  export PYENV_VIRTUALENV_INIT=1
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  false;
 fi;
 EOS
 }
 
 @test "deactivate virtualenv (without pyenv-virtualenv-init)" {
   export PYENV_VIRTUALENV_INIT=
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
 
   PYENV_SHELL="bash" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
 if declare -f deactivate 1>/dev/null 2>&1; then
-  pyenv shell --unset;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
   unset PYENV_ACTIVATE;
   deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv (without pyenv-virtualenv-init) (no-error)" {
-  export PYENV_VIRTUALENV_INIT=
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-if declare -f deactivate 1>/dev/null 2>&1; then
-  pyenv shell --unset;
-  export PYENV_DEACTIVATE="$PYENV_ACTIVATE";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  false;
-fi;
-EOS
-}
-
-@test "deactivate virtualenv which has been activated manually" {
-  export PYENV_VIRTUALENV_INIT=1
-  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-
-  PYENV_SHELL="bash" run pyenv-sh-deactivate
-
-  assert_success
-  assert_output <<EOS
-if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="$VIRTUAL_ENV";
-  unset PYENV_ACTIVATE;
-  deactivate;
-else
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
 fi;
+pyenv shell --unset;
 EOS
 }
 
 @test "deactivate virtualenv (fish)" {
   export PYENV_VIRTUALENV_INIT=1
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
-if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
+if functions -q deactivate
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
   set -e PYENV_ACTIVATE;
   deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
-end;
-EOS
-}
-
-@test "deactivate virtualenv (fish) (no-error)" {
-  export PYENV_VIRTUALENV_INIT=1
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  false;
 end;
 EOS
 }
 
 @test "deactivate virtualenv (fish) (without pyenv-virtualenv-init)" {
   export PYENV_VIRTUALENV_INIT=
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
 
   PYENV_SHELL="fish" run pyenv-sh-deactivate
 
   assert_success
   assert_output <<EOS
-if functions -q deactivate;
-  pyenv shell --unset;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
+if functions -q deactivate
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
   set -e PYENV_ACTIVATE;
   deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
-end;
-EOS
-}
-
-@test "deactivate virtualenv (fish) (without pyenv-virtualenv-init) (no-error)" {
-  export PYENV_VIRTUALENV_INIT=
-  export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv"
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
-
-  assert_success
-  assert_output <<EOS
-if functions -q deactivate;
-  pyenv shell --unset;
-  setenv PYENV_DEACTIVATE "$PYENV_ACTIVATE";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  false;
-end;
-EOS
-}
-
-@test "deactivate virtualenv which has been activated manually (fish)" {
-  export PYENV_VIRTUALENV_INIT=1
-  export VIRTUAL_ENV="${PYENV_ROOT}/versions/venv"
-
-  PYENV_SHELL="fish" run pyenv-sh-deactivate
-
-  assert_success
-  assert_output <<EOS
-if functions -q deactivate;
-  setenv PYENV_DEACTIVATE "$VIRTUAL_ENV";
-  set -e PYENV_ACTIVATE;
-  deactivate;
-else;
-  echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
-  false;
 end;
+pyenv shell --unset;
 EOS
 }
 

test/init.bats

@@ -32,22 +32,17 @@ load test_helper
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name)" = "system" ]; then
-      pyenv deactivate --no-error --verbose
-      unset PYENV_DEACTIVATE
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+      pyenv deactivate || true
       return 0
     fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then
-      if pyenv deactivate --no-error --verbose; then
-        unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      fi
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv deactivate || true
+      pyenv activate 2>/dev/null || true
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then
-      pyenv activate --no-error --verbose
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv activate 2>/dev/null || true
     fi
   fi
 };
@@ -65,21 +60,16 @@ setenv PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
-      pyenv deactivate --no-error --verbose
-      set -e PYENV_DEACTIVATE
+      eval (pyenv sh-deactivate); or true
       return 0
     end
     if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
-      if pyenv deactivate --no-error --verbose
-        set -e PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      end
+      eval (pyenv sh-deactivate); or true
+      eval (pyenv sh-activate 2>/dev/null); or true
     end
   else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
-      pyenv activate --no-error --verbose
+    if [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
+      eval (pyenv sh-activate 2>/dev/null); or true
     end
   end
 end
@@ -93,22 +83,17 @@ EOS
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
   if [ -n "\$PYENV_ACTIVATE" ]; then
-    if [ "\$(pyenv version-name)" = "system" ]; then
-      pyenv deactivate --no-error --verbose
-      unset PYENV_DEACTIVATE
+    if [ "x\`pyenv version-name\`" = "xsystem" ]; then
+      pyenv deactivate || true
       return 0
     fi
-    if [ "\$PYENV_ACTIVATE" != "\$(pyenv prefix)" ]; then
-      if pyenv deactivate --no-error --verbose; then
-        unset PYENV_DEACTIVATE
-        pyenv activate --no-error --verbose || unset PYENV_DEACTIVATE
-      else
-        pyenv activate --no-error --verbose
-      fi
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv deactivate || true
+      pyenv activate 2>/dev/null || true
     fi
   else
-    if [ -z "\$VIRTUAL_ENV" ] && [ "\$PYENV_DEACTIVATE" != "\$(pyenv prefix)" ]; then
-      pyenv activate --no-error --verbose
+    if [ "x\$PYENV_DEACTIVATE" != "x\`pyenv prefix\`" ]; then
+      pyenv activate 2>/dev/null || true
     fi
   fi
 };

test/version.bats

@@ -4,7 +4,7 @@ load test_helper
 
 setup() {
   export PYENV_ROOT="${TMP}/pyenv"
-  export PYENV_VIRTUALENV_VERSION="20141012"
+  export PYENV_VIRTUALENV_VERSION="20140615"
 }
 
 @test "display virtualenv version" {

test/virtualenv-prefix.bats

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

test/virtualenv.bats

@@ -132,21 +132,3 @@ OUT
   unstub pyenv-exec
   unstub curl
 }
-
-@test "no whitespace allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo bar"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: no whitespace allowed in virtualenv name.
-OUT
-}
-
-@test "no tab allowed in virtualenv name" {
-  run pyenv-virtualenv "3.2.1" "foo	bar baz"
-
-  assert_failure
-  assert_output <<OUT
-pyenv-virtualenv: no whitespace allowed in virtualenv name.
-OUT
-}