rvm 0.1.18 → 0.1.19

data/scripts/rvm

@@ -12,15 +12,23 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
+  if [[ -z "$rvm_prefix" ]] ; then
+    if [[ "root" = "$(whoami)" ]] ; then
+      rvm_prefix="/usr/local"
+    else
+      rvm_prefix="$HOME"
+    fi
+  fi
+
   if [[ -z "$rvm_path" ]] ; then
     unset rvm_path
     if [[ "root" = "$(whoami)" ]] ; then
-      rvm_path="/usr/local/rvm"
+      rvm_path="$rvm_prefix/rvm"
     else
       if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
         rvm_path="$HOME/.rvm"
-      elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-        rvm_path="/usr/local/rvm"
+      elif [[ -d "$rvm_prefix/rvm" ]] && [[ -s "$rvm_prefix/rvm/scripts/rvm" ]] ; then
+        rvm_path="$rvm_prefix/rvm"
       else
         rvm_path="$HOME/.rvm"
       fi
@@ -48,7 +56,6 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     source $rvm_scripts_path/version
     source $rvm_scripts_path/selector
     source $rvm_scripts_path/cli
-    source $rvm_scripts_path/libraries
     source $rvm_scripts_path/cd
 
     rvm_loaded_flag=1
@@ -61,8 +68,8 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
       source "$HOME/.rvm/default"
     elif [[ -s "$rvm_config_path/default" ]] ; then
       source "$rvm_config_path/default"
-    elif [[ -s "/usr/local/rvm/config/default" ]] ; then
-      source "/usr/local/rvm/config/default"
+    elif [[ -s "$rvm_prefix/rvm/config/default" ]] ; then
+      source "$rvm_prefix/rvm/config/default"
     fi
   else
     echo -e "\$rvm_path is not set. rvm cannot load."

data/scripts/rvm-install

@@ -35,17 +35,17 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-__rvm_load_rvmrc
-
-if [[ -z "$rvm_path" ]] ; then
-  unset rvm_path
+if [[ -z "$rvm_prefix" ]] ; then
+  __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="/usr/local/rvm"
+    rvm_prefix="/usr/local/"
   else
-    rvm_path="$HOME/.rvm"
+    rvm_prefix="$HOME/."
   fi
 fi
 
+if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+
 source scripts/initialize
 __rvm_initialize
 
@@ -69,7 +69,7 @@ rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
-rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
 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
 
@@ -92,6 +92,11 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   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 libraries"
+for script_name in $(echo $scripts) ; do
+  chmod +x $rvm_scripts_path/$script_name
+done
+
 #
 # Bin Scripts
 #
@@ -167,6 +172,7 @@ echo -e "\nThank you for using rvm. I hope that it makes your work easier and mo
 echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
 echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
 echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "Be sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
@@ -176,13 +182,14 @@ if [[ "root" != "$(whoami)" ]] ; then
   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 split your .bashrc"
+  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 grep '&& return' ~/.bashrc ; then
+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"
 fi
 

data/scripts/selector

@@ -186,7 +186,7 @@ __rvm_select() {
       fi
   esac
 
-  __rvm_gems_select
+  __rvm_gemset_select
 
   if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ "system" != "$rvm_ruby_interpreter" ]]  && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ ! -z "$rvm_ruby_version" ]] ; then
