fix verification in navigation functions and add tests

Author: dhellmann

README

@@ -92,30 +92,39 @@ activated.
 $WORKON_HOME/prermvirtualenv
 ============================
 
-The ``prermvirtualenv`` script is run as an external program before the environment is removed.  The full path to the environment directory is passed as an argument to the script.
+The ``prermvirtualenv`` script is run as an external program before the environment is
+removed. The full path to the environment directory is passed as an argument to the script.
 
 $WORKON_HOME/postrmvirtualenv
 =============================
 
-The ``postrmvirtualenv`` script is run as an external program after the environment is removed.  The full path to the environment directory is passed as an argument to the script.
+The ``postrmvirtualenv`` script is run as an external program after the environment is
+removed. The full path to the environment directory is passed as an argument to the script.
 
 ===============
 Path Management
 ===============
 
-The function ``add2virtualenv`` adds the specified directories to the Python path for the active virtualenv. The directory names passed as argument are added to a path file named ``virtualenv_path_extensions.pth`` inside the virtualenv's site-packages directory. If this file does not exist, it will be created first.
+The function ``add2virtualenv`` adds the specified directories to the Python path for the
+active virtualenv. The directory names passed as argument are added to a path file named
+``virtualenv_path_extensions.pth`` inside the virtualenv's site-packages directory. If this
+file does not exist, it will be created first.
 
 ==================================
 Quickly Navigating to a virtualenv
 ==================================
 
-The functions ``cdsitepackages`` and ``cdvirtualenv`` provide quick shortcuts to quickly ``cd`` into the ``site-packages`` directory of the currently-active virtualenv, and to the root of the currently-active virtualenv, respectively.
+The functions ``cdsitepackages`` and ``cdvirtualenv`` provide quick shortcuts to quickly
+``cd`` into the ``site-packages`` directory of the currently-active virtualenv, and to the
+root of the currently-active virtualenv, respectively.
 
 ==========
 References
 ==========
 
-For more details, refer to the column I wrote for the May 2008 issue of Python Magazine: `virtualenvwrapper | And Now For Something Completely Different <http://www.doughellmann.com/articles/CompletelyDifferent-2008-05-virtualenvwrapper/index.html>`_.
+For more details, refer to the column published in the May 2008 issue of Python Magazine:
+`virtualenvwrapper | And Now For Something Completely Different
+<http://www.doughellmann.com/articles/CompletelyDifferent-2008-05-virtualenvwrapper/index.html>`_.
 
 =======
 Updates
@@ -125,6 +134,8 @@ Updates
   - Check return value of virtualenvwrapper_verify_workon_home everywhere, thanks to 
     Jeff Forcier for pointing out the errors.
   - Fix instructions at top of README, pointed out by Matthew Scott.
+  - Add cdvirtualenv and cdsitepackages, contributed by James Bennett.
+  - Enhance test.sh.
 
 1.11
   - Optimize virtualenvwrapper_show_workon_options.

pavement.py

@@ -22,7 +22,7 @@
 
 # What project are we building?
 PROJECT = 'virtualenvwrapper'
-VERSION = '1.11'
+VERSION = '1.12'
 
 # Read the long description to give to setup
 README_FILE = 'README'

test.sh

@@ -29,23 +29,42 @@ echo "CREATING AND ACTIVATING"
 mkvirtualenv "env1"
 echo "Current environment: $VIRTUAL_ENV"
 
+echo
+echo "NAVIGATION"
+echo -n "remember where we start "
+pushd `pwd`
+cdvirtualenv
+echo "cdvirtualenv: `pwd`"
+cdsitepackages
+echo "cdsitepackages: `pwd`"
+echo -n "back to where we started "
+popd
+
 echo
 echo "CREATING AND SWITCHING"
 mkvirtualenv "env2"
 echo "Current environment: $VIRTUAL_ENV"
+echo -n "virtualenvwrapper_verify_active_environment: "
+virtualenvwrapper_verify_active_environment && echo "PASS" || echo "FAIL"
 
 echo
 echo "POSTACTIVATE HOOK"
 echo "echo postactivate" > $WORKON_HOME/env1/bin/postactivate
 workon env1
+echo -n "virtualenvwrapper_verify_active_environment: "
+virtualenvwrapper_verify_active_environment && echo "PASS" || echo "FAIL"
 
 echo
 echo "DEACTIVATING"
 deactivate
+echo "VIRTUAL_ENV: $VIRTUAL_ENV"
+echo "virtualenvwrapper_verify_active_environment: "
+virtualenvwrapper_verify_active_environment && echo "FAIL" || echo "PASS"
 
 echo
 echo "LISTING ENVIRONMENTS"
 envs=`workon | tr '\n' ' '`
+echo "Found environments: $envs"
 if [ "$envs" = "env1 env2 " ]
 then
     echo "PASS"
@@ -62,6 +81,9 @@ rm -rf $WORKON_HOME
 
 echo
 echo "MISSING WORKON_HOME"
+echo -n "workon: "
 workon && echo "Failed to detect missing dir" || echo "PASS"
+echo -n "mkvirtualenv: "
 mkvirtualenv foo && echo "Failed to detect missing dir" || echo "PASS"
+echo -n "rmvirtualenv: "
 rmvirtualenv foo && echo "Failed to detect missing dir" || echo "PASS"

virtualenvwrapper_bashrc

@@ -224,7 +224,7 @@ function add2virtualenv () {
 #
 
 function cdsitepackages () {
-    verify_active_environment || return 1
+    virtualenvwrapper_verify_active_environment || return 1
     pyvers="`python -c 'import sys; print sys.version[:3]'`"
     site_packages="$VIRTUAL_ENV/lib/python${pyvers}/site-packages"
     cd $site_packages
@@ -237,6 +237,6 @@ function cdsitepackages () {
 #
 
 function cdvirtualenv () {
-    verify_active_environment || return 1
+    virtualenvwrapper_verify_active_environment || return 1
     cd $VIRTUAL_ENV
 }