merge 2.0 changes into tip

Author: dhellmann

.hgignore

@@ -1,16 +1,19 @@
 syntax: glob
+distribute*.egg
+distribute*.tar.gz
 README.html
 virtualenvwrapper.egg-info
-paver-minilib.zip
-setup.py
 trace.txt
-docs
+dist
+docs/build
+docs/website
 *.pyc
 sphinx/web/templates/base.html
 tests/catch_output
 tests/testpackage/build
 tests/testpackage/dist
 tests/testpackage/testpackage.egg-info
+virtualenvwrapper/docs
 
 syntax: re
 .DS_Store

MANIFEST.in

@@ -1,6 +1,5 @@
 include setup.py
-include paver-minilib.zip
-include pavement.py
+include distribute_setup.py
 include tests/*
 recursive-include virtualenvwrapper *.html *.txt *.css *.js *.png
-recursive-include docsource *.rst
+recursive-include docs *.rst

Makefile

@@ -0,0 +1,61 @@
+# Get the version of the app.  This is used in the doc build.
+export VERSION=$(shell python setup.py --version)
+
+# Default target is to build the source distribution.
+.PHONY: sdist
+sdist: html
+	python setup.py sdist
+
+# Documentation
+.PHONY: html
+html:
+	rm -rf virtualenvwrapper/docs
+	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx/pkg")
+	cp -r docs/build/html virtualenvwrapper/docs
+
+# Website copy of documentation
+.PHONY: website
+website: docs/sphinx/web/templates/base.html
+	rm -rf docs/website
+	(cd docs && $(MAKE) html SPHINXOPTS="-c sphinx/web" BUILDDIR="website")
+
+installwebsite: website
+	(cd docs/website/html && rsync --rsh=ssh --archive --delete --verbose . www.doughellmann.com:/var/www/doughellmann/DocumentRoot/docs/virtualenvwrapper2/)
+
+# Register the new version on pypi
+.PHONY: register
+register:
+	python setup.py register
+
+# Copy the base template from my website build directory
+docs/sphinx/web/templates/base.html: ~/Devel/doughellmann/doughellmann/templates/base.html
+	cp $< $@
+
+# Testing
+TEST_SCRIPTS=$(wildcard tests/test*.sh)
+
+.PHONY: develop test test-bash test-sh test-zsh test-loop test-install
+test: develop test-bash test-sh test-zsh test-install
+
+develop:
+	python setup.py develop
+
+test-bash:
+	TEST_SHELL=bash $(MAKE) test-loop
+
+test-sh:
+	TEST_SHELL=sh $(MAKE) test-loop
+
+test-zsh:
+	TEST_SHELL="zsh -o shwordsplit" $(MAKE) test-loop
+
+test-loop:
+	@for test_script in $(wildcard tests/test*.sh) ; do \
+	 	echo '********************************************************************************' ; \
+		echo "Running $$test_script with $(TEST_SHELL)" ; \
+		SHUNIT_PARENT=$$test_script $(TEST_SHELL) $$test_script || exit 1 ; \
+		echo ; \
+	done
+
+test-install:
+	bash ./tests/manual_test_install.sh `pwd`/dist "$(VERSION)"

README README.rstREADME renamed to README.rst

@@ -23,6 +23,10 @@ Features
 4.  Tab completion for commands that take a virtual environment as
     argument.
 
+5. User-configurable hooks for all operations.
+
+6. Plugin system for more creating sharable extensions.
+
 Rich Leland has created a short `screencast
 <http://mathematism.com/2009/jul/30/presentation-pip-and-virtualenv/>`__
 showing off the features of virtualenvwrapper.
@@ -34,20 +38,31 @@ Quick Setup
 1. Create a directory to hold all of the virtual environments. The default is
    ``$HOME/.virtualenvs``.
 
-2. Add two lines to your .bashrc to set the location where the virtual environments should
-   live and the location of the script installed with this package::
+2. Add two lines to your shell startup file (``.bashrc``,
+   ``.profile``, etc.) to set the location where the virtual
+   environments should live and the location of the script installed
+   with this package::
 
     export WORKON_HOME=$HOME/.virtualenvs
-    source /usr/local/bin/virtualenvwrapper_bashrc
+    source /usr/local/bin/virtualenvwrapper.sh
 
-3. Run: ``source ~/.bashrc``
+3. Reload the startup file (e.g., run: ``source ~/.bashrc``).
 4. Run: ``workon``
 5. A list of environments, empty, is printed.
 6. Run: ``mkvirtualenv temp``
 7. A new environment, ``temp`` is created and activated.
 8. Run: ``workon``
 9. This time, the ``temp`` environment is included.
 
+Upgrading from 1.x
+==================
+
+The shell script containing the wrapper functions has been renamed in
+the 2.x series to reflect the fact that shells other than bash are
+supported.  In your startup file, change ``source
+/usr/local/bin/virtualenvwrapper_bashrc`` to ``source
+/usr/local/bin/virtualenvwrapper.sh``.
+
 =======
 License
 =======