Made workon fully support virtualenvs with spaces in names

Author: jessamynsmith

tests/test_mkvirtualenv.sh

@@ -36,6 +36,9 @@ test_create_space_in_name() {
         assertTrue "$hook was not created" "[ -f \"$WORKON_HOME/env with space/bin/$hook\" ]"
         assertFalse "$hook is executable" "[ -x \"$WORKON_HOME/env with space/bin/$hook\" ]"
     done
+    assertTrue virtualenvwrapper_verify_active_environment
+    env_name=$(basename "$VIRTUAL_ENV")
+    assertSame "env with space" "$env_name"
 }
 
 test_activates () {

tests/test_workon.sh

@@ -9,6 +9,7 @@ oneTimeSetUp() {
     source "$test_dir/../virtualenvwrapper.sh"
     mkvirtualenv "env1" >/dev/null 2>&1
     mkvirtualenv "env2" >/dev/null 2>&1
+    mkvirtualenv "env with space" >/dev/null 2>&1
     deactivate >/dev/null 2>&1 
 }
 
@@ -67,7 +68,7 @@ test_virtualenvwrapper_show_workon_options () {
     mkdir "$WORKON_HOME/not_env"
     (cd "$WORKON_HOME"; ln -s env1 link_env)
     envs=$(virtualenvwrapper_show_workon_options | tr '\n' ' ')
-    assertSame "env1 env2 link_env " "$envs"
+    assertSame "env1 env2 link_env env with space " "$envs"
     rmdir "$WORKON_HOME/not_env"
     rm -f "$WORKON_HOME/link_env"
 }
@@ -78,7 +79,7 @@ test_virtualenvwrapper_show_workon_options_grep_options () {
     export GREP_OPTIONS="--count"
     envs=$(virtualenvwrapper_show_workon_options | tr '\n' ' ')
     unset GREP_OPTIONS
-    assertSame "env1 env2 link_env " "$envs"
+    assertSame "env1 env2 link_env env with space " "$envs"
     rmdir "$WORKON_HOME/not_env"
     rm -f "$WORKON_HOME/link_env"
 }
@@ -94,7 +95,7 @@ test_virtualenvwrapper_show_workon_options_chpwd () {
     }
     mkdir "$WORKON_HOME/not_env"
     envs=$(virtualenvwrapper_show_workon_options | tr '\n' ' ')
-    assertSame "env1 env2 " "$envs"
+    assertSame "env1 env2 env with space " "$envs"
     rmdir "$WORKON_HOME/not_env"
     rm -f "$WORKON_HOME/link_env"
 }
@@ -123,4 +124,19 @@ test_workon_dot () {
     assertSame "env1" $(basename "$VIRTUAL_ENV")
 }
 
+test_workon_dot_with_space () {
+    cd $WORKON_HOME/"env with space"
+    workon .
+    assertTrue virtualenvwrapper_verify_active_environment
+    env_name=$(basename "$VIRTUAL_ENV")
+    assertSame "env with space" "$env_name"
+}
+
+test_workon_with_space () {
+    workon "env with space"
+    assertTrue virtualenvwrapper_verify_active_environment
+    env_name=$(basename "$VIRTUAL_ENV")
+    assertSame "env with space" "$env_name"
+}
+
 . "$test_dir/shunit2"

virtualenvwrapper.sh

@@ -722,11 +722,13 @@ function workon {
         return 1
     elif [ "$env_name" = "." ]
     then
-        env_name=$(basename $(pwd))
+        IFS='%'
+        env_name="$(basename $(pwd))"
+        unset IFS
     fi
 
     virtualenvwrapper_verify_workon_home || return 1
-    virtualenvwrapper_verify_workon_environment $env_name || return 1
+    virtualenvwrapper_verify_workon_environment "$env_name" || return 1
 
     activate="$WORKON_HOME/$env_name/$VIRTUALENVWRAPPER_ENV_BIN_DIR/activate"
     if [ ! -f "$activate" ]