Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

20 files changed, 183 insertions, 17 deletions

diff --git a/plugins/brew.plugin.zsh b/plugins/brew/_brew
index 162eb6442..4e590ac63 100644
--- a/plugins/brew.plugin.zsh
+++ b/plugins/brew/_brew
@@ -1,4 +1,5 @@
 #compdef brew
+#autoload
 
 # imported from the latest homebrew contributions
 
@@ -65,3 +66,4 @@ case "$words[1]" in
     _brew_installed_formulae
     _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
 esac
+
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
new file mode 100644
index 000000000..353a18942
--- /dev/null
+++ b/plugins/brew/brew.plugin.zsh
@@ -0,0 +1,4 @@
+# add brew completion function to path
+fpath=($ZSH/plugins/brew $fpath)
+autoload -U compinit
+compinit -i
diff --git a/plugins/rails.plugin.zsh b/plugins/cap/cap.plugin.zsh
index 45bebb722..a0fa21d00 100644
--- a/plugins/rails.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -1,14 +1,3 @@
-
-alias ss='thin --stats "/thin/stats" start'
-alias sg='ruby script/generate'
-alias sd='ruby script/destroy'
-alias sp='ruby script/plugin'
-alias ssp='ruby script/spec'
-alias rdbm='rake db:migrate'
-alias sc='ruby script/console'
-alias sd='ruby script/server --debugger'
-alias devlog='tail -f log/development.log'
-
 function _cap_does_task_list_need_generating () {
   if [ ! -f .cap_tasks~ ]; then return 0;
   else
@@ -29,8 +18,4 @@ function _cap () {
   fi
 }
 
-compctl -K _cap cap
-
-function remote_console() {
-  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
-}
+compctl -K _cap cap
\ No newline at end of file
diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
index 6a2b289a2..6a2b289a2 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
diff --git a/plugins/gem/_gem b/plugins/gem/_gem
new file mode 100644
index 000000000..83cba40d1
--- /dev/null
+++ b/plugins/gem/_gem
@@ -0,0 +1,64 @@
+#compdef gem
+#autoload
+
+# gem zsh completion, based on homebrew completion
+
+_gem_installed() {
+  installed_gems=(`gem list --local --no-versions`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'cert:Manage RubyGems certificates and signing settings'
+  'check:Check installed gems'
+  'cleanup:Clean up old versions of installed gems in the local repository'
+  'contents:Display the contents of the installed gems'
+  'dependency:Show the dependencies of an installed gem'
+  'environment:Display information about the RubyGems environment'
+  'fetch:Download a gem and place it in the current directory'
+  'generate_index:Generates the index files for a gem server directory'
+  'help:Provide help on the `gem` command'
+  'install:Install a gem into the local repository'
+  'list:Display gems whose name starts with STRING'
+  'lock:Generate a lockdown list of gems'
+  'mirror:Mirror a gem repository'
+  'outdated:Display all gems that need updates'
+  'owner:Manage gem owners on RubyGems.org.'
+  'pristine:Restores installed gems to pristine condition from files located in the gem cache'
+  'push:Push a gem up to RubyGems.org'
+  'query:Query gem information in local or remote repositories'
+  'rdoc:Generates RDoc for pre-installed gems'
+  'search:Display all gems whose name contains STRING'
+  'server:Documentation and gem repository HTTP server'
+  'sources:Manage the sources and cache file RubyGems uses to search for gems'
+  'specification:Display gem specification (in yaml)'
+  'stale:List gems along with access times'
+  'uninstall:Uninstall gems from the local repository'
+  'unpack:Unpack an installed gem to the current directory'
+  'update:Update the named gems (or all installed gems) in the local repository'
+  'which:Find the location of a library file you can require'
+)
+
+local expl
+local -a gems installed_gems
+
+_arguments \
+  '(-v --version)'{-v,--version}'[show version]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "gem subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  list)
+      if [[ "$state" == forms ]]; then
+        _gem_installed
+        _requested installed_gems expl 'installed gems' compadd -a installed_gems
+      fi ;;
+  uninstall|update)
+    _gem_installed
+    _wanted installed_gems expl 'installed gems' compadd -a installed_gems ;;
+esac
diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
new file mode 100644
index 000000000..65d3766f3
--- /dev/null
+++ b/plugins/gem/gem.plugin.zsh
@@ -0,0 +1,4 @@
+# add brew completion function to path
+fpath=($ZSH/plugins/gem $fpath)
+autoload -U compinit
+compinit -i
diff --git a/plugins/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 655eaf728..d317d179d 100644
--- a/plugins/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -12,7 +12,7 @@ alias gb='git branch'
 alias gba='git branch -a'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
-
+alias glg='git log --stat --max-count=5'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
diff --git a/plugins/github/_github b/plugins/github/_github
new file mode 100644
index 000000000..83e1713c7
--- /dev/null
+++ b/plugins/github/_github
@@ -0,0 +1,40 @@
+#compdef github
+#autoload
+
+# in order to make this work, you will need to have the github gem installed
+# http://github.com/defunkt/github-gem
+
+# github zsh completion, based on homebrew completion
+
+local -a _1st_arguments
+_1st_arguments=(
+  'browse:Open this repo in a web browser'
+  'clone:Clone a repo'
+  'config:Automatically set configuration info, or pass args to specify'
+  'create-from-local:Create a new GitHub repository from the current local repository'
+  'create:Create a new empty GitHub repository'
+  'fetch:Fetch from a remote to a local branch'
+  'fetch_all:Fetch all refs from a user'
+  'fork:Forks a GitHub repository'
+  'home:Open this repos master branch in a web browser'
+  'ignore:Ignore a SHA from github network commits'
+  'info:Info about this project'
+  'issues:Project issues tools'
+  'network:Project network tools - sub-commands : web [user], list, fetch, commits'
+  'open:Open the given user/project in a web browser'
+  'pull-request:Generate the text for a pull request'
+  'pull:Pull from a remote'
+  'search:Search GitHub for the given repository name'
+  'track:Track another users repository'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "github subcommand" _1st_arguments
+  return
+fi
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
new file mode 100644
index 000000000..c23504b85
--- /dev/null
+++ b/plugins/github/github.plugin.zsh
@@ -0,0 +1,4 @@
+# add github completion function to path
+fpath=($ZSH/plugins/github $fpath)
+autoload -U compinit
+compinit -i
diff --git a/plugins/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
index 4eb06a997..4eb06a997 100644
--- a/plugins/lighthouse.plugin.zsh
+++ b/plugins/lighthouse/lighthouse.plugin.zsh
diff --git a/plugins/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 9564829b0..9564829b0 100644
--- a/plugins/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
index 63b881c9f..63b881c9f 100644
--- a/plugins/mysql-macports.plugin.zsh
+++ b/plugins/mysql/mysql-macports.plugin.zsh
diff --git a/plugins/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index fce88c796..fce88c796 100644
--- a/plugins/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
diff --git a/plugins/pip/_pip b/plugins/pip/_pip
new file mode 100644
index 000000000..b58010173
--- /dev/null
+++ b/plugins/pip/_pip
@@ -0,0 +1,46 @@
+#compdef pip
+#autoload
+
+# pip zsh completion, based on homebrew completion
+
+_pip_installed() {
+  installed_pkgs=(`pip freeze`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'bundle:Create pybundles (archives containing multiple packages)'
+  'freeze:Output all currently installed packages (exact versions) to stdout'
+  'help:Show available commands'
+  'install:Install packages'
+  'search:Search PyPI'
+  'uninstall:Uninstall packages'
+  'unzip:Unzip individual packages'
+  'zip:Zip individual packages'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+  '(--version)--version[Show version number of program and exit]' \
+  '(-v --verbose)'{-v,--verbose}'[Give more output]' \
+  '(-q --quiet)'{-q,--quiet}'[Give less output]' \
+  '(-h --help)'{-h,--help}'[Show help]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "pip subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  list)
+      if [[ "$state" == forms ]]; then
+        _pip_installed
+        _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs
+      fi ;;
+  uninstall)
+    _pip_installed
+    _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
+esac
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
new file mode 100644
index 000000000..bf9f23968
--- /dev/null
+++ b/plugins/pip/pip.plugin.zsh
@@ -0,0 +1,4 @@
+# add brew completion function to path
+fpath=($ZSH/plugins/pip $fpath)
+autoload -U compinit
+compinit -i
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
new file mode 100644
index 000000000..ac8119e83
--- /dev/null
+++ b/plugins/rails/rails.plugin.zsh
@@ -0,0 +1,13 @@
+alias ss='thin --stats "/thin/stats" start'
+alias sg='ruby script/generate'
+alias sd='ruby script/destroy'
+alias sp='ruby script/plugin'
+alias ssp='ruby script/spec'
+alias rdbm='rake db:migrate'
+alias sc='ruby script/console'
+alias sd='ruby script/server --debugger'
+alias devlog='tail -f log/development.log'
+
+function remote_console() {
+  /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
+}
diff --git a/plugins/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 82bf5d49d..82bf5d49d 100644
--- a/plugins/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index ce0d645c1..ce0d645c1 100644
--- a/plugins/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
diff --git a/plugins/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index 7b73e2751..7b73e2751 100644
--- a/plugins/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
diff --git a/plugins/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index c47ab7211..c47ab7211 100644
--- a/plugins/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh