another attempt to address #35

Author: dhellmann

ChangeLog

@@ -0,0 +1,5 @@
+2010-04-26  Doug Hellmann  <[email protected]>
+
+	* virtualenvwrapper.sh (virtualenvwrapper_tempfile): Add a suffix
+	to the tempfile name so we know the tempfile module isn't going to
+	erase it.

Makefile

@@ -20,6 +20,7 @@ help:
 	@echo "website        - build web version of docs"
 	@echo "installwebsite - deploy web version of docs"
 	@echo "develop        - install development version"
+	@echo "test           - run the test suite"
 
 
 .PHONY: sdist

tests/test_tempfile.sh

@@ -23,7 +23,7 @@ setUp () {
 }
 
 test_tempfile () {
-    filename=$(virtualenvwrapper_tempfile)
+    filename=$(virtualenvwrapper_tempfile hook)
     rm -f $filename
     assertSame "$TMPDIR" "$(dirname $filename)/"
     assertTrue "echo $filename | grep virtualenvwrapper"
@@ -32,11 +32,11 @@ test_tempfile () {
 test_no_python () {
     old=$VIRTUALENVWRAPPER_PYTHON
     VIRTUALENVWRAPPER_PYTHON=false
-    filename=$(virtualenvwrapper_tempfile)
+    filename=$(virtualenvwrapper_tempfile hook)
     VIRTUALENVWRAPPER_PYTHON=$old
     rm -f $filename
-    assertSame "$TMPDIR" "$(dirname $filename)/"
-    assertTrue "echo $filename | grep virtualenvwrapper.$$"
+    assertSame "TMPDIR and path not the same for $filename." "$TMPDIR" "$(dirname $filename)/"
+    assertTrue "virtualenvwrapper and pid not in filename." "echo $filename | grep virtualenvwrapper.$$"
 }
 
 . "$test_dir/shunit2"

virtualenvwrapper.sh

@@ -76,11 +76,14 @@ virtualenvwrapper_verify_workon_home () {
 
 # Use Python's tempfile module to create a temporary file
 # with a unique and not-likely-to-be-predictable name.
+# Expects 1 argument, the suffix for the new file.
 virtualenvwrapper_tempfile () {
-    $VIRTUALENVWRAPPER_PYTHON -c "import tempfile; print tempfile.NamedTemporaryFile(prefix='virtualenvwrapper.').name"
-    if [ $? -ne 0 ]
+    typeset base=$("$VIRTUALENVWRAPPER_PYTHON" -c "import tempfile; print tempfile.NamedTemporaryFile(prefix='virtualenvwrapper.').name")
+    if [ -z "$base" ]
     then
-        echo "${TMPDIR:-/tmp}/virtualenvwrapper.$$.`date +%s`"
+        echo "${TMPDIR:-/tmp}/virtualenvwrapper.$$.`date +%s`.$1"
+    else
+        echo "$base.$1"
     fi
 }
 
@@ -89,7 +92,7 @@ virtualenvwrapper_run_hook () {
     # First anything that runs directly from the plugin
     "$VIRTUALENVWRAPPER_PYTHON" -m virtualenvwrapper.hook_loader $HOOK_VERBOSE_OPTION "$@"
     # Now anything that wants to run inside this shell
-    hook_script=$(virtualenvwrapper_tempfile)
+    hook_script="$(virtualenvwrapper_tempfile hook)"
     "$VIRTUALENVWRAPPER_PYTHON" -m virtualenvwrapper.hook_loader $HOOK_VERBOSE_OPTION \
         --source "$@" >>"$hook_script"
     source "$hook_script"