scripts/utility in rvm-0.1.20 vs scripts/utility in rvm-0.1.21

@@ -407,11 +407,11 @@
   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(-22907)\nmaglev-head"
   echo -e "mput(-head) # shyouhei head, the default mput"
-  echo -e "ironruby-0.9.3 # (1.0 RC1)\nironruby-head"
+  echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
     echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
   fi
 }
 
@@ -649,17 +649,21 @@
         unset rvm_ruby_gem_home
       fi
     fi
     if [[ -z "$rvm_gemset_name" ]] ; then unset rvm_gemset_name ; fi
   else
-    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
+    if [[ ! -z "$(echo $rvm_ruby_gem_home | grep '%')" ]] ; then
+      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
+    fi
   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_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."
+  if [[ ! -z "$rvm_gemset_name" ]] && [[ ! -d "$rvm_ruby_gem_home%$rvm_gemset_name" ]] && [[ "$rvm_gemset_create_on_use_flag" -ne 1 ]] && [[ "$rvm_create_flag" -ne 1 ]] && [[ "$rvm_delete_flag" -ne 1 ]] ; then
+    $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
     return 1
+  elif [[ "$rvm_delete_flag" -eq 1 ]] ; then
+    return 1
   fi
 
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
   # TODO: Remove next section after a several releases.
@@ -700,25 +704,27 @@
   fi ; export rvm_ruby_gem_path rvm_ruby_gem_home
 }
 
 # 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_gemset_name' does not exist, rvm gems create '$rvm_gemset_name' first."
-      return 1
+      if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] ; then
+        $rvm_scripts_path/gemsets create $rvm_gemset_name
+      else
+        $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+        return 1
+      fi
     fi
 
-    if [[ "$rvm_interactive" = 1 ]] ; then
-      $rvm_scripts_path/log "info" "gemset : ${rvm_gemset_name:-default}"
+    if [[ "$rvm_interactive" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
+      $rvm_scripts_path/log "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
-
-    export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_path"
-    export BUNDLE_PATH="$rvm_ruby_gem_home"
-    __rvm_use
+    rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')%$rvm_gemset_name"
+    GEM_HOME="$rvm_ruby_gem_home"
+    BUNDLE_PATH="$rvm_ruby_gem_home"
+    GEM_PATH="$rvm_ruby_gem_home/bin:$(echo $GEM_HOME | sed 's/%.*$//')%global/bin"
+    export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
   fi
   return 0
 }
 
 __rvm_mono_env() {