rvm 0.0.99 → 0.0.999

data/config/db

@@ -23,8 +23,8 @@ ree_1.8.7_url=http://rubyforge.org/frs/download.php/66162
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2009.10
 rbx_version=1.0.0
-rbx_patch_level=rc1
-rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc1-20091125.tar.gz
+rbx_patch_level=rc2
+rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc2-20100104.tar.gz
 ruby_1.9.1_patch_level=376
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231

data/install

@@ -1,6 +1,32 @@
 #!/usr/bin/env bash
 
-if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+unset rvm_auto_flag
+
+source scripts/version
+source scripts/utility
+
+usage() {
+  echo -e "
+  Usage:
+    ${0} <options>
+
+  Options:
+    --auto    : Automatically update shell profile files.
+    --prefix  : Installation prefix directory.
+    --help    : Display help/usage (this) message
+    --version : display rvm package version
+  "
+}
+
+while [[ $# -gt 0 ]] ; do
+  token="$1" ; shift
+  case "$token" in
+    --auto)    rvm_auto_flag=1          ;;
+    --prefix)  prefix_path="$1" ; shift ;;
+    --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
+    --help|*)  usage                    ;;
+  esac
+done
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
@@ -14,7 +40,6 @@ if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   fi
 fi
 
-source scripts/utility
 source scripts/initialize
 
 __rvm_initialize
@@ -25,16 +50,16 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
-source_dir="${source_dir:-$cwd}"
+source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
+if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
+source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
-cp -f "$source_dir/README" "$rvm_path/"
+cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
@@ -42,8 +67,8 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  if [[ -d "$source_dir/$dir_name" ]] ; then
-    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_path/$dir_name" ]] ; then
+    cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
@@ -57,7 +82,7 @@ fi
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
 
@@ -83,6 +108,15 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+#
+#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+#mkdir -p $rvm_rubies_path
+#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
+#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
+#done
+
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
@@ -107,13 +141,15 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
 echo "================================================================================"
-
+echo -e "Upgrades"
+echo -e "Gems are now per interpreter installation instead of per interpreter/version"
+echo -e "so for example to upgrade an older install of 1.8.6 and preserve gems:"
+echo -e "rm -rf ~/.rvm/gems/ruby-1.8.6-p383 ;  mv ~/.rvm/gems/ruby/1.8.6 ~/.rvm/gems/ruby-1.8.6-p383"
+echo "================================================================================"
 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(.bash_profile and/or .zshenv), after all path/variable settings:"
+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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
-if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
-
 exit 0

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 99
+:patch: 999

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.99"
+  s.version = "0.0.999"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-12-27}
+  s.date = %q{2010-01-07}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -62,7 +62,8 @@ Gem::Specification.new do |s|
      "scripts/selector",
      "scripts/symlink",
      "scripts/update",
-     "scripts/utility"
+     "scripts/utility",
+     "scripts/version"
   ]
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
   s.post_install_message = %q{********************************************************************************

data/scripts/cli

@@ -1,18 +1,9 @@
 #!/usr/bin/env bash
 
-__rvm_meta() {
-  rvm_meta_author="Wayne E. Seguin"
-  rvm_meta_author_email="wayneeseguin@gmail.com"
-  rvm_meta_website="http://rvm.beginrescueend.com/"
-  rvm_meta_version="${rvm_version}"
-}
-
-__rvm_version() { __rvm_meta ; echo -e "\nrvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]\n" ; }
-
 __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
 
 __rvm_parse_args() {
-  if echo "$*" | grep -q 'trace' ; then echo "$*" ; fi
+  if echo "$*" | grep -q 'trace' ; then echo "$*" ; __rvm_version ; fi
 
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
@@ -58,8 +49,23 @@ __rvm_parse_args() {
 
       gems|gemset)
         rvm_action="gems"
-        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] ; then
+        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "dump" = "$1" ]] || [[ "load" = "$1" ]] ; then
           rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
