From 8d60a0c80039048b836205475dfcf258bd776912 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Thu, 13 Sep 2012 11:38:58 +0200
Subject: [PATCH 1/2] updated cap plugin to use `cap -T` instead of `cap
 show_tasks` which didn't exist (sometimes?)

---
 plugins/cap/cap.plugin.zsh | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index 8336182d5..04479f46f 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -1,8 +1,30 @@
-function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
+stat -f%m . > /dev/null 2>&1
+if [ "$?" = 0 ]; then
+  stat_cmd=(stat -f%m)
+else
+  stat_cmd=(stat -L --format=%y)
+fi
+
+# Cache filename
+_cap_show_undescribed_tasks=0
+
+# Cache filename
+_cap_task_cache_file='.cap_task_cache'
+
+_cap_get_task_list () {
+  if [ ${_cap_show_undescribed_tasks} -eq 0 ]
+    cap -T | grep '^cap' | cut -d " " -f 2
   else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
+    cap -vT | grep '^cap' | cut -d " " -f 2
+  fi
+}
+
+_cap_does_task_list_need_generating () {
+
+  if [ ! -f ${_cap_task_cache_file} ]; then return 0;
+  else
+    accurate=$($stat_cmd $_cap_task_cache_file)
+    changed=$($stat_cmd config/deploy.rb)
     return $(expr $accurate '>=' $changed)
   fi
 }
@@ -10,12 +32,10 @@ function _cap_does_task_list_need_generating () {
 function _cap () {
   if [ -f config/deploy.rb ]; then
     if _cap_does_task_list_need_generating; then
-      echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
-> .cap_tasks~
+      _cap_get_task_list > ${_cap_task_cache_file}
     fi
-    compadd `cat .cap_tasks~`
+    compadd `cat ${_cap_task_cache_file}`
   fi
 }
 
-compctl -K _cap cap
+compdef _cap cap

From 9a4fac184ea1aa7a2e86e50111548a0a98652aaf Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Thu, 13 Sep 2012 12:20:44 +0200
Subject: [PATCH 2/2] fixed incorrect if/else

---
 plugins/cap/cap.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index 04479f46f..d22d10401 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -12,7 +12,7 @@ _cap_show_undescribed_tasks=0
 _cap_task_cache_file='.cap_task_cache'
 
 _cap_get_task_list () {
-  if [ ${_cap_show_undescribed_tasks} -eq 0 ]
+  if [ ${_cap_show_undescribed_tasks} -eq 0 ]; then
     cap -T | grep '^cap' | cut -d " " -f 2
   else
     cap -vT | grep '^cap' | cut -d " " -f 2