error handling in mkvirtualenv

Author: dhellmann

README

@@ -130,6 +130,9 @@ For more details, refer to the column published in the May 2008 issue of Python
 Updates
 =======
 
+upcoming
+  - Better error handling in mkvirtualenv.
+
 1.14
   - Wrap the virtualenv version of deactivate() with one that lets us invoke
     the predeactivate hooks.

tests/test.sh

@@ -23,8 +23,7 @@ setUp () {
 
 test_mkvirtualenv() {
     mkvirtualenv "env1"
-    assertTrue "[ -d $WORKON_HOME/env1 ]"
-    assertSame "env1" $(basename "$VIRTUAL_ENV")
+    assertTrue "Environment directory was not created" "[ -d $WORKON_HOME/env1 ]"
 }
 
 test_cdvirtual() {
@@ -38,20 +37,42 @@ test_cdsitepackages () {
     pushd "$(pwd)" >/dev/null   
     cdsitepackages
     pyvers=$(python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d.)
-    assertSame "$VIRTUAL_ENV/lib/python${pyvers}/site-packages" "$(pwd)"
+    sitepackages="$VIRTUAL_ENV/lib/python${pyvers}/site-packages"
+    assertSame "$sitepackages" "$(pwd)"
     popd >/dev/null
 }
 
-test_mkvirtualenv_switches () {
+test_mkvirtualenv_activates () {
     mkvirtualenv "env2"
     assertTrue virtualenvwrapper_verify_active_environment
     assertSame "env2" $(basename "$VIRTUAL_ENV")
 }
 
+# test_mkvirtualenv_sitepackages () {
+#     # Without the option verify that site-packages are copied.
+#     mkvirtualenv "env3"
+#     assertSame "env3" "$(basename $VIRTUAL_ENV)"
+#     pyvers=$(python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d.)
+#     sitepackages="$VIRTUAL_ENV/lib/python${pyvers}/site-packages"
+#     #cat "$sitepackages/easy-install.pth"
+#     assertTrue "Do not have expected virtualenv.py" "[ -f $sitepackages/virtualenv.py ]"
+#     rmvirtualenv "env3"
+#     
+#     # With the argument, verify that they are not copied.
+#     mkvirtualenv --no-site-packages "env4"
+#     assertSame "env4" $(basename "$VIRTUAL_ENV")
+#     pyvers=$(python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d.)
+#     sitepackages="$VIRTUAL_ENV/lib/python${pyvers}/site-packages"
+#     assertTrue "[ -f $sitepackages/setuptools.pth ]"
+#     assertTrue "[ -f $sitepackages/easy-install.pth ]"
+#     assertFalse "Have virtualenv.py but should not" "[ -f $sitepackages/virtualenv.py ]"    
+#     rmvirtualenv "env4"
+# }
+
 test_workon () {
     workon env1
     assertTrue virtualenvwrapper_verify_active_environment
-    assertSame "env1" $(basename "$VIRTUAL_ENV")    
+    assertSame "env1" $(basename "$VIRTUAL_ENV")
 }
 
 test_postactivate_hook () {

virtualenvwrapper_bashrc

@@ -32,12 +32,6 @@ fi
 WORKON_HOME=$(cd "$WORKON_HOME"; pwd)
 export WORKON_HOME
 
-VIRTUALENV_WRAPPER_BIN=$(dirname "$0")
-if [ "$VIRTUALENV_WRAPPER_BIN" = "." ]
-then
-    VIRTUALENV_WRAPPER_BIN=$(pwd)
-fi
-
 # Verify that the WORKON_HOME directory exists
 function virtualenvwrapper_verify_workon_home () {
     if [ ! -d "$WORKON_HOME" ]
@@ -94,10 +88,14 @@ function virtualenvwrapper_run_hook () {
 function mkvirtualenv () {
     eval "envname=\$$#"
     virtualenvwrapper_verify_workon_home || return 1
-    (cd "$WORKON_HOME"; 
-        virtualenv "$@"; 
+    (cd "$WORKON_HOME" &&
+        virtualenv "$@" &&
         virtualenvwrapper_run_hook "./premkvirtualenv" "$envname"
         )
+    # If they passed a help option or got an error from virtualenv,
+    # the environment won't exist.  Use that to tell whether
+    # we should switch to the environment and run the hook.
+    [ ! -d "$WORKON_HOME/$envname" ] && return 0
     workon "$envname"
     virtualenvwrapper_source_hook "$WORKON_HOME/postmkvirtualenv"
 }
@@ -128,7 +126,9 @@ function virtualenvwrapper_show_workon_options () {
     virtualenvwrapper_verify_workon_home || return 1
     # NOTE: DO NOT use ls here because colorized versions spew control characters
     #       into the output list.
-    (cd "$WORKON_HOME"; find -L . -path '*/bin/activate') | sed 's|^\./||' | sed 's|/bin/activate||' | sort
+    # echo seems a little faster than find, even with -depth 3.
+    (cd "$WORKON_HOME"; for f in */bin/activate; do echo $f; done) | sed 's|^\./||' | sed 's|/bin/activate||' | sort
+#    (cd "$WORKON_HOME"; find -L . -depth 3 -path '*/bin/activate') | sed 's|^\./||' | sed 's|/bin/activate||' | sort
 }
 
 # List or change working virtual environments