rvm 0.1.24 → 0.1.26

data/scripts/gemsets

@@ -10,7 +10,7 @@ if [[ ! -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem
 trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 __rvm_gemset_name() {
-   __rvm_gemset_gemdir |  awk -F'%' '{print $2}'
+   __rvm_gemset_gemdir |  awk -F${rvm_gemset_separator} '{print $2}'
 }
 
 __rvm_gemset_dir() {
@@ -18,9 +18,9 @@ __rvm_gemset_dir() {
 }
 
 __rvm_gemset_create() {
-  rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/%.*$//')
+  rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator}'.*$//')
   for gemset in $(echo $gems_args) ; do
-    gem_home="$rvm_ruby_gem_prefix%${gems_args/ /}"
+    gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gems_args/ /}"
     mkdir -p $gem_home
     ln -nfs "$HOME/.gem/cache" "$gem_home/cache"
     $rvm_scripts_path/log "info" "Gemset '$gemset' created."
@@ -34,8 +34,8 @@ __rvm_gemset_list() {
 
   if [[ ! -z "$rvm_gems_path" ]] ; then
     if [[ ! -z $rvm_ruby_string ]] ; then
-      for gemdir in $rvm_gems_path/${rvm_ruby_string}%* ; do
-        echo "$gemdir" | awk -F'%' '{print $2}'
+      for gemdir in $rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}* ; do
+        echo "$gemdir" | awk -F${rvm_gemset_separator} '{print $2}'
       done
     else
       $rvm_scripts_path/log "error" "\$rvm_ruby_string is not set!"
@@ -48,7 +48,7 @@ __rvm_gemset_list() {
 __rvm_gemset_delete() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ ! -z "$rvm_gemset_name" ]] ; then
-    gemdir="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
+    gemdir="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
     if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
@@ -74,7 +74,7 @@ __rvm_gemset_empty() {
   if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
     cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
   elif [[ -d "$gemdir" ]] ; then
-    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '%$rvm_gemset_name' ($gemdir)?"
+    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '${rvm_gemset_separator}$rvm_gemset_name' ($gemdir)?"
     echo -n "(anything other than 'yes' will cancel) > "
     read response
     if [[ "yes" = "$response" ]] ; then
@@ -119,7 +119,7 @@ __rvm_gemset_export() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin"
+    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}global/bin"
     export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
@@ -152,7 +152,7 @@ __rvm_gemset_import() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin"
+    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}global/bin"
     export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