+        elif [[ "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"
+          export GEM_PATH="$GEM_HOME"
+          rvm_ruby_args="clear"
+          rvm_parse_break=1
+        elif [[ "delete" = "$1" ]] ; then
+          export rvm_delete_flag=1 ; shift
+          rvm_ruby_args="$*"
+          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/')
+          if [[ "$rvm_ruby_string" != "$rvm_gem_set_name" ]] ; then export rvm_ruby_string ; fi
+          if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
         else
           rvm_gem_set_name="$1" ; shift
           export rvm_use_flag=1 # Default is to use the (named) gem set.
@@ -245,7 +251,7 @@ __rvm_parse_args() {
 
       default|system)
         rvm_action="use"
-        rvm_ruby_interpreter="system"
+        rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
       ;;
 
@@ -262,12 +268,11 @@ __rvm_parse_args() {
       -m|--gem-set)         rvm_gem_set_name="$1"      ; shift  ;;
       --sdk)                rvm_sdk="$1"               ; shift  ;;
       --archflags)          rvm_archflags="$1"         ; shift  ;;
-
-      tests|specs)          rvm_action="tests"                  ;;
       --trace)              export rvm_trace_flag=1    ; set -x ;;
       --symlink)            rvm_symlink_name="$1"      ; shift  ;;
-      --disable-llvm|--disable-jit) export rvm_jit_flag=0       ;;
-      --enable-llvm|--enable-jit)   export rvm_jit_flag=1       ;;
+      tests|specs)          rvm_action="tests"                  ;;
+      --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|--dump|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1

data/scripts/gems

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 source $rvm_path/scripts/utility
+source $rvm_path/scripts/selector
 
 color_green=$($rvm_scripts_path/color "green")
 color_red=$($rvm_scripts_path/color "red")
