From 8b4858b6646ef2ce1bf4ab33ba94db33a95559b4 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.org>
Date: Sat, 9 Oct 2010 16:52:53 -0700
Subject: [PATCH 01/37] themes: philips customize git/ls for developers

- Customize LS_COLORS for developers working on C code bases like the
  Kernel.
- Add a * to the dirty prompt. Missed this accidently. Oops.

Signed-off-by: Brandon Philips <brandon@ifup.org>
---
 themes/philips.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
index fa7c59035..c79525590 100644
--- a/themes/philips.zsh-theme
+++ b/themes/philips.zsh-theme
@@ -7,8 +7,8 @@ RPROMPT='[%*]'
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="*"
 
 # LS colors, made with http://geoff.greer.fm/lscolors/
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
-export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:*.patch=00;34:*.o=00;32:*.so=01;35:*.ko=01;31:*.la=00;33'

From f78218f625846afe2b6a487d18b0d7c65daa4edf Mon Sep 17 00:00:00 2001
From: Pete Clark <pete.clark@gmail.com>
Date: Tue, 24 May 2011 15:25:18 -0400
Subject: [PATCH 02/37] Adds compl .swp caches to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4b555067e..ecb8e46bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ projects.zsh
 custom/*
 !custom/example.zsh
 cache
+*.swp

From 5da609e2c96c100c3c862e83f96e618d693c934f Mon Sep 17 00:00:00 2001
From: Pete Clark <pete.clark@gmail.com>
Date: Tue, 24 May 2011 15:28:42 -0400
Subject: [PATCH 03/37] Adds the _task script included with TaskWarrior

On my Ubuntu system this file was found in
/usr/share/doc/task/scripts/zsh/_task.gz
---
 plugins/taskwarrior/_task | 280 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 280 insertions(+)
 create mode 100644 plugins/taskwarrior/_task

diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
new file mode 100644
index 000000000..5bffa9119
--- /dev/null
+++ b/plugins/taskwarrior/_task
@@ -0,0 +1,280 @@
+#compdef task
+#
+# zsh completion for taskwarrior
+#
+# 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.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the
+#
+#     Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor,
+#     Boston, MA
+#     02110-1301
+#     USA
+#
+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_modifiers=(
+	'before' \
+	'after' \
+	'none' \
+	'any' \
+	'is' \
+	'isnt' \
+	'has' \
+	'hasnt' \
+	'startswith' \
+	'endswith' \
+	'word' \
+	'noword'
+)
+_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"
+    return 0
+}
+
+local -a reply args word
+word=$'[^\0]#\0'
+
+# priorities
+local -a task_priorities
+_regex_words values 'task priorities' \
+	'H:High' \
+	'M:Middle' \
+	'L:Low'
+task_priorities=("$reply[@]")
+
+# projects
+local -a task_projects
+task_projects=(
+	/"$word"/
+	":values:task projects:compadd -a _task_projects"
+)
+
+local -a _task_dates
+_regex_words values 'task dates' \
+	'tod*ay:Today' \
+	'yes*terday:Yesterday' \
+	'tom*orrow:Tomorrow' \
+	'sow:Start of week' \
+	'soww:Start of work week' \
+	'socw:Start of calendar week' \
+	'som:Start of month' \
+	'soy:Start of year' \
+	'eow:End of week' \
+	'eoww:End of work week' \
+	'eocw:End of calendar week' \
+	'eom:End of month' \
+	'eoy:End of year' \
+	'mon:Monday' \
+	'tue:Tuesday'\
+	'wed:Wednesday' \
+	'thu:Thursday' \
+	'fri:Friday' \
+	'sat:Saturday' \
+	'sun:Sunday'
+_task_dates=("$reply[@]")
+
+local -a _task_reldates
+_regex_words values 'task reldates' \
+	'hrs:n hours' \
+	'day:n days' \
+	'1st:first' \
+	'2nd:second' \
+	'3rd:third' \
+	'th:4th, 5th, etc.' \
+	'wks:weeks'
+_task_reldates=("$reply[@]")
+
+task_dates=(
+	\( "$_task_dates[@]" \|
+    \( /$'[0-9][0-9]#'/- \( "$_task_reldates[@]" \) \)
+	\)
+)
+
+_regex_words values 'task frequencies' \
+	'daily:Every day' \
+	'day:Every day' \
+	'weekdays:Every day skipping weekend days' \
+	'weekly:Every week' \
+	'biweekly:Every two weeks' \
+	'fortnight:Every two weeks' \
+	'quarterly:Every three months' \
+	'semiannual:Every six months' \
+	'annual:Every year' \
+	'yearly:Every year' \
+	'biannual:Every two years' \
+	'biyearly:Every two years'
+_task_freqs=("$reply[@]")
+
+local -a _task_frequencies
+_regex_words values 'task frequencies' \
+	'd:days' \
+	'w:weeks' \
+	'q:quarters' \
+	'y:years'
+_task_frequencies=("$reply[@]")
+
+task_freqs=(
+	\( "$_task_freqs[@]" \|
+     \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
+	\)
+)
+
+# attributes
+local -a task_attributes
+_regex_words -t ':' default 'task attributes' \
+	'pro*ject:Project name:$task_projects' \
+	'du*e:Due date:$task_dates' \
+	'wa*it:Date until task becomes pending:$task_dates' \
+	're*cur:Recurrence frequency:$task_freqs' \
+	'pri*ority:priority:$task_priorities' \
+	'un*til:Recurrence end date:$task_dates' \
+	'fg:Foreground color' \
+	'bg:Background color' \
+	'li*mit:Desired number of rows in report'
+task_attributes=("$reply[@]")
+
+args=(
+	\( "$task_attributes[@]" \|
+	\( /'(project|due|wait|recur|priority|until|fg|bg|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \|
+	\( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \|
+	\( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \|
+	\( /"$word"/ \)
+	\) \#
+)
+_regex_arguments _task_attributes "${args[@]}"
+
+## task commands
+
+# default completion
+(( $+functions[_task_default] )) ||
+_task_default() {
+	_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
+}
+
+# merge completion
+(( $+functions[_task_merge] )) ||
+_task_merge() {
+	# TODO match URIs in .taskrc
+	_files
+}
+
+# push completion
+(( $+functions[_task_push] )) ||
+_task_push() {
+	# TODO match URIs in .taskrc
+	_files
+}
+
+# pull completion
+(( $+functions[_task_pull] )) ||
+_task_pull() {
+	# TODO match URIs in .taskrc
+	_files
+}
+
+
+# modify (task [0-9]* ...) completion
+(( $+functions[_task_modify] )) ||
+_task_modify() {
+	_describe -t commands 'task command' _task_idCmdsDesc
+	_task_attributes "$@"
+}
+
+## first level completion => task sub-command completion
+(( $+functions[_task_commands] )) ||
+_task_commands() {
+    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
+}

From 1e86678f9d3c8c979ff8d3c8b5aac19e9e611441 Mon Sep 17 00:00:00 2001
From: Pete Clark <pete.clark@gmail.com>
Date: Tue, 24 May 2011 15:29:05 -0400
Subject: [PATCH 04/37] Adds oh-my-zsh plugin to load TaskWarrior completions

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

diff --git a/plugins/taskwarrior/taskwarrior.plugin.zsh b/plugins/taskwarrior/taskwarrior.plugin.zsh
new file mode 100644
index 000000000..c1830042e
--- /dev/null
+++ b/plugins/taskwarrior/taskwarrior.plugin.zsh
@@ -0,0 +1,21 @@
+################################################################################
+# Author: Pete Clark
+# Email: pete[dot]clark[at]gmail[dot]com
+# Version: 0.1 (05/24/2011)
+# License: WTFPL<http://sam.zoy.org/wtfpl/>
+#
+# This oh-my-zsh plugin adds smart tab completion for
+# TaskWarrior<http://taskwarrior.org/>. It uses the zsh tab completion
+# script (_task) distributed with TaskWarrior for the completion definitions.
+#
+# Typing task[tabtab] will give you a list of current tasks, task 66[tabtab]
+# gives a list of available modifications for that task, etc.
+################################################################################
+
+zstyle ':completion:*:*:task:*' verbose yes
+zstyle ':completion:*:*:task:*:descriptions' format '%U%B%d%b%u'
+
+zstyle ':completion:*:*:task:*' group-name ''
+
+alias t=task
+compdef _task t=task

From 714cfb1db2966ddfc0330a09e620164189233b49 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 31 May 2011 11:46:26 +0200
Subject: [PATCH 05/37] Add guru theme

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

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
new file mode 100644
index 000000000..2a2223528
--- /dev/null
+++ b/themes/guru.zsh-theme
@@ -0,0 +1,98 @@
+#-------------------------------------------------------------------------------
+# Guru theme for oh-my-zsh by Adam Lindberg
+# (Needs Git plugin for current_branch method)
+#-------------------------------------------------------------------------------
+
+
+# Color shortcuts
+R=$fg[red]
+Y=$fg[yellow]
+G=$fg[green]
+M=$fg[magenta]
+W=$fg[white]
+B=$fg[black]
+RB=$fg_bold[red]
+YB=$fg_bold[yellow]
+GB=$fg_bold[green]
+MB=$fg_bold[magenta]
+WB=$fg_bold[white]
+BB=$fg_bold[black]
+RESET=$reset_color
+
+if [ "$(whoami)" = "root" ]; then
+    PROMPTCOLOR="%{$RB%}" PREFIX="-!-";
+else
+    PROMPTCOLOR="%{$BB%}" PREFIX="---";
+fi
+
+local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
+
+GIT_PREFIX="%{$YB%}‹"
+GIT_SUFFIX="%{$YB%}›"
+
+# Get the status of the working tree (copied and modified from git.zsh)
+custom_git_prompt_status() {
+  INDEX=$(git status --porcelain 2> /dev/null)
+  STATUS=""
+  # Non-staged
+  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  fi
+  # Staged
+  if $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_DELETED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^A' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS"
+  fi
+  echo $STATUS
+}
+
+# get the name of the branch we are on (copied and modified from git.zsh)
+function custom_git_prompt() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_ahead)$(parse_git_dirty)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+PROMPT='${PROMPTCOLOR}$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$YB%}›%{$RESET%} "
+
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➝"
+
+# Staged
+ZSH_THEME_GIT_PROMPT_STAGED_ADDED="%{$G%}A"
+ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED="%{$G%}M"
+ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
+ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
+
+# Not-staged
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}??"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"
+
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}* "
+
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 9c306670a73ec3e313666fc497952153bdc16220 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 31 May 2011 14:07:38 +0200
Subject: [PATCH 06/37] Improve unicode characters and git status

---
 themes/guru.zsh-theme | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index 2a2223528..c63f1082a 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -64,13 +64,18 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^A' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS"
   fi
+
+  if $(echo "$STATUS" &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_STATUS_PREFIX$STATUS"
+  fi
+
   echo $STATUS
 }
 
 # get the name of the branch we are on (copied and modified from git.zsh)
 function custom_git_prompt() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_ahead)$(parse_git_dirty)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$(git_prompt_ahead)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
 PROMPT='${PROMPTCOLOR}$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
@@ -79,7 +84,12 @@ RPS1="${return_code}"
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$YB%}›%{$RESET%} "
 
-ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➝"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➔"
+
+ZSH_THEME_GIT_STATUS_PREFIX=" "
 
 # Staged
 ZSH_THEME_GIT_PROMPT_STAGED_ADDED="%{$G%}A"
@@ -88,11 +98,7 @@ ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
 ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
 
 # Not-staged
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}??"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}⁇"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"
-
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}* "
-
-ZSH_THEME_GIT_PROMPT_CLEAN=""

From a9b6f081b4a405dd1365df9c35aa3603196e3fc7 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Wed, 1 Jun 2011 10:11:06 +0200
Subject: [PATCH 07/37] Remove extra space when no status

---
 themes/guru.zsh-theme | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index c63f1082a..aa7b28b34 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -27,9 +27,6 @@ fi
 
 local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
 
-GIT_PREFIX="%{$YB%}‹"
-GIT_SUFFIX="%{$YB%}›"
-
 # Get the status of the working tree (copied and modified from git.zsh)
 custom_git_prompt_status() {
   INDEX=$(git status --porcelain 2> /dev/null)
@@ -65,7 +62,7 @@ custom_git_prompt_status() {
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS"
   fi
 
-  if $(echo "$STATUS" &> /dev/null); then
+  if $(echo -n "$STATUS" | grep '.*' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_STATUS_PREFIX$STATUS"
   fi
 

From 35b879a17b965b0ea28009c4561962c9ed17ef1f Mon Sep 17 00:00:00 2001
From: gwjo <gowen72@gmail.com>
Date: Sat, 4 Jun 2011 21:07:55 -0400
Subject: [PATCH 08/37] Add support for agent forwarding

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 52 ++++++++++++++++++++------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 0efc4546f..0f5b03d26 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,23 +1,51 @@
-# Based on code from Joseph M. Reagle
-# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+#
+# INSTRUCTIONS
+#
+#   To enabled agent forwarding support add the following to
+#   your .zshrc file:
+#
+#     zstyle :omz:plugins:ssh-agent agent-forwarding on
+#
+#
+# CREDITS
+#
+#   Based on code from Joseph M. Reagle
+#   http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+#
+#   Agent forwarding support based on ideas from
+#   Florent Thoumie and Jonas Pfenniger
+#
 
-local SSH_ENV=$HOME/.ssh/environment-$HOST
+local _plugin__ssh_env=$HOME/.ssh/environment-$HOST
+local _plugin__forwarding
 
-function start_agent {
-  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
-  chmod 600 ${SSH_ENV}
-  . ${SSH_ENV} > /dev/null
+function _plugin__start_agent()
+{
+  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
+  chmod 600 ${_plugin__ssh_env}
+  . ${_plugin__ssh_env} > /dev/null
   /usr/bin/ssh-add;
 }
 
-# Source SSH settings, if applicable
+# test if agent-forwarding is enabled
+zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
+if [[ ${_plugin__forwarding} == "yes" && -z $SSH_AGENT_PID && -n "$SSH_AUTH_SOCK" ]]; then
+  # No PID but a AUTH_SOCK means agent forwarding is enabled
+  # Add a nifty symlink for screen/tmux 
+  [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
 
-if [ -f "${SSH_ENV}" ]; then
-  . ${SSH_ENV} > /dev/null
+elif [ -f "${_plugin__ssh_env}" ]; then
+  # Source SSH settings, if applicable
+  . ${_plugin__ssh_env} > /dev/null
   ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
-    start_agent;
+    _plugin__start_agent;
   }
 else
-  start_agent;
+  _plugin__start_agent;
 fi
 
+# tidy up after ourselves
+unfunction _plugin__start_agent
+unset _plugin__forwarding
+unset _plugin__ssh_env
+

From 40b7f2099d393950e26d1a9720743e161b1abe49 Mon Sep 17 00:00:00 2001
From: gwjo <gowen72@gmail.com>
Date: Sat, 4 Jun 2011 22:16:10 -0400
Subject: [PATCH 09/37] Add support for loading mulitple identities

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 0f5b03d26..c4e92a1fe 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -6,6 +6,11 @@
 #
 #     zstyle :omz:plugins:ssh-agent agent-forwarding on
 #
+#   To load multiple identies use the identities style, For
+#   example:
+#
+#     zstyle :omz:plugins:ssh-agent id_rsa id_rsa2 id_github
+#
 #
 # CREDITS
 #
@@ -21,17 +26,23 @@ local _plugin__forwarding
 
 function _plugin__start_agent()
 {
+  local -a identities
+
+  # start ssh-agent and setup environment
   /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
   chmod 600 ${_plugin__ssh_env}
   . ${_plugin__ssh_env} > /dev/null
-  /usr/bin/ssh-add;
+
+  # load identies
+  zstyle -a :omz:plugins:ssh-agent identities identities 
+  echo starting...
+  /usr/bin/ssh-add $HOME/.ssh/${^identities}
 }
 
 # test if agent-forwarding is enabled
 zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
-if [[ ${_plugin__forwarding} == "yes" && -z $SSH_AGENT_PID && -n "$SSH_AUTH_SOCK" ]]; then
-  # No PID but a AUTH_SOCK means agent forwarding is enabled
-  # Add a nifty symlink for screen/tmux 
+if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
+  # Add a nifty symlink for screen/tmux if agent forwarding
   [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
 
 elif [ -f "${_plugin__ssh_env}" ]; then

From 70cb607b7bee04ceef74d6f7aa80589e009e4c78 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:28:43 +0200
Subject: [PATCH 10/37] Remove unused colors and use original prompt color

---
 themes/guru.zsh-theme | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index aa7b28b34..b99cd816e 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -6,23 +6,17 @@
 
 # Color shortcuts
 R=$fg[red]
-Y=$fg[yellow]
 G=$fg[green]
 M=$fg[magenta]
-W=$fg[white]
-B=$fg[black]
 RB=$fg_bold[red]
 YB=$fg_bold[yellow]
-GB=$fg_bold[green]
-MB=$fg_bold[magenta]
-WB=$fg_bold[white]
-BB=$fg_bold[black]
+BB=$fg_bold[blue]
 RESET=$reset_color
 
 if [ "$(whoami)" = "root" ]; then
     PROMPTCOLOR="%{$RB%}" PREFIX="-!-";
 else
-    PROMPTCOLOR="%{$BB%}" PREFIX="---";
+    PROMPTCOLOR="" PREFIX="---";
 fi
 
 local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
@@ -75,7 +69,8 @@ function custom_git_prompt() {
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$(git_prompt_ahead)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
-PROMPT='${PROMPTCOLOR}$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
+# %B sets bold text
+PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"

From 915c28752eb8bfb9610e14f62161ab3bd573d218 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:32:48 +0200
Subject: [PATCH 11/37] Add email address

---
 themes/guru.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index b99cd816e..cbd56194f 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Guru theme for oh-my-zsh by Adam Lindberg
+# Guru theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
 # (Needs Git plugin for current_branch method)
 #-------------------------------------------------------------------------------
 

From 73946a6066fa8bf740b4765b7e204df9599f9689 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:40:18 +0200
Subject: [PATCH 12/37] Add note about Solarized color theme

---
 themes/guru.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index cbd56194f..a5ffdb722 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -1,9 +1,9 @@
 #-------------------------------------------------------------------------------
 # Guru theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
+# Intended to be used with Solarized: http://ethanschoonover.com/solarized
 # (Needs Git plugin for current_branch method)
 #-------------------------------------------------------------------------------
 
-
 # Color shortcuts
 R=$fg[red]
 G=$fg[green]

From 4a7392fdd0be8fafcaffccc206f23c7746129fb8 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:40:32 +0200
Subject: [PATCH 13/37] Fix git R and M status when used together

---
 themes/guru.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index a5ffdb722..dfec3dfb5 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -35,7 +35,7 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^.M ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
@@ -46,7 +46,7 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_DELETED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^R' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^M  ' &> /dev/null); then

From d99284f6b569a0860ed14330c8c9eaf5f0441fe8 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:42:55 +0200
Subject: [PATCH 14/37] Rename guru theme to sunrise

---
 themes/{guru.zsh-theme => sunrise.zsh-theme} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename themes/{guru.zsh-theme => sunrise.zsh-theme} (97%)

diff --git a/themes/guru.zsh-theme b/themes/sunrise.zsh-theme
similarity index 97%
rename from themes/guru.zsh-theme
rename to themes/sunrise.zsh-theme
index dfec3dfb5..15004084d 100644
--- a/themes/guru.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Guru theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
+# Sunrise theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
 # Intended to be used with Solarized: http://ethanschoonover.com/solarized
 # (Needs Git plugin for current_branch method)
 #-------------------------------------------------------------------------------

From 3eae652a6d4bc5f280bb7f9d33000f378becf13c Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Wed, 8 Jun 2011 16:33:29 +0100
Subject: [PATCH 15/37] Fix MM lines being read correctly

---
 themes/sunrise.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index 15004084d..88b371d79 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -49,7 +49,7 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^R' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^M' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A' &> /dev/null); then

From f9bf396e4ac68299f1370ed54350cc14ce954eea Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@bluekai.com>
Date: Thu, 9 Jun 2011 21:22:33 -0700
Subject: [PATCH 16/37] Add Django plugin. This is a slight modification of the
 Django zsh completions that I found at
 https://raw.github.com/technolize/zsh-completion-funcs/master/_manage.py

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

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
new file mode 100644
index 000000000..1d72a2f2c
--- /dev/null
+++ b/plugins/django/django.plugin.zsh
@@ -0,0 +1,222 @@
+#compdef manage.py
+
+typeset -ga nul_args
+nul_args=(
+  '--settings=-[the Python path to a settings module.]:file:_files'
+  '--pythonpath=-[a directory to add to the Python path.]::directory:_directories'
+  '--traceback[print traceback on exception.]'
+  "--version[show program's version number and exit.]"
+  {-h,--help}'[show this help message and exit.]'
+)
+
+_managepy-adminindex(){
+  _arguments -s : \
+    $nul_args \
+    '*::directory:_directories' && ret=0
+}
+
+_managepy-createcachetable(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-dbshell(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-diffsettings(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-dumpdata(){
+  _arguments -s : \
+    '--format=-[specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
+    '--indent=-[specifies the indent level to use when pretty-printing output.]:' \
+    $nul_args \
+    '*::appname:_applist' && ret=0
+}
+
+_managepy-flush(){
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $nul_args && ret=0
+}
+
+_managepy-help(){
+  _arguments -s : \
+    '*:command:_managepy_cmds' \
+    $nul_args && ret=0
+}
+
+_managepy_cmds(){
+    local line
+    local -a cmd
+    _call_program help-command ./manage.py help \
+      |& sed -n '/^ /s/[(), ]/ /gp' \
+      | while read -A line; do cmd=($line $cmd) done
+    _describe -t managepy-command 'manage.py command' cmd
+}
+
+_managepy-inspectdb(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-loaddata(){
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '*::file:_files' \
+    $nul_args && ret=0
+}
+
+_managepy-reset(){
+  _arguments -s : \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    '*::appname:_applist' \
+    $nul_args && ret=0
+}
+
+_managepy-runfcgi(){
+  local state
+  
+  local fcgi_opts
+  fcgi_opts=(
+    'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
+    'host[hostname to listen on..]:'
+    'port[port to listen on.]:'
+    'socket[UNIX socket to listen on.]::file:_files'
+    'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
+    'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
+    'maxspare[max number of spare processes / threads.]:'
+    'minspare[min number of spare processes / threads.]:'
+    'maxchildren[hard limit number of processes / threads.]:'
+    'daemonize[whether to detach from terminal.]:boolean:(False True)'
+    'pidfile[write the spawned process-id to this file.]:file:_files'
+    'workdir[change to this directory when daemonizing.]:directory:_files'
+    'outlog[write stdout to this file.]:file:_files'
+    'errlog[write stderr to this file.]:file:_files'
+  )
+  
+  _arguments -s : \
+    $nul_args \
+    '*: :_values "FCGI Setting" $fcgi_opts' && ret=0
+}
+
+_managepy-runserver(){
+  _arguments -s : \
+    '--noreload[tells Django to NOT use the auto-reloader.]' \
+    '--adminmedia[specifies the directory from which to serve admin media.]:directory:_files' \
+    $nul_args && ret=0
+}
+
+_managepy-shell(){
+  _arguments -s : \
+    '--plain[tells Django to use plain Python, not IPython.]' \
+    $nul_args && ret=0
+}
+
+_managepy-sql(){}
+_managepy-sqlall(){}
+_managepy-sqlclear(){}
+_managepy-sqlcustom(){}
+_managepy-sqlflush(){}
+_managepy-sqlindexes(){}
+_managepy-sqlinitialdata(){}
+_managepy-sqlreset(){}
+_managepy-sqlsequencereset(){}
+_managepy-startapp(){}
+
+_managepy-syncdb() {
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $nul_args && ret=0
+}
+
+_managepy-test() {
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    '*::appname:_applist' \
+    $nul_args && ret=0
+}
+
+_managepy-testserver() {
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--addrport=-[port number or ipaddr:port to run the server on.]' \
+    '*::fixture:_files' \
+    $nul_args && ret=0
+}
+
+_managepy-validate() {
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-commands() {
+  local -a commands
+  
+  commands=(
+    'adminindex:prints the admin-index template snippet for the given app name(s).'
+    'createcachetable:creates the table needed to use the SQL cache backend.'
+    'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
+    "diffsettings:displays differences between the current settings.py and Django's default settings."
+    'dumpdata:Output the contents of the database as a fixture of the given format.'
+    'flush:Executes ``sqlflush`` on the current database.'
+    'help:manage.py help.'
+    'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
+    'loaddata:Installs the named fixture(s) in the database.'
+    'reset:Executes ``sqlreset`` for the given app(s) in the current database.'
+    'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
+    'runserver:Starts a lightweight Web server for development.'
+    'shell:Runs a Python interactive interpreter.'
+    'sql:Prints the CREATE TABLE SQL statements for the given app name(s).'
+    'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
+    'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
+    'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
+    'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
+    'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
+    "sqlinitialdata:RENAMED: see 'sqlcustom'"
+    'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
+    'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
+    "startapp:Creates a Django app directory structure for the given app name in this project's directory."
+    "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
+    'test:Runs the test suite for the specified applications, or the entire site if no apps are specified.'
+    'testserver:Runs a development server with data from the given fixture(s).'
+    'validate:Validates all installed models.'
+  )
+  
+  _describe -t commands 'manage.py command' commands && ret=0
+}
+
+_applist() {
+  local line
+  local -a apps
+  _call_program help-command "python -c \"import os.path as op, re, django.conf, sys;\\
+                                          bn=op.basename(op.abspath(op.curdir));[sys\\
+                                          .stdout.write(str(re.sub(r'^%s\.(.*?)$' %
+                                          bn, r'\1', i)) + '\n') for i in django.conf.settings.\\
+                                          INSTALLED_APPS if re.match(r'^%s' % bn, i)]\"" \
+                             | while read -A line; do apps=($line $apps) done
+  _values 'Application' $apps && ret=0
+}
+
+_managepy() {
+  local curcontext=$curcontext ret=1
+  
+  if ((CURRENT == 2)); then
+    _managepy-commands
+  else
+    shift words
+    (( CURRENT -- ))
+    curcontext="${curcontext%:*:*}:managepy-$words[1]:"
+    _call_function ret _managepy-$words[1]
+  fi
+}
+
+compdef _managepy manage.py
+compdef _managepy django

From e43eec99f94c00a6a9d2b30f9c449aff5ab0dfe5 Mon Sep 17 00:00:00 2001
From: Matthew McCullough <matthewm@ambientideas.com>
Date: Tue, 28 Jun 2011 19:42:50 -0600
Subject: [PATCH 17/37] Added cloudapp from @holman of @GitHub fame

---
 plugins/cloudapp/cloudapp.plugin.zsh |  2 +
 plugins/cloudapp/cloudapp.rb         | 60 ++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 plugins/cloudapp/cloudapp.plugin.zsh
 create mode 100755 plugins/cloudapp/cloudapp.rb

diff --git a/plugins/cloudapp/cloudapp.plugin.zsh b/plugins/cloudapp/cloudapp.plugin.zsh
new file mode 100644
index 000000000..99252f690
--- /dev/null
+++ b/plugins/cloudapp/cloudapp.plugin.zsh
@@ -0,0 +1,2 @@
+#!/bin/zsh
+alias cloudapp=$ZSH/plugins/cloudapp/cloudapp.rb
diff --git a/plugins/cloudapp/cloudapp.rb b/plugins/cloudapp/cloudapp.rb
new file mode 100755
index 000000000..a11cfdb32
--- /dev/null
+++ b/plugins/cloudapp/cloudapp.rb
@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+#
+# cloudapp
+# Zach Holman / @holman
+#
+# Uploads a file from the command line to CloudApp, drops it into your 
+# clipboard (on a Mac, at least).
+#
+# Example:
+#
+#   cloudapp drunk-blake.png
+#
+# This requires Aaron Russell's cloudapp_api gem:
+#
+#   gem install cloudapp_api
+#
+# Requires you set your CloudApp credentials in ~/.cloudapp as a simple file of:
+#
+#   email
+#   password
+
+require 'rubygems'
+begin
+  require 'cloudapp_api'
+rescue LoadError
+  puts "You need to install cloudapp_api: gem install cloudapp_api"
+  exit!(1)
+end
+
+config_file = "#{ENV['HOME']}/.cloudapp"
+unless File.exist?(config_file)
+  puts "You need to type your email and password (one per line) into "+
+       "`~/.cloudapp`"
+  exit!(1)
+end
+
+email,password = File.read(config_file).split("\n")
+
+class HTTParty::Response
+  # Apparently HTTPOK.ok? IS NOT OKAY WTFFFFFFFFFFUUUUUUUUUUUUUU
+  # LETS MONKEY PATCH IT I FEEL OKAY ABOUT IT
+  def ok? ; true end
+end
+
+if ARGV[0].nil?
+   puts "You need to specify a file to upload."
+   exit!(1)
+end
+
+CloudApp.authenticate(email,password)
+url = CloudApp::Item.create(:upload, {:file => ARGV[0]}).url
+
+# Say it for good measure.
+puts "Uploaded to #{url}."
+
+# Get the embed link.
+url = "#{url}/#{ARGV[0].split('/').last}"
+
+# Copy it to your (Mac's) clipboard.
+`echo '#{url}' | tr -d "\n" | pbcopy`

From b61fcb64abfd733a95f0e83e3009086959623252 Mon Sep 17 00:00:00 2001
From: Frank Louwers <frank@openminds.be>
Date: Thu, 30 Jun 2011 15:19:50 +0200
Subject: [PATCH 18/37] knife autocompletion

---
 plugins/knife/_knife | 174 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 plugins/knife/_knife

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
new file mode 100644
index 000000000..7f8c95ee5
--- /dev/null
+++ b/plugins/knife/_knife
@@ -0,0 +1,174 @@
+#compdef knife
+
+# These flags should be available everywhere according to man knife
+knife_general_flags=( --help --server-url --key --config --editor --format --log_level --logfile --no-editor --user --print-after --version --yes )
+
+# knife has a very special syntax, some example calls are:
+# knife status
+# knife cookbook list
+# knife role show ROLENAME
+# knife data bag show DATABAGNAME
+# knife role show ROLENAME --attribute ATTRIBUTENAME
+# knife cookbook show COOKBOOKNAME COOKBOOKVERSION recipes
+
+# The -Q switch in compadd allow for completions of things like "data bag" without having to go through two rounds of completion and avoids zsh inserting a \ for escaping spaces
+_knife() {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+  cloudproviders=(bluebox ec2 rackspace slicehost terremark)
+  _arguments \
+    '1: :->knifecmd'\
+    '2: :->knifesubcmd'\
+    '3: :->knifesubcmd2' \
+    '4: :->knifesubcmd3' \
+    '5: :->knifesubcmd4' \
+    '6: :->knifesubcmd5'
+  
+  case $state in
+  knifecmd)
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec index node recipe role search ssh status windows $cloudproviders
+  ;;
+  knifesubcmd)
+    case $words[2] in
+    (bluebox|ec2|rackspace|slicehost|terremark)
+      compadd "$@" server images
+    ;;
+    client)
+      compadd -Q "$@" "bulk delete" list create show delete edit reregister
+    ;;
+    configure)
+      compadd "$@" client
+    ;;
+    cookbook)
+      compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload
+    ;;
+    node)
+     compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"
+    ;;
+    recipe)
+     compadd "$@" list
+    ;;
+    role)
+      compadd -Q "$@" "bulk delete" create delete edit "from file" list show
+    ;; 
+    windows)
+      compadd "$@" bootstrap
+    ;;
+    *)
+    _arguments '2:Subsubcommands:($(_knife_options1))'
+    esac
+   ;;
+   knifesubcmd2)
+    case $words[3] in
+     server)
+      compadd "$@" list create delete
+    ;;
+     images)
+      compadd "$@" list
+    ;;
+     site)
+      compadd "$@" vendor show share search download list unshare
+    ;;
+     (show|delete|edit)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_remote))'
+    ;;
+    (upload|test)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_local) --all)'
+    ;;
+    list)
+     compadd -a "$@" knife_general_flags
+    ;;
+    bag)
+      compadd -Q "$@" show edit list "from file" create delete
+    ;;
+    *)
+      _arguments '3:Subsubcommands:($(_knife_options2))'
+    esac
+   ;;
+   knifesubcmd3)
+     case $words[3] in
+      show)
+       case $words[2] in
+       cookbook)
+          versioncomp=1
+          _arguments '4:Cookbookversions:($(_cookbook_versions) latest)'
+       ;;
+       (node|client|role)
+         compadd "$@" --attribute
+       esac
+     esac
+     case $words[4] in
+     (show|edit)
+     _arguments '4:Subsubsubcommands:($(_chef_$words[2]_$words[3]s_remote))'
+    ;;
+     file)
+     _arguments '*:file or directory:_files -g "*.(rb|json)"'
+    ;;
+      list)
+     compadd -a "$@" knife_general_flags
+    ;;
+        *)
+       _arguments '*:Subsubcommands:($(_knife_options3))'
+    esac
+    ;;
+    knifesubcmd4)
+      if (( versioncomp > 0 )); then
+        compadd "$@" attributes definitions files libraries providers recipes resources templates
+      else
+       _arguments '*:Subsubcommands:($(_knife_options2))'
+      fi
+    ;; 
+    knifesubcmd5) 
+      _arguments '*:Subsubcommands:($(_knife_options3))'
+   esac
+}
+
+# Helper functions to provide the argument completion for several depths of commands
+_knife_options1() {
+ ( for line in $( knife $words[2] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options2() {
+ ( for line in $( knife $words[2] $words[3] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options3() {
+ ( for line in $( knife $words[2] $words[3] $words[4] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+# The chef_x_remote functions use knife to get a list of objects of type x on the server
+_chef_roles_remote() {
+ (knife role list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_clients_remote() {
+ (knife client list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_nodes_remote() {
+ (knife node list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_cookbooks_remote() {
+ (knife cookbook list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_sitecookbooks_remote() {
+ (knife cookbook site list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_data_bags_remote() {
+ (knife data bag list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+# The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server
+_chef_cookbooks_local() {
+ (for i in $( grep cookbook_path $HOME/.chef/knife.rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done)
+}
+
+# This function extracts the available cookbook versions on the chef server
+_cookbook_versions() {
+  (knife cookbook show $words[4] | grep -v $words[4] | grep -v -E '\]|\[|\{|\}' | sed 's/ //g' | sed 's/"//g')
+}
+
+_knife "$@"

From 9e8194355c1a4f69dc52fbe2699fbce1be5c6493 Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 13:13:39 +0200
Subject: [PATCH 19/37] Added bundler-exec plugin

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 plugins/bundler-exec/bundler-exec.plugin.zsh

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
new file mode 100644
index 000000000..966725976
--- /dev/null
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -0,0 +1,37 @@
+# This plugin is based on https://github.com/gma/bundler-exec
+# modify the BUNDLED_COMMANDS if needed
+
+BUNDLED_COMMANDS=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
+
+## Functions
+
+bundler-installed()
+{
+    which bundle > /dev/null 2>&1
+}
+
+within-bundled-project()
+{
+    local dir="$(pwd)"
+    while [ "$(dirname $dir)" != "/" ]; do
+        [ -f "$dir/Gemfile" ] && return
+        dir="$(dirname $dir)"
+    done
+    false
+}
+
+run-with-bundler()
+{
+    local command="$1"
+    shift
+    if bundler-installed && within-bundled-project; then
+        bundle exec $command "$@"
+    else
+        $command "$@"
+    fi
+}
+
+## Main program
+for CMD in $BUNDLED_COMMANDS; do
+   alias $CMD="run-with-bundler $CMD"
+done

From 05883f383143fa4821a5b07a748a800c0299f1fd Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 15:52:58 +0200
Subject: [PATCH 20/37] use lowercase for variablenames

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 966725976..cfab16c5e 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -1,7 +1,7 @@
 # This plugin is based on https://github.com/gma/bundler-exec
 # modify the BUNDLED_COMMANDS if needed
 
-BUNDLED_COMMANDS=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
+bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
 
 ## Functions
 
@@ -32,6 +32,6 @@ run-with-bundler()
 }
 
 ## Main program
-for CMD in $BUNDLED_COMMANDS; do
-   alias $CMD="run-with-bundler $CMD"
+for cmd in $bundled_commands; do
+   alias $cmd="run-with-bundler $cmd"
 done

From 3aee5c19412dea541495e10f1c4cc7a6d8e4af50 Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 19:16:04 +0200
Subject: [PATCH 21/37] changed names of functions and variables to fit naming
 conventions

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index cfab16c5e..4684dcb8d 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -5,26 +5,26 @@ bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spor
 
 ## Functions
 
-bundler-installed()
+_bundler-installed()
 {
     which bundle > /dev/null 2>&1
 }
 
-within-bundled-project()
+_within-bundled-project()
 {
-    local dir="$(pwd)"
-    while [ "$(dirname $dir)" != "/" ]; do
-        [ -f "$dir/Gemfile" ] && return
-        dir="$(dirname $dir)"
+    local check_dir=$PWD
+    while [ "$(dirname $check_dir)" != "/" ]; do
+        [ -f "$check_dir/Gemfile" ] && return
+        dir="$(dirname $check_dir)"
     done
     false
 }
 
-run-with-bundler()
+_run-with-bundler()
 {
     local command="$1"
     shift
-    if bundler-installed && within-bundled-project; then
+    if _bundler-installed && _within-bundled-project; then
         bundle exec $command "$@"
     else
         $command "$@"
@@ -33,5 +33,5 @@ run-with-bundler()
 
 ## Main program
 for cmd in $bundled_commands; do
-   alias $cmd="run-with-bundler $cmd"
+   alias $cmd="_run-with-bundler $cmd"
 done

From 86958a32f3d3e647fc61e92700a9ce393e11a3cb Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 20:28:27 +0200
Subject: [PATCH 22/37] forgot to rename one variable

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 4684dcb8d..bc4d35a84 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -15,7 +15,7 @@ _within-bundled-project()
     local check_dir=$PWD
     while [ "$(dirname $check_dir)" != "/" ]; do
         [ -f "$check_dir/Gemfile" ] && return
-        dir="$(dirname $check_dir)"
+        check_dir="$(dirname $check_dir)"
     done
     false
 }
@@ -27,7 +27,7 @@ _run-with-bundler()
     if _bundler-installed && _within-bundled-project; then
         bundle exec $command "$@"
     else
-        $command "$@"
+      $command "$@"
     fi
 }
 

From 69d30a6302f8c7daf6ad5ecf23224074789843db Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 23:16:47 +0200
Subject: [PATCH 23/37] Moved opening braces

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index bc4d35a84..09f44ed5e 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -1,17 +1,15 @@
 # This plugin is based on https://github.com/gma/bundler-exec
-# modify the BUNDLED_COMMANDS if needed
+# modify the bundled_commands if needed
 
 bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
 
 ## Functions
 
-_bundler-installed()
-{
+_bundler-installed() {
     which bundle > /dev/null 2>&1
 }
 
-_within-bundled-project()
-{
+_within-bundled-project() {
     local check_dir=$PWD
     while [ "$(dirname $check_dir)" != "/" ]; do
         [ -f "$check_dir/Gemfile" ] && return
@@ -20,8 +18,7 @@ _within-bundled-project()
     false
 }
 
-_run-with-bundler()
-{
+_run-with-bundler() {
     local command="$1"
     shift
     if _bundler-installed && _within-bundled-project; then

From 37fcd4af049ad9b755d7b1d32cf63b537da0342c Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:39:23 +0100
Subject: [PATCH 24/37] update bundled commands

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

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 09f44ed5e..61829eb2c 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -1,7 +1,7 @@
 # This plugin is based on https://github.com/gma/bundler-exec
 # modify the bundled_commands if needed
 
-bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
+bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
 
 ## Functions
 

From a77e6fb003cc80fbbff5d453a5ca3d38638d99ed Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:40:23 +0100
Subject: [PATCH 25/37] fix indentation

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 61829eb2c..3417ea81c 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -6,29 +6,29 @@ bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgu
 ## Functions
 
 _bundler-installed() {
-    which bundle > /dev/null 2>&1
+  which bundle > /dev/null 2>&1
 }
 
 _within-bundled-project() {
-    local check_dir=$PWD
-    while [ "$(dirname $check_dir)" != "/" ]; do
-        [ -f "$check_dir/Gemfile" ] && return
-        check_dir="$(dirname $check_dir)"
-    done
-    false
+  local check_dir=$PWD
+  while [ "$(dirname $check_dir)" != "/" ]; do
+    [ -f "$check_dir/Gemfile" ] && return
+    check_dir="$(dirname $check_dir)"
+  done
+  false
 }
 
 _run-with-bundler() {
-    local command="$1"
-    shift
-    if _bundler-installed && _within-bundled-project; then
-        bundle exec $command "$@"
-    else
-      $command "$@"
-    fi
+  local command="$1"
+  shift
+  if _bundler-installed && _within-bundled-project; then
+    bundle exec $command "$@"
+  else
+    $command "$@"
+  fi
 }
 
 ## Main program
 for cmd in $bundled_commands; do
-   alias $cmd="_run-with-bundler $cmd"
+  alias $cmd="_run-with-bundler $cmd"
 done

From 60e104acd1710c04057d079cfa5ac9316762f580 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:41:09 +0100
Subject: [PATCH 26/37] merge bundler and bundle-exec plugins

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 34 --------------------
 plugins/bundler/bundler.plugin.zsh           | 34 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 plugins/bundler-exec/bundler-exec.plugin.zsh

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
deleted file mode 100644
index 3417ea81c..000000000
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ /dev/null
@@ -1,34 +0,0 @@
-# This plugin is based on https://github.com/gma/bundler-exec
-# modify the bundled_commands if needed
-
-bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
-
-## Functions
-
-_bundler-installed() {
-  which bundle > /dev/null 2>&1
-}
-
-_within-bundled-project() {
-  local check_dir=$PWD
-  while [ "$(dirname $check_dir)" != "/" ]; do
-    [ -f "$check_dir/Gemfile" ] && return
-    check_dir="$(dirname $check_dir)"
-  done
-  false
-}
-
-_run-with-bundler() {
-  local command="$1"
-  shift
-  if _bundler-installed && _within-bundled-project; then
-    bundle exec $command "$@"
-  else
-    $command "$@"
-  fi
-}
-
-## Main program
-for cmd in $bundled_commands; do
-  alias $cmd="_run-with-bundler $cmd"
-done
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fb40e2cec..fcf3e85fc 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,3 +1,37 @@
 alias be="bundle exec"
 alias bi="bundle install"
 alias bu="bundle update"
+
+# The following is based on https://github.com/gma/bundler-exec
+
+bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+
+## Functions
+
+_bundler-installed() {
+  which bundle > /dev/null 2>&1
+}
+
+_within-bundled-project() {
+  local check_dir=$PWD
+  while [ "$(dirname $check_dir)" != "/" ]; do
+    [ -f "$check_dir/Gemfile" ] && return
+    check_dir="$(dirname $check_dir)"
+  done
+  false
+}
+
+_run-with-bundler() {
+  local command="$1"
+  shift
+  if _bundler-installed && _within-bundled-project; then
+    bundle exec $command "$@"
+  else
+    $command "$@"
+  fi
+}
+
+## Main program
+for cmd in $bundled_commands; do
+  alias $cmd="_run-with-bundler $cmd"
+done

From ba5fa3abc8ccf1f05e48c9b201282792c956c337 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:41:36 +0100
Subject: [PATCH 27/37] alias bundle list

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

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fcf3e85fc..c91dc9ab9 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,5 +1,6 @@
 alias be="bundle exec"
 alias bi="bundle install"
+alias bl="bundle list"
 alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec

From 7d19ae8fab80c826156f984aa6dd8221a9aaada0 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:42:44 +0100
Subject: [PATCH 28/37] clean up rails plugin, removing bundler-specific logic

---
 plugins/rails3/rails3.plugin.zsh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index f669ef047..f4ee637e6 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -1,13 +1,5 @@
 # Rails 3 aliases, backwards-compatible with Rails 2.
 
-function _bundle_command {
-  if command -v bundle && [ -e "Gemfile" ]; then
-    bundle exec $@
-  else
-    $@
-  fi
-}
-
 function _rails_command () {
   if [ -e "script/server" ]; then
     ruby script/$@
@@ -25,6 +17,3 @@ alias rp='_rails_command plugin'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
-
-alias rspec='_bundle_command rspec'
-alias cuke='_bundle_command cucumber'

From 913cf5325264960d4c1dfe678a2adadeaecdbf6a Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Thu, 14 Jul 2011 17:34:18 +0100
Subject: [PATCH 29/37] refactor _run-with-bundler

---
 plugins/bundler/bundler.plugin.zsh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index c91dc9ab9..e98bb4b46 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -23,12 +23,10 @@ _within-bundled-project() {
 }
 
 _run-with-bundler() {
-  local command="$1"
-  shift
   if _bundler-installed && _within-bundled-project; then
-    bundle exec $command "$@"
+    bundle exec $@
   else
-    $command "$@"
+    $@
   fi
 }
 

From 9308a7d472a1dea6610887b98d6d789741f96a49 Mon Sep 17 00:00:00 2001
From: Adam Blinkinsop <blinks@acm.org>
Date: Thu, 14 Jul 2011 11:04:46 -0700
Subject: [PATCH 30/37] Added a new theme.

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

diff --git a/themes/blinks.zsh-theme b/themes/blinks.zsh-theme
new file mode 100644
index 000000000..3db7012f4
--- /dev/null
+++ b/themes/blinks.zsh-theme
@@ -0,0 +1,20 @@
+# https://github.com/blinks zsh theme
+
+function _prompt_char() {
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+    echo "%{%F{blue}%}±%{%f%k%b%}"
+  else
+    echo ' '
+  fi
+}
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" [%{%B%F{blue}%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{%f%k%b%K{black}%B%F{green}%}]"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{%F{red}%}*%{%f%k%b%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+PROMPT='%{%f%k%b%}
+%{%K{black}%B%F{green}%}%n%{%B%F{blue}%}@%{%B%F{cyan}%}%m%{%B%F{green}%} %{%b%F{yellow}%K{black}%}%~%{%B%F{green}%}$(git_prompt_info)%E%{%f%k%b%}
+%{%K{black}%}$(_prompt_char)%{%K{black}%} %#%{%f%k%b%} '
+
+RPROMPT='!%{%B%F{cyan}%}%!%{%f%k%b%}'

From 66c6260c10422bf50c474c9654a7928ce99e7ceb Mon Sep 17 00:00:00 2001
From: Paul Serby <paul.serby@clock.co.uk>
Date: Sat, 16 Jul 2011 16:15:15 +0100
Subject: [PATCH 31/37] Completion for cake the coffee-script build tool

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

diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
new file mode 100644
index 000000000..75997521a
--- /dev/null
+++ b/plugins/cake/cake.plugin.zsh
@@ -0,0 +1,32 @@
+# Set this to 1 if you want to cache the tasks
+cacheTaskList=1
+
+# Cache filename
+cacheFile='.cake-task-cache'
+
+_cake_does_target_list_need_generating () {
+
+	if [ $cacheTaskList -eq 0 ]; then
+		return 1;
+	fi
+
+	if [ ! -f $cacheFile ]; then return 0;
+	else
+		accurate=$(stat -f%m $cacheFile)
+		changed=$(stat -f%m Cakefile)
+		return $(expr $accurate '>=' $changed)
+	fi
+}
+
+_cake () {
+	if [ -f Cakefile ]; then
+		if _cake_does_target_list_need_generating; then
+			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cacheFile
+			compadd `cat $cacheFile`
+		else
+			compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'`
+		fi
+	fi
+}
+
+compdef _cake cake

From e7e9e5bbe608fd7572a810f36e7f1b3321c25136 Mon Sep 17 00:00:00 2001
From: Benjamin Boudreau <dreurmail@gmail.com>
Date: Sat, 16 Jul 2011 18:42:09 -0400
Subject: [PATCH 32/37] Added archlinux plugin

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

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
new file mode 100644
index 000000000..acb8df057
--- /dev/null
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -0,0 +1,67 @@
+# Archlinux zsh aliases and functions for zsh
+
+# Aliases ###################################################################
+
+# Look for yaourt, and add some useful functions if we have it.
+if [[ -x `which yaourt` ]]; then
+  upgrade () {
+    yaourt -Syu -C
+  }
+  # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
+  alias yaupg='sudo yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+  alias yain='sudo yaourt -S'           # Install specific package(s) from the repositories
+  alias yains='sudo yaourt -U'          # Install specific package not from the repositories but from a file 
+  alias yare='sudo yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
+  alias yarem='sudo yaourt -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
+  alias yarep='yaourt -Si'              # Display information about a given package in the repositories
+  alias yareps='yaourt -Ss'             # Search for package(s) in the repositories
+  alias yaloc='yaourt -Qi'              # Display information about a given package in the local database
+  alias yalocs='yaourt -Qs'             # Search for package(s) in the local database
+  # Additional yaourt alias examples
+  alias yaupd='sudo yaourt -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
+  alias yainsd='sudo yaourt -S --asdeps'        # Install given package(s) as dependencies of another package
+  alias yamir='sudo yaourt -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
+else
+ upgrade() {
+   sudo pacman -Syu
+ }
+fi
+
+# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
+alias pacupg='sudo pacman -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+alias pacin='sudo pacman -S'           # Install specific package(s) from the repositories
+alias pacins='sudo pacman -U'          # Install specific package not from the repositories but from a file 
+alias pacre='sudo pacman -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
+alias pacrem='sudo pacman -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
+alias pacrep='pacman -Si'              # Display information about a given package in the repositories
+alias pacreps='pacman -Ss'             # Search for package(s) in the repositories
+alias pacloc='pacman -Qi'              # Display information about a given package in the local database
+alias paclocs='pacman -Qs'             # Search for package(s) in the local database
+# Additional pacman alias examples
+alias pacupd='sudo pacman -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
+alias pacinsd='sudo pacman -S --asdeps'        # Install given package(s) as dependencies of another package
+alias pacmir='sudo pacman -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
+
+# https://bbs.archlinux.org/viewtopic.php?id=93683
+paclist() {
+  sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
+}
+alias paclsorhpans='sudo pacman -Qdt'
+alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+
+pacdisowned() {
+  tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
+  db=$tmp/db
+  fs=$tmp/fs
+
+  mkdir "$tmp"
+  trap  'rm -rf "$tmp"' EXIT
+
+  pacman -Qlq | sort -u > "$db"
+
+  find /bin /etc /lib /sbin /usr \
+      ! -name lost+found \
+        \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
+
+  comm -23 "$fs" "$db"
+}

From edcd4f7eea357cefee37a25a371e1dd5d1a6b598 Mon Sep 17 00:00:00 2001
From: Jake Bell <jake@theunraveler.com>
Date: Sun, 17 Jul 2011 13:01:48 -0500
Subject: [PATCH 33/37] Adding quotes to deal with paths that have spaces.

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e30488822..2b75e5541 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -9,4 +9,4 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
 echo "\033[0;32m"'                        /____/                       '"\033[0m"
 echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
 echo "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m"
-cd $current_path
+cd "$current_path"

From 127d2ae57b01ae13dd6017c3c104a45a0086e88e Mon Sep 17 00:00:00 2001
From: alexandru totolici <alex@hackd.net>
Date: Sun, 17 Jul 2011 21:01:06 -0700
Subject: [PATCH 34/37] Fixed typo for one of the subcommands (linset ->
 linsert)

---
 plugins/redis-cli/_redis-cli | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/redis-cli/_redis-cli b/plugins/redis-cli/_redis-cli
index 3789add18..1569f2916 100644
--- a/plugins/redis-cli/_redis-cli
+++ b/plugins/redis-cli/_redis-cli
@@ -51,7 +51,7 @@ _1st_arguments=(
   'keys:find all keys matching the given pattern'
   'lastsave:get the UNIX timestamp of the last successful save to disk'
   'lindex:get an element from a list by its index'
-  'linset:insert an element before or after another element in a list'
+  'linsert:insert an element before or after another element in a list'
   'llen:get the length of a list'
   'lpop:remove and get the first element in a list'
   'lpush:prepend a value to a list'

From a38774c98d1c08f82b1325a40b2de1a76586e02a Mon Sep 17 00:00:00 2001
From: Christopher Sexton <csexton@gmail.com>
Date: Tue, 17 May 2011 14:13:07 -0400
Subject: [PATCH 35/37] C-x C-e to edit current command in EDITOR

The command C-x C-e opens the current command line for editing
in the editor defined by the $EDITOR environment variable.

Thanks to Craig Bosma and his blog post about this:
http://distrustsimplicity.net/articles/zsh-command-editing
---
 lib/edit-command-line.zsh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lib/edit-command-line.zsh

diff --git a/lib/edit-command-line.zsh b/lib/edit-command-line.zsh
new file mode 100644
index 000000000..db2000325
--- /dev/null
+++ b/lib/edit-command-line.zsh
@@ -0,0 +1,3 @@
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line

From c09e2f2986aafbf2a67004f8df6b5dd10abb8d61 Mon Sep 17 00:00:00 2001
From: Paul Serby <paul.serby@clock.co.uk>
Date: Mon, 18 Jul 2011 16:05:05 +0100
Subject: [PATCH 36/37] Bringing inline with oh-my-zsh coding convensions

---
 plugins/cake/cake.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
index 75997521a..f968c71d5 100644
--- a/plugins/cake/cake.plugin.zsh
+++ b/plugins/cake/cake.plugin.zsh
@@ -1,18 +1,18 @@
 # Set this to 1 if you want to cache the tasks
-cacheTaskList=1
+cache_task_list=1
 
 # Cache filename
-cacheFile='.cake-task-cache'
+cache_file='.cake_task_cache'
 
 _cake_does_target_list_need_generating () {
 
-	if [ $cacheTaskList -eq 0 ]; then
+	if [ $cache_task_list -eq 0 ]; then
 		return 1;
 	fi
 
-	if [ ! -f $cacheFile ]; then return 0;
+	if [ ! -f $cache_file ]; then return 0;
 	else
-		accurate=$(stat -f%m $cacheFile)
+		accurate=$(stat -f%m $cache_file)
 		changed=$(stat -f%m Cakefile)
 		return $(expr $accurate '>=' $changed)
 	fi
@@ -21,8 +21,8 @@ _cake_does_target_list_need_generating () {
 _cake () {
 	if [ -f Cakefile ]; then
 		if _cake_does_target_list_need_generating; then
-			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cacheFile
-			compadd `cat $cacheFile`
+			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cache_file
+			compadd `cat $cache_file`
 		else
 			compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'`
 		fi

From 8e77ad468dd22f25c461a0f69f9c03cbb2fb2d05 Mon Sep 17 00:00:00 2001
From: Benjamin Boudreau <dreurmail@gmail.com>
Date: Tue, 19 Jul 2011 19:38:29 -0700
Subject: [PATCH 37/37] Fix typo

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

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index acb8df057..8ed291fcf 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -46,7 +46,8 @@ alias pacmir='sudo pacman -Syy'                # Force refresh of all package li
 paclist() {
   sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
 }
-alias paclsorhpans='sudo pacman -Qdt'
+
+alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 
 pacdisowned() {