Simplified rvm, rbenv, and Mac OS X Ruby settings.

plugins/ruby/init.zsh

@@ -5,33 +5,25 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# Install local gems according to Mac OS X conventions.
-if [[ "$OSTYPE" == darwin* ]]; then
-  export GEM_HOME=$HOME/Library/Ruby/Gems/1.8
-  path=("$GEM_HOME/bin" $path)
-
-  # Set environment variables for launchd processes.
-  launchctl setenv GEM_HOME "$GEM_HOME" &!
-fi
-
 # Loads RVM into the shell session.
 if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
-  # Let RVM manage the GEM_HOME.
-  unset GEM_HOME
-
   # Auto adding variable-stored paths to ~ list conflicts with RVM.
   unsetopt AUTO_NAME_DIRS
 
   # Source RVM.
   source "$HOME/.rvm/scripts/rvm"
-fi
-
 # Loads rbenv into the shell session.
-if [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
-  # Let rbenv manage the GEM_HOME.
-  unset GEM_HOME
-
+elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
   path=("$HOME/.rbenv/bin" $path)
   eval "$(rbenv init - zsh)"
+else
+  # Install local gems according to Mac OS X conventions.
+  if [[ "$OSTYPE" == darwin* ]]; then
+    export GEM_HOME="$HOME/Library/Ruby/Gems/1.8"
+    path=("$GEM_HOME/bin" $path)
+
+    # Set environment variables for launchd processes.
+    launchctl setenv GEM_HOME "$GEM_HOME" &!
+  fi
 fi