rvm 0.1.16 → 0.1.18

data/README

@@ -35,7 +35,7 @@ Action
   fetch     - Performs an archive / src fetch only of the selected ruby.
   srcdir    - display the path to rvm source directory (may be yanked)
   list      - show currently installed rubies, interactive output.
-  rubies    - show list of rubies installed for use with scripting.
+  rubies    - (query info) default, installed, or expand_string <str>
   iconv     - Install iconv
   openssl   - Install openssl
   ncurses   - Install ncurses
@@ -51,7 +51,7 @@ Implementation
   rbx       - rubinius
   ree       - ruby Enterprise Edition
   macruby   - MacRuby (Mac OS X Only)
-  maglev    - Gemstone Ruby
+  maglev    - GemStone Ruby
   ironruby  - IronRuby
   mput      - shyouhei(mput)'s github repository
   system    - use the system ruby (eg. pre-rvm state)

data/config/db

@@ -4,6 +4,9 @@ ruby_configure=--enable-shared
 interpreter=ruby
 ruby_version=1.8.6
 ruby_patchlevel=383
+rubygems_version=1.3.6
+rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
+rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
 rbx_version=1.0.0
 rbx_patch_level=rc2
 rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc2-20100104.tar.gz
@@ -26,7 +29,7 @@ macruby_version=0.5
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
-maglev_version=22816
+maglev_version=22891
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 rubinius_repo_url=git://github.com/evanphx/rubinius.git

data/config/md5

@@ -39,6 +39,10 @@ GemStone-22816.Darwin-i386.tar.gz=b12426c17b3925f1c8c7086a3285f15f
 GemStone-22816.Linux-x86_64.tar.gz=21d1e8e7a4b10ac8a1c199eb0cbfaec1
 MagLev-22816.Darwin-i386.tar.gz=b1b3e6530e90d7dcf36f81e097776643
 MagLev-22816.Linux-x86_64.tar.gz=424ca92c34cfce6d0da63170755b000c
+MagLev-22891.Darwin-i386.tar.gz=d8d3a8aaff1473422d6a30ecd2b2e9ff
+GemStone-22891.Darwin-i386.tar.gz=84080bda40c640aac9f19f5ea48403bf
+MagLev-22891.Linux-x86_64.tar.gz=f91f1bec1f3defb49323a70ec25504ef
+GemStone-22891.Linux-x86_64.tar.gz=5fd0d341a0eb586c9f804976cc290810
 MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
 jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
@@ -50,3 +54,4 @@ readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
+rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d

data/install

@@ -42,13 +42,7 @@ if [[ -z "$rvm_path" ]] ; then
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/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"
-    else
-      rvm_path="$HOME/.rvm"
-    fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 
@@ -188,4 +182,8 @@ if [[ "root" != "$(whoami)" ]] ; then
   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
+  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
+
 exit 0

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 16
+:patch: 18

data/rvm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.16"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-23}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
      "scripts/utility",
      "scripts/version"
   ]
+  s.has_rdoc = false
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
   s.post_install_message = %q{********************************************************************************
 
@@ -91,3 +92,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/scripts/cli

@@ -8,7 +8,7 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      fetch|info|version|srcdir|list|rubies|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
+      fetch|version|srcdir|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
         rvm_action=$rvm_token
       ;;
 
@@ -20,7 +20,7 @@ __rvm_parse_args() {
 
       inspect)
         rvm_action=$rvm_token
-        rvm_ruby_args=$*
+        export rvm_ruby_args=$*
         rvm_parse_break=1
       ;;
 
@@ -50,9 +50,7 @@ __rvm_parse_args() {
 
       gems|gemset)
         rvm_action="gems"
-        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "copy" = "$1" ]] || [[ "import" = "$1" ]] || [[ "export" = "$1" ]] ; then
-          export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
-        elif [[ "clear" = "$1" ]] ; then
+        if [[ "clear" = "$1" ]] ; then
           unset rvm_gem_set_name ; shift
           export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"
           export GEM_HOME="$rvm_ruby_gem_home"
