diff --git a/docs/source/command_ref.rst b/docs/source/command_ref.rst index 50997e7..4571703 100644 --- a/docs/source/command_ref.rst +++ b/docs/source/command_ref.rst @@ -591,7 +591,9 @@ Other Commands virtualenvwrapper ----------------- -Print a list of commands and their descriptions as basic help output. +Print a list of commands, their descriptions, and some details about +the version and locations used by virtualenvwrapper as basic help +output. Syntax:: diff --git a/tests/test_virtualenvwrapper.sh b/tests/test_virtualenvwrapper.sh index 529dff1..ecaef8e 100755 --- a/tests/test_virtualenvwrapper.sh +++ b/tests/test_virtualenvwrapper.sh @@ -26,4 +26,16 @@ test_virtualenvwrapper_script_set() { "echo $VIRTUALENVWRAPPER_SCRIPT | grep -q /virtualenvwrapper.sh" } +test_virtualenvwrapper_version() { + source "$test_dir/../virtualenvwrapper.sh" + typeset ver=$(_virtualenvwrapper_version) + assertTrue "version is empty" "[ -n $ver ]" +} + +test_virtualenvwrapper_help_shows_version() { + source "$test_dir/../virtualenvwrapper.sh" + typeset pattern="Version: $(_virtualenvwrapper_version)" + assertTrue "version not in command output" "virtualenvwrapper | grep \"$pattern\"" +} + . "$test_dir/shunit2" diff --git a/virtualenvwrapper.sh b/virtualenvwrapper.sh index 7eb4ca7..cf43626 100644 --- a/virtualenvwrapper.sh +++ b/virtualenvwrapper.sh @@ -1336,8 +1336,13 @@ function allvirtualenv { unset IFS } +function _virtualenvwrapper_version { + "$VIRTUALENVWRAPPER_PYTHON" -m 'virtualenvwrapper.hook_loader' --version +} + #:help:virtualenvwrapper: show this help message function virtualenvwrapper { + typeset version=$(_virtualenvwrapper_version) cat <