@@ -274,9 +274,9 @@ __rvm_gem_install() {
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
     if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gems_path" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin' BUNDLE_PATH='$rvm_ruby_gem_home' $gem_prefix gem install $gems_args $rvm_gem_options $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} gem install --ignore-dependencies $gems_args $rvm_gem_options $gem_postfix $vars"
     else
-      command="$gem_prefix gem install $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
+      command="$gem_prefix gem install --ignore-dependencies $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
     fi
     __rvm_run "gem.install" "$command" "$gem_name $gem_version is not installed, installing..."
     result=$?

data/scripts/initialize

@@ -23,6 +23,7 @@ rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
 rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
+rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 
-export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path
+export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
 

data/scripts/install

@@ -13,9 +13,9 @@ source scripts/utility
 usage() {
   echo -e "
   Usage:
-    ${0} <options>
+    ${0} [options]
 
-  Options:
+  options:
     --auto    : Automatically update shell profile files.
     --prefix  : Installation prefix directory.
     --help    : Display help/usage (this) message
@@ -23,6 +23,15 @@ usage() {
   "
 }
 
+spinner_counter=0
+spinner() {
+  array=('/' '-' '\\' '|' '/' '-' '\\' '|')
+  index=$((($spinner_counter % 8)))
+  echo -e -n "\r${array[$index]}"
+  let "spinner_counter=spinner_counter+1"
+  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+}
+
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
@@ -47,18 +56,25 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
+  if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
+    export upgrade_flag=1
+  else
+    export upgrade_flag=0
+  fi
+else
+  export upgrade_flag=0
+fi
+
 __rvm_initialize
 
 #
-# Setup
+# Setup & Configuration
 #
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
 source_path="${source_path:-$cwd}"
-
-# State what is required to use rvm
-echo -e "\nInstalling rvm to $rvm_path/ ..."
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
@@ -71,9 +87,25 @@ rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
+export rvm_gemset_separator="@" # TODO: Remove this after a while.
+
+echo -e "\n$(tput setaf 2)RVM$(tput sgr0) - shell scripts which allow management of multiple ruby interpreters and environments."
+echo -e "\n    $(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
+echo -e "\n    $(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
+
+echo -e "\n********************************************************************************"
+if [[ "$upgrade_flag" -eq 1 ]] ;then
+  echo -e -n "  Upgrading the RVM installation in $rvm_path/"
+else
+  echo -e -n "  Installing rvm to $rvm_path/"
+fi
+
+spinner
+
 mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path $HOME/.gem/cache
 
 for file in README LICENCE ; do
+  spinner
   cp -f "$source_path/$file" "$rvm_path/"
 done
 
@@ -81,19 +113,22 @@ done
 # Scripts
 #
 for dir_name in config scripts examples lib hooks ; do
+  spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
     cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
+spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
   mkdir -p "$rvm_config_path/"
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
-scripts="monitor match log install color db fetch log set package"
-for script_name in $(echo $scripts) ; do
+scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
+for script_name in $scripts ; do
+  spinner
   chmod +x $rvm_scripts_path/$script_name
 done
 
@@ -102,14 +137,17 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo ; do
+  spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
+spinner
 chmod +x $rvm_bin_path/*
 
 #
 # RC Files
 #
+spinner
 if [[ ! -z "$rvm_auto_flag" ]] ; then
   echo -e "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
@@ -134,11 +172,13 @@ fi
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 mkdir -p "$rvm_rubies_path/"
+spinner
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
   if [[ -d "$ruby" ]] ; then
     mv "$ruby" "$rvm_rubies_path/"
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
+      spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
         sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
@@ -148,7 +188,46 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
   fi
 done
 #
-# End of migration.
+# End of rubies migration.
+#
+
+#
+# Migrate old gemset directories to new gemset pattern.
+#
+spinner
+echo -e -n "\r*" # Stop spinner.
+
+for gemset in $rvm_path/gems/*\%* ; do
+  new_path=${gemset/\%/${rvm_gemset_separator}}
+  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    mv $gemset $new_path
+  fi
+done
+
+for gemset in $rvm_path/gems/*\+* ; do
+  new_path=${gemset/\+/${rvm_gemset_separator}}
+  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    mv $gemset $new_path
+  fi
+done
+for gemset in $rvm_path/gems/*\@ ; do
+  new_path=$(echo $gemset | sed -e 's#\@$##')
+  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+    echo -e "    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    mv $gemset $new_path
+  fi
+done
+
+# Upgrade any default file.
+if [[ -s $rvm_config_path/default ]] && grep -q '\%' $rvm_config_path/default ; then
+  sed -e "s#\%#${rvm_gemset_separator}#g" $rvm_config_path/default > $rvm_config_path/default.new
+  mv $rvm_config_path/default.new $rvm_config_path/default
+fi
+
+#
+# End of gemset migration.
 #
 
 if [[ "root" = "$(whoami)" ]] ; then
@@ -160,11 +239,11 @@ if [[ "root" = "$(whoami)" ]] ; then
   chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-./scripts/notes
+if [[ "$upgrade_flag" -eq 0 ]] ; then
+  echo -e "\n********************************************************************************"
+  ./scripts/notes
+fi
 
-echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
-echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "
 echo -e "\n********************************************************************************"
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 echo -e "\n${name:-"$(whoami)"},\n"
@@ -177,20 +256,28 @@ echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
 
-if [[ "root" != "$(whoami)" ]] ; then
-  echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-  echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-  echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-  echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
-  echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
-  echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
-  echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-  echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
-fi
-
-if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
-  echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n\n"
+if [[ "$upgrade_flag" -eq 1 ]] ; then
+  echo -e "\n$(tput setaf 6)**** NOTICE *************************************************************************************"
+  echo -e "*  Gemset separator has changed, it is now @ and will remain unless any rubies error using it.  *"
+  echo -e "*  If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X'   *"
+  echo -e "*************************************************************************************************$(tput sgr0)\n"
+  echo -e "Upgrade of RVM in $rvm_path/ is complete.\n"
+else
+  if [[ "root" != "$(whoami)" ]] ; then
+    echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
+    echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+    echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+    echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
+    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
+    echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
+    echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
+    echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
+    echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+  fi
+  if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
+    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n"
+  fi
+  echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi
 
 exit 0

data/scripts/manage

@@ -152,8 +152,8 @@ __rvm_install_ruby() {
           mkdir -p "$rvm_ruby_home/bin"
         fi
 
-        binaries="erb gem irb rake rdoc ri ruby testrb" # Trick to work in more shells :)
-        for binary_name in $(echo $binaries); do
+        binaries=(erb gem irb rake rdoc ri ruby testrb)
+        for binary_name in ${binaries[@]}; do
           # if [[ $binary_name != "gem" ]] ; then prefix="-S" ; fi
           ruby_wrapper=$(cat <<RubyWrapper
 #!/usr/bin/env bash
@@ -226,7 +226,7 @@ RubyWrapper
 
         __rvm_rubygems_setup
 
-        for rvm_gem_name in rake ; do
+        for rvm_gem_name in rdoc rake ; do
           __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
         done
         __rvm_inject_ruby_shebang "$rvm_ruby_gem_home/bin/rake"
@@ -486,7 +486,6 @@ RubyWrapper
       $rvm_scripts_path/log "info" "Generating smalltalk FFI."
       $rvm_bin_path/rvm 1.8.7 rake stwrappers >/dev/null 2>&1
 
-
       # TODO: Figure out if anything needs to be done with rubygems.
       #__rvm_rubygems_setup
       __rvm_irbrc
@@ -554,7 +553,7 @@ RubyWrapper
       cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
       cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
 
-      binaries="gem irb rake rdoc ri ruby"
+      binaries="gem irb rdoc rake ri ruby"
       for binary_name in $(echo $binaries); do
         binary_path=""
         if [[ "ruby" != "$binary_name" ]] ; then
@@ -797,7 +796,7 @@ __rvm_uninstall_ruby() {
         rm -f $rvm_bin_path/$rvm_ruby_string
       fi
     done ; unset dir
-    rm -rf $rvm_gems_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
+    __rvm_remove_gemsets
   else
     $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
   fi ; unset rvm_uninstall_flag
@@ -818,11 +817,20 @@ __rvm_remove_ruby() {
         rm -f $rvm_bin_path/$rvm_ruby_string
       fi
     done ; unset dir
+    __rvm_remove_gemsets
   else
     $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
   fi ; unset rvm_remove_flag
 }
 
+__rvm_remove_gemsets() {
+  if [[ ! -z "$rvm_gems_flag" ]] ; then
+    if [[ -d "$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}" ]] ; then
+      rm -rf $rvm_gems_path/${rvm_ruby_string}*
+    fi
+  fi
+}
+
 __rvm_post_install() {
   binaries="${binaries:-"gem irb erb ri rdoc testrb rake"}"
   for binary in $(echo $binaries) ; do
@@ -840,25 +848,26 @@ __rvm_post_install() {
 
   $rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_string."
 
-  for rvm_gem_name in rake ; do
+  for rvm_gem_name in rdoc rake ; do
     home="$GEM_HOME" ; path="$GEM_PATH" # Save
-    export GEM_HOME="$rvm_ruby_global_gems_path"
-    export GEM_PATH="$rvm_ruby_global_gems_path"
-    export BUNDLE_PATH="$rvm_ruby_global_gems_path"
-    __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
-    export GEM_HOME="$home" ; export GEM_PATH="$path" ; export BUNDLE_PATH="$home" ; unset home path
+    for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
+      GEM_HOME="$dir" ; GEM_PATH="$dir" ; BUNDLE_PATH="$dir"
+      export GEM_HOME GEM_PATH BUNDLE_PATH
+      __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install --no-rdoc --no-ri $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
+
+      if [[ -x $rvm_ruby_gem_home/bin/$rvm_gem_name ]] ; then
+        if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] && [[ ! -x $rvm_ruby_home/bin/$rvm_gem_name ]] ; then
+          ln -nfs $rvm_ruby_gem_home/bin/$rvm_gem_name $rvm_ruby_home/bin/$rvm_gem_name
+        fi
+        __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$rvm_gem_name"
+        __rvm_inject_gem_env "$rvm_ruby_home/bin/$rvm_gem_name"
+      fi ; unset rvm_gem_name
+    done ; unset home path dir
+    GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
+    export GEM_HOME GEM_PATH BUNDLE_PATH
   done ; unset rvm_gem_name
-
   $rvm_scripts_path/log "info" "Installation of gems for $rvm_ruby_string is complete."
 
-  binary=rake
-  if [[ -x $rvm_ruby_gem_home/bin/$binary ]] ; then
-    if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then
-      cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
-    fi
-    __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
-    __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
-  fi ; unset binary
   __rvm_irbrc
 }
 
@@ -877,18 +886,22 @@ __rvm_rubygems_setup() {
     # 1.9.X has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
+
     cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
+
     home="$GEM_HOME" ; path="$GEM_PATH" # Save
-    export GEM_HOME="$rvm_ruby_global_gems_path"
-    export GEM_PATH="$rvm_ruby_global_gems_path"
-    export BUNDLE_PATH="$rvm_ruby_global_gems_path"
-    __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "Updating rubygems for $rvm_ruby_string"
-    export GEM_HOME="$home" ; export GEM_PATH="$path" ; export BUNDLE_PATH="$home" unset home path
+    for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
+      export GEM_HOME="$dir" ; export GEM_PATH="$dir" ; export BUNDLE_PATH="$dir"
+      __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "Updating rubygems for $dir"
+    done ; unset home path dir
+    GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
+    export GEM_HOME GEM_PATH BUNDLE_PATH
 
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
     ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/1.$rvm_major_version"
   elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
+    # Hands off rubygems for rbx & jruby
     if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version" ; fi
     ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/jruby"
   else
@@ -898,7 +911,8 @@ __rvm_rubygems_setup() {
     rvm_gem_package_name="rubygems-$rvm_rubygems_version"
     rvm_gem_url="$rvm_rubygems_url/$rvm_gem_package_name.tgz"
 
-    # Sanity check...
+    # Sanity check... If setup.rb is missing from the rubygems source path,
+    # something went wrong. Cleanup, aisle 3!
     if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
       rm -rf "$rvm_src_path/$rvm_gem_package_name"
     fi
@@ -934,12 +948,17 @@ __rvm_rubygems_setup() {
 
   # Add ruby's gem path to ruby's lib direcotry.
   mkdir -p $(dirname $ruby_lib_gem_path)
-  if [[ -d "$ruby_lib_gem_path" ]] ; then
-    rm -rf "$ruby_lib_gem_path"
-  fi
+
+  if [[ -d "$ruby_lib_gem_path" ]] ; then rm -rf "$ruby_lib_gem_path" ; fi
+
   ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
+
   unset ruby_lib_gem_path
 
+  if [[ -s "$rvm_ruby_src_path/bin/rdoc" ]] ; then
+    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rdoc"
+  fi
+
   if [[ -s "$rvm_ruby_src_path/bin/rake" ]] ; then
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rake"
   fi
@@ -986,8 +1005,8 @@ __rvm_manage_rubies() {
 
   unset rvm_gemset_name rvm_ruby_selected_flag
 
-  rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F'%' '{print $1}')
-  rvm_ruby_string=$(echo $rvm_ruby_string | awk -F'%' '{print $1}')
+  rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F${rvm_gemset_separator} '{print $1}')
+  rvm_ruby_string=$(echo $rvm_ruby_string | awk -F${rvm_gemset_separator} '{print $1}')
 
   # TODO: Extract the common functionality out of the if below
   #if [[ ! -z "$rvm_ruby_string" ]] ; then