From 6fa11377dd777b8ef37a0634317ab9b60dccdc7f Mon Sep 17 00:00:00 2001
From: Sankara Rameswaran <sankara@bankbazaar.com>
Date: Wed, 2 Mar 2011 15:20:43 +0530
Subject: [PATCH 1/2] Lein completion

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

diff --git a/plugins/lein/lein.plugin.zsh b/plugins/lein/lein.plugin.zsh
new file mode 100644
index 00000000..19af3556
--- /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

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

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

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 6bf2ba08..f669ef04 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'