Add -c/-n options to mktmpenv

Add options to control whether to cd to the virtualenv when creating a
temporary env.

Closes #220

Change-Id: I2a1fdfb9705ab30f13a6a6c3af9582e413655652

Author: dhellmann

docs/source/command_ref.rst

@@ -68,10 +68,18 @@ Create a new virtualenv in the ``WORKON_HOME`` directory.
 
 Syntax::
 
-    mktmpenv [VIRTUALENV_OPTIONS]
+    mktmpenv [(-c|--cd)|(-n|--no-cd)] [VIRTUALENV_OPTIONS]
 
 A unique virtualenv name is generated.
 
+If ``-c`` or ``--cd`` is specified the working directory is changed to
+the virtualenv directory during the post-activate phase, regardless of
+the value of ``VIRTUALENVWRAPPER_WORKON_CD``.
+
+If ``-n`` or ``--no-cd`` is specified the working directory is **not**
+changed to the virtualenv directory during the post-activate phase,
+regardless of the value of ``VIRTUALENVWRAPPER_WORKON_CD``.
+
 ::
 
     $ mktmpenv

tests/test_mktmpenv.sh

@@ -32,6 +32,16 @@ test_mktmpenv_name() {
     assertTrue "Error was not detected" "[ $RC -ne 0 ]"
 }
 
+test_mktmpenv_n() {
+    mktmpenv -n >/dev/null 2>&1
+    assertNotSame "$VIRTUAL_ENV" "$(pwd)"
+}
+
+test_mktmpenv_no_cd() {
+    mktmpenv --no-cd >/dev/null 2>&1
+    assertNotSame "$VIRTUAL_ENV" "$(pwd)"
+}
+
 test_mktmpenv_virtualenv_args() {
     mktmpenv --no-site-packages >/dev/null 2>&1
     ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"

virtualenvwrapper.sh

@@ -1195,6 +1195,40 @@ function cdproject {
 function mktmpenv {
     typeset tmpenvname
     typeset RC
+    typeset -a in_args
+    typeset -a out_args
+
+    in_args=( "$@" )
+
+    if [ -n "$ZSH_VERSION" ]
+    then
+        i=1
+        tst="-le"
+    else
+        i=0
+        tst="-lt"
+    fi
+    typeset cd_after_activate=$VIRTUALENVWRAPPER_WORKON_CD
+    while [ $i $tst $# ]
+    do
+        a="${in_args[$i]}"
+        case "$a" in
+            -n|--no-cd)
+                cd_after_activate=0;;
+            -c|--cd)
+                cd_after_activate=1;;
+            *)
+                if [ ${#out_args} -gt 0 ]
+                then
+                    out_args=( "${out_args[@]-}" "$a" )
+                else
+                    out_args=( "$a" )
+                fi;;
+        esac
+        i=$(( $i + 1 ))
+    done
+
+    set -- "${out_args[@]}"
 
     # Generate a unique temporary name
     tmpenvname=$("$VIRTUALENVWRAPPER_PYTHON" -c 'import uuid,sys; sys.stdout.write(uuid.uuid4()+"\n")' 2>/dev/null)
@@ -1214,7 +1248,7 @@ function mktmpenv {
     fi
 
     # Change working directory
-    cdvirtualenv
+    [ "$cd_after_activate" = "1" ] && cdvirtualenv
 
     # Create the tmpenv marker file
     echo "This is a temporary environment. It will be deleted when you run 'deactivate'." | tee "$VIRTUAL_ENV/README.tmpenv"