From 9d991a5080bea5c71e1b5f6838d5498c908c434b Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 00:21:49 -0500
Subject: ssh-agent plugin now ends in "-$HOST" so an agent is started properly
 with nfs shared homes.

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

(limited to 'plugins')

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index ce0d645c1..0efc4546f 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,7 +1,7 @@
 # Based on code from Joseph M. Reagle
 # http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
 
-local SSH_ENV=$HOME/.ssh/environment
+local SSH_ENV=$HOME/.ssh/environment-$HOST
 
 function start_agent {
   /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
-- 
cgit v1.2.3-70-g09d2


From a2d0bd7c296706b3a2f6b0125ab79748a95bb90c Mon Sep 17 00:00:00 2001
From: Alessandro Ghedini <al3xbio@gmail.com>
Date: Sat, 12 Mar 2011 16:23:55 +0100
Subject: add 'lol' plugin (based on lolbash)

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

(limited to 'plugins')

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
new file mode 100644
index 000000000..a7153bb57
--- /dev/null
+++ b/plugins/lol/lol.plugin.zsh
@@ -0,0 +1,26 @@
+# LOL!!1
+# Source: http://aur.archlinux.org/packages/lolbash/lolbash/lolbash.sh
+
+alias wtf='dmesg'
+alias onoz='cat /var/log/errors.log'
+alias rtfm='man'
+
+alias visible='echo'
+alias invisible='cat'
+alias moar='more'
+
+alias icanhas='mkdir'
+alias donotwant='rm'
+alias dowant='cp'
+alias gtfo='mv'
+
+alias hai='cd'
+alias plz='pwd'
+
+alias inur='locate'
+
+alias nomz='ps -aux'
+alias nomnom='killall'
+
+alias cya='reboot'
+alias kthxbai='halt'
-- 
cgit v1.2.3-70-g09d2


From a6b8bec8ecdb48a059f73e82a1df0bf3387beccc Mon Sep 17 00:00:00 2001
From: Alessandro Ghedini <al3xbio@gmail.com>
Date: Sat, 12 Mar 2011 16:24:20 +0100
Subject: add completion plugin 'cpanm' for cpanminus

---
 plugins/cpanm/_cpanm           | 67 ++++++++++++++++++++++++++++++++++++++++++
 plugins/cpanm/cpanm.plugin.zsh |  4 +++
 2 files changed, 71 insertions(+)
 create mode 100644 plugins/cpanm/_cpanm
 create mode 100644 plugins/cpanm/cpanm.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/cpanm/_cpanm b/plugins/cpanm/_cpanm
new file mode 100644
index 000000000..58451d35a
--- /dev/null
+++ b/plugins/cpanm/_cpanm
@@ -0,0 +1,67 @@
+#compdef cpanm
+
+##
+# cpanminus Z Shell completion script
+##
+#
+# Current supported cpanm version: 1.4000 (Tue Mar  8 01:00:49 PST 2011)
+#
+# The latest code is always located at:
+#   https://github.com/rshhh/cpanminus/blob/master/etc/_cpanm
+#
+
+local arguments curcontext="$curcontext"
+typeset -A opt_args
+
+
+arguments=(
+
+# Commands
+#  '(--install -i)'{--install,-i}'[Installs the modules]'
+  '(- :)--self-upgrade[Upgrades itself]'
+  '(- :)--info[Displays distribution info on CPAN]'
+  '(--installdeps)--installdeps[Only install dependencies]'
+  '(--look)--look[Download/unpack the distribution and then open the directory with your shell]'
+  '(- :)'{--help,-h}'[Displays help information]'
+  '(- :)'{--version,-V}'[Displays software version]'
+
+# Options
+  {--force,-f}'[Force install]'
+  {--notest,-n}'[Do not run unit tests]'
+  {--sudo,-S}'[sudo to run install commands]'
+  '(-v --verbose --quiet -q)'{--verbose,-v}'[Turns on chatty output]'
+  '(-q --quiet --verbose -v)'{--quiet,-q}'[Turns off all output]'
+  {--local-lib,-l}'[Specify the install base to install modules]'
+  {--local-lib-contained,-L}'[Specify the install base to install all non-core modules]'
+  '--mirror[Specify the base URL for the mirror (e.g. http://cpan.cpantesters.org/)]:URLs:_urls'
+  '--mirror-only[Use the mirror\''s index file instead of the CPAN Meta DB]'
+  '--prompt[Prompt when configure/build/test fails]'
+  '--reinstall[Reinstall the distribution even if you already have the latest version installed]'
+  '--interactive[Turn on interactive configure]'
+
+  '--scandeps[Scan the depencencies of given modules and output the tree in a text format]'
+  '--format[Specify what format to display the scanned dependency tree]:scandeps format:(tree json yaml dists)'
+
+  '--save-dists[Specify the optional directory path to copy downloaded tarballs]'
+#  '--uninst-shadows[Uninstalls the shadow files of the distribution that you\''re installing]'
+
+  '--auto-cleanup[Number of days that cpanm\''s work directories expire in. Defaults to 7]'
+  '(--no-man-pages)--man-pages[Generates man pages for executables (man1) and libraries (man3)]'
+  '(--man-pages)--no-man-pages[Do not generate man pages]'
+
+
+  # Note: Normally with "--lwp", "--wget" and "--curl" options set to true (which is the default) cpanm tries LWP,
+  #            Wget, cURL and HTTP::Tiny (in that order) and uses the first one available.
+  # (So that the exclusions are not enabled here for the completion)
+  '(--lwp)--lwp[Use LWP module to download stuff]'
+  '(--wget)--wget[Use GNU Wget (if available) to download stuff]'
+  '(--curl)--curl[Use cURL (if available) to download stuff]'
+
+# Other completions
+  '*:Local directory or archive:_files -/ -g "*.(tar.gz|tgz|tar.bz2|zip)(-.)"'
+  #  '*::args: _normal' # this looks for default files (any files)
+)
+_arguments -s $arguments \
+  && return 0
+
+return 1
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
new file mode 100644
index 000000000..af52d3e8b
--- /dev/null
+++ b/plugins/cpanm/cpanm.plugin.zsh
@@ -0,0 +1,4 @@
+# add cpanm completion function to path
+fpath=($ZSH/plugins/cpanm $fpath)
+autoload -U compinit
+compinit -i
-- 
cgit v1.2.3-70-g09d2


