From 7f69551498a78a6b30d706c89808fcd2ba000045 Mon Sep 17 00:00:00 2001
From: Christopher Chow <soliah@gmail.com>
Date: Wed, 23 Feb 2011 02:56:25 +1100
Subject: Add tab completion for rvm.

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

(limited to 'plugins/rvm/rvm.plugin.zsh')

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
new file mode 100644
index 000000000..ef934d547
--- /dev/null
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -0,0 +1,3 @@
+fpath=($ZSH/plugins/rvm $fpath)
+autoload -U compinit
+compinit -i
-- 
cgit v1.2.3-70-g09d2


From 3e433165502a01028fcd0368161a2193eaeb386c Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:16:06 -0400
Subject: Ruby Switching Helpers

Add helper functions to switch gemsets on ruby-1.8.7-p334 and ruby-1.9.2-p180.
Add completion definitions for helper functions.
---
 plugins/rvm/rvm.plugin.zsh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'plugins/rvm/rvm.plugin.zsh')

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index ef934d547..274123836 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,3 +1,28 @@
 fpath=($ZSH/plugins/rvm $fpath)
 autoload -U compinit
 compinit -i
+
+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
-- 
cgit v1.2.3-70-g09d2


From e703c9591c64cd23bb0f0e1a892fbed0efe74fa7 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:23:06 -0400
Subject: Helpful Listing Aliases

Add alias to list installed rubies. Add alias to list gemsets in active ruby.
---
 plugins/rvm/rvm.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/rvm/rvm.plugin.zsh')

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 274123836..ba780c97d 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -2,6 +2,9 @@ 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'
 
-- 
cgit v1.2.3-70-g09d2


From 9f34bbedc8d4843b0ed50f76d38b63e5aa48cc8b Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:35:54 -0400
Subject: RVM Update Helpers

Add helper function to get rvm head. Add helper function to link zsh
completion that comes with rvm into om-my-zsh plugin directory, but don't
overwrite the completion that comes with oh-my-zsh (oh-my-zsh's completion is
better, but I want to be able to compare).
---
 plugins/rvm/rvm.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'plugins/rvm/rvm.plugin.zsh')

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index ba780c97d..509dcbd98 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -29,3 +29,12 @@ function rb19 {
 
 _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"
+}
-- 
cgit v1.2.3-70-g09d2


From 572b27b75724d00fbc99ef64de3dbd21a28c8194 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:50:06 -0400
Subject: Gem List Helper

Add helper function to list gems in a pretty way (only with rvm, for now). Add
missng EOF newline and a todo to the ruby plugin.
---
 plugins/ruby/ruby.plugin.zsh |  4 +++-
 plugins/rvm/rvm.plugin.zsh   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'plugins/rvm/rvm.plugin.zsh')

diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 82bf5d49d..08ca9c601 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/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'
\ No newline at end of file
+alias rfind='find . -name *.rb | xargs grep -n'
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 509dcbd98..8a3ec788a 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -38,3 +38,15 @@ function rvm-update {
 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"
+}
-- 
cgit v1.2.3-70-g09d2


From 1e3b441ce7e0b8706867801c1e5e7ca6760ff17e Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 10:07:15 -0400
Subject: Rollback of Pull #366

sorin-ionescu had some good points.
---
 plugins/brew/brew.plugin.zsh | 12 ------------
 plugins/node/node.plugin.zsh |  5 +----
 plugins/npm/npm.plugin.zsh   |  2 --
 plugins/rvm/rvm.plugin.zsh   |  9 ++-------
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 plugins/npm/npm.plugin.zsh

(limited to 'plugins/rvm/rvm.plugin.zsh')

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index f584a4684..c2e95884e 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,13 +1 @@
-# 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"
-}
diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 18f35333c..519bc18da 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -1,8 +1,5 @@
-# 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 {
+function node-docs {
 	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
 }
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
deleted file mode 100644
index 0b0a30e11..000000000
--- a/plugins/npm/npm.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO: Don't do this in such a weird way.
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 8a3ec788a..40fd88c1a 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,5 @@
-fpath=($ZSH/plugins/rvm $fpath)
-autoload -U compinit
-compinit -i
+# What does this really do?
+# fpath=($ZSH/plugins/rvm $fpath)
 
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
@@ -35,10 +34,6 @@ function rvm-update {
 	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`
-- 
cgit v1.2.3-70-g09d2


From 9801ad6453caa05925847f63401e6266378eb2de Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 11:10:08 -0400
Subject: Remove Uneeded Lines

---
 plugins/rvm/rvm.plugin.zsh | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'plugins/rvm/rvm.plugin.zsh')

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 40fd88c1a..24621fe0b 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,3 @@
-# What does this really do?
-# fpath=($ZSH/plugins/rvm $fpath)
-
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
-- 
cgit v1.2.3-70-g09d2