From 3b8f65477e989d534d2ce19aaec65ab2c1179aa3 Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Sat, 13 Nov 2010 09:08:24 -0800
Subject: [PATCH 1/4] Fixed cap plugin

---
 plugins/cap/cap.plugin.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index a0fa21d00..a9db4381b 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -11,11 +11,10 @@ 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 --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
     fi
     compadd `cat .cap_tasks~`
   fi
 }
 
-compctl -K _cap cap
\ No newline at end of file
+compdef _cap cap

From b02094e50fe3cd2e3f8ba911d19257dda047bf48 Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Tue, 7 Jun 2011 14:06:24 -0700
Subject: [PATCH 2/4] Change plugin name from cap to capistrano

---
 plugins/{cap/cap.plugin.zsh => capistrano/capistrano.plugin.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/{cap/cap.plugin.zsh => capistrano/capistrano.plugin.zsh} (100%)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
similarity index 100%
rename from plugins/cap/cap.plugin.zsh
rename to plugins/capistrano/capistrano.plugin.zsh

From efa5593f88e552fbd3fde850b283fa43d36f481c Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Tue, 16 Aug 2011 13:54:47 -0700
Subject: [PATCH 3/4] Rename to _capistrano (completion only)

---
 plugins/capistrano/_capistrano           | 19 +++++++++++++++++++
 plugins/capistrano/capistrano.plugin.zsh | 20 --------------------
 2 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 plugins/capistrano/_capistrano
 delete mode 100644 plugins/capistrano/capistrano.plugin.zsh

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
new file mode 100644
index 000000000..2ae977fcd
--- /dev/null
+++ b/plugins/capistrano/_capistrano
@@ -0,0 +1,19 @@
+#compdef cap
+#autoload
+
+_cap_does_task_list_need_generating () {
+  if [ ! -f .cap_tasks~ ]; then return 0;
+  else
+    accurate=$(stat -f%m .cap_tasks~)
+    changed=$(stat -f%m config/deploy.rb)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+if [ -f config/deploy.rb ]; then
+  if _cap_does_task_list_need_generating; then
+    echo "\nGenerating .cap_tasks~..." > /dev/stderr
+    cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
+  fi
+  compadd `cat .cap_tasks~`
+fi
diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
deleted file mode 100644
index a9db4381b..000000000
--- a/plugins/capistrano/capistrano.plugin.zsh
+++ /dev/null
@@ -1,20 +0,0 @@
-function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
-function _cap () {
-  if [ -f config/deploy.rb ]; then
-    if _cap_does_task_list_need_generating; then
-      echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
-    fi
-    compadd `cat .cap_tasks~`
-  fi
-}
-
-compdef _cap cap

From cfeb57024d78d84521ea6676a49182dee9a98b52 Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Mon, 3 Sep 2012 21:20:45 +0430
Subject: [PATCH 4/4] Nuke _cap_does_task_list_need_generating

Thanks @docwhat
---
 plugins/capistrano/_capistrano | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index 2ae977fcd..cf6b50c7f 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -1,17 +1,8 @@
 #compdef cap
 #autoload
 
-_cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
 if [ -f config/deploy.rb ]; then
-  if _cap_does_task_list_need_generating; then
+  if [[ ! -f .cap_tasks~ || config/deploy.rb -nt .cap_tasks~ ]]; then
     echo "\nGenerating .cap_tasks~..." > /dev/stderr
     cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
   fi