utility in rvm-0.0.999

- old
+ new

@@ -132,11 +132,11 @@
   unset log_file command
 }
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_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
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_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_unset_ruby_variables() {
   unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_patch rvm_ruby_package_file rvm_ruby_package_name
 }
@@ -277,11 +277,11 @@
       echo "${prefix}-t${tag/\//}"
       unset prefix tag
     done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
     echo -e "(ruby-)1.8.6(-p383)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p248)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1"
     echo -e "jruby-1.2.0\njruby-1.3.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
-    echo -e "rbx(-head) # rubinius head, the default rbx \nrbx(-head) --jit (rubinius head with LLVM enabled)"
+    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 "mput(-head) # shyouhei head, the default mput"
     echo -e "ironruby-0.9.3 # (1.0 RC1)\nironruby-head"
     if [[ "Darwin" = "$(uname)" ]] ; then
       echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
@@ -305,11 +305,11 @@
         echo -e "   $(tput setaf 2)$version$(tput sgr0) $string"
       fi
     done ; unset version
 
     if [[ -f "$rvm_path/default" ]] && [[ -s $rvm_path/default ]] ; then
-      version=$(grep '^MY_RUBY_HOME' $rvm_path/default | awk -F"'" '{print $2}' | xargs basename)
+      version=$(grep 'MY_RUBY_HOME' $rvm_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
         string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
         if [[ "$version" = "$current_ruby" ]] ; then
           echo -e "=> $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
           selected="1"
@@ -665,18 +665,21 @@
 
 __rvm_gems_select() {
   if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
 
   if [[ -z "$rvm_gem_set_name" ]] ; then
-    if [[ ! -z "$GEM_HOME" ]] ; then
-      rvm_gem_set_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
+    # No longer defaulting to 'sticky' gem sets.
+    # Set 'rvm_sticky_gemsets=1' in ~/.rvmrc to enable.
+    if [[ ! -z "$rvm_sticky_gemsets" ]] ; then
+      if [[ ! -z "$GEM_HOME" ]] ; then
+        rvm_gem_set_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}')
+      fi
     fi
 
-    if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-      rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
-    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_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
     else
       if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string"
@@ -701,13 +704,7 @@
     mkdir -p "$rvm_ruby_gem_home"
     GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
     GEM_PATH="$GEM_HOME" ; export GEM_PATH
     __rvm_use
   fi
-}
-
-__rvm_gems_clear() {
-  unset rvm_ruby_gem_home rvm_gem_set_name GEM_HOME GEM_PATH
-  __rvm_gems_select
-  __rvm_gems_use
 }
 