Merged in phd/virtualenvwrapper (pull request #46)

Fix the problem with lazy completion for bash

Author: jasonamyers

.gitignore

@@ -1,6 +1,6 @@
 syntax: glob
 *~
-*.pyc
+*.py[co]
 README.html
 build
 dist

docs/source/command_ref.rst

@@ -57,7 +57,7 @@ installed.
    * :ref:`scripts-postmkvirtualenv`
    * `requirements file format`_
 
-.. _requirements file format: http://www.pip-installer.org/en/latest/requirements.html
+.. _requirements file format: https://pip.pypa.io/en/latest/reference/pip_install/#requirements-file-format
 
 .. _command-mktmpenv:
 

docs/source/developers.rst

@@ -89,7 +89,7 @@ Python::
 Add new tests by modifying an existing file or creating new script in
 the ``tests`` directory.
 
-.. _shunit2: http://shunit2.googlecode.com/
+.. _shunit2: https://github.com/kward/shunit2
 
 .. _tox: https://tox.testrun.org/
 
@@ -100,7 +100,7 @@ Creating a New Template
 
 virtualenvwrapper.project templates work like `virtualenvwrapper
 plugins
-<http://www.doughellmann.com/docs/virtualenvwrapper/plugins.html>`__.
+<https://virtualenvwrapper.readthedocs.io/en/latest/plugins.html>`__.
 The *entry point* group name is
 ``virtualenvwrapper.project.template``.  Configure your entry point to
 refer to a function that will **run** (source hooks are not supported

docs/source/extensions.rst

@@ -14,9 +14,9 @@ used as a project file similar to other IDEs.  The emacs-desktop_
 plugin adds a trigger to save the current desktop file and load a new
 one when activating a new virtualenv using ``workon``.
 
-.. _desktop-mode: http://www.emacswiki.org/emacs/DeskTop
+.. _desktop-mode: https://www.emacswiki.org/emacs/DeskTop
 
-.. _emacs-desktop: http://www.doughellmann.com/projects/virtualenvwrapper-emacs-desktop/
+.. _emacs-desktop: https://pypi.python.org/pypi/virtualenvwrapper-emacs-desktop
 
 .. _extensions-user_scripts:
 
@@ -53,7 +53,7 @@ bitbucket
 The bitbucket_ extension automatically clones a mercurial repository
 from the specified bitbucket project.
 
-.. _bitbucket: http://www.doughellmann.com/projects/virtualenvwrapper.bitbucket/
+.. _bitbucket: https://pypi.python.org/pypi/virtualenvwrapper.bitbucket
 
 .. _templates-django:
 
@@ -62,7 +62,7 @@ django
 
 The django_ extension automatically creates a new Django project.
 
-.. _django: http://www.doughellmann.com/projects/virtualenvwrapper.django/
+.. _django: https://pypi.python.org/pypi/virtualenvwrapper.django
 
 SublimeText
 -----------

docs/source/index.rst

@@ -8,7 +8,7 @@ virtualenvwrapper |release|
 ###########################
 
 virtualenvwrapper is a set of extensions to Ian Bicking's `virtualenv
-<http://pypi.python.org/pypi/virtualenv>`_ tool.  The extensions
+<https://pypi.python.org/pypi/virtualenv>`_ tool.  The extensions
 include wrappers for creating and deleting virtual environments and
 otherwise managing your development workflow, making it easier to work
 on more than one project at a time without introducing conflicts in
@@ -189,23 +189,23 @@ Details
 References
 ==========
 
-`virtualenv <http://pypi.python.org/pypi/virtualenv>`_, from Ian
+`virtualenv <https://pypi.python.org/pypi/virtualenv>`_, from Ian
 Bicking, is a pre-requisite to using these extensions.
 
 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>`_.
+<https://doughellmann.com/blog/2008/05/01/virtualenvwrapper/>`_.
 
 Rich Leland has created a short `screencast
-<http://mathematism.com/2009/jul/30/presentation-pip-and-virtualenv/>`__
+<http://mathematism.com/2009/07/30/presentation-pip-and-virtualenv/>`__
 showing off the features of virtualenvwrapper.
 
 Manuel Kaufmann has `translated this documentation into Spanish
-<http://virtualenvwrapper-docs-es.readthedocs.org/en/latest/>`__.
+<https://virtualenvwrapper-docs-es.readthedocs.org/es/latest/>`__.
 
 Tetsuya Morimoto has `translated this documentation into Japanese
-<http://virtualenvwrapper-docs-ja.readthedocs.org/en/latest/>`__.
+<https://virtualenvwrapper-docs-ja.readthedocs.org/en/latest/>`__.
 
 =======
 Support

docs/source/install.rst

@@ -32,7 +32,7 @@ which can be run under Microsoft Windows Command Prompt. This is also
 a separately distributed re-implementation. You can download
 `virtualenvwrapper-win`_ from PyPI.
 
-.. _virtualenvwrapper-win: http://pypi.python.org/pypi/virtualenvwrapper-win
+.. _virtualenvwrapper-win: https://pypi.python.org/pypi/virtualenvwrapper-win
 
 MSYS
 ----
@@ -58,7 +58,7 @@ or::
 Depending on your MSYS setup, you may need to install the `MSYS mktemp
 binary`_ in the ``MSYS_HOME/bin`` folder.
 
-.. _MSYS mktemp binary: http://sourceforge.net/projects/mingw/files/MSYS/mktemp/
+.. _MSYS mktemp binary: https://sourceforge.net/projects/mingw/files/MSYS/
 
 PowerShell
 ----------
@@ -69,7 +69,7 @@ with the rest of the extensions, and is largely a re-implementation
 (rather than an adaptation), it should be distributed separately. You
 can download virtualenvwrapper-powershell_ from PyPI.
 
-.. _virtualenvwrapper-powershell: http://pypi.python.org/pypi/virtualenvwrapper-powershell/2.7.1
+.. _virtualenvwrapper-powershell: https://pypi.python.org/pypi/virtualenvwrapper-powershell
 
 .. _supported-versions:
 
@@ -104,7 +104,7 @@ or::
 
 An alternative to installing it into the global site-packages is to
 add it to `your user local directory
-<http://docs.python.org/install/index.html#alternate-installation-the-user-scheme>`__
+<https://docs.python.org/install/index.html#alternate-installation-the-user-scheme>`__
 (usually `~/.local`).
 
 ::
@@ -331,4 +331,4 @@ supported.  In your startup file, change ``source
 /usr/local/bin/virtualenvwrapper_bashrc`` to ``source
 /usr/local/bin/virtualenvwrapper.sh``.
 
-.. _pip: http://pypi.python.org/pypi/pip
+.. _pip: https://pypi.python.org/pypi/pip

docs/source/plugins.rst

@@ -186,8 +186,8 @@ used).
 
 .. seealso::
 
-  * `namespace packages <http://pythonhosted.org//setuptools/setuptools.html#namespace-packages>`__
-  * `Extensible Applications and Frameworks <http://pythonhosted.org/setuptools/setuptools.html#extensible-applications-and-frameworks>`__
+  * `namespace packages <https://setuptools.readthedocs.io/en/latest/setuptools.html#namespace-packages>`__
+  * `Extensible Applications and Frameworks <https://setuptools.readthedocs.io/en/latest/setuptools.html#extensible-applications-and-frameworks>`__
 
 The Hook Loader
 ---------------
@@ -256,8 +256,8 @@ messages.
 
 .. seealso::
 
-   * `Standard library documentation for logging <http://docs.python.org/library/logging.html>`__
-   * `PyMOTW for logging <http://www.doughellmann.com/PyMOTW/logging/>`__
+   * `Standard library documentation for logging <https://docs.python.org/library/logging.html>`__
+   * `PyMOTW for logging <https://www.doughellmann.com/PyMOTW/logging/>`__
 
 .. _plugins-extension-points:
 
@@ -394,6 +394,6 @@ and::
 
 respectively.
 
-.. _Setuptools entry points: http://pythonhosted.org//setuptools/pkg_resources.html#entry-points
+.. _Setuptools entry points: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#entry-points
 
-.. _project: http://www.doughellmann.com/projects/virtualenvwrapper.project/
+.. _project: https://bitbucket.org/virtualenvwrapper/virtualenvwrapper

docs/source/tips.rst

@@ -13,7 +13,7 @@ and I'll add it here.
 zsh Prompt
 ==========
 
-From `Nat <http://www.blogger.com/profile/16779944428406910187>`_:
+From Nat (was blogger.com/profile/16779944428406910187):
 
 Using zsh, I added some bits to ``$WORKON_HOME/post(de)activate`` to show
 the active virtualenv on the right side of my screen instead.
@@ -33,7 +33,7 @@ Adjust colors according to your own personal tastes or environment.
 Updating cached ``$PATH`` entries
 =================================
 
-From `Nat <http://www.blogger.com/profile/16779944428406910187>`_:
+From Nat (was blogger.com/profile/16779944428406910187):
 
 I also added the command 'rehash' to ``$WORKON_HOME/postactivate`` and
 ``$WORKON_HOME/postdeactivate`` as I was having some problems with zsh
@@ -42,7 +42,7 @@ not picking up the new paths immediately.
 Creating Project Work Directories
 =================================
 
-Via `James <http://www.blogger.com/profile/02618224969192901883>`_:
+Via `James <https://www.blogger.com/profile/02618224969192901883>`_:
 
 In the ``postmkvirtualenv`` script I have the following to create a
 directory based on the project name, add that directory to the python
@@ -70,14 +70,14 @@ directory each time he runs ``cd``.  If it finds a ``.venv`` file, it
 activates the environment named within.  On leaving that directory,
 the current virtualenv is automatically deactivated.
 
-`Harry Marr <http://www.blogger.com/profile/17141199633387157732>`__
+`Harry Marr <http://hmarr.com/about/>`__
 wrote a similar function that works with `git repositories
 <http://hmarr.com/2010/jan/19/making-virtualenv-play-nice-with-git/>`__.
 
 Installing Common Tools Automatically in New Environments
 =========================================================
 
-Via `rizumu <http://rizumu.myopenid.com/>`__:
+Via rizumu (was rizumu.myopenid.com):
 
 I have this ``postmkvirtualenv`` to install the get a basic setup.
 
@@ -112,7 +112,7 @@ PIL, psycopg2, django-apps, numpy, etc.
 Changing the Default Behavior of ``cd``
 =======================================
 
-Via `mae <http://www.blogger.com/profile/10879711379090472478>`__:
+Via `mae <https://www.blogger.com/profile/10879711379090472478>`__:
 
 This is supposed to be executed after workon, that is as a
 ``postactivate`` hook. It basically overrides ``cd`` to know about the
@@ -136,7 +136,7 @@ it a proper path then it will do the right thing.
 And to finally restore the default behaviour of ``cd`` once you
 bailout of a VENV via a ``deactivate`` command, you need to add this
 as a ``postdeactivate`` hook (`source
-<http://github.com/kdeldycke/dotfiles/commit/80470b>`_)::
+<https://github.com/kdeldycke/dotfiles/commit/80470b>`_)::
 
     cd () {
         builtin cd "$@"

tests/test_lazy.sh

@@ -96,4 +96,12 @@ test_mktmpenv_defined_lazy() {
     function_defined_lazy mktmpenv
 }
 
+test_mktmpenv_defined_lazy() {
+    function_defined_lazy wipeenv
+}
+
+test_mktmpenv_defined_lazy() {
+    function_defined_lazy allvirtualenv
+}
+
 . "$test_dir/shunit2"

tests/test_lazy_loaded.sh

@@ -88,6 +88,14 @@ test_mktmpenv_defined_normal() {
     function_defined_normal mktmpenv
 }
 
+test_mktmpenv_defined_normal() {
+    function_defined_normal wipeenv
+}
+
+test_mktmpenv_defined_normal() {
+    function_defined_normal allvirtualenv
+}
+
 
 # test_virtualenvwrapper_initialize() {
 #     assertTrue "Initialized" virtualenvwrapper_initialize