Merged in barberj/vew/fix_installing_requirements_after_cd (pull request #21)

Author: dhellmann

tests/test_expandpath.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+test_dir=$(cd $(dirname $0) && pwd)
+source "$test_dir/setup.sh"
+TMP_WORKON_HOME="$WORKON_HOME"
+
+oneTimeSetUp() {
+    source "$test_dir/../virtualenvwrapper.sh"
+    echo $PYTHONPATH
+}
+
+oneTimeTearDown() {
+    return 0
+}
+
+test_tilde() {
+    assertSame "$HOME" "$(virtualenvwrapper_expandpath ~)"
+}
+
+test_vars() {
+    assertSame "$HOME" "$(virtualenvwrapper_expandpath '$HOME')"
+}
+
+test_tilde_vars() {
+    assertSame "$HOME" "$(virtualenvwrapper_expandpath '~$USER')"
+}
+
+. "$test_dir/shunit2"

virtualenvwrapper.sh

@@ -72,6 +72,15 @@ then
     export VIRTUALENVWRAPPER_PROJECT_FILENAME=".project"
 fi
 
+function virtualenvwrapper_expandpath {
+        if [ "$1" = "" ]; then
+            return 1
+        else
+            "$VIRTUALENVWRAPPER_PYTHON" -c "import os,sys; sys.stdout.write(os.path.realpath(os.path.expanduser(os.path.expandvars(\"$1\")))+'\n')"
+            return 0
+        fi
+}
+
 function virtualenvwrapper_derive_workon_home {
     typeset workon_home_dir="$WORKON_HOME"
 
@@ -99,7 +108,7 @@ function virtualenvwrapper_derive_workon_home {
         # - Removing extra slashes (e.g., when TMPDIR ends in a slash)
         # - Expanding variables (e.g., $foo)
         # - Converting ~s to complete paths (e.g., ~/ to /home/brian/ and ~arthur to /home/arthur)
-        workon_home_dir=$("$VIRTUALENVWRAPPER_PYTHON" -c "import os,sys; sys.stdout.write(os.path.expandvars(os.path.expanduser(\"$workon_home_dir\"))+'\n')")
+        workon_home_dir=$(virtualenvwrapper_expandpath "$workon_home_dir")
     fi
 
     echo "$workon_home_dir"
@@ -344,7 +353,8 @@ function mkvirtualenv {
                 packages="$packages ${in_args[$i]}";;
             -r)
                 i=$(( $i + 1 ));
-                requirements="${in_args[$i]}";;
+                requirements="${in_args[$i]}";
+                requirements=$(virtualenvwrapper_expandpath "$requirements");;
             *)
                 if [ ${#out_args} -gt 0 ]
                 then