From f90cb7e7b9f8a3743071d6d15ca441f293379517 Mon Sep 17 00:00:00 2001
From: Alessandro Ghedini <al3xbio@gmail.com>
Date: Sat, 12 Mar 2011 16:25:27 +0100
Subject: add 'deb' plugin with Debian's apt aliases

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

(limited to 'plugins')

diff --git a/plugins/deb/deb.plugin.zsh b/plugins/deb/deb.plugin.zsh
new file mode 100644
index 000000000..732294a87
--- /dev/null
+++ b/plugins/deb/deb.plugin.zsh
@@ -0,0 +1,12 @@
+# Aliases
+alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
+		--no-gui --disable-columns search"	# search package
+alias ad="sudo apt-get update"				# update packages lists
+alias au="sudo apt-get update && \
+		sudo apt-get dselect-upgrade"		# upgrade packages
+alias ai="sudo apt-get install"				# install package
+alias ar="sudo apt-get remove --purge && \
+		sudo apt-get autoremove --purge"	# remove package
+alias ap="apt-cache policy"				# apt policy
+alias av="apt-cache show"				# show package info
+alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
-- 
cgit v1.2.3-70-g09d2


From fa344733e5d7cee33e4c3ba6a9a7241c7b6377ca Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 13 Mar 2011 16:08:12 -0600
Subject: Add completion for port command

---
 plugins/macports/_port               | 89 ++++++++++++++++++++++++++++++++++++
 plugins/macports/macports.plugin.zsh |  5 ++
 2 files changed, 94 insertions(+)
 create mode 100644 plugins/macports/_port

(limited to 'plugins')

diff --git a/plugins/macports/_port b/plugins/macports/_port
new file mode 100644
index 000000000..06d7fb426
--- /dev/null
+++ b/plugins/macports/_port
@@ -0,0 +1,89 @@
+#compdef port
+
+local subcmds 
+
+# we cache the list of ports
+# we shall use some cache policy to avoid problems with new ports
+if (( ! $+portlist )); then
+	portlist=($(port echo all; echo "all current active inactive installed uninstalled outdated"))
+fi
+
+subcmds=(
+'activate'
+'archive'
+'build'
+'cat'
+'clean'
+'configure'
+'contents'
+'deactivate'
+'dependents'
+'deps'
+'destroot'
+'dir'
+'distcheck'
+'distclean'
+'dmg'
+'echo'
+'edit'
+'extract'
+'fetch'
+'file'
+'help'
+'info'
+'install' 
+'installed' 
+'list'
+'livecheck'
+'location'
+'mpkg'
+'outdated'
+'patch'
+'pkg'
+'provides'
+'rpmpackage'
+'search'
+'selfupdate'
+'sync'
+'test'
+'unarchive'
+'uninstall'
+'upgrade' 
+'variants'
+'version'
+)
+
+_arguments -C \
+'-v[verbose mode (generate verbose messages)]' \
+'-d[debug mode (generate debugging messages)]' \
+'-q[quiet mode (suppress messages)]' \
+'-D[specify portdir]' \
+'-k[keep mode (do not autoclean after install)]' \
+'-n[dont follow dependencies in upgrade (only for upgrading)]' \
+'-a[upgrade all installed ports (only for upgrading)]' \
+'-u[uninstall non-active ports when upgrading and uninstalling]' \
+'-f[force mode (ignore state file)]' \
+'-s[source-only mode]' \
+'-b[binary-only mode]' \
+'-o[honor state files older than Portfile]' \
+'*::command:->command' \
+&& return 0
+
+case $state in
+	command)
+	if ((CURRENT == 1)); then
+		state=subcommands
+	else
+		state=portname
+	fi
+	;;
+esac
+
+case $state in
+	subcommands)
+	_describe -t commands 'port commands' subcmds
+	;;
+	portname)
+	_describe -t commands 'available ports' portlist
+	;;
+esac
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 9564829b0..cbbc49265 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -5,3 +5,8 @@ alias psu="sudo port selfupdate"
 alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
 alias pup="psu && puo"
+
+# add macports completion function to path
+fpath=($ZSH/plugins/macports $fpath)
+autoload -U compinit
+compinit -i
-- 
cgit v1.2.3-70-g09d2


From 5bbd87a33380ab4fb9cab6688b11cb98faa61cd7 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <danielbarrettbolton@gmail.com>
Date: Mon, 14 Mar 2011 01:43:33 -0400
Subject: add Perl plugins file

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

(limited to 'plugins')

diff --git a/plugins/perl/perl.plugin.zsh b/plugins/perl/perl.plugin.zsh
new file mode 100644
index 000000000..f94c4195d
--- /dev/null
+++ b/plugins/perl/perl.plugin.zsh
@@ -0,0 +1,62 @@
+# https://github.com/dbbolton
+#
+# Below are some useful Perl-related aliases/functions that I use with zsh.
+
+
+# Aliases ###################################################################
+
+# perlbrew ########
+alias pbi='perlbrew install'
+alias pbl='perlbrew list'
+alias pbo='perlbrew off'
+alias pbs='perlbrew switch'
+alias pbu='perlbrew use'
+
+# Perl ############
+
+# perldoc`
+alias pd='perldoc'
+
+# use perl like awk/sed
+alias ple='perl -wlne'
+
+# show the latest stable release of Perl
+alias latest-perl='curl -s http://www.perl.org/get.html | perl -wlne '\''if (/perl\-([\d\.]+)\.tar\.gz/) { print $1; exit;}'\'
+
+
+
+# Functions #################################################################
+
+# newpl - creates a basic Perl script file and opens it with $EDITOR 
+newpl () {
+	# set $EDITOR to 'vim' if it is undefined
+	[[ -z $EDITOR ]] && EDITOR=vim
+
+	# if the file exists, just open it
+	[[ -e $1 ]] && print "$1 exists; not modifying.\n" && $EDITOR $1
+
+	# if it doesn't, make it, and open it
+	[[ ! -e $1 ]] && print '#!/usr/bin/perl'"\n"'use strict;'"\n"'use warnings;'\
+		"\n\n" > $1 && $EDITOR $1
+}
+
+
+# pgs - Perl Global Substitution
+# find pattern		= 1st arg
+# replace pattern	= 2nd arg
+# filename			= 3rd arg
+pgs() { # [find] [replace] [filename]
+    perl -i.orig -pe 's/'"$1"'/'"$2"'/g' "$3"
+}
+
+
+# Perl grep, because 'grep -P' is terrible. Lets you work with pipes or files.
+prep() { # [pattern] [filename unless STDOUT]
+    perl -nle 'print if /'"$1"'/;' $2
+}
+
+# say - append a newline to 'print'
+say() {
+    print "$1\n"
+}
+
-- 
cgit v1.2.3-70-g09d2


From ce41d0e5bdf7df7e4261ad6e5b3e3c0fa59dd890 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <danielbarrettbolton@gmail.com>
Date: Tue, 15 Mar 2011 20:31:14 -0400
Subject: Add debian plugins file

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

(limited to 'plugins')

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
new file mode 100644
index 000000000..f8865a412
--- /dev/null
+++ b/plugins/debian/debian.plugin.zsh
@@ -0,0 +1,60 @@
+# https://github.com/dbbolton/
+#
+# Debian-related zsh aliases and functions for zsh
+
+
+# Aliases ###################################################################
+
+# Some self-explanatory aliases
+alias afs='apt-file search --regexp'
+alias aps='aptitude search'
+alias apsrc='apt-get source'
+alias apv='apt-cache policy'
+
+alias apdg='su -c "aptitude update && aptitude safe-upgrade"'
+alias apud='su -c "aptitude update"'
+alias apug='su -c "aptitude safe-upgrade"'
+
+# print all installed packages
+alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
+
+# Install all .deb files in the current directory.
+# Warning: you will need to put the glob in single quotes if you use:
+# glob_subst
+alias di='su -c "dpkg -i ./*.deb"'
+
+# Create a basic .deb package
+alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
+
+# Remove ALL kernel images and headers EXCEPT the one in use
+alias kclean='su -c '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
+
+
+
+# Functions #################################################################
+
+# create a simple script that can be used to 'duplicate' a system
+apt-copy() {
+	print '#!/bin/sh'"\n" > apt-copy.sh
+
+	list=$(perl -m'AptPkg::Cache' -e '$c=AptPkg::Cache->new; for (keys %$c){ push @a, $_ if $c->{$_}->{'CurrentState'} eq 'Installed';} print "$_ " for sort @a;')
+
+	print 'aptitude install '"$list\n" >> apt-copy.sh
+
+	chmod +x apt-copy.sh
+}
+
+
+# Kernel-package building shortcut
+dbb-build () {
+	MAKEFLAGS=''		# temporarily unset MAKEFLAGS ( '-j3' will fail )
+	appendage='-custom' # this shows up in $ (uname -r )
+    revision=$(date +"%Y%m%d") # this shows up in the .deb file name
+
+    make-kpkg clean
+
+    time fakeroot make-kpkg --append-to-version "$appendage" --revision \
+        "$revision" kernel_image kernel_headers
+}
+
+
-- 
cgit v1.2.3-70-g09d2


From d03a6176aacd583993c02c7e837d10751c431875 Mon Sep 17 00:00:00 2001
From: Sankara Rameswaran <sankara@bankbazaar.com>
Date: Wed, 2 Mar 2011 15:20:43 +0530
Subject: Lein completion

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

(limited to 'plugins')

diff --git a/plugins/lein/lein.plugin.zsh b/plugins/lein/lein.plugin.zsh
new file mode 100644
index 000000000..19af3556a
--- /dev/null
+++ b/plugins/lein/lein.plugin.zsh
@@ -0,0 +1,27 @@
+function _lein_commands() {
+    local ret=1 state
+    _arguments ':subcommand:->subcommand' && ret=0
+
+    case $state in
+      subcommand)
+        subcommands=(
+          "clean:remove compiled files and dependencies from project"
+          "compile:ahead-of-time compile the project"
+          "deps:download and install all dependencies"
+          "help:display a list of tasks or help for a given task"
+          "install:install the project and its dependencies in your local repository"
+          "jar:create a jar file containing the compiled .class files"
+          "new:create a new project skeleton"
+          "pom:write a pom.xml file to disk for maven interop"
+          "test:run the project's tests"
+          "uberjar:Create a jar including the contents of each of deps"
+          "upgrade:upgrade leiningen to the latest stable release"
+          "version:print leiningen's version"
+        )
+        _describe -t subcommands 'leiningen subcommands' subcommands && ret=0
+    esac
+
+    return ret
+}
+
+compdef _lein_commands lein
-- 
cgit v1.2.3-70-g09d2


From 57f55e69ed967e93c0fd44a6a7e470781eb38029 Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 13:50:05 +0200
Subject: Zsh will now complete git aliases with git stuff

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

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 71a62819b..fc4e56fac 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,19 +1,34 @@
 # Aliases
 alias g='git'
+compdef g=git
 alias gst='git status'
+compdef gst=git
 alias gl='git pull'
+compdef gl=git
 alias gup='git fetch && git rebase'
+compdef gup=git
 alias gp='git push'
+compdef gp=git
 alias gd='git diff | mate'
+compdef gd=git
 alias gdv='git diff -w "$@" | vim -R -'
+compdef gdv=git
 alias gc='git commit -v'
+compdef gc=git
 alias gca='git commit -v -a'
+compdef gca=git
 alias gco='git checkout'
+compdef gco=git
 alias gb='git branch'
+compdef gb=git
 alias gba='git branch -a'
+compdef gba=git
 alias gcount='git shortlog -sn'
+compdef gcount=git
 alias gcp='git cherry-pick'
+compdef gcp=git
 alias glg='git log --stat --max-count=5'
