From 42b0123427d2bdee0e3221d930bb48038c601932 Mon Sep 17 00:00:00 2001
From: Max Persson <max@maxpersson.com>
Date: Wed, 7 Dec 2011 11:08:42 +0100
Subject: Added brute force package completin on install subcommand
---
plugins/pip/_pip | 60 +++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 42 insertions(+), 18 deletions(-)
(limited to 'plugins/pip')
diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index b58010173..8c03d8519 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -3,30 +3,39 @@
# pip zsh completion, based on homebrew completion
+_pip_all() {
+ all_pkgs=(`pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'`)
+}
+
_pip_installed() {
- installed_pkgs=(`pip freeze`)
+ installed_pkgs=(`pip freeze | cut -d '=' -f 1`)
}
local -a _1st_arguments
_1st_arguments=(
- 'bundle:Create pybundles (archives containing multiple packages)'
- 'freeze:Output all currently installed packages (exact versions) to stdout'
- 'help:Show available commands'
- 'install:Install packages'
- 'search:Search PyPI'
- 'uninstall:Uninstall packages'
- 'unzip:Unzip individual packages'
- 'zip:Zip individual packages'
+ 'bundle:create pybundles (archives containing multiple packages)'
+ 'freeze:output all currently installed packages (exact versions) to stdout'
+ 'help:show available commands'
+ 'install:install packages'
+ 'search:search PyPI'
+ 'uninstall:uninstall packages'
+ 'unzip:unzip individual packages'
+ 'zip:zip individual packages'
)
local expl
-local -a pkgs installed_pkgs
+local -a all_pkgs installed_pkgs
_arguments \
- '(--version)--version[Show version number of program and exit]' \
- '(-v --verbose)'{-v,--verbose}'[Give more output]' \
- '(-q --quiet)'{-q,--quiet}'[Give less output]' \
- '(-h --help)'{-h,--help}'[Show help]' \
+ '(--version)--version[show version number of program and exit]' \
+ '(-h --help)'{-h,--help}'[show help]' \
+ '(-E --environment)'{-E,--environment}'[virtualenv environment to run pip in]' \
+ '(-s --enable-site-packages)'{-s,--enable-site-packages}'[include site-packages in virtualenv]' \
+ '(-v --verbose)'{-v,--verbose}'[give more output]' \
+ '(-q --quiet)'{-q,--quiet}'[give less output]' \
+ '(--log)--log[log file location]' \
+ '(--proxy)--proxy[proxy in form user:passwd@proxy.server:port]' \
+ '(--timeout)--timeout[socket timeout (default 15s)]' \
'*:: :->subcmds' && return 0
if (( CURRENT == 1 )); then
@@ -35,10 +44,25 @@ if (( CURRENT == 1 )); then
fi
case "$words[1]" in
- list)
- if [[ "$state" == forms ]]; then
- _pip_installed
- _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs
+ search)
+ _arguments \
+ '(--index)--index[base URL of Python Package Index]' ;;
+ freeze)
+ _arguments \
+ '(-l --local)'{-l,--local}'[report only virtualenv packages]' ;;
+ install)
+ _arguments \
+ '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
+ '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \
+ '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \
+ '(--no-install)--no-install[only download packages]' \
+ '(--no-download)--no-download[only install downloaded packages]' \
+ '(--install-option)--install-option[extra arguments to be supplied to the setup.py]' \
+ '1: :->packages' && return 0
+
+ if [[ "$state" == packages ]]; then
+ _pip_all
+ _wanted all_pkgs expl 'packages' compadd -a all_pkgs
fi ;;
uninstall)
_pip_installed
--
cgit v1.2.3-70-g09d2
From 1c4997f5cada6f1ff1f205b20cf321cfc6b6d347 Mon Sep 17 00:00:00 2001
From: Max Persson <max@maxpersson.com>
Date: Wed, 7 Dec 2011 13:32:58 +0100
Subject: Added caching of packages
---
plugins/pip/_pip | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'plugins/pip')
diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 8c03d8519..07d37c80e 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -4,7 +4,10 @@
# pip zsh completion, based on homebrew completion
_pip_all() {
- all_pkgs=(`pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'`)
+ # we cache the list of packages (originally from the macports plugin)
+ if (( ! $+piplist )); then
+ piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
+ fi
}
_pip_installed() {
@@ -62,7 +65,7 @@ case "$words[1]" in
if [[ "$state" == packages ]]; then
_pip_all
- _wanted all_pkgs expl 'packages' compadd -a all_pkgs
+ _wanted piplist expl 'packages' compadd -a piplist
fi ;;
uninstall)
_pip_installed
--
cgit v1.2.3-70-g09d2
From 5eae9421883d71b954d4abaa6056b28874ad47ec Mon Sep 17 00:00:00 2001
From: Max Persson <max@maxpersson.com>
Date: Wed, 7 Dec 2011 14:09:43 +0100
Subject: Added message when caching packages
---
plugins/pip/_pip | 1 +
1 file changed, 1 insertion(+)
(limited to 'plugins/pip')
diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 07d37c80e..df53ba5ce 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -6,6 +6,7 @@
_pip_all() {
# we cache the list of packages (originally from the macports plugin)
if (( ! $+piplist )); then
+ echo -n " (caching package index...)"
piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
fi
}
--
cgit v1.2.3-70-g09d2