@@ -60,9 +58,9 @@ __rvm_parse_args() {
           export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin"
           rvm_ruby_args="clear"
           rvm_parse_break=1
-        elif [[ "delete" = "$1" ]] ; then
-          export rvm_delete_flag=1
-          rvm_ruby_args="$*" ; shift
+        elif [[ "delete" = "$1" ]] || [[ "use" = "$1" ]] ; then
+          export rvm_${1}_flag=1
+          export rvm_ruby_args="$*" ; shift
           rvm_gem_set_name="$1"; shift
           rvm_ruby_string=$(echo $rvm_gem_set_name | sed 's/\(.*\)%.*/\1/')
           rvm_gem_set_name=$(echo $rvm_gem_set_name | sed 's/.*%\(.*\)/\1/')
@@ -73,8 +71,7 @@ __rvm_parse_args() {
             rvm_action="error"
             rvm_error_message="'gems' must be followed by a gems(et) action, see http://rvm.beginrescueend.com/gemsets/#managing for details."
           else
-            rvm_gem_set_name="$1" ; shift
-            export rvm_use_flag=1 # Default is to use the (named) gem set.
+            export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
           fi
         fi
       ;;
@@ -86,14 +83,21 @@ __rvm_parse_args() {
         if [[ "user" = "$1"  ]]   ; then export rvm_user_flag=1  ;  shift ; fi
       ;;
 
+      list|info|strings)
+        rvm_action="$rvm_token"
+        export rvm_ruby_args="$@"
+        rvm_parse_break=1
+      ;;
+
       -S)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token $@"
+        export rvm_ruby_args="$rvm_token $@"
         rvm_parse_break=1
       ;;
+
       -e)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token \"$@\""
+        export rvm_ruby_args="$rvm_token \"$@\""
         rvm_parse_break=1
       ;;
 
@@ -281,7 +285,7 @@ __rvm_parse_args() {
       --disable-llvm|--disable-jit) export rvm_llvm_flag=0      ;;
       --enable-llvm|--enable-jit)   export rvm_llvm_flag=1      ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky_gems)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;
@@ -377,24 +381,29 @@ rvm() {
 
   result=0
   case "$rvm_action" in
-    use)           __rvm_use                 ; result=$?  ;;
-    srcdir)        __rvm_source_dir          ; result=$?  ;;
-    list)          __rvm_list                ; result=$?  ;;
-    rubies)        __rvm_rubies              ; result=$?  ;;
-    version)       __rvm_version             ; result=$?  ;;
-    reset)         __rvm_reset               ; result=$?  ;;
-    implode)       __rvm_implode             ; result=$?  ;;
-    update)        __rvm_update              ; result=$?  ;;
-    reboot)        __rvm_reboot              ; result=$?  ;;
-    usage|help)    __rvm_usage               ; result=$?  ;;
-    benchmark)     __rvm_benchmark           ; result=$?  ;;
-    inspect)       __rvm_inspect             ; result=$?  ;;
-    ruby|gem|rake) __rvm_do                  ; result=$?  ;;
+    use)           __rvm_use                 ; result=$? ;;
+    srcdir)        __rvm_source_dir          ; result=$? ;;
+    list)          __rvm_list                ; result=$? ;;
+    strings)       __rvm_strings             ; result=$? ;;
+    info)          __rvm_info                ; result=$? ;;
+    debug)         __rvm_debug               ; result=$? ;;
+    version)       __rvm_version             ; result=$? ;;
+    reset)         __rvm_reset               ; result=$? ;;
+    implode)       __rvm_implode             ; result=$? ;;
+    update)        __rvm_update              ; result=$? ;;
+    reboot)        __rvm_reboot              ; result=$? ;;
+    usage|help)    __rvm_usage               ; result=$? ;;
+    benchmark)     __rvm_benchmark           ; result=$? ;;
+    inspect)       __rvm_inspect             ; result=$? ;;
+    ruby|gem|rake) __rvm_do                  ; result=$? ;;
     gemdir)        $rvm_scripts_path/gems gemdir ; result=$?  ;;
     gems)
       if [[ "$rvm_use_flag" -eq 1 ]] ; then
         __rvm_gems_select
-        __rvm_gems_use
+        result=$? 
+        if [[ $result -eq 0 ]] ; then
+          __rvm_gems_use
+        fi
       else
         $rvm_scripts_path/gems $rvm_ruby_args
       fi
@@ -424,11 +433,6 @@ rvm() {
       result=$?
     ;;
 
-    info|debug)
-      __rvm_version
-      __rvm_info
-      if [[ "debug" = "$rvm_action" ]] ; then export rvm_debug_flag=1 ; __rvm_debug ; fi
-    ;;
 
     error)
       $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"