@@ -14,7 +15,7 @@ if [[ -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_h
 trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 __rvm_gems_name() {
-  echo "$rvm_gem_set_name"
+  echo "$(gem env gemdir)" | awk -F'%' '{print $2}'
 }
 
 __rvm_gems_dir() {
@@ -22,20 +23,31 @@ __rvm_gems_dir() {
 }
 
 __rvm_gems_list() {
-  if [[ $rvm_path =~ rvm ]] ; then
-    for gemdir in "${rvm_gem_path}"/${rvm_ruby_string}%* ; do
-      echo "$gemdir" | awk -F'%' '{print $2}'
-    done
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+
+  $rvm_scripts_path/log "info" "Listing gems(ets) for $rvm_ruby_string found in $rvm_gem_path/"
+
+  if [[ ! -z "$rvm_gem_path" ]] ; then
+    if [[ ! -z $rvm_ruby_string ]] ; then
+      for gemdir in $rvm_gem_path/${rvm_ruby_string}%* ; do
+        echo "$gemdir" | awk -F'%' '{print $2}'
+      done
+    else
+      $rvm_scripts_path/log "error" "\$rvm_ruby_string is not set!"
+    fi
+  else
+    $rvm_scripts_path/log "error" "\$rvm_gem_path is not set!"
   fi
 }
 
 __rvm_gems_delete() {
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ ! -z "$rvm_gem_set_name" ]] ; then
     gemdir="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
-    if [[ -d "$gemdir" ]] && [[ ! -z "$rvm_force_flag" ]] ; then
+    if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
-      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name ' ($gemdir)?"
+      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name' ($gemdir)?"
       echo -n "(anything other than 'yes' will cancel) > "
       read response
       if [[ "yes" = "$response" ]] ; then
@@ -263,7 +275,11 @@ elif [[ "gemdir" = "$action" ]] ; then
   __rvm_gems_gemdir
 elif [[ "install" = "$action" ]] ; then
   __rvm_gem_install $*
+elif [[ "clear" = "$action" ]] ; then
+  $rvm_scripts_path/log "info" "gems(et) cleared."
+  exit 0
 else
   $rvm_scripts_path/log "error" "gems must be passed an action as the first parameter {load,dump,delete,name,list,gemdir,install}"
 fi
 
+exit $?

data/scripts/initialize

@@ -32,5 +32,5 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path
+export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path rvm_hooks_path
 

data/scripts/install

@@ -1,6 +1,32 @@
 #!/usr/bin/env bash
 
-if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+unset rvm_auto_flag
+
+source scripts/version
+source scripts/utility
+
+usage() {
+  echo -e "
+  Usage:
+    ${0} <options>
+
+  Options:
+    --auto    : Automatically update shell profile files.
+    --prefix  : Installation prefix directory.
+    --help    : Display help/usage (this) message
+    --version : display rvm package version
+  "
+}
+
+while [[ $# -gt 0 ]] ; do
+  token="$1" ; shift
+  case "$token" in
+    --auto)    rvm_auto_flag=1          ;;
+    --prefix)  prefix_path="$1" ; shift ;;
+    --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
+    --help|*)  usage                    ;;
+  esac
+done
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
@@ -14,7 +40,6 @@ if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   fi
 fi
 
-source scripts/utility
 source scripts/initialize
 
 __rvm_initialize
@@ -25,16 +50,16 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
-source_dir="${source_dir:-$cwd}"
+source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
+if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
+source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
-cp -f "$source_dir/README" "$rvm_path/"
+cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
@@ -42,8 +67,8 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  if [[ -d "$source_dir/$dir_name" ]] ; then
-    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_path/$dir_name" ]] ; then
+    cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
@@ -57,7 +82,7 @@ fi
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
 
@@ -83,6 +108,15 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+#
+#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+#mkdir -p $rvm_rubies_path
+#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
+#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
+#done
+
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
@@ -107,13 +141,15 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
 echo "================================================================================"
-
+echo -e "Upgrades"
+echo -e "Gems are now per interpreter installation instead of per interpreter/version"
+echo -e "so for example to upgrade an older install of 1.8.6 and preserve gems:"
+echo -e "rm -rf ~/.rvm/gems/ruby-1.8.6-p383 ;  mv ~/.rvm/gems/ruby/1.8.6 ~/.rvm/gems/ruby-1.8.6-p383"
+echo "================================================================================"
 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(.bash_profile and/or .zshenv), after all path/variable settings:"
+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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
-if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
-
 exit 0

data/scripts/manage

@@ -6,6 +6,7 @@ original_ruby_string=$rvm_ruby_string
 source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
 source $rvm_scripts_path/selector
+source $rvm_scripts_path/libraries
 
 trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
@@ -20,9 +21,15 @@ __rvm_install_source() {
   if [[ ! -z "$rvm_force_flag" ]] ; then rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
 
   result=0
-  __rvm_fetch_ruby || (result=$? && return $result)
+  __rvm_fetch_ruby
+  result=$? ; if [[ "$result" -gt 0 ]] ; then
+    $rvm_scripts_path/log "error" "There has been an error fetching the ruby interpreter. Aborting the installation." ; __rvm_pushpop ; return $result
+  fi
 
-  builtin cd $rvm_ruby_src_path || (result=$? ; $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result)
+  builtin cd $rvm_ruby_src_path
+  result=$? ; if [[ "$result" -gt 0 ]] ; then
+    $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
 
@@ -30,14 +37,14 @@ __rvm_install_source() {
     if which autoconf &> /dev/null ; then
       __rvm_run "autoconf" "autoconf" "Running autoconf"
     else
-      $rvm_scripts_path/log "fail" "rvm expects autoconf"  result=$? ; return $result
+      result=$? ; $rvm_scripts_path/log "fail" "rvm requires autoconf to install the selected ruby interpreter however autoconf was not found in the PATH." ; return $result
     fi
   fi
 
   if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
     # How to install ruby 1.8.5... "sneaky sneaky, sir"
-    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.7-p248/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 1>/dev/null ; fi
-    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.6-p383/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 1>/dev/null ; fi
+    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.7-p248/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
+    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.6-p383/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
     cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
     cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
     cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
@@ -47,9 +54,15 @@ __rvm_install_source() {
   if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
     (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
   elif [[ ! -z "$rvm_ruby_configure" ]] ; then
-    __rvm_run "configure" "$rvm_ruby_configure" || (result=$? && return $result)
+    __rvm_run "configure" "$rvm_ruby_configure"
+    result=$? ; if [[ "$result" -gt 0 ]] ; then
+      $rvm_scripts_path/log "error" "There has been an error while configuring. Aborting the installation." ; __rvm_pushpop ; return $result
+    fi
   elif [[ -s ./configure ]] ; then
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..." || (result=$? && return $result)
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
+    result=$? ; if [[ "$result" -gt 0 ]] ; then
+      $rvm_scripts_path/log "error" "There has been an error while running configure. Aborting the installation." ; __rvm_pushpop ; return $result
+    fi
     unset configure_parameters
   else
     $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
@@ -62,10 +75,16 @@ __rvm_install_source() {
   fi
 
   rvm_ruby_make=${rvm_ruby_make:-"make"}
-  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..." || (result=$? && return $result)
+  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+  result=$? ; if [[ "$result" -gt 0 ]] ; then
+    $rvm_scripts_path/log "error" "There has been an error while running make. Aborting the installation." ; __rvm_pushpop ; return $result
+  fi
 
   rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
-  __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string" || (result=$? && return $result)
+  __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then
+    $rvm_scripts_path/log "error" "There has been an error while running make install. Aborting the installation." ; __rvm_pushpop ; return $result
+  fi
 
   $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
@@ -88,7 +107,7 @@ __rvm_install_ruby() {
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
         if [[ "$rvm_head_flag" = 1 ]] ; then
-          __rvm_install_llvm
+          if [[ ! -z "$rvm_llvm_flag" ]] ; then __rvm_install_llvm ; fi
           macruby_path="/usr/local/bin"
           # TODO: configure & make variables should be set here.
           rvm_ruby_configure=" true "
@@ -97,12 +116,19 @@ __rvm_install_ruby() {
           __rvm_db "${rvm_ruby_interpreter}_repo_url" "rvm_url"
           rvm_ruby_repo_url=$rvm_url
           __rvm_install_source $*
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to install from source. Aborting the installation." ; return $result
+          fi
         else # if [[ "nightly" = "$rvm_ruby_version" ]] ; then
           macruby_path="/usr/local/bin"
           # TODO: Separated nightly from head.
           __rvm_db "macruby_nightly_url" "rvm_url"
           $rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
-          $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
+          $rvm_scripts_path/fetch "$rvm_url"
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
+
           mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
           __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
@@ -122,8 +148,7 @@ PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 exec $macruby_path/mac$binary_name $prefix "\$@"
 RubyWrapper
 )
-          files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_string"
-          for file_name in $(echo $files)  ; do
+          for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_path/bin/$binary_name-$rvm_ruby_string" ; do
             rm -f $file_name
             echo "$ruby_wrapper" > $file_name
             if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
@@ -145,9 +170,17 @@ RubyWrapper
           $rvm_scripts_path/log "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)."
         else
           $rvm_scripts_path/log "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
-          $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
+          $rvm_scripts_path/fetch "$rvm_url"
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
+
           rm -rf "$rvm_ruby_src_path"
-          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file..." || (result=$? && return $result)
+          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file..."
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
+
           mv "$rvm_src_path/$rvm_ruby_package_file" "$rvm_ruby_src_path"
         fi
         builtin cd "$rvm_ruby_src_path"
@@ -162,7 +195,11 @@ RubyWrapper
           rvm_ree_options="${rvm_ree_options} --no-tcmalloc"
         fi
 
-        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..." || (result=$? && return $result)
+        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
+
         chmod +x $rvm_ruby_home/bin/*
 
         __rvm_rubygems_setup
@@ -207,9 +244,15 @@ RubyWrapper
       if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
         if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_file.tar.gz" ]] ; then
           $rvm_scripts_path/log "info" "Downloading $rvm_ruby_file, this may take a while depending on your connection..."
-          $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
+          $rvm_scripts_path/fetch "$rvm_url"
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
         fi
-        __rvm_run "extract" "tar xzf $rvm_archives_path/$(basename $rvm_url) -C $rvm_src_path" "Extracting $(basename $rvm_url) ..." || (result=$? && return $result)
+        __rvm_run "extract" "tar xzf $rvm_archives_path/$(basename $rvm_url) -C $rvm_src_path" "Extracting $(basename $rvm_url) ..."
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
         mv "$rvm_src_path/rubinius-$rvm_ruby_version-${rvm_ruby_patch_level/^p//}" $rvm_ruby_src_path
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
@@ -222,6 +265,9 @@ RubyWrapper
           builtin cd "$rvm_ruby_src_path"
           __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
         fi
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while fetching the rbx git repo. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
       fi
 
       #if [[ ! -x "$rvm_ruby_distclean" ]] ; then
@@ -231,14 +277,17 @@ RubyWrapper
       builtin cd "$rvm_ruby_src_path"
       chmod +x ./configure
       rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
-
-      if [[ "$rvm_jit_flag" -eq 0 ]] && [[ "rc1" != "$rvm_ruby_patch_level" ]] ; then
-        rvm_ruby_configure="$rvm_ruby_configure --disable-llvm" ; message="$message with LLVM disabled"
+      if [[ "$rvm_llvm_flag" = "0" ]] ; then
+        rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
       else
-        rvm_ruby_configure="$rvm_ruby_configure" ; message="$message with LLVM enabled"
+        if [[ "$rvm_ruby_patch_level" = "rc1" ]] ; then
+          rvm_ruby_configure="$rvm_ruby_configure --enable-llvm"
+        fi
       fi
-
       __rvm_run "configure" "$rvm_ruby_configure" "$message"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while running '$rvm_ruby_configure'. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
 
       if [[ "$rvm_trace_flag" -eq 1 ]] ; then
         rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 rake install --trace" ; message="Compiling rbx"
@@ -246,6 +295,9 @@ RubyWrapper
         rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 rake install" ; message="Compiling rbx"
       fi
       __rvm_run "rake" "$rvm_ruby_make" "$message"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while running '$rvm_ruby_configure'. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
 
       binaries="ruby irb" # Trick to work in more shells :)
       for binary_name in $(echo $binaries) ; do
@@ -288,9 +340,10 @@ RubyWrapper
 
       mkdir -p "$rvm_ruby_log_path" "$rvm_ruby_src_path"
       __rvm_pushpop $rvm_src_path
-      __rvm_fetch_ruby || (result=$? && return $result)
-
-      # if [[ -z "$rvm_head_flag" ]] ; then __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..." ; fi
+      __rvm_fetch_ruby
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
 
       builtin cd "$rvm_ruby_src_path"
       if [[ ! -z "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
@@ -331,7 +384,7 @@ RubyWrapper
 
       if [[ "$rvm_head_flag" = 1 ]] ; then
           mono_version="$(mono -V | head -n 1 | cut -d ' ' -f5)"
-          if [[ "$mono_version" =~ ([0-9]+)\.([0-9]+)\.?([0-9]+)? ]] ; then
+          if $rvm_scripts_path/match "$mono_version" "([0-9]+)\.([0-9]+)\.?([0-9]+)?" ; then
             if [[ ${BASH_REMATCH[1]} -lt 2 ]] || ( [[ ${BASH_REMATCH[1]} -eq 2 ]] && [[ ${BASH_REMATCH[2]} -lt 6 ]] ) ; then
               echo -e "Mono 2.6 (or greater) must be installed and in your path in order to build IronRuby from the repository."
               echo -e "Version detected: ${BASH_REMATCH[0]}"
@@ -360,10 +413,15 @@ RubyWrapper
           cp -r $rvm_ruby_src_path/ruby_home/lib/IronRuby
       else
         $rvm_scripts_path/log "info" "Retrieving IronRuby"
-        $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
+        $rvm_scripts_path/fetch "$rvm_url"
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
 
         __rvm_run "extract" "unzip $rvm_archives_path/$rvm_ruby_package_file ironruby/bin/* ironruby/lib/* -d $rvm_ruby_home" "Extracting $rvm_ruby_package_file ..."
-        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
 
         mv $rvm_ruby_home/ironruby/* $rvm_ruby_home
         rm -rf $rvm_ruby_home/ironruby
@@ -420,25 +478,38 @@ RubyWrapper
         if which autoconf &> /dev/null ; then
           __rvm_run "autoconf" "autoconf" "Running autoconf"
         else
-          $rvm_scripts_path/log "fail" "rvm expects autoconf" ; result=$? ; return $result
+          $rvm_scripts_path/log "fail" "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. Aborting installation." ; result=$? ; return $result
         fi
       fi
 
       if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
           (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
       elif [[ ! -z "$rvm_ruby_configure" ]] ; then
-        __rvm_run "configure" "$rvm_ruby_configure" || (result=$? && return $result)
+        __rvm_run "configure" "$rvm_ruby_configure"
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to configure the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
+
       elif [[ -s ./configure ]] ; then
-          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..." || (result=$? && return $result)
+          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..."
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to configure the source. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
       else
           $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
       fi
 
       rvm_ruby_make=${rvm_ruby_make:-"make"}
-      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..." || (result=$? && return $result)
+      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to run make. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
 
       rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
-      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string" || (result=$? && return $result)
+      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to run make install. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
 
       $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
@@ -486,26 +557,43 @@ __rvm_fetch_ruby() {
         rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
       fi
       $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
-      $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
+      $rvm_scripts_path/fetch "$rvm_url"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
+
     fi
-    __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..." || (result=$? && return $result)
+    __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+    result=$? ; if [[ "$result" -gt 0 ]] ; then
+      $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
+    fi
+
   else
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
         builtin cd $rvm_ruby_src_path
         if [[ -z "$rvm_ruby_revision" ]] ; then
           $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-          git pull origin master || (result=$? && return $result)
+          git pull origin master
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to update the source from the remote repository. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
         else
           if [[ -z "$rvm_ruby_sha" ]] ; then
             git checkout HEAD
           else
             git checkout $(echo $rvm_ruby_sha | sed 's#^s##')
-          fi || (result=$? && return $result)
+          fi
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to checkout the source branch. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
         fi
       else
         $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path || (result=$? && return $result)
+        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to fetch the repository. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
       fi
     else
       if [[ ! -z "$rvm_head_flag" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
@@ -515,6 +603,9 @@ __rvm_fetch_ruby() {
         # TODO: Check if tag v is valid
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/tags/$(echo $rvm_ruby_tag | sed 's/^t//')"}"
         rvm_rev=""
+      elif [[ "$rvm_major_version.$rvm_minor_version" = "8.8" ]] ; then
+        rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}"}"
+        rvm_rev="-$rvm_ruby_revision"
       else
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}"
         rvm_rev="-$rvm_ruby_revision"
@@ -531,7 +622,11 @@ __rvm_fetch_ruby() {
       else
         rm -rf $rvm_ruby_src_path
         __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path"
-      fi || (result=$? && return $result)
+      fi
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to fetch / update the source. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
+
     fi
   fi
 }
@@ -631,7 +726,10 @@ __rvm_rubygems_setup() {
     if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then rm -rf "$rvm_src_path/$rvm_gem_package_name" ; fi
     if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
       $rvm_scripts_path/log "info" "Retrieving $rvm_gem_package_name"
-      $rvm_scripts_path/fetch "$rvm_gem_url" || (result=$? && return $result)
+      $rvm_scripts_path/fetch "$rvm_gem_url"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
       mkdir -p "$rvm_src_path/$rvm_gem_package_name"
       __rvm_run "rubygems.extract" "tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_src_path" "Extracting $rvm_gem_package_name"
     fi

data/scripts/rvm

@@ -26,6 +26,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     source $rvm_path/scripts/array
     source $rvm_path/scripts/utility
     source $rvm_path/scripts/initialize
+    source $rvm_scripts_path/version
     source $rvm_path/scripts/selector
     source $rvm_path/scripts/cli
     #source $rvm_path/scripts/gems

data/scripts/rvm-install

@@ -1,6 +1,32 @@
 #!/usr/bin/env bash
 
-if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+unset rvm_auto_flag
+
+source scripts/version
+source scripts/utility
+
+usage() {
+  echo -e "
+  Usage:
+    ${0} <options>
+
+  Options:
+    --auto    : Automatically update shell profile files.
+    --prefix  : Installation prefix directory.
+    --help    : Display help/usage (this) message
+    --version : display rvm package version
+  "
+}
+
+while [[ $# -gt 0 ]] ; do
+  token="$1" ; shift
+  case "$token" in
+    --auto)    rvm_auto_flag=1          ;;
+    --prefix)  prefix_path="$1" ; shift ;;
+    --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
+    --help|*)  usage                    ;;
+  esac
+done
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
@@ -14,7 +40,6 @@ if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   fi
 fi
 
-source scripts/utility
 source scripts/initialize
 
 __rvm_initialize
@@ -25,16 +50,16 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
-source_dir="${source_dir:-$cwd}"
+source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
+if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
+source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
-cp -f "$source_dir/README" "$rvm_path/"
+cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
@@ -42,8 +67,8 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  if [[ -d "$source_dir/$dir_name" ]] ; then
-    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_path/$dir_name" ]] ; then
+    cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
@@ -57,7 +82,7 @@ fi
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
 
@@ -83,6 +108,15 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+#
+#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+#mkdir -p $rvm_rubies_path
+#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
+#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
+#done
+
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
@@ -107,13 +141,15 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
 echo "================================================================================"
-
+echo -e "Upgrades"
+echo -e "Gems are now per interpreter installation instead of per interpreter/version"
+echo -e "so for example to upgrade an older install of 1.8.6 and preserve gems:"
+echo -e "rm -rf ~/.rvm/gems/ruby-1.8.6-p383 ;  mv ~/.rvm/gems/ruby/1.8.6 ~/.rvm/gems/ruby-1.8.6-p383"
+echo "================================================================================"
 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(.bash_profile and/or .zshenv), after all path/variable settings:"
+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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
-if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
-
 exit 0

data/scripts/selector

@@ -52,7 +52,8 @@ __rvm_select() {
         rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
       else
         unset rvm_ruby_patch_level
-        rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version-head"
+        unset rvm_ruby_version
+        rvm_ruby_string="$rvm_ruby_interpreter-head"
       fi
     ;;
 
@@ -157,7 +158,7 @@ __rvm_select() {
 
   __rvm_gems_select
 
-  if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ "system" != "$rvm_ruby_interpreter" ]] ; then
+  if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ "system" != "$rvm_ruby_interpreter" ]]  && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ ! -z "$rvm_ruby_version" ]] ; then
       rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
       rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
@@ -179,8 +180,7 @@ __rvm_select() {
 
     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_gem_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_unset_ruby_variables
-    rvm_ruby_interpreter="system"
+    rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
   fi
 }
 
@@ -194,8 +194,8 @@ __rvm_use() {
     new_path=$rvm_bin_path:$new_path
 
     if [[ -s $rvm_path/default ]] ; then
+      unset new_path
       source $rvm_path/default
-
       if [[ ! -z "$rvm_verbose_flag" ]] ; then
         $rvm_scripts_path/log "info" "Now using default ruby."
       fi
@@ -212,7 +212,7 @@ __rvm_use() {
     new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
     new_path=$rvm_bin_path:$new_path
     if [[ -s $rvm_path/system ]] ; then
-      grep "^MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
+      grep "MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
         rm -f $rvm_path/system # 'system' should *not* point to an rvm ruby.
       else
@@ -275,16 +275,16 @@ __rvm_use() {
       rm -f $rvm_path/default
       rm -f $rvm_path/bin/default*
     else
-      RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
+      RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
-      echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/default
+      echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_path/bin:\$PATH\"" > $rvm_path/default
 
-      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name; do
+      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name ; do
         eval "export $variable"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then
-          echo "${variable}='$value' ; export ${variable}" >> $rvm_path/default
+          echo "export ${variable}='$value'" >> $rvm_path/default
         else
           echo "unset ${variable}" >> $rvm_path/default
         fi
@@ -330,13 +330,15 @@ __rvm_ruby_string() {
     if [[ "head" = "$string" ]] ; then
       rvm_ruby_revision="head"
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
-      rvm_head_flag=1
+      export rvm_head_flag=1
     elif [[ "default" = "$string" ]] ; then
       rvm_ruby_interpreter="default"
-      break
+      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gem_set_name
+      return
     elif [[ "system" = "$string" ]] ; then
       rvm_ruby_interpreter="system"
-      break
+      unset rvm_ruby_patch_level rvm_ruby_tag rvm_head_flag rvm_ruby_revision rvm_ruby_version rvm_gem_set_name
+      return
     elif [[ "nightly" = "$string" ]] ; then
       rvm_ruby_version="nightly"
       rvm_nightly_flag=1
@@ -396,7 +398,7 @@ __rvm_ruby_string() {
   fi
 
   # Unspecified version
-  if [[ -z "$rvm_ruby_version" ]] ; then
+  if [[ -z "$rvm_ruby_version" ]] && [[ -z "$rvm_head_flag" ]]; then
     rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
   fi
 

data/scripts/update

@@ -1,6 +1,32 @@
 #!/usr/bin/env bash
 
-if [[ "--auto" = "$1" ]] ; then rvm_auto_flag=1 ; else unset rvm_auto_flag ; fi
+unset rvm_auto_flag
+
+source scripts/version
+source scripts/utility
+
+usage() {
+  echo -e "
+  Usage:
+    ${0} <options>
+
+  Options:
+    --auto    : Automatically update shell profile files.
+    --prefix  : Installation prefix directory.
+    --help    : Display help/usage (this) message
+    --version : display rvm package version
+  "
+}
+
+while [[ $# -gt 0 ]] ; do
+  token="$1" ; shift
+  case "$token" in
+    --auto)    rvm_auto_flag=1          ;;
+    --prefix)  prefix_path="$1" ; shift ;;
+    --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
+    --help|*)  usage                    ;;
+  esac
+done
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
@@ -14,7 +40,6 @@ if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   fi
 fi
 
-source scripts/utility
 source scripts/initialize
 
 __rvm_initialize
@@ -25,16 +50,16 @@ __rvm_initialize
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
-source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
-if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
-source_dir="${source_dir:-$cwd}"
+source_path="${source_path:-"$(dirname $0 | xargs dirname)"}"
+if [[ ! -d "$source_path" ]] ; then unset source_path ; fi
+source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
-cp -f "$source_dir/README" "$rvm_path/"
+cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
@@ -42,8 +67,8 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  if [[ -d "$source_dir/$dir_name" ]] ; then
-    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_path/$dir_name" ]] ; then
+    cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
@@ -57,7 +82,7 @@ fi
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
-  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+  cp -f "$source_path/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
 
@@ -83,6 +108,15 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# TODO: Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/
+#
+#rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+#mkdir -p $rvm_rubies_path
+#for ruby in "$rvm_path"/ruby-* "$rvm_path"/jruby-* "$rvm_path"/mput-* "$rvm_path"/rbx-* ; do
+#  if [[ -d "$ruby" ]] ; then mv "$ruby" "$rvm_rubies_path" ; fi
+#done
+
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
   mkdir -p $rvm_symlink_path
@@ -107,13 +141,15 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne\n"
 echo "================================================================================"
-
+echo -e "Upgrades"
+echo -e "Gems are now per interpreter installation instead of per interpreter/version"
+echo -e "so for example to upgrade an older install of 1.8.6 and preserve gems:"
+echo -e "rm -rf ~/.rvm/gems/ruby-1.8.6-p383 ;  mv ~/.rvm/gems/ruby/1.8.6 ~/.rvm/gems/ruby-1.8.6-p383"
+echo "================================================================================"
 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(.bash_profile and/or .zshenv), after all path/variable settings:"
+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 "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 
-if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
-
 exit 0

data/scripts/utility

@@ -134,7 +134,7 @@ __rvm_run() {
 
 __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() {
@@ -279,7 +279,7 @@ __rvm_list() {
     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"
@@ -307,7 +307,7 @@ __rvm_list() {
     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
@@ -667,12 +667,15 @@ __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}')
-    fi
-
-    if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-      rvm_gem_set_name=$(echo $rvm_ruby_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_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then
@@ -705,9 +708,3 @@ __rvm_gems_use() {
   fi
 }
 
-__rvm_gems_clear() {
-  unset rvm_ruby_gem_home rvm_gem_set_name GEM_HOME GEM_PATH
-  __rvm_gems_select
-  __rvm_gems_use
-}
-

data/scripts/version

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+__rvm_meta() {
+  rvm_meta_author="Wayne E. Seguin"
+  rvm_meta_author_email="wayneeseguin@gmail.com"
+  rvm_meta_website="http://rvm.beginrescueend.com/"
+  rvm_meta_version="${rvm_version}"
+}
+
+__rvm_version() {
+  __rvm_meta
+  echo -e "\nrvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]\n"
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.99
+  version: 0.0.999
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 -05:00
+date: 2010-01-07 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -67,6 +67,7 @@ files:
 - scripts/symlink
 - scripts/update
 - scripts/utility
+- scripts/version
 has_rdoc: true
 homepage: http://github.com/wayneeseguin/rvm
 licenses: []