m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-10 12:33:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix broken setenv in pyenv-virtualenv-init

Browse Source
This commit is contained in:
Yamashita Yuu
2014-06-30 21:35:43 +09:00
parent 763696b3fb
commit 7079cbe979
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pyenv-virtualenv-init
View File

@@ -81,7 +81,7 @@ EOS
;; ;;
fish ) fish )
cat <<EOS cat <<EOS
setenv PYENV_VIRTUALENV_INIT=1; setenv PYENV_VIRTUALENV_INIT 1;
function _pyenv_virtualenv_hook --on-event fish_prompt; function _pyenv_virtualenv_hook --on-event fish_prompt;
if [ (pyenv version-name) = "system" ] if [ (pyenv version-name) = "system" ]
eval (pyenv sh-deactivate); or true eval (pyenv sh-deactivate); or true

43
test/init.bats
View File

@@ -28,17 +28,54 @@ load test_helper
@test "outputs bash-specific syntax" { @test "outputs bash-specific syntax" {
run pyenv-virtualenv-init - bash run pyenv-virtualenv-init - bash
assert_success assert_success
assert_output_contains ' PROMPT_COMMAND="_pyenv_virtualenv_hook;$PROMPT_COMMAND";' assert_output <<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
} }
@test "outputs fish-specific syntax" { @test "outputs fish-specific syntax" {
run pyenv-virtualenv-init - fish run pyenv-virtualenv-init - fish
assert_success assert_success
assert_output_contains 'function _pyenv_virtualenv_hook --on-event fish_prompt;' assert_output <<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
} }
@test "outputs zsh-specific syntax" { @test "outputs zsh-specific syntax" {
run pyenv-virtualenv-init - zsh run pyenv-virtualenv-init - zsh
assert_success assert_success
assert_output_contains ' precmd_functions+=_pyenv_virtualenv_hook;' assert_output <<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
} }