Fix virtualenv detection with spaces in WORKON_HOME

Fixes issue #194

Change-Id: I9021fbecd15f0626b948c810a3fb2dcf8e800802
Signed-off-by: Doug Hellmann <[email protected]>

Author: dhellmann

docs/source/history.rst

@@ -5,7 +5,7 @@ Release History
 dev
 ===
 
-- Ensure that all $() style commands that produce paths are
+- Ensure that all ``$()`` style commands that produce paths are
   quoted. Addresses :bbissue:`164`.
 - Add :ref:`command-wipeenv` command for removing all packages
   installed in the virtualenv.
@@ -17,6 +17,8 @@ dev
   :ref:`command-mkvirtualenv`. Resolves :bbissue:`190`.
 - Add :ref:`command-allvirtualenv` command to run a command across all
   virtualenvs. Suggested by Dave Coutts in :bbissue:`186`.
+- Fix :ref:`command-lsvirtualenv` when there are spaces in
+  ``WORKON_HOME``. Resolves :bbissue:`194`.
 
 4.0
 ===

tests/test_lsvirtualenv.sh

@@ -0,0 +1,42 @@
+# -*- mode: shell-script -*-
+
+test_dir=$(cd $(dirname $0) && pwd)
+source "$test_dir/setup.sh"
+
+oneTimeSetUp() {
+    rm -rf "$WORKON_HOME"
+    mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
+}
+
+oneTimeTearDown() {
+    rm -rf "$WORKON_HOME"
+}
+
+setUp () {
+    echo
+    rm -f "$test_dir/catch_output"
+}
+
+test_no_workon_home () {
+    old_home="$WORKON_HOME"
+    export WORKON_HOME="$WORKON_HOME/not_there"
+    lsvirtualenv >"$old_home/output" 2>&1
+    output=$(cat "$old_home/output")
+    assertTrue "Did not see expected message" "echo $output | grep 'does not exist'"
+    WORKON_HOME="$old_home"
+}
+
+test_space_in_workon_home () {
+    old_home="$WORKON_HOME"
+    export WORKON_HOME="$WORKON_HOME/with space"
+    mkdir "$WORKON_HOME"
+    (cd "$WORKON_HOME"; virtualenv testenv) 2>&1
+    lsvirtualenv -b >"$old_home/output"
+    output=$(cat "$old_home/output")
+    assertTrue "Did not see expected message in \"$output\"" "echo $output | grep 'testenv'"
+    WORKON_HOME="$old_home"
+}
+
+
+. "$test_dir/shunit2"

virtualenvwrapper.sh

@@ -534,8 +534,7 @@ function virtualenvwrapper_show_workon_options {
     # 4. Format the output to show one name on a line.
     # 5. Eliminate any lines with * on them because that means there 
     #    were no envs.
-    (echo $WORKON_HOME/*/$VIRTUALENVWRAPPER_ENV_BIN_DIR/activate) 2>/dev/null \
-        | command \sed "s|$WORKON_HOME/||g" \
+    (cd "$WORKON_HOME" && echo */$VIRTUALENVWRAPPER_ENV_BIN_DIR/activate) 2>/dev/null \
         | command \sed "s|/$VIRTUALENVWRAPPER_ENV_BIN_DIR/activate||g" \
         | command \fmt -w 1 \
         | (unset GREP_OPTIONS; command \egrep -v '^\*$') 2>/dev/null