adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Organize error checking in virtualenwrapper plugin

Browse Source
This commit is contained in:
Marc Cornellà 2015-02-10 12:20:24 +01:00
parent 4161aa4f9d
commit b62911660d
1 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View File

@ -6,67 +6,70 @@ elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper" virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
source "/etc/bash_completion.d/virtualenvwrapper" source "/etc/bash_completion.d/virtualenvwrapper"
else else
print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`." print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\
"Please install with \`pip install virtualenvwrapper\`" >&2
return
fi
if ! type workon &>/dev/null; then
print "zsh virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
"Please check ${virtualenvwrapper}" >&2
return return
fi fi
if type workon 2>&1 >/dev/null; then if [[ "$WORKON_HOME" == "" ]]; then
if [[ "$WORKON_HOME" == "" ]]; then print "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" >&2
echo "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" return
else fi
if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
# Automatically activate Git projects's virtual environments based on the if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
# directory name of the project. Virtual environment name can be overridden # Automatically activate Git projects's virtual environments based on the
# by placing a .venv file in the project root with a virtualenv name in it # directory name of the project. Virtual environment name can be overridden
function workon_cwd { # by placing a .venv file in the project root with a virtualenv name in it
if [ ! $WORKON_CWD ]; then function workon_cwd {
WORKON_CWD=1 if [ ! $WORKON_CWD ]; then
# Check if this is a Git repo WORKON_CWD=1
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` # Check if this is a Git repo
if (( $? != 0 )); then PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
PROJECT_ROOT="." if (( $? != 0 )); then
fi PROJECT_ROOT="."
# Check for virtualenv name override fi
if [[ -f "$PROJECT_ROOT/.venv" ]]; then # Check for virtualenv name override
ENV_NAME=`cat "$PROJECT_ROOT/.venv"` if [[ -f "$PROJECT_ROOT/.venv" ]]; then
elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
ENV_NAME="$PROJECT_ROOT/.venv" elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
elif [[ "$PROJECT_ROOT" != "." ]]; then ENV_NAME="$PROJECT_ROOT/.venv"
ENV_NAME=`basename "$PROJECT_ROOT"` elif [[ "$PROJECT_ROOT" != "." ]]; then
else ENV_NAME=`basename "$PROJECT_ROOT"`
ENV_NAME="" else
fi ENV_NAME=""
if [[ "$ENV_NAME" != "" ]]; then fi
# Activate the environment only if it is not already active if [[ "$ENV_NAME" != "" ]]; then
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then # Activate the environment only if it is not already active
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
elif [[ -e "$ENV_NAME/bin/activate" ]]; then workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" elif [[ -e "$ENV_NAME/bin/activate" ]]; then
fi source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
fi fi
elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then fi
# We've just left the repo, deactivate the environment elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
# Note: this only happens if the virtualenv was activated automatically # We've just left the repo, deactivate the environment
deactivate && unset CD_VIRTUAL_ENV # Note: this only happens if the virtualenv was activated automatically
fi deactivate && unset CD_VIRTUAL_ENV
unset PROJECT_ROOT fi
unset WORKON_CWD unset PROJECT_ROOT
fi unset WORKON_CWD
} fi
}
# Append workon_cwd to the chpwd_functions array, so it will be called on cd
# http://zsh.sourceforge.net/Doc/Release/Functions.html # Append workon_cwd to the chpwd_functions array, so it will be called on cd
# TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4 # http://zsh.sourceforge.net/Doc/Release/Functions.html
if (( ${+chpwd_functions} )); then # TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4
if (( $chpwd_functions[(I)workon_cwd] == 0 )); then if (( ${+chpwd_functions} )); then
set -A chpwd_functions $chpwd_functions workon_cwd if (( $chpwd_functions[(I)workon_cwd] == 0 )); then
fi set -A chpwd_functions $chpwd_functions workon_cwd
else fi
set -A chpwd_functions workon_cwd else
fi set -A chpwd_functions workon_cwd
fi fi
fi
else
print "zsh virtualenvwrapper plugin: shell function 'workon' not defined. Please check ${virtualenvwrapper}." >&2
fi fi