data/scripts/gems

@@ -10,7 +10,7 @@ color_none=$($rvm_scripts_path/color "none")
 
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
-if [[ -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; fi
+if [[ ! -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; 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
 
@@ -22,6 +22,15 @@ __rvm_gems_dir() {
   echo "$rvm_ruby_gem_home"
 }
 
+__rvm_gems_create() {
+  for gemset in $(echo $gems_args) ; do
+    gem_home="$rvm_ruby_gem_home%${gems_args/ /}"
+    mkdir -p $gem_home 
+    ln -nfs "$HOME/.gem/cache" "$gem_home/cache"
+    $rvm_scripts_path/log "info" "Gemset '$gemset' created."
+  done ; unset gem_home
+}
+
 __rvm_gems_list() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
@@ -65,31 +74,27 @@ __rvm_gems_delete() {
 
 __rvm_gems_empty() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
-  if [[ ! -z "$rvm_gem_set_name" ]] ; then
-    gemdir="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
-    if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
+  gemdir="$rvm_ruby_gem_home"
+  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 gems for gemset '%$rvm_gem_set_name' ($gemdir)?"
+    echo -n "(anything other than 'yes' will cancel) > "
+    read response
+    if [[ "yes" = "$response" ]] ; 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 gems for gemset '%$rvm_gem_set_name' ($gemdir)?"
-      echo -n "(anything other than 'yes' will cancel) > "
-      read response
-      if [[ "yes" = "$response" ]] ; then
-        cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
-      else
-        $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
-      fi
     else
-      $rvm_scripts_path/log "info" "$gemdir already does not exist."
-    fi ; unset gemdir
+      $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
+    fi
   else
-    $rvm_scripts_path/log "error" "A gems name must be specified in order to delete a gems."
-  fi
+    $rvm_scripts_path/log "info" "$gemdir already does not exist."
+  fi ; unset gemdir
 }
 
 # Migrate gemsets from ruby X to ruby Y
 __rvm_gems_copy() {
-  source_ruby="$(echo $gem_args | awk '{print $1}')"
-  destination_ruby="$(echo $gem_args | awk '{print $2}')"
+  source_ruby="$(echo $gems_args | awk '{print $1}')"
+  destination_ruby="$(echo $gems_args | awk '{print $2}')"
   if [[ -z "$source_ruby" ]] ; then
     $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gems copy X Y'"
   fi
@@ -191,7 +196,7 @@ __rvm_gems_import() {
   fi
 }
 
-__rvm_parse_gem_args() {
+__rvm_parse_gems_args() {
   gem="$(echo $gems_args | awk -F';' '{print $1}')"
   gem_prefix="$(echo $gems_args | awk -F';' '{print $2}')"
   if $rvm_scripts_path/match "$gem" "\.gem$" ; then
@@ -225,7 +230,7 @@ __rvm_parse_gem_args() {
 # Install a gem
 __rvm_gem_install() {
   # First we parse the gem args to pick apart the pieces.
-  __rvm_parse_gem_args
+  __rvm_parse_gems_args
 
   # Now we determine if a .gem cache file is already installed
   if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
@@ -312,12 +317,14 @@ if [[ -z "$(which gem 2>/dev/null)" ]] ; then
 fi
 
 action="$(echo $* | awk '{print $1}')"
-gem_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+gems_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
 
 if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then
   __rvm_gems_import
 elif [[ "export" = "$action" ]] || [[ "dump" = "$action" ]] ; then
   __rvm_gems_export
+elif [[ "create" = "$action" ]] ; then
+  __rvm_gems_create
 elif [[ "copy" = "$action" ]] ; then
   __rvm_gems_copy
 elif [[ "empty" = "$action" ]] ; then
@@ -338,7 +345,7 @@ elif [[ "clear" = "$action" ]] ; then
   $rvm_scripts_path/log "info" "gems(et) cleared."
   exit 0
 else
-  $rvm_scripts_path/log "error" "Unrecognized gems action '$action'.\ngems must be passed an action as the first parameter {import,export,copy,delete,empty,name,list,gemdir,install}"
+  $rvm_scripts_path/log "error" "Unrecognized gems action '$action'.\n\nValid gems actions are: {create,use,import,export,copy,delete,empty,name,list,gemdir,install}"
 fi
 
 exit $?

data/scripts/install

@@ -42,13 +42,7 @@ if [[ -z "$rvm_path" ]] ; then
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/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"
-    else
-      rvm_path="$HOME/.rvm"
-    fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 
@@ -188,4 +182,8 @@ if [[ "root" != "$(whoami)" ]] ; then
   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
+  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
+
 exit 0

data/scripts/manage

@@ -30,7 +30,7 @@ __rvm_install_source() {
     $rvm_scripts_path/log "error" "There has been an error, source directory is missing. Did the download or extraction fail? Aborting the installation." ; __rvm_pushpop ; return $result
   fi
 
-  if [[ -d "${rvm_path}/usr/bin" ]] ; then export PATH="${rvm_path}/usr/bin:${PATH}" ; fi
+  if [[ -d "${rvm_path}/usr" ]] ; then export PATH="${rvm_path}/usr/bin:${PATH}" ; fi
 
   if [[ -z "$rvm_ruby_configure" ]] && [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
     if which autoconf &> /dev/null ; then
@@ -423,10 +423,10 @@ RubyWrapper
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
       fi
 
-      $rvm_scripts_path/log "info" "Downloading the gemstone package, this may take a while depending on your connection..."
+      $rvm_scripts_path/log "info" "Downloading the GemStone package, this may take a while depending on your connection..."
       $rvm_scripts_path/fetch "$rvm_gemstone_url"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
-        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the gemstone package. Aborting the installation." ; __rvm_pushpop ; return $result
+        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the GemStone package. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
 
       builtin cd "$rvm_src_path"
@@ -439,7 +439,7 @@ RubyWrapper
 
       __rvm_run "gemstone.extract" "cat $rvm_archives_path/${rvm_gemstone_package_file}.${rvm_archive_extension} | gunzip | tar xf - -C $rvm_ruby_src_path"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
-        $rvm_scripts_path/log "error" "There has been an error while trying to extract the gemstone package. Aborting the installation." ; __rvm_pushpop ; return $result
+        $rvm_scripts_path/log "error" "There has been an error while trying to extract the GemStone package. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
 
       chmod -R 777 "$rvm_gemstone_package_file" # for now.
@@ -853,6 +853,15 @@ __rvm_post_install() {
 
 __rvm_rubygems_setup() {
   if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
+    install=0
+  elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
+    install=0
+  else
+    install=1
+  fi
+
+
+  if [[ "$install" -eq 0 ]] ; then
     # 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"
@@ -868,12 +877,14 @@ __rvm_rubygems_setup() {
     __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
-    (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version"
+    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
     $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
-    rvm_gem_package_name="rubygems-1.3.5"
-    rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
+    rvm_rubygems_version=$(__rvm_db "rubygems_version")
+    rvm_rubygems_url=$(__rvm_db "rubygems_${rvm_rubygems_version}_url")
+    rvm_gem_package_name="rubygems-$rvm_rubygems_version"
+    rvm_gem_url="$rvm_rubygems_url/$rvm_gem_package_name.tgz"
 
     # Sanity check...
     if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
@@ -987,7 +998,7 @@ __rvm_manage_rubies() {
         fi
       done < <(\ls $rvm_rubies_path/*/bin/ruby 2> /dev/null)
     else
-      $rvm_scripts_path/log "warn" 'Really? Install all? See "rvm list --all" and limit the selection to something more sane please :)'
+      $rvm_scripts_path/log "warn" 'Really? Install all? See "rvm list known" and limit the selection to something more sane please :)'
     fi
   fi
 

data/scripts/rvm-install

@@ -42,13 +42,7 @@ if [[ -z "$rvm_path" ]] ; then
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/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"
-    else
-      rvm_path="$HOME/.rvm"
-    fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 
@@ -188,4 +182,8 @@ if [[ "root" != "$(whoami)" ]] ; then
   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
+  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
+
 exit 0

data/scripts/selector

@@ -181,6 +181,7 @@ __rvm_select() {
       else
         if [[ -z "$rvm_ruby_string" ]] ; then
           $rvm_scripts_path/log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+          return 1
         fi
       fi
   esac
@@ -218,6 +219,7 @@ __rvm_select() {
   else
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
   fi
+
 }
 
 __rvm_use() {
@@ -424,7 +426,8 @@ __rvm_ruby_string() {
       rvm_ruby_user_tag="$string"
     elif $rvm_scripts_path/match "$string" "^b[0-9][0-9]" ; then
       rvm_ruby_bits="$string"
-    elif $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" "$string" ; then
+    elif $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby " "$string " ; then
+      # NOTE: The space at the end of each of the above strings is *very* important.
       rvm_ruby_interpreter="$string"
     else
       $rvm_scripts_path/log "error" "Unknown ruby string component: '$string'"

data/scripts/update

@@ -42,13 +42,7 @@ if [[ -z "$rvm_path" ]] ; then
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/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"
-    else
-      rvm_path="$HOME/.rvm"
-    fi
+    rvm_path="$HOME/.rvm"
   fi
 fi
 
@@ -188,4 +182,8 @@ if [[ "root" != "$(whoami)" ]] ; then
   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
+  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
+
 exit 0

data/scripts/utility

@@ -24,11 +24,22 @@ __rvm_db() {
 
 # Ouput rvm environment information.
 __rvm_info() {
-  if [[ ! -z "$(/usr/bin/which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
 
+  if [[ ! -z "$rvm_ruby_args" ]] ; then
+    echo $(rvm_ruby_string="$rvm_ruby_args"; __rvm_select ; __rvm_use ; __rvm_environment_info)
+    echo -e $info ; unset info
+  else
+    __rvm_environment_info
+  fi
+
+}
+
+__rvm_environment_info() {
+  if [[ ! -z "$(/usr/bin/which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
   echo -e "system:\n  uname:        \"$(uname -a)\""
-if [[ ! -z "$ZSH_VERSION" ]] ; then echo -e "  shell:         \"zsh\"\n  version:     \"$ZSH_VERSION\"" ; fi
-if [[ ! -z "$BASH_VERSION" ]] ; then echo -e "  shell:        \"bash\"\n  version:      \"$BASH_VERSION\"" ; fi
+
+  if [[ ! -z "$ZSH_VERSION" ]] ; then echo -e "  shell:         \"zsh\"\n  version:     \"$ZSH_VERSION\"" ; fi
+  if [[ ! -z "$BASH_VERSION" ]] ; then echo -e "  shell:        \"bash\"\n  version:      \"$BASH_VERSION\"" ; fi
 
   cat <<Info
 
@@ -58,13 +69,15 @@ environment:
   IRBRC:        "$IRBRC"
 
 Info
-if [[ ! -z "$MAGLEV_HOME" ]] ; then echo -e "  MAGLEV_HOME: \"$MAGLEV_HOME\"" ; fi
+  if [[ ! -z "$MAGLEV_HOME" ]] ; then info="$info\n  MAGLEV_HOME: \"$MAGLEV_HOME\"" ; fi
 
   unset full_version
 }
 
 # Output debugging information that has been found useful to help people identify and resolve issues.
 __rvm_debug() {
+  __rvm_version
+  __rvm_environment_info
   $rvm_scripts_path/log "debug" "PATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
   $rvm_scripts_path/log "debug" "uname -a: $(uname -a)"
   $rvm_scripts_path/log "debug" "permissions: $(ls -la $rvm_path{,/rubies})"
@@ -100,6 +113,22 @@ __rvm_debug() {
   $rvm_scripts_path/log "debug" "gem sources:\n$(gem sources | awk '/gems/')"
 }
 
+__rvm_strings() {
+  unset results
+  for rvm_ruby_string in $(echo $rvm_ruby_args) ; do
+    __rvm_ruby_string
+    if [[ $? -gt 0 ]] ; then
+      return 1
+    else
+      results="$results $(__rvm_select ; echo $rvm_ruby_string)"
+      unset rvm_ruby_string
+    fi
+  done 
+  echo $results 
+  unset results
+  return 0
+}
+
 # ZSH has 1 based array indexing, bash has 0 based.
 if [[ ! -z "$ZSH_VERSION" ]] ; then __shell_array_start=1 ; else __shell_array_start=0 ; fi
 
@@ -146,13 +175,13 @@ __rvm_run() {
 }
 
 # Unset both rvm variables as well as ruby-specific variables
-# Preserve gemset if 'rvm_sticky_gems' is set (persist gemset unless clear is explicitely called).
+# Preserve gemset if 'rvm_sticky' is set (persist gemset unless clear is explicitely called).
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
 
-  if [[ "$rvm_sticky_gems" = "1" ]] ; then export rvm_gem_set_name ; else unset rvm_gem_set_name  ; fi
+  if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gem_set_name ; else unset rvm_gem_set_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_gems
+  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
 }
 
 # Unset ruby-specific variables
@@ -309,75 +338,106 @@ __rvm_source_dir() {
   fi
 }
 
-# List all rvm installed rubies.
+# Query for valid rvm ruby strings
 # This is meant to be used with scripting.
-__rvm_rubies() {
-  \ls $rvm_rubies_path
+__rvm_list_strings() {
+  echo $(\ls $rvm_rubies_path)
 }
 
 # List all rvm installed rubies, default ruby and system ruby.
 # Display the rubies, indicate their architecture and indicate which is currently used.
 # This is not meant to be used with scripting. This is for interactive mode usage only.
 __rvm_list() {
-  echo
-  if [[ ! -z "$rvm_all_flag" ]] ; then
-    while read -r tag
-    do
-      prefix="$(echo ${tag/\//} | sed 's#^v1_##' | awk -F'_' '{print "(ruby-)1."$1"."$2}' | sed 's#p$##')"
-      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(-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(-22725)"
-    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"
-    fi
+  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
+    __rvm_list_rubies
+  elif [[ "strings" = "$action" ]] ; then
+    __rvm_list_strings
   else
-    ruby=$(which ruby 2>/dev/null) ; current_ruby=""
-    if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
-      current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
-    fi
-
-    echo -e "rvm Rubies\n"
-    for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
-      if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
-        string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}') ]"
-      elif [[ ! -z "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
-        string="[ x86_64 ]"
-      else
-        string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
-      fi
-      if [[ "$version" = "$current_ruby" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
-      echo -e "$(tput setaf 2)$version$(tput sgr0) $string"
-    done ; unset version
+    echo -e "Usage:  rvm list {known,default,rubies,strings}"
+  fi
+}
 
+__rvm_list_default() {
+  strings="$(echo $rvm_ruby_args | awk '{print $2}')"
+  if [[ "$strings" = "string" ]] ; then
+    echo $(grep 'MY_RUBY_HOME' $rvm_config_path/default | awk -F"'" '{print $2}' | xargs basename)
+  else
     if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
       version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
         echo -e "\nDefault Ruby (for new shells)\n"
         string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
-        echo -e "   $(tput setaf 2)$version$(tput sgr0) $string"
+        echo -e "   $(tput setaf 2)$version$(tput sgr0) $string\n"
       fi ; unset version
     fi
+  fi
+}
 
-    system_ruby="$(rvm system ; which ruby 2>/dev/null)"
-    if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]]; then
-      echo -e "\nSystem Ruby\n"
-      system_version=$($system_ruby -v)
-      string="[ $(file $system_ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
-      if [[ ! -z "$system_ruby" ]] && [[ "$current_ruby" = "$system_version" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
-      echo -e "$(tput setaf 2)system$(tput sgr0) $string"
+__rvm_list_known() {
+  while read -r tag
+  do
+    prefix="$(echo ${tag/\//} | sed 's#^v1_##' | awk -F'_' '{print "(ruby-)1."$1"."$2}' | sed 's#p$##')"
+    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.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 "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"
+  fi
+}
+
+__rvm_list_rubies() {
+  echo
+  ruby=$(which ruby 2>/dev/null) ; current_ruby=""
+  if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
+    current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
+  fi
+
+  echo -e "rvm Rubies\n"
+  for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+    if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
+      string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}') ]"
+    elif [[ ! -z "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
+      string="[ x86_64 ]"
     else
-      $rvm_scripts_path/log "info" "No system ruby found."
+      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
     fi
+    if [[ "$version" = "$current_ruby" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
+    echo -e "$(tput setaf 2)$version$(tput sgr0) $string"
+  done ; unset version
 
-    unset current_ruby version selected system_ruby system_version string
+  if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
+    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | awk -F"'" '{print $2}' | xargs basename)
+    if [[ ! -z "$version" ]] ; then
+      echo -e "\nDefault Ruby (for new shells)\n"
+      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      echo -e "   $(tput setaf 2)$version$(tput sgr0) $string"
+    fi ; unset version
   fi
+
+  system_ruby="$(rvm system ; which ruby 2>/dev/null)"
+  if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]]; then
+    echo -e "\nSystem Ruby\n"
+    system_version=$($system_ruby -v)
+    string="[ $(file $system_ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+    if [[ ! -z "$system_ruby" ]] && [[ "$current_ruby" = "$system_version" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
+    echo -e "$(tput setaf 2)system$(tput sgr0) $string"
+  else
+    $rvm_scripts_path/log "info" "No system ruby found."
+  fi
+
+  unset current_ruby version selected system_ruby system_version string
   echo
 }
 
@@ -415,16 +475,6 @@ __rvm_update_rvm() {
   mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
 
-  ruby="$(which ruby 2>/dev/null)"
-  system_ruby="$(rvm system ; which ruby 2>/dev/null)"
-  if [[ ! -x "$ruby" ]] ; then
-    if [[ ! -x "$system" ]] ; then
-      unset ruby
-    else
-      ruby=$system_ruby
-    fi
-  fi
-
   if [[ "head" = "$rvm_ruby_revision" ]] || [[ -z "$system_ruby" ]] ; then
     if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
       builtin cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
@@ -432,15 +482,15 @@ __rvm_update_rvm() {
       builtin cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && builtin cd rvm/ && ./install
     fi
   else
-    if [[ "true" = "$($ruby -S gem list rvm --installed)" ]]; then
-      $ruby -S gem update rvm $rvm_gem_options
-    else
-      $ruby -S gem install rvm $rvm_gem_options
-    fi
-    # TODO: Check all gem paths instead of simply assuming the last one...
-    builtin cd "$($ruby -S gem env | grep "\- $HOME" | awk '{print $NF}' | head -n 1)/gems/rvm-$(gem list rvm | sed 's/.*(//' | sed 's/).*//' | awk -F',' '{print $1 ; exit}')" && ./install
+    stable_version=$(curl -s http://rvm.beginrescueend.com/releases/stable-version.txt)
+
+    __rvm_run "fetch" "$rvm_scripts_path/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" "fetching rvm-${stable_version}.tar.gz"
+
+    __rvm_run "extract" "cat $rvm_archives_path/rvm-${stable_version}.tar.gz | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+
+    __rvm_run "install" "builtin cd $rvm_src_path/rvm-${stable_version}/ ; ./install" "Installing rvm-${stable_version}..."
   fi
-  unset ruby system_ruby
+
   __rvm_pushpop
   $rvm_scripts_path/hook "after_update"
 }
@@ -730,14 +780,14 @@ __rvm_make_flags() {
 # Select a gems(et) based on CLI set options and environment.
 # This only sets 'rvm_ruby_gem_home'
 __rvm_gems_select() {
-  if ! which gem >/dev/null 2>&1 ; then return 0 ; fi
+  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
     # No longer defaulting to 'sticky' gem sets.
-    # Set 'rvm_sticky_gems=1' in ~/.rvmrc to enable.
-    if [[ ! -z "$rvm_sticky_gems" ]] ; then
+    # 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}')
       fi
@@ -749,7 +799,7 @@ __rvm_gems_select() {
     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"
     else
-      if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
+      if [[ ! -z "$rvm_ruby_string" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
       elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
@@ -764,7 +814,11 @@ __rvm_gems_select() {
     rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
   fi
 
-  if [[ ! -d "$rvm_ruby_gem_home" ]] ; then mkdir -p $rvm_ruby_gem_home ; 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."
+    return 1
+  fi
 
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
@@ -812,7 +866,8 @@ __rvm_gems_use() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
-      mkdir -p "$rvm_ruby_gem_home"
+      $rvm_scripts_path/log "error" "Gemset '$rvm_gem_set_name' does not exist, rvm gems create '$rvm_gem_set_name' first."
+      return 1
     fi
 
     if [[ "$rvm_interactive" = 1 ]] ; then
@@ -824,6 +879,7 @@ __rvm_gems_use() {
     export BUNDLE_PATH="$rvm_ruby_gem_home"
     __rvm_use
   fi
+  return 0
 }
 
 __rvm_mono_env() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-02-23 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -67,7 +67,7 @@ files:
 - scripts/update
 - scripts/utility
 - scripts/version
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/wayneeseguin/rvm
 licenses: []