@@ -207,15 +207,15 @@ __rvm_select() {
       export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
     fi
 
-    if [[ ! -z "$rvm_gem_set_name" ]] ; then
-      rvm_ruby_gem_home="${rvm_ruby_gem_home}%${rvm_gem_set_name}"
+    if [[ ! -z "$rvm_gemset_name" ]] ; then
+      rvm_ruby_gem_home="${rvm_ruby_gem_home}%${rvm_gemset_name}"
     fi
 
     rvm_ruby_selected_flag=1
 
     mkdir -p $rvm_ruby_log_path
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
   fi
@@ -319,7 +319,7 @@ __rvm_use() {
 
       echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
 
-      for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
+      for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
         eval "export $variable"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then
@@ -340,7 +340,7 @@ __rvm_use() {
   if [[ ! -z "$rvm_rvmrc_flag" ]]     ; then __rvm_set_rvmrc ; fi
   # Export ruby string and gem set name for extrnal scripts to take advantage of them.
   if [[ ! -z "$rvm_ruby_string" ]]    ; then export rvm_ruby_string  ; fi
-  if [[ ! -z "$rvm_gem_set_name" ]]   ; then export rvm_gem_set_name ; fi
+  if [[ ! -z "$rvm_gemset_name" ]]   ; then export rvm_gemset_name ; fi
   if [[ ! -z "$new_path" ]]           ; then export PATH="$new_path" ; unset new_path ; fi
 
   if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
@@ -357,7 +357,7 @@ __rvm_use() {
 
 __rvm_ruby_string() {
   # rvm_ruby_string may designate any of the following items:
-  # * rvm_gem_set_name
+  # * rvm_gemset_name
   # * rvm_ruby_interpreter
   # * rvm_ruby_version
   # * rvm_ruby_patch_level
@@ -366,7 +366,7 @@ __rvm_ruby_string() {
   # * rvm_ruby_patch
 
   set_name=$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')
-  if [[ ! -z "$set_name" ]] ; then rvm_gem_set_name="$set_name" ; fi
+  if [[ ! -z "$set_name" ]] ; then rvm_gemset_name="$set_name" ; fi
   ruby_string=$(echo "$rvm_ruby_string" | awk -F'%' '{print $1}')
 
   __rvm_unset_ruby_variables
@@ -378,11 +378,11 @@ __rvm_ruby_string() {
       export rvm_head_flag=1
     elif [[ "default" = "$string" ]] ; then
       rvm_ruby_interpreter="default"
-      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gem_set_name
+      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gemset_name
       return
     elif [[ "system" = "$string" ]] ; then
       rvm_ruby_interpreter="system"
-      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gem_set_name
+      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gemset_name
       return
     elif [[ "nightly" = "$string" ]] ; then
       rvm_ruby_version="nightly"

data/scripts/set

@@ -0,0 +1,179 @@
+#!/usr/bin/env bash
+
+source $rvm_scripts_path/initialize
+source $rvm_scripts_path/utility
+source $rvm_scripts_path/selector
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+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
+
+action="$1" ; shift
+args="$*"
+if [[ -z "$action" ]] ; then
+  $rvm_scripts_path/log "error" "Action must be specified."
+  exit 1
+fi
+
+# Perform an action using one of a selected ruby's specified binaries.
+__rvm_ruby_do() {
+  __rvm_select
+  __rvm_use
+
+  binary="$(echo $action | sed 's#do$##')"
+  if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
+    rm -f "$rvm_path/gems/cache"
+    ln -nfs "$HOME/.gem/cache" "$rvm_path/gems/cache"
+    binary="$rvm_ruby_home/bin/$binary"
+  elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
+    binary="$rvm_ruby_global_gems_path/bin/$binary"
+  elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
+    binary="$rvm_ruby_gem_home/bin/$binary"
+  elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
+    binary="$(basename $(which $binary 2>/dev/null) 2>/dev/null)"
+  else
+    $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
+    __rvm_unset_ruby_variables
+    return 1
+  fi
+
+  if [[ ! -z "$rvm_ruby_mode" ]] ; then
+    rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_mode}"
+    rvm_ruby_mode="--$(echo $rvm_ruby_mode | sed 's/^m//')"
+  fi
+
+  load_path="$(dirname $(which $binary 2>/dev/null) 2>/dev/null):$rvm_ruby_load_path"
+  # TODO: the else case below should be run if $args =~ /\.rb$/
+  if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
+    if $rvm_scripts_path/match "$args" "\.rb$" ; then
+      if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
+      if ! $rvm_scripts_path/match "$args" "$prefix" ; then
+        args="$prefix $args"
+      fi
+    fi
+    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args"
+  elif [[ "gem" = "$(basename $binary)" ]] && $rvm_scripts_path/match "$args" '^install' ; then
+    #$rvm_scripts_path/gem install $args
+    rvm_command="$rvm_scripts_path/gemsets $rvm_ruby_mode $args $rvm_gem_options"
+  else
+    rvm_command="$binary $rvm_ruby_mode $args"
+  fi
+
+  if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
+    mkdir -p ./log/$rvm_ruby_string/
+    touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
+    eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
+  else
+    $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')"
+    eval "$rvm_command"
+  fi
+  result=$?
+
+  string=$(basename $rvm_ruby_gem_home)
+  if [[ $result -eq 0 ]]; then
+    eval "successes=(${successes[*]} $string)"
+  else
+    eval "errors=(${errors[*]} $string)"
+  fi
+  eval "rubies=(${rubies[*]} $string)"
+  eval "statuses=(${statuses[*]} $result)"
+  unset string
+  __rvm_unset_ruby_variables
+}
+
+# Output the summary in a human readable format.
+__rvm_summary() {
+  export successes errors statuses
+  summary="\nSummary:\n\n"
+  if [[ ${#successes[*]} -gt 0 ]] ; then
+    summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's# #, #g')\033[0m\n"
+  fi
+  if [[ ${#errors[*]} -gt 0 ]] ; then
+    summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's# #, #g')\033[0m\n"
+  fi
+  total=${#rubies[*]}
+  if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
+  echo -e "$summary" | tee -a log/summary.log
+  return ${#errors[*]}
+}
+
+# Output the summary in a yaml format.
+__rvm_yaml() {
+  export successes errors statuses
+  yaml="totals:\n  rubies: ${#rubies[*]}\n  successes: ${#successes[*]}\n  errors: ${#errors[*]}\nsuccesses:"
+  for var in ${successes[*]} ; do yaml="$yaml\n  - $var" ; done
+  yaml="$yaml\nerrors:"
+  for var in ${errors[*]} ; do yaml="$yaml\n  - $var" ; done
+  yaml="$yaml\nrubies:"
+  total=${#rubies[*]}
+  if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
+  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+    if [[ ! -z "$rvm_debug_flag" ]] ; then
+      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    fi
+    yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
+  done ; unset index array_start
+  mkdir -p log
+  echo -e "$yaml" | tee -a log/summary.yaml
+
+  return ${#errors[*]}
+}
+
+# Output the summary in a json format.
+__rvm_json() {
+  json="{"
+  json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
+  json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's# #", "#g')" ],"
+  json="$json\n  \"errors\": [ "$(echo ${errors[*]} | sed 's# #", "#g')" ],"
+  json="$json\n  \"rubies\": {"
+
+  total=${#rubies[*]}
+  if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
+  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+    if [[ ! -z "$rvm_debug_flag" ]] ; then
+      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    fi
+    json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
+    if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
+  done ; unset index array_start
+  json="$json\n  }\n}"
+
+  mkdir -p log
+  echo -e "$json" | tee -a log/summary.json
+
+  return ${#errors[*]}
+}
+
+# Loop over a set or all rvm installed rubies to perform some action.
+# Record the results and report based on CLI selections.
+#__rvm_do() {
+rubies=() ; successes=() ; errors=() ; statuses=()
+# TODO: Extract the common functionality out of the if below
+if [[ ! -z "$rvm_ruby_string" ]] ; then
+  unset rvm_ruby_interpreter rvm_ruby_version
+  __rvm_ruby_do
+elif [[ ! -z "$rvm_ruby_version" ]] ;then
+  for rvm_ruby_string in $(echo $rvm_ruby_version | tr ',' ' ') ; do
+    __rvm_ruby_do
+  done
+elif [[ ! -z "$rvm_ruby_interpreter" ]] ; then
+    unset rvm_ruby_string rvm_ruby_version
+    __rvm_ruby_do
+else # all
+  for full_binary in $rvm_rubies_path/*/bin/ruby ; do
+    if [[ -x "$full_binary" ]] ; then
+      rvm_ruby_string="$(dirname $full_binary | xargs dirname | xargs basename)"
+      __rvm_ruby_do
+    fi
+  done ; unset full_binary
+fi
+
+if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
+if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi
+if [[ ! -z "$rvm_json_flag" ]]    ; then __rvm_json    ; fi
+
+$rvm_scripts_path/hook "after_do"
+
+exit ${#errors[*]}
+#}
+

data/scripts/update

@@ -35,17 +35,17 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-__rvm_load_rvmrc
-
-if [[ -z "$rvm_path" ]] ; then
-  unset rvm_path
+if [[ -z "$rvm_prefix" ]] ; then
+  __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="/usr/local/rvm"
+    rvm_prefix="/usr/local/"
   else
-    rvm_path="$HOME/.rvm"
+    rvm_prefix="$HOME/."
   fi
 fi
 
+if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+
 source scripts/initialize
 __rvm_initialize
 
@@ -69,7 +69,7 @@ rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
-rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
 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
 
@@ -92,6 +92,11 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   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 libraries"
+for script_name in $(echo $scripts) ; do
+  chmod +x $rvm_scripts_path/$script_name
+done
+
 #
 # Bin Scripts
 #
@@ -167,6 +172,7 @@ echo -e "\nThank you for using rvm. I hope that it makes your work easier and mo
 echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
 echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
 echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "Be sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
@@ -176,13 +182,14 @@ if [[ "root" != "$(whoami)" ]] ; then
   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 split your .bashrc"
+  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 grep '&& return' ~/.bashrc ; then
+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"
 fi
 

data/scripts/utility

@@ -22,6 +22,8 @@ __rvm_db() {
   unset key value variable
 }
 
+is_a_function() { type $1 | head -n 1 | grep -q "function" ; }
+
 # Ouput rvm environment information.
 __rvm_info() {
 
@@ -123,8 +125,8 @@ __rvm_strings() {
       results="$results $(__rvm_select ; echo $rvm_ruby_string)"
       unset rvm_ruby_string
     fi
-  done 
-  echo $results 
+  done
+  echo $results
   unset results
   return 0
 }
@@ -179,7 +181,7 @@ __rvm_run() {
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
 
-  if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gem_set_name ; else unset rvm_gem_set_name  ; fi
+  if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
 
   unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flag
 }
@@ -204,6 +206,21 @@ __rvm_load_rvmrc() {
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 }
 
+# Wrap the specified ruby code file in a Benchmark.bmbm block and execute it.
+__rvm_benchmark() {
+  code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
+  echo -e "$code" > "$rvm_tmp_path/$$.rb"
+  unset code
+  cat $rvm_ruby_file >> "$rvm_tmp_path/$$.rb"
+  echo -e "\n end \nend\n" >> "$rvm_tmp_path/$$.rb"
+  rvm_ruby_args="$rvm_tmp_path/$$.rb"
+  rvm_benchmark_flag=1
+  action="ruby"
+  if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
+  $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+}
+
+
 # Loop over the currently installed rubies and refresh their binscripts.
 __rvm_bin_scripts() {
   for rvm_ruby_binary in $rvm_rubies_path/*/bin/ruby ; do
@@ -244,7 +261,7 @@ __rvm_load_defaults() {
   if [[ ! -s "$rvm_config_path/system" ]] ; then
     for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME ; do
       eval value=\$${variable}
-      if [[ -z "$value" ]] ; then
+      if [[ -z "${value/ /}" ]] ; then
         echo "unset ${variable}" >> $rvm_config_path/system
       else
         eval "export $variable"
@@ -315,7 +332,7 @@ __rvm_implode() {
         if [[ -d "$rvm_path" ]] ; then
           $rvm_scripts_path/log "info" "Hai! Removing $rvm_path"
           rm -rf $rvm_path/
-          $rvm_scripts_path/log "info" "$rvm_path has been removed."
+          echo "$rvm_path has been removed."
         else
           $rvm_scripts_path/log "info" "It appears that $rvm_path is already non existant."
         fi
@@ -349,15 +366,16 @@ __rvm_list_strings() {
 # This is not meant to be used with scripting. This is for interactive mode usage only.
 __rvm_list() {
   action="$(echo $rvm_ruby_args | awk '{print $1}')"
+
   if [[ "known" = "$action" ]] ; then
     __rvm_list_known
   elif [[ "default" = "$action" ]] ; then
     __rvm_list_default
-  elif [[ "rubies" = "$action" ]] ; then
+  elif [[ -z "$action" ]] || [[ "rubies" = "$action" ]] ; then
     __rvm_list_rubies
   elif [[ "strings" = "$action" ]] ; then
     __rvm_list_strings
-  else
+  else # help
     echo -e "Usage:  rvm list {known,default,rubies,strings}"
   fi
 }
@@ -389,7 +407,7 @@ __rvm_list_known() {
   echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
   echo -e "rbx(-prc1) # default\nrbx-head"
   echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
-  echo -e "maglev(-22891)\nmaglev-head"
+  echo -e "maglev(-22907)\nmaglev-head"
   echo -e "mput(-head) # shyouhei head, the default mput"
   echo -e "ironruby-0.9.3 # (1.0 RC1)\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -515,184 +533,6 @@ __rvm_reboot() {
   fi ; unset response
 }
 
-# Perform an action using one of a selected ruby's specified binaries.
-__rvm_ruby_do() {
-  __rvm_select
-  __rvm_use
-
-  binary="$(echo $rvm_action | sed 's#do$##')"
-  if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
-    rm -f "$rvm_path/gems/cache"
-    ln -nfs "$HOME/.gem/cache" "$rvm_path/gems/cache"
-    binary="$rvm_ruby_home/bin/$binary"
-  elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
-    binary="$rvm_ruby_global_gems_path/bin/$binary"
-  elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
-    binary="$rvm_ruby_gem_home/bin/$binary"
-  elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
-    binary="$(basename $(which $binary 2>/dev/null) 2>/dev/null)"
-  else
-    $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
-    __rvm_unset_ruby_variables
-    return 1
-  fi
-
-  if [[ ! -z "$rvm_ruby_mode" ]] ; then
-    rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_mode"
-    rvm_ruby_mode="--$(echo $rvm_ruby_mode | sed 's/^m//')"
-  fi
-
-  load_path="$(dirname $(which $binary 2>/dev/null) 2>/dev/null):$rvm_ruby_load_path"
-  # TODO: the else case below should be run if $rvm_ruby_args =~ /\.rb$/
-  if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
-    if $rvm_scripts_path/match "$rvm_ruby_args" "\.rb$" ; then
-      if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
-      if ! $rvm_scripts_path/match "$rvm_ruby_args" "$prefix" ; then
-        rvm_ruby_args="$prefix $rvm_ruby_args"
-      fi
-    fi
-    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $rvm_ruby_args"
-  elif [[ "gem" = "$(basename $binary)" ]] && $rvm_scripts_path/match "$rvm_ruby_args" '^install' ; then
-    #$rvm_scripts_path/gem install $rvm_ruby_args
-    rvm_command="$rvm_scripts_path/gems $rvm_ruby_mode $rvm_ruby_args $rvm_gem_options"
-  else
-    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_args"
-  fi
-
-  if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
-    mkdir -p ./log/$rvm_ruby_string/
-    touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
-    eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
-  else
-    $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')"
-    eval "$rvm_command"
-  fi
-  result=$?
-
-  if [[ $result -eq 0 ]]; then
-    eval "successes=(${successes[*]} $rvm_ruby_string)"
-  else
-    eval "errors=(${errors[*]} $rvm_ruby_string)"
-  fi
-  eval "rubies=(${rubies[*]} $rvm_ruby_string)"
-  eval "statuses=(${statuses[*]} $result)"
-  __rvm_unset_ruby_variables
-}
-
-# Loop over a set or all rvm installed rubies to perform some action.
-# Record the results and report based on CLI selections.
-__rvm_do() {
-  __rvm_state
-
-  rubies=() ; successes=() ; errors=() ; statuses=()
-  # TODO: Extract the common functionality out of the if below
-  if [[ ! -z "$rvm_ruby_string" ]] ; then
-    unset rvm_ruby_interpreter rvm_ruby_version
-    __rvm_ruby_do
-  elif [[ ! -z "$rvm_ruby_version" ]] ;then
-    for rvm_ruby_string in $(echo $rvm_ruby_version | tr ',' ' ') ; do
-      __rvm_ruby_do
-    done
-  elif [[ ! -z "$rvm_ruby_interpreter" ]] ; then
-      unset rvm_ruby_string rvm_ruby_version
-      __rvm_ruby_do
-  else # all
-    for full_binary in $rvm_rubies_path/*/bin/ruby ; do
-      if [[ -x "$full_binary" ]] ; then
-        rvm_ruby_string="$(dirname $full_binary | xargs dirname | xargs basename)"
-        __rvm_ruby_do
-      fi
-    done ; unset full_binary
-  fi
-
-  if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
-  if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi
-  if [[ ! -z "$rvm_json_flag" ]]    ; then __rvm_json    ; fi
-
-  __rvm_state
-
-  $rvm_scripts_path/hook "after_do"
-
-  return ${#errors[*]}
-}
-
-# Output the summary in a human readable format.
-__rvm_summary() {
-  export successes errors statuses
-  summary="\nSummary:\n\n"
-  if [[ ${#successes[*]} -gt 0 ]] ; then
-    summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's# #, #g')\033[0m\n"
-  fi
-  if [[ ${#errors[*]} -gt 0 ]] ; then
-    summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's# #, #g')\033[0m\n"
-  fi
-  total=${#rubies[*]}
-  if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
-  echo -e "$summary" | tee -a log/summary.log
-  return ${#errors[*]}
-}
-
-# Output the summary in a yaml format.
-__rvm_yaml() {
-  export successes errors statuses
-  yaml="totals:\n  rubies: ${#rubies[*]}\n  successes: ${#successes[*]}\n  errors: ${#errors[*]}\nsuccesses:"
-  for var in ${successes[*]} ; do yaml="$yaml\n  - $var" ; done
-  yaml="$yaml\nerrors:"
-  for var in ${errors[*]} ; do yaml="$yaml\n  - $var" ; done
-  yaml="$yaml\nrubies:"
-  total=${#rubies[*]}
-  if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
-  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    if [[ ! -z "$rvm_debug_flag" ]] ; then
-      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
-    fi
-    yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
-  done ; unset index array_start
-  mkdir -p log
-  echo -e "$yaml" | tee -a log/summary.yaml
-
-  return ${#errors[*]}
-}
-
-# Output the summary in a json format.
-__rvm_json() {
-  json="{"
-  json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
-  json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's# #", "#g')" ],"
-  json="$json\n  \"errors\": [ "$(echo ${errors[*]} | sed 's# #", "#g')" ],"
-  json="$json\n  \"rubies\": {"
-
-  total=${#rubies[*]}
-  if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
-  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    if [[ ! -z "$rvm_debug_flag" ]] ; then
-      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
-    fi
-    json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
-    if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
-  done ; unset index array_start
-  json="$json\n  }\n}"
-
-  mkdir -p log
-  echo -e "$json" | tee -a log/summary.json
-
-  return ${#errors[*]}
-}
-
-# Wrap the specified ruby code file in a Benchmark.bmbm block and execute it.
-__rvm_benchmark() {
-  code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
-  echo -e "$code" > "$rvm_tmp_path/$$.rb"
-  unset code
-  cat $rvm_ruby_file >> "$rvm_tmp_path/$$.rb"
-  echo -e "\n end \nend\n" >> "$rvm_tmp_path/$$.rb"
-  rvm_ruby_args="$rvm_tmp_path/$$.rb"
-  rvm_benchmark_flag=1
-  rvm_action="ruby"
-  if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
-  __rvm_do
-}
-
 # Create the irbrc for the currently selected ruby installation.
 __rvm_irbrc() {
   if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
@@ -777,27 +617,27 @@ __rvm_make_flags() {
   fi
 }
 
-# Select a gems(et) based on CLI set options and environment.
+# Select a gemset based on CLI set options and environment.
 # This only sets 'rvm_ruby_gem_home'
-__rvm_gems_select() {
+__rvm_gemset_select() {
   if ! which gem > /dev/null 2>&1 ; then return 0 ; fi
 
   rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string%global"
 
-  if [[ -z "$rvm_gem_set_name" ]] ; then
+  if [[ -z "$rvm_gemset_name" ]] ; then
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable.
     if [[ ! -z "$rvm_sticky_flag" ]] ; then
       if [[ ! -z "$GEM_HOME" ]] ; then
-        rvm_gem_set_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
+        rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
       fi
       if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-        rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
+        rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
       fi
     fi
 
-    if [[ ! -z "$rvm_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then
-      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
+    if [[ ! -z "$rvm_gemset_name" ]] && ! $rvm_scripts_path/match "$rvm_gemset_name" "^[0-9]\.[0-9]" ; then
+      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
     else
       if [[ ! -z "$rvm_ruby_string" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
@@ -809,14 +649,14 @@ __rvm_gems_select() {
         unset rvm_ruby_gem_home
       fi
     fi
-    if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
+    if [[ -z "$rvm_gemset_name" ]] ; then unset rvm_gemset_name ; fi
   else
-    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
+    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
   fi
 
   # If the gemset does not exist, then notify the user as such and abort the action.
-  if [[ ! -d "$rvm_ruby_gem_home" ]] && [[ ! -z "$rvm_gem_set_name" ]] && [[ -z "$rvm_create_flag" ]]; then 
-    $rvm_scripts_path/log "error" "Gemset '$rvm_gem_set_name' does not exist, rvm gems create '$rvm_gem_set_name' first."
+  if [[ ! -d "$rvm_ruby_gem_home" ]] && [[ ! -z "$rvm_gemset_name" ]] && [[ -z "$rvm_create_flag" ]]; then
+    $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gems create '$rvm_gemset_name' first."
     return 1
   fi
 
@@ -832,11 +672,11 @@ __rvm_gems_select() {
   fi
 
   # Some sanity checking.
-  if [[ ! -e "$HOME/.gem/cache" ]] ; then mkdir -p $HOME/.gem/cache ; fi
-  chmod u+w "$HOME/.gem"
+  if [[ ! -e "$rvm_gems_cache_path" ]] ; then mkdir -p $rvm_gems_cache_path ; fi
+  chmod u+w "$rvm_gems_cache_path"
   rm -f "$rvm_gems_path/cache"
-  ln -nfs "$HOME/.gem/cache" "$rvm_gems_path/cache"
-  chmod u+w "$HOME/.gem/cache"
+  ln -nfs "$rvm_gems_cache_path" "$rvm_gems_path/cache"
+  chmod u+w "$rvm_gems_cache_path"
   # /TODO
 
   # Careful not to nuke system gems cache.
@@ -860,18 +700,18 @@ __rvm_gems_select() {
   fi ; export rvm_ruby_gem_path rvm_ruby_gem_home
 }
 
-# Use a gems(et) specified by 'rvm_ruby_gem_home'
-__rvm_gems_use() {
+# Use a gemset specified by 'rvm_ruby_gem_home'
+__rvm_gemset_use() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
-      $rvm_scripts_path/log "error" "Gemset '$rvm_gem_set_name' does not exist, rvm gems create '$rvm_gem_set_name' first."
+      $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gems create '$rvm_gemset_name' first."
       return 1
     fi
 
     if [[ "$rvm_interactive" = 1 ]] ; then
-      $rvm_scripts_path/log "info" "gems(et) : ${rvm_gem_set_name:-default}"
+      $rvm_scripts_path/log "info" "gemset : ${rvm_gemset_name:-default}"
     fi
 
     export GEM_HOME="$rvm_ruby_gem_home"