From 7553d0171f7d1fe070a70af2c863fdadf6d7d5ac Mon Sep 17 00:00:00 2001
From: Gavin Huang <gravof@gmail.com>
Date: Tue, 18 Oct 2011 11:46:45 +0800
Subject: Replace "git-diff" with "git diff" in the git plugin

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 183c56c1c..89b3259fe 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -9,7 +9,7 @@ alias gup='git fetch && git rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
-gdv() { git-diff -w "$@" | view - }
+gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
 compdef _git gc=git-commit
-- 
cgit v1.2.3-70-g09d2


From 81d94e6c9e3ebe5f0cb094474b1b2f96d2cf567b Mon Sep 17 00:00:00 2001
From: Godwin Ko <godwin.ko@athenabest.com>
Date: Wed, 12 Oct 2011 12:16:23 +0800
Subject: add rails runner alias

---
 plugins/rails/rails.plugin.zsh   | 1 +
 plugins/rails3/rails3.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index ac8119e83..4aa7a05d6 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -2,6 +2,7 @@ alias ss='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
 alias sp='ruby script/plugin'
+alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
 alias rdbm='rake db:migrate'
 alias sc='ruby script/console'
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index f4ee637e6..a817b483f 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -14,6 +14,7 @@ alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
 alias rg='_rails_command generate'
 alias rp='_rails_command plugin'
+alias rr='_rails_command runner'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
-- 
cgit v1.2.3-70-g09d2


From 2c660c16ad818d4e1f001e392f7e82c7c02cbbc6 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Thu, 24 Nov 2011 13:51:55 +0100
Subject: Only alias git=hub if `hub --version` works.

`hub` is crashing for me on a old CentOS setup with
"undefined method `shelljoin'".

On first use of the `git` function it is now checked if
`hub --version` returns successfully.
---
 plugins/github/github.plugin.zsh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 9b0d54602..197e86a48 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,7 +1,17 @@
 # Setup hub function for git, if it is available; http://github.com/defunkt/hub
 if [ "$commands[(I)hub]" ] && [ "$commands[(I)ruby]" ]; then
     # eval `hub alias -s zsh`
-    function git(){hub "$@"}
+    function git(){
+        if ! (( $+_has_working_hub  )); then
+            hub --version &> /dev/null
+            _has_working_hub=$(($? == 0))
+        fi
+        if (( $_has_working_hub )) ; then
+            hub "$@"
+        else
+            command git "$@"
+        fi
+    }
 fi
 
 # Functions #################################################################
-- 
cgit v1.2.3-70-g09d2


From 5260bfd4eba3787d5d32086b55ed728f3f3ab7f8 Mon Sep 17 00:00:00 2001
From: Gael Pasgrimaud <gael@gawel.org>
Date: Sun, 27 Nov 2011 15:07:31 +0100
Subject: allow django-manage completion.
 http://pypi.python.org/pypi/DjangoDevKit

---
 plugins/django/django.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 1d72a2f2c..0bbd031fe 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -220,3 +220,4 @@ _managepy() {
 
 compdef _managepy manage.py
 compdef _managepy django
+compdef _managepy django-manage
-- 
cgit v1.2.3-70-g09d2


From 955825b1e9e484e4b6811a6ba8895924c1834493 Mon Sep 17 00:00:00 2001
From: Calogero Lo Leggio <kalos@nerdrug.org>
Date: Tue, 3 Jan 2012 18:03:53 +0100
Subject: autojump plugin enhanced

---
 plugins/autojump/autojump.plugin.zsh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 6f9b80bff..72c416a17 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,5 +1,9 @@
-if [ -f /opt/local/etc/profile.d/autojump.sh ]; then
-  . /opt/local/etc/profile.d/autojump.sh
-elif [ -f `brew --prefix`/etc/autojump ]; then
-  . `brew --prefix`/etc/autojump
+if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
+  . /usr/share/autojump/autojump.zsh
+elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
+  . /etc/profile.d/autojump.zsh
+elif (`command -v brew >/dev/null`); then # mac os x with brew
+  if [ -f `brew --prefix`/etc/autojump ]; then
+    . `brew --prefix`/etc/autojump
+  fi
 fi
-- 
cgit v1.2.3-70-g09d2


From 9ac98f6ceb77df71c98558a122bc06f8adadf989 Mon Sep 17 00:00:00 2001
From: Chad Seeger <chad@manilla.com>
Date: Thu, 5 Jan 2012 13:41:27 -0800
Subject: Git Plugin: adds 'grhh' alias for 'git reset HEAD --hard'

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index c1b382b2c..ec98d4ad5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -36,6 +36,8 @@ alias ga='git add'
 compdef _git ga=git-add
 alias gm='git merge'
 compdef _git gm=git-merge
+alias grhh='git reset HEAD --hard'
+compdef _git grhh=git-reset-head-hard
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-- 
cgit v1.2.3-70-g09d2


From 804c18ca53e832f20869a7681143464382e8a2df Mon Sep 17 00:00:00 2001
From: Mark Drago <markdrago@gmail.com>
Date: Thu, 5 Jan 2012 17:39:13 -0500
Subject: remove the -v flag from a few mercurial aliases

The -v flag for these commands really isn't very useful.  It will
output some information about the hooks it is running, but that is
generally not useful and just noisy.  The desire to add -v to these
commands is exceptional and IMHO it's better to make the common
case of not seeing those messages the supported behavior.
---
 plugins/mercurial/mercurial.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 2988f0a46..caf0d9efc 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -1,14 +1,14 @@
 
 # Mercurial
-alias hgc='hg commit -v'
-alias hgb='hg branch -v'
+alias hgc='hg commit'
+alias hgb='hg branch'
 alias hgba='hg branches'
 alias hgco='hg checkout'
 alias hgd='hg diff'
 alias hged='hg diffmerge'
 # pull and update
-alias hgl='hg pull -u -v'
-alias hgp='hg push -v'
-alias hgs='hg status -v'
+alias hgl='hg pull -u'
+alias hgp='hg push'
+alias hgs='hg status'
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
-- 
cgit v1.2.3-70-g09d2


From ae735335e186447b370d299376970a7ea949b474 Mon Sep 17 00:00:00 2001
From: Chad Seeger <chad@manilla.com>
Date: Mon, 9 Jan 2012 15:19:19 -0800
Subject: Kill the compdef; Introduce 'grh' alias for 'git reset HEAD'

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index ec98d4ad5..ae080662f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -36,8 +36,8 @@ alias ga='git add'
 compdef _git ga=git-add
 alias gm='git merge'
 compdef _git gm=git-merge
+alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
-compdef _git grhh=git-reset-head-hard
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-- 
cgit v1.2.3-70-g09d2


From 5809a4721dd1b575c1f4cbc3cc361520e97cd8b9 Mon Sep 17 00:00:00 2001
From: Calogero Lo Leggio <kalos@nerdrug.org>
Date: Tue, 10 Jan 2012 10:01:16 +0100
Subject: check if autojump is installed

---
 plugins/autojump/autojump.plugin.zsh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 72c416a17..6f0edb062 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,9 +1,9 @@
-if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
-  . /usr/share/autojump/autojump.zsh
-elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
-  . /etc/profile.d/autojump.zsh
-elif (`command -v brew >/dev/null`); then # mac os x with brew
-  if [ -f `brew --prefix`/etc/autojump ]; then
+if [ $commands[autojump] ]; then # check if autojump is installed
+  if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
+    . /usr/share/autojump/autojump.zsh
+  elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
+    . /etc/profile.d/autojump.zsh
+  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew
     . `brew --prefix`/etc/autojump
   fi
 fi
-- 
cgit v1.2.3-70-g09d2


From c04b4abe91b69c058bde8e5968abb759b9168b88 Mon Sep 17 00:00:00 2001
From: Daniel Bye <dan@slightlystrange.org>
Date: Fri, 13 Jan 2012 12:40:59 +0000
Subject: Removed calls to compinit in the extract and the bundler plugins.
 compinit should only be called once, after all modules, libs, etc are
 imported.

---
 plugins/bundler/bundler.plugin.zsh | 2 --
 plugins/extract/extract.plugin.zsh | 2 --
 2 files changed, 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 55564a252..e120331ff 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,6 +1,4 @@
 fpath=($ZSH/plugins/bundler $fpath)
-autoload -U compinit
-compinit -i
 
 alias be="bundle exec"
 alias bi="bundle install"
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 8cc17f7d4..383331ccf 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -80,6 +80,4 @@ alias x=extract
 
 # add extract completion function to path
 fpath=($ZSH/plugins/extract $fpath)
-autoload -U compinit
-compinit -i
 
-- 
cgit v1.2.3-70-g09d2


From b73f95ab260f49bf6baa484faa40591c51629c02 Mon Sep 17 00:00:00 2001
From: Daniel Bye <dan@slightlystrange.org>
Date: Mon, 16 Jan 2012 13:34:07 +0000
Subject: Removed the assignments to fpath as well, since that's all handled in
 the .oh-my-zsh/oh-my-zsh.sh boot script.

---
 plugins/bundler/bundler.plugin.zsh | 2 --
 plugins/extract/extract.plugin.zsh | 3 ---
 2 files changed, 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index e120331ff..b473d203c 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,5 +1,3 @@
-fpath=($ZSH/plugins/bundler $fpath)
-
 alias be="bundle exec"
 alias bi="bundle install"
 alias bl="bundle list"
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 383331ccf..5c125e98b 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -78,6 +78,3 @@ function extract() {
 
 alias x=extract
 
-# add extract completion function to path
-fpath=($ZSH/plugins/extract $fpath)
-
-- 
cgit v1.2.3-70-g09d2


From 73c2c8adc77568abdf2c7be1761c5cac6f06ad06 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nico@bounga.org>
Date: Mon, 16 Jan 2012 15:19:36 +0100
Subject: Add Thor to bundled commands

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 55564a252..033f9cedf 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -10,7 +10,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
 
 ## Functions
 
-- 
cgit v1.2.3-70-g09d2


From 96265d26454868b8b654e4a5271939748e1dd148 Mon Sep 17 00:00:00 2001
From: Jeff Wallace <jwallace@partnerpedia.com>
Date: Tue, 17 Jan 2012 10:00:12 -0800
Subject: fix bundler plugin for root level folders

this fix allows _within-bundled-project() to properly pickup a Gemfile
within a root level folder (ie. /my_project)
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 033f9cedf..b8f8ed3da 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -20,7 +20,7 @@ _bundler-installed() {
 
 _within-bundled-project() {
   local check_dir=$PWD
-  while [ "$(dirname $check_dir)" != "/" ]; do
+  while [ $check_dir != "/" ]; do
     [ -f "$check_dir/Gemfile" ] && return
     check_dir="$(dirname $check_dir)"
   done
-- 
cgit v1.2.3-70-g09d2


From 8f1a5d3f1581c80510728143e146143deecaa61e Mon Sep 17 00:00:00 2001
From: max sharples <maxsharples@gmail.com>
Date: Tue, 17 Jan 2012 13:11:01 +1100
Subject: added a rake plugin to disable zsh file globbing when calling rake
 tasks with square brackets

---
 plugins/rake/rake.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/rake/rake.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
new file mode 100644
index 000000000..16b933c14
--- /dev/null
+++ b/plugins/rake/rake.plugin.zsh
@@ -0,0 +1,6 @@
+alias rake="noglob rake" # allows square brackts for rake task invocation
+alias brake='noglob bundle exec rake' # execute the bundled rake gem
+alias srake='noglob sudo rake' # noglob must come before sudo
+alias sbrake='noglob sudo bundle exec rake' # altogether now ... 
+
+
-- 
cgit v1.2.3-70-g09d2


From 741f6747e418229deec62ae2d19c776f6494e219 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 12:52:27 -0500
Subject: fix for pow plugin to default to current dir

---
 plugins/pow/pow.plugin.zsh | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 6b2a6f2be..da94b657b 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -1,10 +1,25 @@
-# Thanks to Christopher Sexton
+# Restart a rack app running under pow
+# http://pow.cx/
+#
+# Adds a kapow command that will restart an app
+#
+#   $ kapow myapp
+#   $ kapow # defaults to current directory
+#
+# Supports command completion.
+#
+# If you are not already using completion you might need to enable it with
+# 
+#    autoload -U compinit compinit
+#
+# Thanks also to Christopher Sexton
 # https://gist.github.com/965032
+#
 function kapow {
-	touch ~/.pow/$1/tmp/restart.txt
-	if [ $? -eq 0 ]; then
-		echo "$fg[yellow]Pow restarting $1...$reset_color"
-	fi
+	FOLDERNAME=$1
+	if [ -z "$FOLDERNAME" ]; then; FOLDERNAME=${PWD##*/}; fi
+	touch ~/.pow/$FOLDERNAME/tmp/restart.txt;
+	if [ $? -eq 0 ]; then; echo "pow: restarting $FOLDERNAME" ; fi
 }
 
 compctl -W ~/.pow -/ kapow
-- 
cgit v1.2.3-70-g09d2


From c1a04eb61fcdd740bef52cd9da75fd72aeac3cf4 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 12:58:13 -0500
Subject: take in csexton's changes

https://gist.github.com/1019777/70dbb46db9bd5b346faf543a9dd4edac4782adda
---
 plugins/pow/pow.plugin.zsh | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index da94b657b..08e5cf62f 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -4,7 +4,6 @@
 # Adds a kapow command that will restart an app
 #
 #   $ kapow myapp
-#   $ kapow # defaults to current directory
 #
 # Supports command completion.
 #
@@ -12,14 +11,40 @@
 # 
 #    autoload -U compinit compinit
 #
-# Thanks also to Christopher Sexton
-# https://gist.github.com/965032
+# Changes:
 #
-function kapow {
-	FOLDERNAME=$1
-	if [ -z "$FOLDERNAME" ]; then; FOLDERNAME=${PWD##*/}; fi
-	touch ~/.pow/$FOLDERNAME/tmp/restart.txt;
-	if [ $? -eq 0 ]; then; echo "pow: restarting $FOLDERNAME" ; fi
+# Defaults to the current application, and will walk up the tree to find 
+# a config.ru file and restart the corresponding app
+#
+# Will Detect if a app does not exist in pow and print a (slightly) helpful 
+# error message
+
+rack_root_detect(){
+  setopt chaselinks
+  local orgdir=$(pwd)
+  local basedir=$(pwd)
+
+  while [[ $basedir != '/' ]]; do
+    test -e "$basedir/config.ru" && break
+    builtin cd ".." 2>/dev/null
+    basedir="$(pwd)"
+  done
+
+  builtin cd $orgdir 2>/dev/null
+  [[ ${basedir} == "/" ]] && return 1
+  echo `basename $basedir | sed -E "s/.(com|net|org)//"`
 }
+kapow(){
+  local vhost=$1
+  [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
+  if [ ! -h ~/.pow/$vhost ]
+  then
+    echo "pow: This domain isn’t set up yet. Symlink your application to ${vhost} first."
+    return 1
+  fi
 
-compctl -W ~/.pow -/ kapow
+  [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
+  touch ~/.pow/$vhost/tmp/restart.txt;
+  [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
+}
+compctl -W ~/.pow -/ kapow
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 36cd5ed1a59394827d6e9d38eca33b614790ded3 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 14:18:09 -0500
Subject: add alias to view the standard out (puts) from any pow app

---
 plugins/pow/pow.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 08e5cf62f..5ab55ff1f 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -47,4 +47,7 @@ kapow(){
   touch ~/.pow/$vhost/tmp/restart.txt;
   [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
 }
-compctl -W ~/.pow -/ kapow
\ No newline at end of file
+compctl -W ~/.pow -/ kapow
+
+# View the standard out (puts) from any pow app
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 3841da15d02e6d36310b9cc1ebd62502d0bf2135 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 18:07:31 -0500
Subject: don't check for tmp dir

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

(limited to 'plugins')

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 5ab55ff1f..0fbcf8c7b 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -43,7 +43,7 @@ kapow(){
     return 1
   fi
 
-  [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
+  # [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
   touch ~/.pow/$vhost/tmp/restart.txt;
   [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
 }
-- 
cgit v1.2.3-70-g09d2


From f9b4356e0ed9e95890ce79c982dd5481ba7803aa Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 18:36:11 -0500
Subject: bug : stop creating those ~ directories add powit command to symlink
 an app if it hasn't been already

---
 plugins/pow/pow.plugin.zsh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 0fbcf8c7b..399a54cb0 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -34,6 +34,7 @@ rack_root_detect(){
   [[ ${basedir} == "/" ]] && return 1
   echo `basename $basedir | sed -E "s/.(com|net|org)//"`
 }
+
 kapow(){
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
@@ -43,11 +44,23 @@ kapow(){
     return 1
   fi
 
-  # [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
+  [ ! -d ~/.pow/${vhost}/tmp ] && mkdir -p ~/.pow/$vhost/tmp
   touch ~/.pow/$vhost/tmp/restart.txt;
   [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
 }
 compctl -W ~/.pow -/ kapow
 
+powit(){
+	local basedir=$(pwd)
+  local vhost=$1
+  [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
+  if [ ! -h ~/.pow/$vhost ]
+	then
+		echo "pow: Symlinking your app with pow. ${vhost}"
+	  [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+    return 1
+  fi
+}
+
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
-- 
cgit v1.2.3-70-g09d2


From 5f95d018e89e886615c82bc180e7e70457188c9b Mon Sep 17 00:00:00 2001
From: lepht <pete.clark@gmail.com>
Date: Wed, 18 Jan 2012 20:29:31 -0500
Subject: Updated to latest version of taskwarrior completions (using
 Taskwarrior 2.0b4)

---
 plugins/taskwarrior/_task | 162 +++++++++++++++++++---------------------------
 1 file changed, 65 insertions(+), 97 deletions(-)

(limited to 'plugins')

diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
index 5bffa9119..0bda738bb 100644
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
@@ -1,37 +1,37 @@
 #compdef task
-#
 # zsh completion for taskwarrior
 #
+# taskwarrior - a command line task list manager.
+#
 # Copyright 2010 - 2011 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
-# All rights reserved.
-#
-# This script is part of the taskwarrior project.
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
 #
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 #
-#     Free Software Foundation, Inc.,
-#     51 Franklin Street, Fifth Floor,
-#     Boston, MA
-#     02110-1301
-#     USA
+# http://www.opensource.org/licenses/mit-license.php
 #
 typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
 _task_projects=($(task _projects))
 _task_tags=($(task _tags))
 _task_ids=($(task _ids))
 _task_config=($(task _config))
+_task_columns=($(task _columns))
 _task_modifiers=(
 	'before' \
 	'after' \
@@ -46,39 +46,19 @@ _task_modifiers=(
 	'word' \
 	'noword'
 )
+_task_conjunctions=(
+   'and' \
+   'or' \
+	'xor' \
+	'\)'
+	'\('
+)
 _task_cmds=($(task _commands))
 _task_zshcmds=( ${(f)"$(task _zshcommands)"} )
 
-
-_task_idCmds=(
-	'append' \
-	'prepend' \
-	'annotate' \
-	'denotate' \
-	'edit' \
-	'duplicate' \
-	'info' \
-	'start' \
-	'stop' \
-	'done'
-)
-
-_task_idCmdsDesc=(
-	'append:Appends more description to an existing task.' \
-	'prepend:Prepends more description to an existing task.' \
-	'annotate:Adds an annotation to an existing task.' \
-	'denotate:Deletes an annotation of an existing task.' \
-	'edit:Launches an editor to let you modify a task directly.' \
-	'duplicate:Duplicates the specified task, and allows modifications.' \
-	'info:Shows all data, metadata for specified task.' \
-	'start:Marks specified task as started.' \
-	'stop:Removes the start time from a task.' \
-	'done:Marks the specified task as completed.'
-)
-
 _task() {
     _arguments -s -S \
-        "*::task command:_task_commands"
+        "*::task default:_task_default"
     return 0
 }
 
@@ -148,6 +128,7 @@ _regex_words values 'task frequencies' \
 	'weekly:Every week' \
 	'biweekly:Every two weeks' \
 	'fortnight:Every two weeks' \
++ 'monthly:Every month' \
 	'quarterly:Every three months' \
 	'semiannual:Every six months' \
 	'annual:Every year' \
@@ -196,22 +177,13 @@ _regex_arguments _task_attributes "${args[@]}"
 
 ## task commands
 
-# default completion
-(( $+functions[_task_default] )) ||
-_task_default() {
+# filter completion
+(( $+functions[_task_filter] )) ||
+_task_filter() {
 	_task_attributes "$@"
-}
 
-# commands expecting an ID
-(( $+functions[_task_id] )) ||
-_task_id() {
-	if (( CURRENT < 3 )); then
-		# update IDs
-		_task_zshids=( ${(f)"$(task _zshids)"} )
-		_describe -t values 'task IDs' _task_zshids
-	else
-		_task_attributes "$@"
-	fi
+	# TODO complete conjunctions only if the previous word is a filter expression, i.e. attribute, ID, any non-command
+	_describe -t default 'task conjunctions' _task_conjunctions
 }
 
 # merge completion
@@ -235,46 +207,42 @@ _task_pull() {
 	_files
 }
 
+# execute completion
+(( $+functions[_task_execute] )) ||
+_task_execute() {
+	_files
+}
 
-# modify (task [0-9]* ...) completion
-(( $+functions[_task_modify] )) ||
-_task_modify() {
-	_describe -t commands 'task command' _task_idCmdsDesc
-	_task_attributes "$@"
+# id-only completion
+(( $+functions[_task_id] )) ||
+_task_id() {
+	_describe -t values 'task IDs' _task_zshids
 }
 
 ## first level completion => task sub-command completion
-(( $+functions[_task_commands] )) ||
-_task_commands() {
+(( $+functions[_task_default] )) ||
+_task_default() {
     local cmd ret=1
-	if (( CURRENT == 1 )); then
-		# update IDs
-		_task_zshids=( ${(f)"$(task _zshids)"} )
-
-		_describe -t commands 'task command' _task_zshcmds
-		_describe -t values 'task IDs' _task_zshids
-		# TODO match more than one ID
-	elif [[ $words[1] =~ ^[0-9]*$ ]] then
-		 _call_function ret _task_modify
-		 return ret
-	else
-#        local curcontext="${curcontext}"
-#        cmd="${_task_cmds[(r)$words[1]:*]%%:*}"
-		  cmd="${_task_cmds[(r)$words[1]]}"
-		  idCmd="${(M)_task_idCmds[@]:#$words[1]}"
-        if (( $#cmd )); then
-#            curcontext="${curcontext%:*:*}:task-${cmd}"
 
-				if (( $#idCmd )); then
-					_call_function ret _task_id
-				else
-					_call_function ret _task_${cmd} ||
-						_call_function ret _task_default ||
-							_message "No command remaining."
-				fi
-        else
-            _message "Unknown subcommand ${cmd}"
-        fi
-        return ret
-    fi
+	integer i=1
+	while (( i < $#words ))
+	do
+		cmd="${_task_cmds[(r)$words[$i]]}"
+		if (( $#cmd )); then
+			_call_function ret _task_${cmd} ||
+				_call_function ret _task_filter ||
+					_message "No command remaining."
+			return ret
+		fi
+		(( i++ ))
+	done
+
+	# update IDs
+	_task_zshids=( ${(f)"$(task _zshids)"} )
+
+	_describe -t commands 'task command' _task_zshcmds
+	_describe -t values 'task IDs' _task_zshids
+	_call_function ret _task_filter
+
+	return ret
 }
-- 
cgit v1.2.3-70-g09d2


From e0b235608032256f5b725676f7c6217480a52722 Mon Sep 17 00:00:00 2001
From: Tate Johnson <tate@tatey.com>
Date: Sun, 22 Jan 2012 21:34:25 +1000
Subject: Add middleman to bundled commands

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 12123eea6..74a3adaf8 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber foreman guard heroku middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
 
 ## Functions
 
-- 
cgit v1.2.3-70-g09d2


From a26f9b9948405a10d3c04280a0ad2e49e69ba6f8 Mon Sep 17 00:00:00 2001
From: Alexander Greim <alexxx@iltempo.de>
Date: Wed, 25 Jan 2012 06:56:09 +0100
Subject: adding engine yard command (ey) to bundler binstubs

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

(limited to 'plugins')

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 96c649664..5e9b82336 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard heroku middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber ey foreman guard heroku middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
 
 ## Functions
 
-- 
cgit v1.2.3-70-g09d2


From 35d89ab85991e9a6dc055d0fd790b50c1aaa0cce Mon Sep 17 00:00:00 2001
From: szetobo <szetobo@gmail.com>
Date: Fri, 27 Jan 2012 08:50:28 +0800
Subject: update rails runner alias to ru

- avoid rr as it is mostly used for restart rails server
---
 plugins/rails3/rails3.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index a817b483f..52fdf43e9 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -14,7 +14,7 @@ alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
 alias rg='_rails_command generate'
 alias rp='_rails_command plugin'
-alias rr='_rails_command runner'
+alias ru='_rails_command runner'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
-- 
cgit v1.2.3-70-g09d2


From 8769e5f8c959f3d3fc9e5b62ab48fc0f73aedb1f Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <carlos@eddorre.com>
Date: Thu, 26 Jan 2012 23:19:50 -0800
Subject: Removed trailing spaces in Git files. Fixes #867

---
 lib/git.zsh                | 2 +-
 plugins/git/git.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/lib/git.zsh b/lib/git.zsh
index defa062c6..4d1634e8b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -61,4 +61,4 @@ git_prompt_status() {
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   echo $STATUS
-}
+}
\ No newline at end of file
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 94af31202..e1d682508 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -60,4 +60,4 @@ compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
+compdef ggpnp=git
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2