diff options
| author | Brandon W Maister <quodlibetor@gmail.com> | 2013-10-30 21:00:08 -0400 |
|---|---|---|
| committer | Brandon W Maister <quodlibetor@gmail.com> | 2013-10-30 21:00:08 -0400 |
| commit | 008e57aa5aec0f38445785da58a11462ef9451f9 (patch) | |
| tree | 2dfc7e8bba7d06e6603f33c58e62f6f5b78a55d1 /plugins/pip/pip.plugin.zsh | |
| parent | 78df6e96f5ad2d6df77af39f70f4906a09700849 (diff) | |
| download | zsh-008e57aa5aec0f38445785da58a11462ef9451f9.tar.gz zsh-008e57aa5aec0f38445785da58a11462ef9451f9.tar.bz2 zsh-008e57aa5aec0f38445785da58a11462ef9451f9.zip | |
Make the pip cache work with djangopypi2
Also add a test function that allows messing with the cache-creating
regex with some assurance that you're not trampling other people's
index-parsing.
Diffstat (limited to 'plugins/pip/pip.plugin.zsh')
| -rw-r--r-- | plugins/pip/pip.plugin.zsh | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh index 78532a6d3..71f977bbf 100644 --- a/plugins/pip/pip.plugin.zsh +++ b/plugins/pip/pip.plugin.zsh @@ -17,6 +17,10 @@ zsh-pip-clear-cache() { unset piplist } +zsh-pip-clean-packages() { + sed -nr '/<a href/ s/.*>([^<]+).*/\1/p' +} + zsh-pip-cache-packages() { if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then mkdir -p ${PIP_CACHE_FILE:h} @@ -28,10 +32,47 @@ zsh-pip-cache-packages() { for index in $ZSH_PIP_INDEXES ; do # well... I've already got two problems curl $index 2>/dev/null | \ - sed -nr '/^<a href/ s/.*>([^<]+).*/\1/p' \ + zsh-pip-clean-packages \ >> $tmp_cache done sort $tmp_cache | uniq | tr '\n' ' ' > $ZSH_PIP_CACHE_FILE rm $tmp_cache fi } + +# A test function that validates the regex against known forms of the simple +# index. If you modify the regex to make it work for you, you should add a test +# case in here and make sure that your changes don't break things for someone +# else. +zsh-pip-test-clean-packages() { + local expected + local actual + expected="0x10c-asm +1009558_nester" + + actual=$(echo -n "<html><head><title>Simple Index</title><meta name=\"api-version\" value=\"2\" /></head><body> +<a href='0x10c-asm'>0x10c-asm</a><br/> +<a href='1009558_nester'>1009558_nester</a><br/> +</body></html>" | zsh-pip-clean-packages) + + if [[ $actual != $expected ]] ; then + echo -e "python's simple index is broken:\n$actual\n !=\n$expected" + else + echo "python's simple index is fine" + fi + + actual=$(echo -n '<html> + <head> + <title>Simple Package Index</title> + </head> + <body> + <a href="0x10c-asm">0x10c-asm</a><br/> + <a href="1009558_nester">1009558_nester</a><br/> +</body></html>' | zsh-pip-clean-packages) + + if [[ $actual != $expected ]] ; then + echo -e "the djangopypi2 index is broken:\n$actual\n !=\n$expected" + else + echo "the djangopypi2 index is fine" + fi +} |