experimental version of deactivate wrapper

Author: dhellmann

README

@@ -130,6 +130,10 @@ For more details, refer to the column published in the May 2008 issue of Python
 Updates
 =======
 
+Upcoming
+  - Wrap the virtualenv version of deactivate() with one that lets us invoke
+    the predeactivate hooks.
+
 1.13
   - Fix issue #5 by correctly handling symlinks and limiting the list of envs to things 
     that look like they can be activated.

test.sh

@@ -7,16 +7,21 @@ mkdir -p $WORKON_HOME
 
 function mk_test_hook () {
     hookname="$1"
-    echo "echo \"$hookname\" \$@" > $WORKON_HOME/$hookname
+    echo "echo GLOBAL \"$hookname\" \$@" > $WORKON_HOME/$hookname
     chmod +x $WORKON_HOME/$hookname
 }
 
 mk_test_hook premkvirtualenv
 mk_test_hook postmkvirtualenv
+
 mk_test_hook prermvirtualenv
 mk_test_hook postrmvirtualenv
+
 mk_test_hook postactivate
 
+mk_test_hook predeactivate
+mk_test_hook postdeactivate
+
 echo
 echo "HOOKS:"
 ls -l $WORKON_HOME
@@ -49,15 +54,18 @@ virtualenvwrapper_verify_active_environment && echo "PASS" || echo "FAIL"
 
 echo
 echo "POSTACTIVATE HOOK"
-echo "echo postactivate" > $WORKON_HOME/env1/bin/postactivate
+echo "echo ENV postactivate" > "$WORKON_HOME/env1/bin/postactivate"
 workon env1
 echo -n "virtualenvwrapper_verify_active_environment: "
 virtualenvwrapper_verify_active_environment && echo "PASS" || echo "FAIL"
 
 echo
 echo "DEACTIVATING"
+echo "before VIRTUAL_ENV: $VIRTUAL_ENV"
+echo "echo ENV predeactivate \$@" > "$WORKON_HOME/env1/bin/predeactivate"
+echo "echo ENV postdeactivate \$@" > "$WORKON_HOME/env1/bin/postdeactivate"
 deactivate
-echo "VIRTUAL_ENV: $VIRTUAL_ENV"
+echo "after VIRTUAL_ENV: $VIRTUAL_ENV"
 echo "virtualenvwrapper_verify_active_environment: "
 virtualenvwrapper_verify_active_environment && echo "FAIL" || echo "PASS"
 
@@ -81,6 +89,10 @@ echo "REMOVING ENVIRONMENTS"
 rmvirtualenv "env1"
 rmvirtualenv "env2"
 
+echo
+echo "REMOVING MISSING ENVIRONMENT"
+rmvirtualenv "env1"
+
 rm -rf $WORKON_HOME
 
 echo

virtualenvwrapper_bashrc

@@ -27,6 +27,17 @@ then
     export WORKON_HOME="$HOME/.virtualenvs"
 fi
 
+# Normalize the directory name in case it includes 
+# relative path components.
+WORKON_HOME=$(cd "$WORKON_HOME"; pwd)
+export WORKON_HOME
+
+VIRTUALENV_WRAPPER_BIN=$(dirname "$0")
+if [ "$VIRTUALENV_WRAPPER_BIN" = "." ]
+then
+    VIRTUALENV_WRAPPER_BIN=$(pwd)
+fi
+
 # Verify that the WORKON_HOME directory exists
 function virtualenvwrapper_verify_workon_home () {
     if [ ! -d "$WORKON_HOME" ]
@@ -140,17 +151,47 @@ function workon () {
         return 1
     fi
 
-    virtualenvwrapper_source_hook "$VIRTUAL_ENV/bin/predeactivate"
+    # Deactivate any current environment "destructively"
+    # before switching so we use our override function,
+    # if it exists.
+    type deactivate >/dev/null 2>&1
+    if [ $? -eq 0 ]
+    then
+        deactivate
+    fi
 
     source "$activate"
 
+    # Save the deactivate function from virtualenv
+    virtualenvwrapper_saved_deactivate=$(typeset -f deactivate)
+
+    # Replace the deactivate() function with a wrapper.
+    eval 'function deactivate () {
+        # Call the local hook before the global so we can undo
+        # any settings made by the local postactivate first.
+        virtualenvwrapper_source_hook "$VIRTUAL_ENV/bin/predeactivate"
+        virtualenvwrapper_source_hook "$WORKON_HOME/predeactivate"
+        
+        env_postdeactivate_hook="$VIRTUAL_ENV/bin/postdeactivate"
+        
+        # Restore the original definition of deactivate
+        eval "$virtualenvwrapper_saved_deactivate"
+
+        # Instead of recursing, this calls the now restored original function.
+        deactivate
+
+        virtualenvwrapper_source_hook "$env_postdeactivate_hook"
+        virtualenvwrapper_source_hook "$WORKON_HOME/postdeactivate"
+    }'
+    
     virtualenvwrapper_source_hook "$WORKON_HOME/postactivate"
 
     virtualenvwrapper_source_hook "$VIRTUAL_ENV/bin/postactivate"    
 
 	return 0
 }
 
+
 #
 # Set up tab completion.  (Adapted from Arthur Koziel's version at 
 # http://arthurkoziel.com/2008/10/11/virtualenvwrapper-bash-completion/)