Merge pull request #23 from fgimian/fish-activation-fix

Repaired virtualenv activation and deactivation for the fish shell

bin/pyenv-sh-activate

@@ -41,7 +41,7 @@ fi
 
 pyenv-virtualenv-prefix "${versions}" 1>/dev/null
 
-echo "pyenv shell \"${versions}\""
+echo "pyenv shell \"${versions}\";"
 case "$shell" in
 fish ) echo ". \"$(pyenv-prefix "${versions}")/bin/activate.fish\"" ;;
 *    ) echo "source \"$(pyenv-prefix "${versions}")/bin/activate\"" ;;

bin/pyenv-sh-deactivate

@@ -11,7 +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";;
 esac
 echo "pyenv shell --unset"

test/activate.bats

@@ -19,7 +19,7 @@ setup() {
 
   assert_success
   assert_output <<EOS
-pyenv shell "venv"
+pyenv shell "venv";
 source "${PYENV_ROOT}/versions/venv/bin/activate"
 EOS
 }
@@ -37,7 +37,7 @@ EOS
 
   assert_success
   assert_output <<EOS
-pyenv shell "venv"
+pyenv shell "venv";
 . "${PYENV_ROOT}/versions/venv/bin/activate.fish"
 EOS
 }
@@ -53,7 +53,7 @@ EOS
 
   assert_success
   assert_output <<EOS
-pyenv shell "venv27"
+pyenv shell "venv27";
 source "${PYENV_ROOT}/versions/venv27/bin/activate"
 EOS
 }

test/deactivate.bats

@@ -21,7 +21,7 @@ EOS
 
   assert_success
   assert_output <<EOS
-functions -q deactivate; and deactivate
+functions -q deactivate; and deactivate;
 pyenv shell --unset
 EOS
 }