make it possible to remove a virtualenv while inside it; fixes #83

Author: dhellmann

ChangeLog

@@ -1,3 +1,9 @@
+2011-04-13  Doug Hellmann  <[email protected]>
+
+	* virtualenvwrapper.sh (rmvirtualenv): Move to a safe directory
+	before removing the virtual environment, and only move back if the
+	previously occupied directory still exists.
+
 2011-04-10  Doug Hellmann  <[email protected]>
 
 	* virtualenvwrapper.sh: Initialize VIRTUALENVWRAPPER_LOG_DIR and

docs/en/history.rst

@@ -29,6 +29,8 @@ dev
     locations of hooks and logs.
   - Enabled tab completion for :ref:`command-showvirtualenv`
     (:bbissue:`78`).
+  - Fixed a problem with running :ref:`command-rmvirtualenv` from
+    within the environment being removed (:bbissue:`83`).
 
 2.6.3
 

tests/test_rmvirtualenv.sh

@@ -22,15 +22,26 @@ setUp () {
 }
 
 test_remove () {
-    mkvirtualenv "deleteme"
+    mkvirtualenv "deleteme" >/dev/null 2>&1
     assertTrue "[ -d $WORKON_HOME/deleteme ]"
     deactivate
     rmvirtualenv "deleteme"
     assertFalse "[ -d $WORKON_HOME/deleteme ]"
 }
 
+test_within_virtualenv () {
+    mkvirtualenv "deleteme" >/dev/null 2>&1
+    assertTrue "[ -d $WORKON_HOME/deleteme ]"
+    cdvirtualenv
+    assertSame "$VIRTUAL_ENV" "$(pwd)"
+    deactivate
+    rmvirtualenv "deleteme"
+    assertSame "$WORKON_HOME" "$(pwd)"
+    assertFalse "[ -d $WORKON_HOME/deleteme ]"
+}
+
 test_rm_aliased () {
-    mkvirtualenv "deleteme"
+    mkvirtualenv "deleteme" >/dev/null 2>&1
     deactivate
     alias rm='rm -i'
     rmvirtualenv "deleteme"

virtualenvwrapper.sh

@@ -252,9 +252,21 @@ rmvirtualenv () {
         echo "Either switch to another environment, or run 'deactivate'." >&2
         return 1
     fi
+
+    # Move out of the current directory to one known to be
+    # safe, in case we are inside the environment somewhere.
+    typeset prior_dir="$(pwd)"
+    cd "$WORKON_HOME"
+
     virtualenvwrapper_run_hook "pre_rmvirtualenv" "$env_name"
     \rm -rf "$env_dir"
     virtualenvwrapper_run_hook "post_rmvirtualenv" "$env_name"
+
+    # If the directory we used to be in still exists, move back to it.
+    if [ -d "$prior_dir" ]
+    then
+        cd "$prior_dir"
+    fi
 }
 
 # List the available environments.