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.

Make the pip cache work with djangopypi2
008e57aa · Brandon W Maister · 78df6e96 · 008e57aa
Commit 008e57aa authored Oct 31, 2013 by Brandon W Maister
Hide whitespace changes
Inline Side-by-side

Showing with 42 additions and 1 deletion

pip.plugin.zsh plugins/pip/pip.plugin.zsh +42 -1

No files found.
--- 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
+}