Made lsvirtualenv and allvirtualenv work with spaces in env names

Author: jessamynsmith

tests/test_allvirtualenv.sh

@@ -10,6 +10,7 @@ oneTimeSetUp() {
     source "$test_dir/../virtualenvwrapper.sh"
     mkvirtualenv test1 >/dev/null 2>&1
     mkvirtualenv test2 >/dev/null 2>&1
+    mkvirtualenv " env with space " >/dev/null 2>&1
     deactivate
 }
 
@@ -28,6 +29,8 @@ tearDown () {
 test_allvirtualenv_all() {
     assertTrue "Did not find test1" "allvirtualenv pwd | grep -q 'test1$'"
     assertTrue "Did not find test2" "allvirtualenv pwd | grep -q 'test2$'"
+    allvirtualenv pwd
+    assertTrue "Did not find ' env with space '" "allvirtualenv pwd | grep -q ' env with space '"
 }
 
 test_allvirtualenv_spaces() {

tests/test_ls.sh

@@ -75,5 +75,11 @@ test_lsvirtualenv_space_in_workon_home () {
     WORKON_HOME="$old_home"
 }
 
+test_lsvirtualenv_space_in_env_name () {
+    mkvirtualenv " env with space "
+    lsvirtualenv -b >"$WORKON_HOME/output" 2>&1
+    assertTrue "Did not see expected message in \"$output\"" "cat \"$WORKON_HOME/output\" | grep -q ' env with space '"
+}
+
 
 . "$test_dir/shunit2"

virtualenvwrapper.sh

@@ -569,8 +569,9 @@ function virtualenvwrapper_show_workon_options {
     # 5. Eliminate any lines with * on them because that means there 
     #    were no envs.
     (virtualenvwrapper_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 \
+        | command \tr "\n" " " \
+        | command \sed "s|/$VIRTUALENVWRAPPER_ENV_BIN_DIR/activate |/|g" \
+        | command \tr "/" "\n" \
         | (unset GREP_OPTIONS; command \egrep -v '^\*$') 2>/dev/null
 }
 
@@ -1292,6 +1293,7 @@ function allvirtualenv {
     virtualenvwrapper_verify_workon_home || return 1
     typeset d
 
+    IFS=''
     virtualenvwrapper_show_workon_options | while read d
     do
         [ ! -d "$WORKON_HOME/$d" ] && continue
@@ -1304,6 +1306,7 @@ function allvirtualenv {
             "$@")
         echo
     done
+    unset IFS
 }
 
 #:help:virtualenvwrapper: show this help message