+compdef glg=git
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
@@ -29,5 +44,8 @@ function current_branch() {
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
+compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
+compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+compdef ggpnp=git
-- 
cgit v1.2.3-70-g09d2


From 2e9492969b0ea90932ad3f4298330b75ef8cf2ce Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 15:43:39 +0200
Subject: Completions are git subdommand-aware now

---
 plugins/git/git.plugin.zsh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fc4e56fac..8470c28a4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -2,15 +2,16 @@
 alias g='git'
 compdef g=git
 alias gst='git status'
-compdef gst=git
+compdef _git gst=git-status
 alias gl='git pull'
-compdef gl=git
+compdef _git gl=git-pull
 alias gup='git fetch && git rebase'
 compdef gup=git
 alias gp='git push'
-compdef gp=git
+compdef _git gp=git-push
 alias gd='git diff | mate'
-compdef gd=git
+# WTF is mate??
+compdef _git gd=git-diff
 alias gdv='git diff -w "$@" | vim -R -'
 compdef gdv=git
 alias gc='git commit -v'
@@ -18,20 +19,21 @@ compdef gc=git
 alias gca='git commit -v -a'
 compdef gca=git
 alias gco='git checkout'
-compdef gco=git
+compdef _git gco=git-checkout
 alias gb='git branch'
-compdef gb=git
+compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef gba=git
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'
-compdef gcp=git
+compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --max-count=5'
-compdef glg=git
+compdef _git glg=git-log
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
+compdef git-svn-dcommit-push=git
 
 #
 # Will return the current branch name
-- 
cgit v1.2.3-70-g09d2


From 4cd4167c8d988656eed4896d6d1343e311ce078c Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 21:28:19 +0200
Subject: Further git completion improovements

In detail:
gup - now completes with remotes like git fetch would
gdv - got git diff completions
gc/gca - now zsh will suggest files in staging area
gba - suggestions as for git branch
---
 plugins/git/git.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8470c28a4..9fe7a6467 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -6,24 +6,24 @@ compdef _git gst=git-status
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git fetch && git rebase'
-compdef gup=git
+compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
 alias gd='git diff | mate'
 # WTF is mate??
 compdef _git gd=git-diff
 alias gdv='git diff -w "$@" | vim -R -'
-compdef gdv=git
+compdef _git gdv=git-diff
 alias gc='git commit -v'
-compdef gc=git
+compdef _git gc=git-commit
 alias gca='git commit -v -a'
-compdef gca=git
+compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
-compdef gba=git
+compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'
-- 
cgit v1.2.3-70-g09d2


From 993e05da50543b9c2dcc5e4fedb93afd1c8b020c Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Fri, 8 Apr 2011 10:12:22 -0400
Subject: Replace redundant calls to compinit with a single call.

---
 lib/completion.zsh                   | 3 ---
 lib/key-bindings.zsh                 | 2 --
 oh-my-zsh.sh                         | 4 ++++
 plugins/brew/brew.plugin.zsh         | 2 --
 plugins/cpanm/cpanm.plugin.zsh       | 2 --
 plugins/gem/gem.plugin.zsh           | 2 --
 plugins/github/github.plugin.zsh     | 2 --
 plugins/macports/macports.plugin.zsh | 2 --
 plugins/pip/pip.plugin.zsh           | 2 --
 plugins/vagrant/vagrant.plugin.zsh   | 2 --
 10 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'plugins')

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e8e9776a5..3c5a41e14 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -9,9 +9,6 @@ setopt always_to_end
 
 WORDCHARS=''
 
-autoload -U compinit
-compinit -i
-
 zmodload -i zsh/complist
 
 ## case-insensitive (all),partial-word and then substring completion
diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 7196a88ff..c7ad907d7 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -1,6 +1,4 @@
 # TODO: Explain what some of this does..
