add VIRTUALENVWRAPPER_LAST_VIRTUAL_ENV variable for postdeactivate scripts

Author: dhellmann

virtualenvwrapper/user_scripts.py

@@ -14,38 +14,32 @@
 
 log = logging.getLogger(__name__)
 
-def get_script_source(script_name):
-    """Retrieve the source code for a script.
-    """
-    script_path = pkg_resources.resource_filename(__name__, script_name)
-    if not script_path:
-        raise RuntimeError('Missing script for %s', script_name)
-    log.debug('Looking for %s in %s', script_name, script_path)
-    return pkg_resources.resource_string(__name__, script_name)
-
 
 def run_script(script_path, *args):
     """Execute a script in a subshell.
     """
     if os.path.exists(script_path):
-        log.debug('Running %s', script_path)
-        subprocess.call([script_path] + list(args), shell=True)
+#         with open(script_path, 'rt') as f:
+#             print '+' * 80
+#             print f.read()
+#             print '+' * 80
+        cmd = [script_path] + list(args)
+        log.debug('Running %s', str(cmd))
+        try:
+            return_code = subprocess.call(cmd)
+        except OSError, msg:
+            log.error('ERROR: Could not run %s. %s', script_path, str(msg))
+        #log.debug('Returned %s', return_code)
     return
 
+
 def run_global(script_name, *args):
+    """Run a script from $WORKON_HOME.
+    """
     script_path = os.path.expandvars(os.path.join('$WORKON_HOME', script_name))
     run_script(script_path, *args)
     return
 
-def run_local_from_arg(script_name, *args):
-    script_path = os.path.expandvars(os.path.join('$WORKON_HOME', args[0], 'bin', script_name))
-    run_script(script_path, *args)
-    return
-
-def run_local_from_env(script_name, *args):
-    script_path = os.path.expandvars(os.path.join('$VIRTUAL_ENV', 'bin', script_name))
-    run_script(script_path, *args)
-    return
 
 
 # HOOKS
@@ -59,35 +53,40 @@ def initialize_source(args):
 """
 
 def pre_mkvirtualenv(args):
-    log.debug('pre_mkvirtualenv')
-    run_global('premkvirtualenv')
+    log.debug('pre_mkvirtualenv %s', str(args))
+    run_global('premkvirtualenv', *args)
     return
 
+
 def post_mkvirtualenv_source(args):
     return """
 #
 # Run user-provided scripts
 #
 [ -f "$WORKON_HOME/postmkvirtualenv" ] && source "$WORKON_HOME/postmkvirtualenv"
-[ -f "$VIRTUAL_ENV/bin/postmkvirtualenv" ] && source "$VIRTUAL_ENV/bin/postmkvirtualenv"
 """
 
+
 def pre_rmvirtualenv(args):
     log.debug('pre_rmvirtualenv')
     run_global('prermvirtualenv', *args)
     return
 
+
 def post_rmvirtualenv(args):
     log.debug('post_rmvirtualenv')
     run_global('postrmvirtualenv', *args)
     return
 
+
 def pre_activate(args):
     log.debug('pre_activate')
     run_global('preactivate', *args)
-    run_local_from_arg('preactivate', *args)
+    script_path = os.path.expandvars(os.path.join('$WORKON_HOME', args[0], 'bin', 'preactivate'))
+    run_script(script_path, *args)
     return
 
+
 def post_activate_source(args):
     log.debug('post_activate')
     return """
@@ -98,6 +97,7 @@ def post_activate_source(args):
 [ -f "$VIRTUAL_ENV/bin/postactivate" ] && source "$VIRTUAL_ENV/bin/postactivate"
 """
 
+
 def pre_deactivate_source(args):
     log.debug('pre_deactivate')
     return """
@@ -108,12 +108,15 @@ def pre_deactivate_source(args):
 [ -f "$WORKON_HOME/predeactivate" ] && source "$WORKON_HOME/predeactivate"
 """
 
+
 def post_deactivate_source(args):
     log.debug('post_deactivate')
     return """
 #
 # Run user-provided scripts
 #
+VIRTUALENVWRAPPER_LAST_VIRTUAL_ENV="$WORKON_HOME/%(env_name)s"
 [ -f "$WORKON_HOME/%(env_name)s/bin/postdeactivate" ] && source "$WORKON_HOME/%(env_name)s/bin/postdeactivate"
 [ -f "$WORKON_HOME/postdeactivate" ] && source "$WORKON_HOME/postdeactivate"
+unset VIRTUALENVWRAPPER_LAST_VIRTUAL_ENV
 """ % { 'env_name':args[0] }