Merge pull request #366 from betawaffle/master

Add/update plugins: brew, rvm, node, npm, pow, and thor.

plugins/brew/_brew

@@ -25,10 +25,12 @@ _1st_arguments=(
   'link:link a formula'
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
+  'missing:check all installed formuale for missing dependencies.'
   'outdated:list formulas for which a newer version is available'
   'prune:remove dead links'
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
+  'server:start a local web app that lets you browse formulae (requires Sinatra)'
   'unlink:unlink a formula'
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'
@@ -36,10 +38,14 @@ _1st_arguments=(
 )
 
 local expl
-local -a formula installed_formulae
+local -a formulae installed_formulae
 
 _arguments \
-  '(-v --verbose)'{-v,--verbose}'[verbose]' \
+  '(-v)-v[verbose]' \
+  '(--cellar)--cellar[brew cellar]' \
+  '(--config)--config[brew configuration]' \
+  '(--env)--env[brew environment]' \
+  '(--repository)--repository[brew repository]' \
   '(--version)--version[version information]' \
   '(--prefix)--prefix[where brew lives on this system]' \
   '(--cache)--cache[brew cache]' \
@@ -51,20 +57,24 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  list)
+  search|-S)
+    _arguments \
+      '(--macports)--macports[search the macports repository]' \
+      '(--fink)--fink[search the fink repository]' ;;
+  list|ls)
     _arguments \
       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+      '(--versions)--versions[list all installed versions of a formula]' \
       '1: :->forms' &&  return 0
 
       if [[ "$state" == forms ]]; then
         _brew_installed_formulae
-        _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
+        _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|log|info|uses|cat|deps)
+  install|home|homepage|log|info|abv|uses|cat|deps|edit|options)
     _brew_all_formulae
     _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  remove|edit|xo)
+  remove|rm|uninstall|unlink|cleanup|link|ln)
     _brew_installed_formulae
     _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
 esac
-

plugins/brew/brew.plugin.zsh

@@ -0,0 +1,13 @@
+# Move /usr/local/bin (path where brews are linked) to the front of the path
+# This will allow us to override system binaries like ruby with our brews
+# TODO: Do this in a more compatible way.
+#       What if someone doesn't have /usr/bin in their path?
+export PATH=`echo $PATH | sed -e 's|/usr/local/bin||' -e 's|::|:|g'` # Remove /usr/local/bin
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/bin:&|'`     # Add it in front of /usr/bin
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/sbin:&|'`    # Add /usr/local/sbin
+
+alias brews='brew list -1'
+
+function brew-link-completion {
+	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
+}

plugins/cap/cap.plugin.zsh

@@ -18,4 +18,4 @@ function _cap () {
   fi
 }
 
-compctl -K _cap cap
+compctl -K _cap cap

plugins/compleat/compleat.plugin.zsh

@@ -5,7 +5,6 @@
 #       VERSION:  1.0.0
 # ------------------------------------------------------------------------------
 
-
 if (( ${+commands[compleat]} )); then
   local prefix="${commands[compleat]:h:h}"
   local setup="${prefix}/share/compleat-1.0/compleat_setup" 
@@ -19,4 +18,3 @@ if (( ${+commands[compleat]} )); then
     source "$setup" 
   fi
 fi
-

plugins/github/github.plugin.zsh

@@ -4,4 +4,3 @@ if [ "$commands[(I)hub]" ]; then
     # eval `hub alias -s zsh`
     function git(){hub "$@"}
 fi
-

plugins/node/node.plugin.zsh

@@ -0,0 +1,8 @@
+# This works if you installed node via homebrew.
+export NODE_PATH="/usr/local/lib/node"
+
+# Open the node api for your current version to the optional section.
+# TODO: Make the section part easier to use.
+function node-api {
+	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
+}

plugins/npm/npm.plugin.zsh

@@ -0,0 +1,2 @@
+# TODO: Don't do this in such a weird way.
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`

plugins/osx/osx.plugin.zsh

@@ -1,3 +1,9 @@
+alias showfiles='defaults write com.apple.finder AppleShowAllFiles TRUE; killall Finder'
+alias hidefiles='defaults write com.apple.finder AppleShowAllFiles FALSE; killall Finder'
+
+# Recursively delete .DS_Store files
+alias rm-dsstore="find . -name '*.DS_Store' -type f -delete"
+
 function savepath() {
   pwd > ~/.current_path~
 }

plugins/pow/pow.plugin.zsh

@@ -0,0 +1,10 @@
+# Thanks to Christopher Sexton
+# https://gist.github.com/965032
+function kapow {
+	touch ~/.pow/$1/tmp/restart.txt
+	if [ $? -eq 0 ]; then
+		echo "$fg[yellow]Pow restarting $1...$reset_color"
+	fi
+}
+
+compctl -W ~/.pow -/ kapow

plugins/ruby/ruby.plugin.zsh

@@ -1,4 +1,6 @@
+# TODO: Make this compatible with rvm.
+#       Run sudo gem on the system ruby, not the active ruby.
 alias sgem='sudo gem'
 
 # Find ruby file
-alias rfind='find . -name *.rb | xargs grep -n'
+alias rfind='find . -name *.rb | xargs grep -n'

plugins/rvm/rvm.plugin.zsh

@@ -1,3 +1,52 @@
 fpath=($ZSH/plugins/rvm $fpath)
 autoload -U compinit
 compinit -i
+
+alias rubies='rvm list rubies'
+alias gemsets='rvm gemset list'
+
+local ruby18='ruby-1.8.7-p334'
+local ruby19='ruby-1.9.2-p180'
+
+function rb18 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby18"
+	else
+		rvm use "$ruby18@$1"
+	fi
+}
+
+_rb18() {compadd `ls -1 $rvm_path/gems | grep "^$ruby18@" | sed -e "s/^$ruby18@//" | awk '{print $1}'`}
+compdef _rb18 rb18
+
+function rb19 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby19"
+	else
+		rvm use "$ruby19@$1"
+	fi
+}
+
+_rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
+compdef _rb19 rb19
+
+function rvm-update {
+	rvm get head
+	rvm reload # TODO: Reload rvm completion?
+}
+
+function rvm-link-completion {
+	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
+}
+
+# TODO: Make this usable w/o rvm.
+function gems {
+	local current_ruby=`rvm-prompt i v p`
+	local current_gemset=`rvm-prompt g`
+
+	gem list $@ | sed \
+		-Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+		-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
+		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+}

plugins/textmate/textmate.plugin.zsh

@@ -1,11 +1,9 @@
-
-# TextMate
 alias et='mate .'
 alias ett='mate app config lib db public spec test Rakefile Capfile Todo'
 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 
-# Editor Ruby file in TextMate
+# Edit Ruby app in TextMate
 alias mr='mate CHANGELOG app config db lib public script spec test'
 
 function tm() {

plugins/thor/_thor

@@ -0,0 +1,4 @@
+#compdef thor
+#autoload
+
+compadd `thor list | grep thor | cut -d " " -f 2`