From f8aae64e478066be7d05f5eb6970c356cafcfd36 Mon Sep 17 00:00:00 2001
From: Jake Bell <jake@theunraveler.com>
Date: Thu, 26 May 2011 12:34:37 -0500
Subject: [PATCH 01/17] Adding ability to override plugins from the custom
 directory.

---
 .gitignore                        | 1 +
 README.textile                    | 6 ++++--
 custom/example/example.plugin.zsh | 2 ++
 oh-my-zsh.sh                      | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 custom/example/example.plugin.zsh

diff --git a/.gitignore b/.gitignore
index 4b555067..8fdfae28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@ locals.zsh
 log/.zsh_history
 projects.zsh
 custom/*
+!custom/example
 !custom/example.zsh
 cache
diff --git a/README.textile b/README.textile
index d01c3310..2dbfbe5a 100644
--- a/README.textile
+++ b/README.textile
@@ -48,7 +48,9 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
 h3. Customization
 
 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
-If you have many functions which go good together you can put them as a *.plugin.zsh file in the @plugin/@ directory and then enable this plugin.
+If you have many functions which go good together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
+If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
+
 
 h3. Uninstalling
 
@@ -68,4 +70,4 @@ This project wouldn't exist without all of our awesome users and contributors.
 
 * "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
 
-Thank you so much!
\ No newline at end of file
+Thank you so much!
diff --git a/custom/example/example.plugin.zsh b/custom/example/example.plugin.zsh
new file mode 100644
index 00000000..406f2744
--- /dev/null
+++ b/custom/example/example.plugin.zsh
@@ -0,0 +1,2 @@
+# Add your own custom plugins in the custom/plugins directory. Plugins placed
+# here will override ones with the same name in the main plugins directory.
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c8f1a33b..dbff1ced 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -17,7 +17,9 @@ compinit -i
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+  if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then
+    source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh
+  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
     source $ZSH/plugins/$plugin/$plugin.plugin.zsh
   fi
 done

From 04573324d52aaadf947f3a80190e4f54d8580932 Mon Sep 17 00:00:00 2001
From: Martin Thurau <martin.thurau@gmail.com>
Date: Fri, 27 May 2011 16:58:14 +0200
Subject: [PATCH 02/17] Added compatibility for the linux 'stat' command for
 the ant plugin

---
 plugins/ant/ant.plugin.zsh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
index 0544ac92..23bc7756 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -1,8 +1,15 @@
+stat -f%m . > /dev/null 2>&1
+if [ "$?" = 0 ]; then
+	stat_cmd=(stat -f%m)
+else
+	stat_cmd=(stat -L --format=%y)
+fi
+
 _ant_does_target_list_need_generating () {
   if [ ! -f .ant_targets ]; then return 0;
   else
-    accurate=$(stat -f%m .ant_targets)
-    changed=$(stat -f%m build.xml)
+    accurate=$($stat_cmd -f%m .ant_targets)
+    changed=$($stat_cmd -f%m build.xml)
     return $(expr $accurate '>=' $changed)
   fi
 }

From 3e433165502a01028fcd0368161a2193eaeb386c Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:16:06 -0400
Subject: [PATCH 03/17] Ruby Switching Helpers

Add helper functions to switch gemsets on ruby-1.8.7-p334 and ruby-1.9.2-p180.
Add completion definitions for helper functions.
---
 plugins/rvm/rvm.plugin.zsh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index ef934d54..27412383 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,3 +1,28 @@
 fpath=($ZSH/plugins/rvm $fpath)
 autoload -U compinit
 compinit -i
+
+local ruby18='ruby-1.8.7-p334'
+local ruby19='ruby-1.9.2-p180'
+
+function rb18 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby18"
+	else
+		rvm use "$ruby18@$1"
+	fi
+}
+
+_rb18() {compadd `ls -1 $rvm_path/gems | grep "^$ruby18@" | sed -e "s/^$ruby18@//" | awk '{print $1}'`}
+compdef _rb18 rb18
+
+function rb19 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby19"
+	else
+		rvm use "$ruby19@$1"
+	fi
+}
+
+_rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
+compdef _rb19 rb19

From e703c9591c64cd23bb0f0e1a892fbed0efe74fa7 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:23:06 -0400
Subject: [PATCH 04/17] Helpful Listing Aliases

Add alias to list installed rubies. Add alias to list gemsets in active ruby.
---
 plugins/rvm/rvm.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 27412383..ba780c97 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -2,6 +2,9 @@ fpath=($ZSH/plugins/rvm $fpath)
 autoload -U compinit
 compinit -i
 
+alias rubies='rvm list rubies'
+alias gemsets='rvm gemset list'
+
 local ruby18='ruby-1.8.7-p334'
 local ruby19='ruby-1.9.2-p180'
 

From 9f34bbedc8d4843b0ed50f76d38b63e5aa48cc8b Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:35:54 -0400
Subject: [PATCH 05/17] RVM Update Helpers

Add helper function to get rvm head. Add helper function to link zsh
completion that comes with rvm into om-my-zsh plugin directory, but don't
overwrite the completion that comes with oh-my-zsh (oh-my-zsh's completion is
better, but I want to be able to compare).
---
 plugins/rvm/rvm.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index ba780c97..509dcbd9 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -29,3 +29,12 @@ function rb19 {
 
 _rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
 compdef _rb19 rb19
+
+function rvm-update {
+	rvm get head
+	rvm reload # TODO: Reload rvm completion?
+}
+
+function rvm-link-completion {
+	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
+}

From 572b27b75724d00fbc99ef64de3dbd21a28c8194 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:50:06 -0400
Subject: [PATCH 06/17] Gem List Helper

Add helper function to list gems in a pretty way (only with rvm, for now). Add
missng EOF newline and a todo to the ruby plugin.
---
 plugins/ruby/ruby.plugin.zsh |  4 +++-
 plugins/rvm/rvm.plugin.zsh   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 82bf5d49..08ca9c60 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -1,4 +1,6 @@
+# TODO: Make this compatible with rvm.
+#       Run sudo gem on the system ruby, not the active ruby.
 alias sgem='sudo gem'
 
 # Find ruby file
-alias rfind='find . -name *.rb | xargs grep -n'
\ No newline at end of file
+alias rfind='find . -name *.rb | xargs grep -n'
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 509dcbd9..8a3ec788 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -38,3 +38,15 @@ function rvm-update {
 function rvm-link-completion {
 	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
 }
+
+# TODO: Make this usable w/o rvm.
+function gems {
+	local current_ruby=`rvm-prompt i v p`
+	local current_gemset=`rvm-prompt g`
+
+	gem list $@ | sed \
+		-Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+		-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
+		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+}

From e263f1f0057f6cac15ef588c681e6f49713c3975 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:57:48 -0400
Subject: [PATCH 07/17] Brew Plugin

Merge completion with official brew completion. Add a helper to link official
completion into oh-my-zsh plugin (without overwriting). Add an alias to list
installed brews. Add brews to the path (in a somewhat strange way).
---
 plugins/brew/_brew           | 24 +++++++++++++++++-------
 plugins/brew/brew.plugin.zsh | 13 +++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 plugins/brew/brew.plugin.zsh

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index cee1e25f..1dcf0a4b 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -25,10 +25,12 @@ _1st_arguments=(
   'link:link a formula'
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
+  'missing:check all installed formuale for missing dependencies.'
   'outdated:list formulas for which a newer version is available'
   'prune:remove dead links'
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
+  'server:start a local web app that lets you browse formulae (requires Sinatra)'
   'unlink:unlink a formula'
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'
@@ -36,10 +38,14 @@ _1st_arguments=(
 )
 
 local expl
-local -a formula installed_formulae
+local -a formulae installed_formulae
 
 _arguments \
-  '(-v --verbose)'{-v,--verbose}'[verbose]' \
+  '(-v)-v[verbose]' \
+  '(--cellar)--cellar[brew cellar]' \
+  '(--config)--config[brew configuration]' \
+  '(--env)--env[brew environment]' \
+  '(--repository)--repository[brew repository]' \
   '(--version)--version[version information]' \
   '(--prefix)--prefix[where brew lives on this system]' \
   '(--cache)--cache[brew cache]' \
@@ -51,20 +57,24 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  list)
+  search|-S)
+    _arguments \
+      '(--macports)--macports[search the macports repository]' \
+      '(--fink)--fink[search the fink repository]' ;;
+  list|ls)
     _arguments \
       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+      '(--versions)--versions[list all installed versions of a formula]' \
       '1: :->forms' &&  return 0
 
       if [[ "$state" == forms ]]; then
         _brew_installed_formulae
-        _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
+        _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|log|info|uses|cat|deps)
+  install|home|homepage|log|info|abv|uses|cat|deps|edit|options)
     _brew_all_formulae
     _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  remove|edit|xo)
+  remove|rm|uninstall|unlink|cleanup|link|ln)
     _brew_installed_formulae
     _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
 esac
-
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
new file mode 100644
index 00000000..f584a468
--- /dev/null
+++ b/plugins/brew/brew.plugin.zsh
@@ -0,0 +1,13 @@
+# Move /usr/local/bin (path where brews are linked) to the front of the path
+# This will allow us to override system binaries like ruby with our brews
+# TODO: Do this in a more compatible way.
+#       What if someone doesn't have /usr/bin in their path?
+export PATH=`echo $PATH | sed -e 's|/usr/local/bin||' -e 's|::|:|g'` # Remove /usr/local/bin
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/bin:&|'`     # Add it in front of /usr/bin
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/sbin:&|'`    # Add /usr/local/sbin
+
+alias brews='brew list -1'
+
+function brew-link-completion {
+	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
+}

From befb02e3da0573fa788114e1c18c70b75f787f1f Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 11:09:37 -0400
Subject: [PATCH 08/17] Pow! Restart Helper

Add helper function to restart an app running on Pow!
---
 plugins/pow/pow.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 plugins/pow/pow.plugin.zsh

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
new file mode 100644
index 00000000..6b2a6f2b
--- /dev/null
+++ b/plugins/pow/pow.plugin.zsh
@@ -0,0 +1,10 @@
+# Thanks 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
+}
+
+compctl -W ~/.pow -/ kapow

From d72b9c5ec5d55765998bb301b3425fbe84012c1f Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 11:20:48 -0400
Subject: [PATCH 09/17] Node.js Helpers

Add helper function to open node api in browser. Add binaries installed via
npm to path. Tell node where to find things (what things?).
---
 plugins/node/node.plugin.zsh | 8 ++++++++
 plugins/npm/npm.plugin.zsh   | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 plugins/node/node.plugin.zsh
 create mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
new file mode 100644
index 00000000..18f35333
--- /dev/null
+++ b/plugins/node/node.plugin.zsh
@@ -0,0 +1,8 @@
+# This works if you installed node via homebrew.
+export NODE_PATH="/usr/local/lib/node"
+
+# Open the node api for your current version to the optional section.
+# TODO: Make the section part easier to use.
+function node-api {
+	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
+}
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
new file mode 100644
index 00000000..0b0a30e1
--- /dev/null
+++ b/plugins/npm/npm.plugin.zsh
@@ -0,0 +1,2 @@
+# TODO: Don't do this in such a weird way.
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`

From 18293cd724224282d6ca473fcbe6e7439d3eac0c Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 11:27:50 -0400
Subject: [PATCH 10/17] OS X Helpers

Add helper aliases for show/hide files. Add helper alias to recursively delete
.DS_Store files.
---
 plugins/osx/osx.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 81eed5e9..a65ca642 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,3 +1,9 @@
+alias showfiles='defaults write com.apple.finder AppleShowAllFiles TRUE; killall Finder'
+alias hidefiles='defaults write com.apple.finder AppleShowAllFiles FALSE; killall Finder'
+
+# Recursively delete .DS_Store files
+alias rm-dsstore="find . -name '*.DS_Store' -type f -delete"
+
 function savepath() {
   pwd > ~/.current_path~
 }

From 18ab94bccd3cfe64f81ab2ea0e09ce4a630a21bc Mon Sep 17 00:00:00 2001
From: brian tse <briankftse@gmail.com>
Date: Sat, 28 May 2011 23:57:32 +0800
Subject: [PATCH 11/17] Add new 'minimal' theme

---
 themes/minimal.zsh-theme | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 themes/minimal.zsh-theme

diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
new file mode 100644
index 00000000..ee3ab6b2
--- /dev/null
+++ b/themes/minimal.zsh-theme
@@ -0,0 +1,15 @@
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+git_custom_status() {
+  local cb=$(current_branch)
+  if [ -n "$cb" ]; then
+    echo "- $ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+}
+
+
+PROMPT='%2~ $(git_custom_status) »%b '
\ No newline at end of file

From ace84c8b7eb8b50842798bac9811d02928f58dd3 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 13:06:03 -0400
Subject: [PATCH 12/17] Cleanup

Add missing newlines at EOF. Remove redundant comment. Fix grammar in comment.
---
 plugins/cap/cap.plugin.zsh           | 2 +-
 plugins/compleat/compleat.plugin.zsh | 2 --
 plugins/github/github.plugin.zsh     | 1 -
 plugins/textmate/textmate.plugin.zsh | 4 +---
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index a0fa21d0..8336182d 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -18,4 +18,4 @@ function _cap () {
   fi
 }
 
-compctl -K _cap cap
\ No newline at end of file
+compctl -K _cap cap
diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
index 8d16a568..38f1b396 100644
--- a/plugins/compleat/compleat.plugin.zsh
+++ b/plugins/compleat/compleat.plugin.zsh
@@ -5,7 +5,6 @@
 #       VERSION:  1.0.0
 # ------------------------------------------------------------------------------
 
-
 if (( ${+commands[compleat]} )); then
   local prefix="${commands[compleat]:h:h}"
   local setup="${prefix}/share/compleat-1.0/compleat_setup" 
@@ -19,4 +18,3 @@ if (( ${+commands[compleat]} )); then
     source "$setup" 
   fi
 fi
-
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index df7053ba..1eb33811 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -4,4 +4,3 @@ if [ "$commands[(I)hub]" ]; then
     # eval `hub alias -s zsh`
     function git(){hub "$@"}
 fi
-
diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index 7c4c14a5..aa2f75f4 100644
--- a/plugins/textmate/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
@@ -1,11 +1,9 @@
-
-# TextMate
 alias et='mate .'
 alias ett='mate app config lib db public spec test Rakefile Capfile Todo'
 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 
-# Editor Ruby file in TextMate
+# Edit Ruby app in TextMate
 alias mr='mate CHANGELOG app config db lib public script spec test'
 
 function tm() {

From 18bfb14a2f774b115c8634cdaa3864cbdee91a94 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 13:12:03 -0400
Subject: [PATCH 13/17] Thor

Add plugin with completion for thor.
---
 plugins/thor/_thor | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/thor/_thor

diff --git a/plugins/thor/_thor b/plugins/thor/_thor
new file mode 100644
index 00000000..9f7ed5ae
--- /dev/null
+++ b/plugins/thor/_thor
@@ -0,0 +1,4 @@
+#compdef thor
+#autoload
+
+compadd `thor list | grep thor | cut -d " " -f 2`

From 205e2f4842d1d1808b0d8d16bcfd1daeadb111d9 Mon Sep 17 00:00:00 2001
From: Magnus Woldrich <m@japh.se>
Date: Sun, 29 May 2011 11:55:24 +0200
Subject: [PATCH 14/17] add trapd00r theme

---
 themes/trapd00r.zsh-theme | 95 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 themes/trapd00r.zsh-theme

diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
new file mode 100644
index 00000000..cba14c42
--- /dev/null
+++ b/themes/trapd00r.zsh-theme
@@ -0,0 +1,95 @@
+# Name:   trapd00r zsh theme
+# Author: Magnus Woldrich <m@japh.se>
+#
+# This theme needs a terminal supporting 256 colors as well as unicode. It also
+# needs the script that splits up the current path and makes it fancy as located
+# here: https://github.com/trapd00r/utils/blob/master/zsh_path
+#
+# By default it spans over two lines like so:
+#
+# scp1@shiva:pts/9-> /home » scp1 (0)
+# >
+#
+# that's  user@host:pts/-> splitted path (return status)
+#
+# If the current directory is a git repository, we span 3 lines;
+#
+# git❨ master ❩ DIRTY
+# scp1@shiva:pts/4-> /home » scp1 » dev » utils (0)
+# >
+
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+local c0=$( printf "\e[m")
+local c1=$( printf "\e[38;5;245m")
+local c2=$( printf "\e[38;5;250m")
+local c3=$( printf "\e[38;5;242m")
+local c4=$( printf "\e[38;5;197m")
+local c5=$( printf "\e[38;5;225m")
+local c6=$( printf "\e[38;5;240m")
+local c7=$( printf "\e[38;5;242m")
+local c8=$( printf "\e[38;5;244m")
+local c9=$( printf "\e[38;5;162m")
+local c10=$(printf "\e[1m")
+local c11=$(printf "\e[38;5;208m\e[1m")
+local c12=$(printf "\e[38;5;142m\e[1m")
+local c13=$(printf "\e[38;5;196m\e[1m")
+
+
+# We dont want to use the extended colorset in the TTY / VC.
+if [ "$TERM" = "linux" ]; then
+    c1=$( printf "\e[34;1m")
+    c2=$( printf "\e[35m")
+    c3=$( printf "\e[31m")
+    c4=$( printf "\e[31;1m")
+    c5=$( printf "\e[32m")
+    c6=$( printf "\e[32;1m")
+    c7=$( printf "\e[33m")
+    c8=$( printf "\e[33;1m")
+    c9=$( printf "\e[34m")
+
+    c11=$(printf "\e[35;1m")
+    c12=$(printf "\e[36m")
+    c13=$(printf "\e[31;1m")
+fi
+
+zstyle ':vcs_info:*' actionformats \
+    '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+
+zstyle ':vcs_info:*' formats \
+    "%{$c8%}%s%%{$c7%}❨ %{$c9%}%{$c11%}%b%{$c7%} ❩%{$reset_color%}%f "
+
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' enable git
+
+add-zsh-hook precmd prompt_jnrowe_precmd
+
+prompt_jnrowe_precmd () {
+  vcs_info
+  if [ "${vcs_info_msg_0_}" = "" ]; then
+    dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
+    PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
+> '
+
+# modified, to be commited
+  elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
+    dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
+    PROMPT='${vcs_info_msg_0_}%{$30%} %{$bg_bold[red]%}%{$fg_bold[cyan]%}C%{$fg_bold[black]%}OMMIT%{$reset_color%}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+> '
+
+  elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
+    dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
+    PROMPT='${vcs_info_msg_0_}%{$bg_bold[red]%}%{$fg_bold[blue]%}D%{$fg_bold[black]%}IRTY%{$reset_color%}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+%{$c13%}>%{$c0%} '
+  else
+    dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
+    PROMPT='${vcs_info_msg_0_}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
+> '
+fi
+}
+
+#  vim: set ft=zsh sw=2 et tw=0:

From 1e3b441ce7e0b8706867801c1e5e7ca6760ff17e Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 10:07:15 -0400
Subject: [PATCH 15/17] Rollback of Pull #366

sorin-ionescu had some good points.
---
 plugins/brew/brew.plugin.zsh | 12 ------------
 plugins/node/node.plugin.zsh |  5 +----
 plugins/npm/npm.plugin.zsh   |  2 --
 plugins/rvm/rvm.plugin.zsh   |  9 ++-------
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index f584a468..c2e95884 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,13 +1 @@
-# Move /usr/local/bin (path where brews are linked) to the front of the path
-# This will allow us to override system binaries like ruby with our brews
-# TODO: Do this in a more compatible way.
-#       What if someone doesn't have /usr/bin in their path?
-export PATH=`echo $PATH | sed -e 's|/usr/local/bin||' -e 's|::|:|g'` # Remove /usr/local/bin
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/bin:&|'`     # Add it in front of /usr/bin
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/sbin:&|'`    # Add /usr/local/sbin
-
 alias brews='brew list -1'
-
-function brew-link-completion {
-	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
-}
diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 18f35333..519bc18d 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -1,8 +1,5 @@
-# This works if you installed node via homebrew.
-export NODE_PATH="/usr/local/lib/node"
-
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
-function node-api {
+function node-docs {
 	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
 }
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
deleted file mode 100644
index 0b0a30e1..00000000
--- a/plugins/npm/npm.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO: Don't do this in such a weird way.
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 8a3ec788..40fd88c1 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,5 @@
-fpath=($ZSH/plugins/rvm $fpath)
-autoload -U compinit
-compinit -i
+# What does this really do?
+# fpath=($ZSH/plugins/rvm $fpath)
 
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
@@ -35,10 +34,6 @@ function rvm-update {
 	rvm reload # TODO: Reload rvm completion?
 }
 
-function rvm-link-completion {
-	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
-}
-
 # TODO: Make this usable w/o rvm.
 function gems {
 	local current_ruby=`rvm-prompt i v p`

From 9801ad6453caa05925847f63401e6266378eb2de Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 11:10:08 -0400
Subject: [PATCH 16/17] Remove Uneeded Lines

---
 plugins/rvm/rvm.plugin.zsh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 40fd88c1..24621fe0 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,3 @@
-# What does this really do?
-# fpath=($ZSH/plugins/rvm $fpath)
-
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 

From c014dca141588737a13c4e3974adb4afd58c09bb Mon Sep 17 00:00:00 2001
From: Michael Hanson <michael.b.hanson@gmail.com>
Date: Tue, 31 May 2011 15:13:23 -0700
Subject: [PATCH 17/17] Fix deleted in git.zsh

---
 lib/git.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 2ace3d0e..ce4de559 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -52,11 +52,11 @@ git_prompt_status() {
   if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   echo $STATUS
-}
\ No newline at end of file
+}