-autoload -U compinit
-compinit -i
 
 bindkey -e
 bindkey '\ew' kill-region
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 291772dfe..805e92428 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -17,6 +17,10 @@ for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
+# Load and run compinit
+autoload -U compinit
+compinit -i
+
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 then
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 353a18942..079c0fba0 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,4 +1,2 @@
 # add brew completion function to path
 fpath=($ZSH/plugins/brew $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
index af52d3e8b..8425b5ad8 100644
--- a/plugins/cpanm/cpanm.plugin.zsh
+++ b/plugins/cpanm/cpanm.plugin.zsh
@@ -1,4 +1,2 @@
 # add cpanm completion function to path
 fpath=($ZSH/plugins/cpanm $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
index d4e5c6584..cdfad7ad6 100644
--- a/plugins/gem/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1,4 +1,2 @@
 # add gem completion function to path
 fpath=($ZSH/plugins/gem $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index c23504b85..0858783cc 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,4 +1,2 @@
 # add github completion function to path
 fpath=($ZSH/plugins/github $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index cbbc49265..492a665b5 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -8,5 +8,3 @@ alias pup="psu && puo"
 
 # add macports completion function to path
 fpath=($ZSH/plugins/macports $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index bf9f23968..740f96207 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -1,4 +1,2 @@
 # add brew completion function to path
 fpath=($ZSH/plugins/pip $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
index 5e9bcf10a..98d2d705c 100644
--- a/plugins/vagrant/vagrant.plugin.zsh
+++ b/plugins/vagrant/vagrant.plugin.zsh
@@ -1,3 +1 @@
 fpath=($ZSH/plugins/vagrant $fpath)
-autoload -U compinit
-compinit -i
-- 
cgit v1.2.3-70-g09d2


From 91e4f3d667cc04148fafc4675174424daf5f6b5a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 4 Apr 2011 00:54:43 +0200
Subject: Fix `gdv`: make it a function, and use `view`.

I've changed it to use `view` instead of `vim -R` to make it hopefully
more editor-agnostic.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8470c28a4..b21c6a8e0 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -12,7 +12,7 @@ compdef _git gp=git-push
 alias gd='git diff | mate'
 # WTF is mate??
 compdef _git gd=git-diff
-alias gdv='git diff -w "$@" | vim -R -'
+gdv() { git diff -w "$@" | view - }
 compdef gdv=git
 alias gc='git commit -v'
 compdef gc=git
-- 
cgit v1.2.3-70-g09d2


From b3a78d2b287cc9789d1c791a91448c40dcab2e23 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 12 Apr 2011 10:19:15 +0200
Subject: Using git-diff instead of git diff

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

(limited to 'plugins')

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


From f9282283822771a7f471547569de481a66a70b0f Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 20 Mar 2011 16:29:00 -0400
Subject: Added npm plugin.

---
 plugins/npm/_npm           | 19 +++++++++++++++++++
 plugins/npm/npm.plugin.zsh |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 plugins/npm/_npm
 create mode 100644 plugins/npm/npm.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/npm/_npm b/plugins/npm/_npm
new file mode 100644
index 000000000..24b536188
--- /dev/null
+++ b/plugins/npm/_npm
@@ -0,0 +1,19 @@
+#compdef npm
+
+# Node Package Manager 0.3.15 completion, letting npm do all the completion work
+
+_npm() {
+  compadd -- $(_npm_complete $words)
+}
+
+# We want to show all errors of any substance, but never the "npm (not )ok" one.
+# (Also doesn't consider "ERR! no match found" worth breaking the terminal for.)
+_npm_complete() {
+  local ask_npm
+  ask_npm=(npm completion --color false --loglevel error -- $@)
+  { _call_program npm $ask_npm 2>&1 >&3 \
+  | egrep -v '^(npm (not |)ok|ERR! no match found)$' >&2; \
+  } 3>&1
+}
+
+_npm "$@"
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
new file mode 100644
index 000000000..826f0f7b0
--- /dev/null
+++ b/plugins/npm/npm.plugin.zsh
@@ -0,0 +1,4 @@
+# add npm completion function to path
+fpath=($ZSH/plugins/npm $fpath)
+autoload -U compinit
+compinit -i
-- 
cgit v1.2.3-70-g09d2


From 0447a0ec11ad56d24ad391e9149c8d7e0429b205 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 01:04:10 -0500
Subject: added hub plugin from defunkt

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

(limited to 'plugins')

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
new file mode 100644
index 000000000..e82a0ec25
--- /dev/null
+++ b/plugins/hub/hub.plugin.zsh
@@ -0,0 +1,5 @@
+# hub alias from defunkt
+# https://github.com/defunkt/hub
+if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
+    eval $( hub alias -s $( ps -o comm= -p $$ ) )
+fi
-- 
cgit v1.2.3-70-g09d2


From 8ed33a8ccc5e926e84bf522951ecf80e97e2a8e6 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 21:34:25 -0500
Subject: no need for an extra fork

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

(limited to 'plugins')

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
index e82a0ec25..9f95c6361 100644
--- a/plugins/hub/hub.plugin.zsh
+++ b/plugins/hub/hub.plugin.zsh
@@ -1,5 +1,5 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
 if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
-    eval $( hub alias -s $( ps -o comm= -p $$ ) )
+    eval $( hub alias -s zsh )
 fi
-- 
cgit v1.2.3-70-g09d2


From 2717e147b303beef0f84e6dfbb2db562c8fc6740 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Wed, 2 Mar 2011 20:00:40 -0500
Subject: blueyed's ZSH-fu is much stronger than mine.

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

(limited to 'plugins')

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
index 9f95c6361..48e1fa4ad 100644
--- a/plugins/hub/hub.plugin.zsh
+++ b/plugins/hub/hub.plugin.zsh
@@ -1,5 +1,5 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
-if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
-    eval $( hub alias -s zsh )
+if which hub > /dev/null; then
+    eval $(hub alias -s zsh)
 fi
-- 
cgit v1.2.3-70-g09d2


From 277057cb6399769340d41bba9421464c58742026 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Thu, 3 Mar 2011 21:36:35 -0500
Subject: Moved this to the existing github plugin

---
 plugins/hub/hub.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 plugins/hub/hub.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
deleted file mode 100644
index 48e1fa4ad..000000000
--- a/plugins/hub/hub.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-# hub alias from defunkt
-# https://github.com/defunkt/hub
-if which hub > /dev/null; then
-    eval $(hub alias -s zsh)
-fi
-- 
cgit v1.2.3-70-g09d2


From 9406ae7929bc1d3a063b65e7559a28268aaf0a7a Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Thu, 3 Mar 2011 21:38:56 -0500
Subject: Whoops, this was supposed to be in the last commit!

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

(limited to 'plugins')

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index c23504b85..72e9b07b9 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,3 +1,9 @@
+# hub alias from defunkt
+# https://github.com/defunkt/hub
+if which hub > /dev/null; then
+    eval $(hub alias -s zsh)
+fi
+
 # add github completion function to path
 fpath=($ZSH/plugins/github $fpath)
 autoload -U compinit
-- 
cgit v1.2.3-70-g09d2


From f0922006aba68e485480a81d83ba53b201270a69 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Sat, 19 Mar 2011 10:29:22 -0400
Subject: changes recommended by blueyed

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

(limited to 'plugins')

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 72e9b07b9..8d4580654 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,7 +1,8 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
-if which hub > /dev/null; then
-    eval $(hub alias -s zsh)
+if [ "$commands[(I)hub]" ]; then
+    # eval `hub alias -s zsh`
+    function git(){hub "$@"}
 fi
 
 # add github completion function to path
-- 
cgit v1.2.3-70-g09d2


From 6bf906a2622ddea1e9aae5d23c544d37fc4b6a76 Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Tue, 12 Apr 2011 17:41:09 -0400
Subject: Optimize plugin loading so that only one call to compinit is required

---
 oh-my-zsh.sh                         | 13 +++++++++++--
 plugins/brew/brew.plugin.zsh         |  2 --
 plugins/cpanm/cpanm.plugin.zsh       |  2 --
 plugins/gem/gem.plugin.zsh           |  2 --
 plugins/github/github.plugin.zsh     |  2 --
 plugins/macports/macports.plugin.zsh |  2 --
 plugins/pip/pip.plugin.zsh           |  2 --
 plugins/vagrant/vagrant.plugin.zsh   |  1 -
 8 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 plugins/brew/brew.plugin.zsh
 delete mode 100644 plugins/cpanm/cpanm.plugin.zsh
 delete mode 100644 plugins/gem/gem.plugin.zsh
 delete mode 100644 plugins/github/github.plugin.zsh
 delete mode 100644 plugins/pip/pip.plugin.zsh
 delete mode 100644 plugins/vagrant/vagrant.plugin.zsh

(limited to 'plugins')

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 84a850ca3..0c85de714 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -10,14 +10,23 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
 # Load all of your custom configurations from custom/
 for config_file ($ZSH/custom/*.zsh) source $config_file
 
-# Load all of the plugins that were defined in ~/.zshrc
+# Add all defined plugins to fpath
 plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
 
 # Load and run compinit
 autoload -U compinit
 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
+    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+  fi
+done
+
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
deleted file mode 100644
index 079c0fba0..000000000
--- a/plugins/brew/brew.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/brew $fpath)
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
deleted file mode 100644
index 8425b5ad8..000000000
--- a/plugins/cpanm/cpanm.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add cpanm completion function to path
-fpath=($ZSH/plugins/cpanm $fpath)
diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
deleted file mode 100644
index cdfad7ad6..000000000
--- a/plugins/gem/gem.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add gem completion function to path
-fpath=($ZSH/plugins/gem $fpath)
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
deleted file mode 100644
index 0858783cc..000000000
--- a/plugins/github/github.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add github completion function to path
-fpath=($ZSH/plugins/github $fpath)
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 492a665b5..277352e32 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -6,5 +6,3 @@ alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
 alias pup="psu && puo"
 
-# add macports completion function to path
-fpath=($ZSH/plugins/macports $fpath)
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
deleted file mode 100644
index 740f96207..000000000
--- a/plugins/pip/pip.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/pip $fpath)
diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
deleted file mode 100644
index 98d2d705c..000000000
--- a/plugins/vagrant/vagrant.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-fpath=($ZSH/plugins/vagrant $fpath)
-- 
cgit v1.2.3-70-g09d2


From 60bae66bbfebe7bf78378564ffe9aed00c3342b4 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Thu, 7 Apr 2011 10:23:06 +0200
Subject: new yum plugin with useful aliases

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

(limited to 'plugins')

diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
new file mode 100644
index 000000000..d6ba7ed62
--- /dev/null
+++ b/plugins/yum/yum.plugin.zsh
@@ -0,0 +1,12 @@
+## Aliases
+
+alias ys="yum search"                       # search package
+alias yp="yum info"                         # show package info
+alias yl="yum list"                         # list packages
+alias yli="yum list installed"              # print all installed packages
+
+alias yu="sudo yum update"                  # upgrate packages
+alias yi="sudo yum install"                 # install package
+alias yr="sudo yum remove"                  # remove package
+alias yrl="sudo yum remove --remove-leaves" # remove package and leaves
+alias yc="sudo yum clean all"               # clean cache
-- 
cgit v1.2.3-70-g09d2


From 14f07ebc68da8b06cdb0a4fdb435ac928ff419f1 Mon Sep 17 00:00:00 2001
From: alexandru <alex@hackd.net>
Date: Thu, 14 Apr 2011 16:22:18 -0700
Subject: redis-cli completion plugin

---
 plugins/redis-cli/_redis-cli           | 142 +++++++++++++++++++++++++++++++++
 plugins/redis-cli/redis-cli.plugin.zsh |   4 +
 2 files changed, 146 insertions(+)
 create mode 100644 plugins/redis-cli/_redis-cli
 create mode 100644 plugins/redis-cli/redis-cli.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/redis-cli/_redis-cli b/plugins/redis-cli/_redis-cli
new file mode 100644
index 000000000..3789add18
--- /dev/null
+++ b/plugins/redis-cli/_redis-cli
@@ -0,0 +1,142 @@
+#compdef redis-cli rec
+#autoload
+
+#redis cli completion, based off homebrew completion (ref. 2011-04-14)
+
+local -a _1st_arguments
+_1st_arguments=(
+  'append:append a value to a key'
+  'auth:authenticate to the server'
+  'bgrewriteeaof:asynchronously rewrite the append-only file'
+  'bgsave:asynchornously save the dataset to disk'
+  'blpop:remove and get the first element in a list, or block until one is available'
+  'brpop:remove and get the last element in a list, or block until one is available'
+  'brpoplpush:pop a value from a list, push it to another list and return it; or block until one is available'
+  # 'config get:get the value of a configuration parameter'
+  # 'config set:set a configuration parameter to the given value'
+  # 'config resetstat: reset the stats returned by INFO'
+  'dbsize:return the number of keys in the selected database'
+  # 'debug object:get debugging information about a key'
+  # 'debug setgfault:make the server crash'
+  'decr:decrement the integer value of a key by one'
+  'decrby:decrement the integet value of a key by the given number'
+  'del:delete a key'
+  'discard:discard all commands issued after MULTI'
+  'echo:echo the given string'
+  'exec:execute all commands issued after a MULTI'
+  'exists:determine if a key exists'
+  'expire:set the time to live for a key, in seconds'
+  'expireat:set the expiration for a key as a UNIX timestamp'
+  'flushall:remove all keys from all databases'
+  'flushdb:remove all keys from the current database'
+  'get:get the value of a key'
+  'getbit:returns the bit value at offset in the string value stored at key'
+  'getrange:get a substring of the string stored at a key'
+  'getset:set the string value of a key and return its old value'
+  'hdel:delete a hash field'
+  'hexists:determine if a hash field exists'
+  'hget:get the value of a hash field'
+  'hgetall:get all the fields and values in a hash'
+  'hincrby:increment the integer value of a hash field by the given number'
+  'hkeys:get all the fields in a hash'
+  'hlen:get the number of fields in a hash'
+  'hmget:get the values of all the given hash fields'
+  'hmset:set multiple hash fields to multiple values'
+  'hset:set the string value of a hash field'
+  'hsetnx:set the value of a hash field, only if the field does not exist'
+  'hvals:get all the values in a hash'
+  'incr:increment the integer value of a key by one'
+  'incrby:increment the integer value of a key by the given number'
+  'info:get information and statistics about the server'
+  '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'
+  'llen:get the length of a list'
+  'lpop:remove and get the first element in a list'
+  'lpush:prepend a value to a list'
+  'lpushx:prepend a value to a list, only if the list exists'
+  'lrange:get a range of elements from a list'
+  'lrem:remove elements from a list'
+  'lset:set the value of an element in a list by its index'
+  'ltrim:trim a list to the specified range'
+  'mget:get the values of all the given keys'
+  'monitor:listen for all requests received by the server in real time'
+  'move:move a key to another database'
+  'mset:set multiple keys to muliple values'
+  'msetnx:set multiple keys tom ultiple values, only if none of the keys exist'
+  'multi:mark the start of a transaction block'
+  'object:inspect the internals of Redis objects'
+  'persist:remove the expiration from a key'
+  'ping:ping the server'
+  'psubscribe:listen for messages published to channels matching the given patterns'
+  'publish:post a message to a channel'
+  'punsubscribe:stop listening for messages posted to channels matching the given patterns'
+  'quit:close the connection'
+  'randomkey:return a random key from the keyspace'
+  'rename:rename a key'
+  'renamenx:rename a key, only if the new key does not exist'
+  'rpop:remove and get the last element in a list'
+  'rpoplpush:remove the last element in a list, append it to another list and return it'
+  'rpush:append a value to a list'
+  'rpushx:append a value to a list, only if the list exists'
+  'sadd:add a member to a set'
+  'save:synchronously save the dataset to disk'
+  'scard:get the number of members in a set'
+  'sdiff:subtract multiple sets'
+  'sdiffstore:subtract multiple sets and store the resulting set in a key'
+  'select:change the selected database for the current connection'
+  'set:set the string value of a key'
+  'setbit:sets or clears the bit at offset in the string value stored at key'
+  'setex:set the value and expiration of a key'
+  'setnx:set the value of a key, only if the key does not exist'
+  'setrange:overwrite part of a string at key starting at the specified offset'
+  'shutdown:synchronously save the dataset to disk and then shut down the server'
+  'sinter:intersect multiple sets'
+  'sinterstore:intersect multiple sets and store the resulting set in a key'
+  'sismember:determine if a given value is a member of a set'
+  'slaveof:make the server a slave of another instance, or promote it as master'
+  'smembers:get all the members in a set'
+  'smove:move a member from one set to another'
+  'sort:sort the elements in a list, set or sorted set'
+  'spop:remove and return a random member from a set'
+  'srandmember:get a random member from a set'
+  'srem:remove a member from a set'
+  'strlen:get the length of the value stored in a key'
+  'subscribe:listen for messages published to the given channels'
+  'sunion:add multiple sets'
+  'sunionstore:add multiple sets and store the resulting set in a key'
+  'ttl:get the time to live for a key'
+  'type:determine the type stored at key'
+  'unsubscribe:stop listening for messages posted to the given channels'
+  'unwatch:forget about all watched keys'
+  'watch:watch the given keys to determine execution of the MULTI/EXEC block'
+  'zadd:add a member to a sorted set, or update its score if it already exists'
+  'zcard:get the number of members in a sorted set'
+  'zcount:count the members in a sorted set with scores within the given values'
+  'zincrby:increment the score of a member in a sorted set'
+  'zinterstore:intersect multiple sorted sets and store the resulting sorted set in a new key'
+  'zrange:return a range of members in a sorted set, by index'
+  'zrangebyscore:return a range of members in a sorted set, by score'
+  'zrank:determine the index of a member in a sorted set'
+  'zrem:remove a member from a sorted set'
+  'zremrangebyrank:remove all members in a sorted set within the given indexes'
+  'zremrangebyscore:remove all members in a sorted set within the given scores'
+  'zrevrange:return a range of membrs in a sorted set, by index, with scores ordered from high to low'
+  'zrevrangebyscore:return a range of members in a sorted set, by score, with scores ordered from high to low'
+  'zrevrank:determine the index of a member in a sorted set, with scores ordered from high to low'
+  'zscore:get the score associated with the given member in a sorted set'
+  'zunionstore:add multiple sorted sets and store te resulting sorted set in a new key'
+)
+
+local expl
+
+_arguments \
+  '(-v --version)'{-v,--version}'[show version]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "redis-cli subcommand" _1st_arguments
+  return
+fi
\ No newline at end of file
diff --git a/plugins/redis-cli/redis-cli.plugin.zsh b/plugins/redis-cli/redis-cli.plugin.zsh
new file mode 100644
index 000000000..af5a843c9
--- /dev/null
+++ b/plugins/redis-cli/redis-cli.plugin.zsh
@@ -0,0 +1,4 @@
+# add redis completion function to path
+fpath=($ZSH/plugins/redis-cli $fpath)
+autoload -U compinit
+compinit -i
-- 
cgit v1.2.3-70-g09d2


From 886af72125a108c2f928474c7f817dd2c164795e Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Wed, 20 Apr 2011 01:30:52 -0400
Subject: Remove fpath/compinit code from github and npm plugins

---
 plugins/github/github.plugin.zsh | 4 ----
 plugins/npm/npm.plugin.zsh       | 4 ----
 2 files changed, 8 deletions(-)
 delete mode 100644 plugins/npm/npm.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 8d4580654..df7053ba7 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -5,7 +5,3 @@ if [ "$commands[(I)hub]" ]; then
     function git(){hub "$@"}
 fi
 
-# add github completion function to path
-fpath=($ZSH/plugins/github $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
deleted file mode 100644
index 826f0f7b0..000000000
--- a/plugins/npm/npm.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# add npm completion function to path
-fpath=($ZSH/plugins/npm $fpath)
-autoload -U compinit
-compinit -i
-- 
cgit v1.2.3-70-g09d2


From 96ec1e12498fb2c3200fef941ad6eadece723a0d Mon Sep 17 00:00:00 2001
From: Alexander Rinass <alex@rinass.net>
Date: Wed, 20 Apr 2011 15:50:55 +0200
Subject: Fixed folder naming for mysql-macports plugin and improved start/stop
 scripts.

---
 plugins/mysql-macports/mysql-macports.plugin.zsh | 8 ++++++++
 plugins/mysql/mysql-macports.plugin.zsh          | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 plugins/mysql-macports/mysql-macports.plugin.zsh
 delete mode 100644 plugins/mysql/mysql-macports.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/mysql-macports/mysql-macports.plugin.zsh b/plugins/mysql-macports/mysql-macports.plugin.zsh
new file mode 100644
index 000000000..c39563fe4
--- /dev/null
+++ b/plugins/mysql-macports/mysql-macports.plugin.zsh
@@ -0,0 +1,8 @@
+# commands to control local mysql-server installation
+# paths are for osx installation via macports
+
+alias mysqlstart='sudo /opt/local/share/mysql5/mysql/mysql.server start'
+alias mysqlstop='sudo /opt/local/share/mysql5/mysql/mysql.server stop'
+alias mysqlrestart='sudo /opt/local/share/mysql5/mysql/mysql.server restart'
+
+alias mysqlstatus='mysqladmin5 -u root -p ping'
diff --git a/plugins/mysql/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
deleted file mode 100644
index 63b881c9f..000000000
--- a/plugins/mysql/mysql-macports.plugin.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-# commands to control local mysql-server installation
-# paths are for osx installtion via macports
-
-alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'
-alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'
-alias mysqlstatus='mysqladmin5 -u root -p ping'
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 6f53b3130d5aee8461b0be30e5589e5673929318 Mon Sep 17 00:00:00 2001
From: Ilmari Vacklin <ilmari@dicole.com>
Date: Fri, 22 Apr 2011 00:16:29 +0300
Subject: Add 'upgrade' to brew completions.

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins')

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index 4e590ac63..cee1e25f0 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -31,6 +31,7 @@ _1st_arguments=(
   'search:search for a formula (/regex/ or string)'
   'unlink:unlink a formula'
   'update:freshen up links'
+  'upgrade:upgrade outdated formulae'
   'uses:show formulas which depend on a formula'
 )
 
-- 
cgit v1.2.3-70-g09d2


From 1783b16d25029b72bdd1aa164f3e76fd29702e70 Mon Sep 17 00:00:00 2001
From: Florian Adamsky <Florian.Adamsky@iem.fh-friedberg.de>
Date: Tue, 26 Apr 2011 23:22:42 +0200
Subject: added alias for apt-cache search

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

(limited to 'plugins')

diff --git a/plugins/deb/deb.plugin.zsh b/plugins/deb/deb.plugin.zsh
index 732294a87..1b35a0646 100644
--- a/plugins/deb/deb.plugin.zsh
+++ b/plugins/deb/deb.plugin.zsh
@@ -9,4 +9,5 @@ alias ar="sudo apt-get remove --purge && \
 		sudo apt-get autoremove --purge"	# remove package
 alias ap="apt-cache policy"				# apt policy
 alias av="apt-cache show"				# show package info
+alias acs="apt-cache search"                            # search package
 alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
-- 
cgit v1.2.3-70-g09d2


From 57d699ee33e5d4673d8c6a2a9ba42bd25d7b737c Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Wed, 27 Apr 2011 19:46:23 -0400
Subject: redis-cli.plugin.zsh removed, adding to the fpath isn't needed now

---
 plugins/redis-cli/redis-cli.plugin.zsh | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 plugins/redis-cli/redis-cli.plugin.zsh

(limited to 'plugins')

diff --git a/plugins/redis-cli/redis-cli.plugin.zsh b/plugins/redis-cli/redis-cli.plugin.zsh
deleted file mode 100644
index af5a843c9..000000000
--- a/plugins/redis-cli/redis-cli.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# add redis completion function to path
-fpath=($ZSH/plugins/redis-cli $fpath)
-autoload -U compinit
-compinit -i
-- 
cgit v1.2.3-70-g09d2


From 7377ba3f7a08bb11114ddae1b421599e4073da96 Mon Sep 17 00:00:00 2001
From: Kevin Daudt <compufreak@gmail.com>
Date: Fri, 29 Apr 2011 11:54:31 +0200
Subject: Added git-flow plugin

---
 .gitignore                           |   3 +-
 plugins/git-flow/git-flow.plugin.zsh | 332 +++++++++++++++++++++++++++++++++++
 2 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 plugins/git-flow/git-flow.plugin.zsh

(limited to 'plugins')

diff --git a/.gitignore b/.gitignore
index 8d19d100c..4b555067e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ locals.zsh
 log/.zsh_history
 projects.zsh
 custom/*
-!custom/example.zsh
\ No newline at end of file
+!custom/example.zsh
+cache
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
new file mode 100644
index 000000000..270bcbe38
--- /dev/null
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -0,0 +1,332 @@
+#!zsh
+#
+# Installation
+# ------------
+#
+# To achieve git-flow completion nirvana:
+#
+#  0. Update your zsh's git-completion module to the newest verion.
+#     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
+#
+#  1. Install this file. Either:
+#
+#     a. Place it in your .zshrc:
+#
+#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
+#        your .zshrc:
+#
+#            source ~/.git-flow-completion.zsh
+#
+#     c. Or, use this file as a oh-my-zsh plugin.
+#
+
+_git-flow ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'init:Initialize a new git repo with support for the branching model.'
+				'feature:Manage your feature branches.'
+				'release:Manage your release branches.'
+				'hotfix:Manage your hotfix branches.'
+				'support:Manage your support branches.'
+				'version:Shows version information.'
+			)
+			_describe -t commands 'git flow' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(init)
+					_arguments \
+						-f'[Force setting of gitflow branches, even if already configured]'
+					;;
+
+					(version)
+					;;
+
+					(hotfix)
+						__git-flow-hotfix
+					;;
+
+					(release)
+						__git-flow-release
+					;;
+
+					(feature)
+						__git-flow-feature
+					;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-release ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new release branch.'
+				'finish:Finish a release branch.'
+				'list:List all your release branches. (Alias to `git flow release`)'
+			)
+			_describe -t commands 'git flow release' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-hotfix ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new hotfix branch.'
+				'finish:Finish a hotfix branch.'
+				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
+			)
+			_describe -t commands 'git flow hotfix' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':hotfix:__git_flow_version_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						':hotfix:__git_flow_hotfix_list'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-feature ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new feature branch.'
+				'finish:Finish a feature branch.'
+				'list:List all your feature branches. (Alias to `git flow feature`)'
+				'publish: public'
+				'track: track'
+				'diff: diff'
+				'rebase: rebase'
+				'checkout: checkout'
+				'pull: pull'
+			)
+			_describe -t commands 'git flow feature' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':feature:__git_flow_feature_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-r'[Rebase instead of merge]'\
+						':feature:__git_flow_feature_list'
+				;;
+
+				(publish)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(track)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(diff)
+					_arguments \
+						':branch:__git_branch_names'\
+				;;
+
+				(rebase)
+					_arguments \
+						-i'[Do an interactive rebase]' \
+						':branch:__git_branch_names'
+				;;
+
+				(checkout)
+					_arguments \
+						':branch:__git_flow_feature_list'\
+				;;
+
+				(pull)
+					_arguments \
+						':remote:__git_remotes'\
+						':branch:__git_branch_names'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git_flow_version_list ()
+{
+	local expl
+	declare -a versions
+
+	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted versions expl 'version' compadd $versions
+}
+
+__git_flow_feature_list ()
+{
+	local expl
+	declare -a features
+
+	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted features expl 'feature' compadd $features
+}
+
+__git_remotes () {
+	local expl gitdir remotes
+
+	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+	__git_command_successful || return
+
+	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+	__git_command_successful || return
+
+	# TODO: Should combine the two instead of either or.
+	if (( $#remotes > 0 )); then
+		_wanted remotes expl remote compadd $* - $remotes
+	else
+		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+	fi
+}
+
+__git_flow_hotfix_list ()
+{
+	local expl
+	declare -a hotfixes
+
+	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted hotfixes expl 'hotfix' compadd $hotfixes
+}
+
+__git_branch_names () {
+	local expl
+	declare -a branch_names
+
+	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+	__git_command_successful || return
+
+	_wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+__git_command_successful () {
+	if (( ${#pipestatus:#0} > 0 )); then
+		_message 'not a git repository'
+		return 1
+	fi
+	return 0
+}
+
+zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 86fa4385c51d6778b1358d6f7134c1243feace87 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Fri, 29 Apr 2011 10:59:59 +0100
Subject: Rails 3 aliases now work with Rails 2 as well.

---
 plugins/rails3/rails3.plugin.zsh | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 6bf2ba088..f669ef047 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -1,10 +1,30 @@
-alias rs='ruby script/rails server'
-alias rg='ruby script/rails generate'
-alias rd='ruby script/rails destroy'
-alias rp='ruby script/rails plugin'
+# 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/$@
+  else
+    ruby script/rails $@
+  fi
+}
+
+alias rc='_rails_command console'
+alias rd='_rails_command destroy'
+alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
-alias rdbmr='rake db:migrate && rake db:migrate:redo'
-alias rc='ruby script/rails console'
-alias rd='ruby script/rails server --debugger'
+alias rg='_rails_command generate'
+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'
-- 
cgit v1.2.3-70-g09d2