rvm 0.0.84 → 0.0.85

data/config/md5

@@ -0,0 +1,25 @@
+curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
+jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
+jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
+libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
+ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
+openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
+readline-5.2.tar.gz=e39331f32ad14009b9ff49cc10c5e751
+readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
+rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
+ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
+ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
+ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
+ruby-1.8.6-p287.tar.gz=6ff3420094711266c3201a0c7c2faa38
+ruby-1.8.6-p369.tar.gz=8c140ae28b4c3947b92dfad69109d90b
+ruby-1.8.6-p383.tar.gz=4f49544d4a4d0d34e9d86c41e853db2e
+ruby-1.8.7-p160.tar.gz=945398f97e2de6dd8ab6df68d10bb1a1
+ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
+ruby-1.9.1-p129.tar.gz=c71f413514ee6341c627be2957023a5c
+ruby-1.9.1-p243.tar.gz=515bfd965814e718c0943abf3dde5494
+ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
+ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
+ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
+ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
+rubygems-1.3.5.tgz=6e317335898e73beab15623cdd5f8cff
+zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634

data/examples/rvmrc

@@ -1,38 +1,51 @@
-# Example rvm Defaults file.
+# Example ~/.rvmrc file.
+#
 # This file shows some examples of setting defaults to your own tastes.
-
-# Default action to assume
-#rvm_action="use"
-
-# Default ruby implementation
-#rvm_implementation="ruby"
-
-# Default ruby version
-#rvm_version="1.8.6"
-
-# Default patchlevel to set, if implementation is set
-#rvm_patchlevel="369"
-
-# Default prefix path (~/, or /usr/local/src/ for example.)
-#rvm_prefix_path="$HOME/."
-
-# Default Install Path
-#rvm_path="${rvm_prefix_path}rvm"
-
-# Default Archives Path
+#
+# If you wish to adjust the default ruby interpreter/version/patchlevel
+# settings they can be found in the $rvm_path/config/db file.
+# Beware that currently that file is overwritten on install so
+# back it up if you change anything.
+#
+
+# rvm Path
+#   This is where rvm installs and manages everything in by default.
+#rvm_path="$HOME/.rvm"
+
+# Archives Path
+#   This is where all tarballs/zipfiles/packagefiles are downladed to
 #rvm_archives_path="${rvm_path}/archives"
 
-# Default Source Path
+# Source Path
+#   This is where rvm extracts to for compiling & installing.
 #rvm_source_path="${rvm_path}/src"
 
-# Default Log Path
+# Log Path
+#   This is where rvm logs all of it's actions to
+#   (not including the 'do' actions)
 #rvm_log_path="${rvm_path}/log"
 
-# Default gems directory
-# rvm_gem_path="$HOME/.gem"
+# Bin Path
+#   This is where rvm places all of it's executable/wrapper scripts.
+#rvm_bin_path="${$rvm_path}/bin"
+
+# Gem Path
+#   This is where rvm installs all gems to for each ruby
+#   interpreter/version%gemset
+#rvm_gem_path="$rvm_path/.gem"
+
+# Hooks Path
+#   This is where rvm rubs custom hook files from.
+#rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 
-# Install rubies on use when they are not installed
+# Temp Path
+#   This is where rvm stores all of its temporary files.
+#rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+
+# Install On Use Flag
+# Install rubies when used if are not installed.
 #ruby_install_on_use=1
 
-# Make Flags, I have 2 cpu's so I can do 2 make threads:
-#rvm_make_flags="-j 2"
+# Make Flags, I have 8 cpu's so I might use 7 make threads:
+#rvm_make_flags="-j 7"
+

data/install

@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-$cwd/scripts/rvm -v
+if [[ -x "$rvm_path/scripts/rvm" ]] ; then
+  "$rvm_path/scripts/rvm" -v
+fi
 
 exit 0

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 84
+:patch: 85

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.84"
+  s.version = "0.0.85"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-11-27}
+  s.date = %q{2009-11-30}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "README",
      "binscripts/rvm-prompt",
      "config/db",
+     "config/md5",
      "examples/rvmrc",
      "install",
      "lib/VERSION.yml",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
      "scripts/fetch",
      "scripts/functions",
      "scripts/gems",
+     "scripts/hash",
      "scripts/initialize",
      "scripts/install",
      "scripts/irbrc",

data/scripts/array

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
+
 if [[ ! -z "$ZSH_VERSION" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 # Usage: contains "a_string" "${an_array[@]}"

data/scripts/cli

@@ -104,7 +104,7 @@ __rvm_parse_args() {
               rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
               unset rvm_ruby_interpreter
             else
-              if [[ "jruby" = "$1" ]] || [[ "rbx" = "$1" ]] || [[ "rubinius" = "$1" ]] || [[ "macruby" = "$1" ]] || [[ "ree" = "$1" ]] || [[  "mput" = "$1" ]]  || [[  "shyouhei" = "$1" ]] ; then
+              if $rvm_scripts_path/match "rbx jruby rubinius macruby ree mput shyouhei" "$1" ; then
                 rvm_ruby_interpreter=$1 ; shift
               else
                 unset rvm_ruby_interpreter rvm_ruby_version
@@ -358,10 +358,7 @@ rvm() {
       $rvm_scripts_path/monitor ; result=$?
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload)
-      shift;shift;unset rvm_action;
-      source "$rvm_path/scripts/rvm"
-    ;;
+    reload) rvm_reload_flag=1 ; break   ;;
     install|uninstall) __rvm_manage_rubies   ; result=$? ;;
     tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
 
@@ -391,6 +388,9 @@ rvm() {
       result=1
   esac
 
+
+  if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi
+
   if [[ "1" = "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
 
   return $result

data/scripts/hash

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+#
+# The idea is that we emulate a hash using two methods
+#
+# The first method is providing functions by sourcing this file
+#
+# The second method is where this script is called directly,
+# we then provide functionality of a file based hash
+#
+
+if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
+
+if [[ ! -z "$ZSH_VERSION" ]] ; then __array_start=1 ; else __array_start=0 ; fi
+
+hash() {
+  hash_name=$1 ; hash_key=$2 ; hash_value=$3
+
+  eval "_hash_${hash_name}_keys=\${_hash_${hash_name}_keys:-()} ; _hash_${hash_name}_values=\${_hash_${hash_name}_values:-()}"
+  if [[ -z "$hash_value" ]] ; then
+    eval "length=\${#_hash_${hash_name}_keys[@]}"
+    for (( index=$__array_start ; index < $length; index++ )) ; do
+      eval "key=\"\${_hash_${hash_name}_keys[$index]}\""
+      if [[ "$hash_key" = "$key" ]] ; then
+        eval "echo -n \${_hash_${hash_name}_values[$index]}"
+        break
+      fi
+    done
+  else
+    eval "index=\$((\${#_hash_${hash_name}_keys[*]} + $__array_start))"
+    eval "_hash_${hash_name}_keys[$index]=\"$hash_key\""
+    eval "_hash_${hash_name}_values[$index]=\"$hash_value\""
+  fi
+  set +x
+}
+

data/scripts/initialize

@@ -14,7 +14,7 @@ rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
-rvm_temp_path="${rvm_temp_path:-"$rvm_path/tmp"}"
+rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 
-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_temp_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
 

data/scripts/install

@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-$cwd/scripts/rvm -v
+if [[ -x "$rvm_path/scripts/rvm" ]] ; then
+  "$rvm_path/scripts/rvm" -v
+fi
 
 exit 0

data/scripts/monitor

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
+
 original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
 

data/scripts/notes

@@ -35,7 +35,7 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "\n      The SUN java runtime environment and development kit."
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "    $item Be sure that you have XCode Tools (Version 3.2.1 (1613) or later) installed in order to use rvm."
+  echo -e "    $item For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version)."
   echo -e "\n    $item You should download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
   echo -e "\n    $item If you intend on installing MacRuby you must install LLVM first."
 fi

data/scripts/ruby-installer

@@ -131,13 +131,13 @@ __rvm_install_ruby() {
           rvm_ruby_configure=" true "
           rvm_ruby_make="rake"
           rvm_ruby_make_install="sudo rake install"
-          rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_repo_url")"
+          __rvm_db "${rvm_ruby_interpreter}_repo_url" "rvm_url"
           rvm_ruby_repo_url=$rvm_url
           __rvm_install_source $*
         else # if [[ "nightly" = "$rvm_ruby_version" ]] ; then
           macruby_path="/usr/local/bin"
           # TODO: Separated nightly from head.
-          rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "macruby_nightly_url")"
+          __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=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
@@ -176,7 +176,7 @@ RubyWrapper
 
     ree)
       if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
-        rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
+        rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
         $rvm_scripts_path/log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
         __rvm_pushpop "$rvm_src_path"
         if [[ -z "$rvm_force_flag" ]] && [[ -d "$rvm_ruby_src_path" ]] && [[ ! -x "$rvm_ruby_src_path/installer" ]] ; then
@@ -219,7 +219,7 @@ RubyWrapper
         __rvm_post_install
         __rvm_pushpop
       else
-        rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "ree_${rvm_ruby_version}_repo_url")"
+        __rvm_db "ree_${rvm_ruby_version}_repo_url" "rvm_url"
         if [[ -z "$rvm_url" ]] ; then
           $rvm_scripts_path/log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'"
           result=1

data/scripts/rvm

@@ -1,44 +1,44 @@
 #!/usr/bin/env bash
 
-#
 # rvm : Ruby Version Manager
 # http://rvm.beginrescueend.com
 # http://gitub.com/wayneeseguin/rvm
-#
 
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
+if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
+  if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
-if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path="${rvm_path:-/usr/local/rvm}"
-else
-  if [[ -d "$HOME/.rvm" ]] ; then
-    rvm_path="${rvm_path:-$HOME/.rvm}"
-  else
+  if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="${rvm_path:-/usr/local/rvm}"
+  else
+    if [[ -d "$HOME/.rvm" ]] ; then
+      rvm_path="${rvm_path:-$HOME/.rvm}"
+    else
+      rvm_path="${rvm_path:-/usr/local/rvm}"
+    fi
   fi
-fi
 
-source $rvm_path/scripts/array
-source $rvm_path/scripts/initialize
-source $rvm_path/scripts/utility
-source $rvm_path/scripts/selector
-source $rvm_path/scripts/ruby-installer # TODO: Script not function.
-source $rvm_path/scripts/cli
-source $rvm_path/scripts/gems
-source $rvm_path/scripts/libraries
+  source $rvm_path/scripts/array
+  source $rvm_path/scripts/initialize
+  source $rvm_path/scripts/utility
+  source $rvm_path/scripts/selector
+  source $rvm_path/scripts/ruby-installer # TODO: Script not function.
+  source $rvm_path/scripts/cli
+  source $rvm_path/scripts/gems
+  source $rvm_path/scripts/libraries
 
-rvm_loaded_flag=1 ; export rvm_loaded_flag
+  unset rvm_reload_flag ; rvm_loaded_flag=1
 
-rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
+  rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
 
-alias rvm-restart="source \"${rvm_path}/scripts/rvm\""
+  if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
 
-if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
+  # Source a .rvmrc file in a directory after changing to it, if it exists.
+  cd() { builtin cd "$@" ; if [[ -f .rvmrc ]] ; then source .rvmrc ; fi ; }
 
-# Source a .rvmrc file in a directory after changing to it, if it exists.
-cd() { builtin cd "$@" ; if [[ -f .rvmrc ]] ; then source .rvmrc ; fi ; }
+  alias rvm-restart="source '${rvm_path}/scripts/rvm'"
+fi
 
 # Ok now we determine if we were called or sourced... under assumption of course ;)
 if [[ $# -gt 0 ]] && [[ -z "$(echo "$*" | awk '/completion-/')" ]] ; then rvm "$*" ; fi

data/scripts/rvm-install

@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-$cwd/scripts/rvm -v
+if [[ -x "$rvm_path/scripts/rvm" ]] ; then
+  "$rvm_path/scripts/rvm" -v
+fi
 
 exit 0

data/scripts/selector

@@ -18,14 +18,14 @@ __rvm_select() {
         if [[ "$rvm_head_flag" -eq 1 ]] ; then
           unset rvm_ruby_version rvm_ruby_tag
           rvm_ruby_revision="head"
-          rvm_ruby_repo_url=${rvm_ruby_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "macruby_repo_url")"}
+          __rvm_db "macruby_repo_url" "rvm_ruby_repo_url"
           rvm_url="$rvm_ruby_repo_url"
           rvm_ruby_string="${rvm_ruby_interpreter}-head"
         elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
           rvm_url="http://macruby.icoretech.org/latest"
           rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         else
-          rvm_ruby_version="${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "macruby_version")"}"
+          __rvm_db "macruby_version" "rvm_ruby_version"
           rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
           rvm_ruby_package_file="MacRuby%200.5%20beta%201.zip"
           rvm_url="http://www.macruby.org/files/MacRuby%200.5%20beta%201.zip"
@@ -40,11 +40,11 @@ __rvm_select() {
 
     rbx|rubinius)
       rvm_ruby_interpreter="rbx"
-      rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_version")"}
-      rvm_ruby_patch_level=${rvm_ruby_patch_level:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_patch_level")"}
-      rvm_ruby_repo_url=${rvm_rbx_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rubinius_repo_url")"}
-      #rvm_ruby_string="rbx-head" # for now :)
-      rvm_url=$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_url")
+      rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
+      rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
+      rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
+      __rvm_db "rbx_url" "rvm_url"
+
       rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
     ;;
 
@@ -53,10 +53,10 @@ __rvm_select() {
       if [[ "$rvm_head_flag" -eq 1 ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_string="jruby-head"
-        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$($rvm_scripts_path/db "$rvm_config_path/db" "jruby_repo_url")}"
-        rvm_url="${rvm_ruby_repo_url:-$($rvm_scripts_path/db "$rvm_config_path/db" "jruby_repo_url")}"
+        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
+        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
       else
-        rvm_ruby_version="${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "jruby_version")"}"
+        rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
         rvm_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_url="http://jruby.kenai.com/downloads/${rvm_ruby_version}/${rvm_package_file}.tar.gz"
@@ -67,7 +67,7 @@ __rvm_select() {
 
     ree)
       rvm_ruby_interpreter=ree
-      rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "ree_version")"}
+      rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
       if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
         rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^p##')"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}-${rvm_ruby_patch_level}"
@@ -81,7 +81,7 @@ __rvm_select() {
           rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_revision"
         else
           rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
-          rvm_url="${rvm_url:-$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
+          rvm_url="${rvm_url:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
         fi
       fi
 
@@ -95,13 +95,13 @@ __rvm_select() {
       rvm_ruby_version="head"
       rvm_ruby_string="mput-head"
       unset rvm_ruby_patch_level
-      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "shyouhei_repo_url")"}
+      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
       rvm_url=$rvm_ruby_repo_url
       unset rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install
     ;;
 
     ruby)
-      rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "ruby_repo_url")"}"
+      rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
       if [[ -z "$rvm_ruby_version" ]] ; then $rvm_scripts_path/log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
     ;;
 
@@ -366,8 +366,9 @@ __rvm_ruby_string() {
 
   # Unspecified version
   if [[ -z "$rvm_ruby_version" ]] ; then
-    rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_version")"}
+    rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
   fi
+
   if [[ -z "$rvm_ruby_version" ]] ; then
     rvm_ruby_string="${rvm_ruby_interpreter}"
   else
@@ -383,7 +384,7 @@ __rvm_ruby_string() {
   elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
   else
-    patch_level="$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+    patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
     if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="p${patch_level}" ; fi
     if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
       rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"

data/scripts/update

@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-$cwd/scripts/rvm -v
+if [[ -x "$rvm_path/scripts/rvm" ]] ; then
+  "$rvm_path/scripts/rvm" -v
+fi
 
 exit 0

data/scripts/utility

@@ -1,5 +1,24 @@
 #!/usr/bin/env bash
 
+__rvm_db() {
+  key=$1 ; variable=$2
+  if [[ -f "$rvm_config_path/user" ]] ; then
+    value="$($rvm_scripts_path/db "$rvm_config_path/user" "$key")"
+  fi
+
+  if [[ -z "$value" ]] ; then
+    value="$($rvm_scripts_path/db "$rvm_config_path/db" "$key")"
+  fi
+
+  if [[ ! -z "$value" ]] ; then
+    if [[ -z $variable ]] ; then
+      echo $value
+    else
+      eval "$variable=$value"
+    fi
+  fi
+}
+
 __rvm_info() {
   if [[ ! -z "$(which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
 
@@ -166,25 +185,25 @@ __rvm_load_defaults() {
     done
   fi
 
-  rvm_system_ruby=$($rvm_scripts_path/db "$rvm_config_path/db" "system_ruby")
+  __rvm_db "system_ruby" "rvm_system_ruby"
   if [[ ! -z "$rvm_system_ruby" ]] ; then
     rvm_system_ruby=$(which ruby 2>/dev/null)
     if [[ $? -ne 0 ]] ; then
       $rvm_scripts_path/log "info" "System ruby not found, no system default will be stored."
     else
-      $rvm_scripts_path/db "$rvm_config_path/db" "system_ruby" "$rvm_system_ruby"
+      $rvm_scripts_path/db "$rvm_config_path/user" "system_ruby" "$rvm_system_ruby"
 
       # Now store system system & user gem paths
       if [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
-        rvm_system_user_gem_path=$($rvm_scripts_path/db "$rvm_config_path/db" "system_user_gem_path")
+        __rvm_db "system_user_gem_path" "rvm_system_user_gem_path"
         if [[ -z "$rvm_system_user_gem_path" ]] ; then
           rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; )
-          $rvm_scripts_path/db "$rvm_config_path/db" "system_user_gem_path" "$rvm_system_user_gem_path"
+          $rvm_scripts_path/db "$rvm_config_path/user" "system_user_gem_path" "$rvm_system_user_gem_path"
         fi
-        rvm_system_gem_path=$($rvm_scripts_path/db "$rvm_config_path/db" "system_gem_path")
+        __rvm_db "system_gem_path" "rvm_system_gem_path"
         if [[ -z "$rvm_system_gem_path" ]] ; then
           rvm_system_gem_path=$( rvm system ; gem env gemdir; )
-          $rvm_scripts_path/db "$rvm_config_path/db" "system_gem_path" "$rvm_system_gem_path"
+          $rvm_scripts_path/db "$rvm_config_path/user" "system_gem_path" "$rvm_system_gem_path"
         fi
       fi
     fi
@@ -204,7 +223,7 @@ __rvm_reset() {
   __rvm_select
 
   for system_config in system_ruby system_gem_path system_user_gem_path ; do
-    $rvm_scripts_path/db "$rvm_config_path/db" "$system_config" "delete"
+    $rvm_scripts_path/db "$rvm_config_path/user" "$system_config" "delete"
   done ; unset system_config variable
 
   rm -f $rvm_path/bin/ruby $rvm_path/bin/gem $rvm_path/bin/rake $rvm_path/bin/irb $rvm_path/bin/default*
@@ -344,16 +363,19 @@ __rvm_list() {
       fi ; unset version
     fi
 
-    system_version=$(rvm system ; which ruby 2>/dev/null && ruby -v 2> /dev/null)
-    if [[ ! -z "$system_version" ]] ; then
-      if [[ "$($(which ruby) -v)" = "$system_version" ]] ; then
+    system_ruby="$(rvm system ; which ruby 2>/dev/null)"
+    if [[ ! -z "$system_ruby" ]] ; then
+      system_version=$($system_ruby -v)
+      if [[ ! -z "$(which ruby 2>/dev/null)" ]] && [[ "$($(which ruby 2>/dev/null) -v)" = "$system_version" ]] ; then
         echo -e "=> $(tput setaf 2)system$(tput sgr0) ( ruby -v # => $system_version )\n"
       else
         echo -e "   $(tput setaf 2)system$(tput sgr0) ( ruby -v # => $system_version )\n"
       fi
     else
       $rvm_scripts_path/log "info" "No system ruby found."
-    fi ; unset current_ruby version selected
+    fi
+
+    unset current_ruby version selected system_ruby system_version string
   fi
 }
 
@@ -368,7 +390,7 @@ __rvm_initialize() {
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
-  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path
+  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_tmp_path
 }
 
 __rvm_update() {
@@ -570,14 +592,14 @@ __rvm_json() {
 
 __rvm_benchmark() {
   code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
-  echo -e "$code" > "$rvm_temp_path/$$.rb"
+  echo -e "$code" > "$rvm_tmp_path/$$.rb"
   unset code
-  cat $rvm_ruby_file >> "$rvm_temp_path/$$.rb"
-  echo -e "\n end \nend\n" >> "$rvm_temp_path/$$.rb"
-  rvm_ruby_args="$rvm_temp_path/$$.rb"
+  cat $rvm_ruby_file >> "$rvm_tmp_path/$$.rb"
+  echo -e "\n end \nend\n" >> "$rvm_tmp_path/$$.rb"
+  rvm_ruby_args="$rvm_tmp_path/$$.rb"
   rvm_benchmark_flag=1
   rvm_action="ruby"
-  if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_temp_path/$$.rb:\n$(cat $rvm_temp_path/$$.rb)" ; fi
+  if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
   __rvm_do
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.84
+  version: 0.0.85
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -05:00
+date: 2009-11-30 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -26,6 +26,7 @@ files:
 - README
 - binscripts/rvm-prompt
 - config/db
+- config/md5
 - examples/rvmrc
 - install
 - lib/VERSION.yml
@@ -44,6 +45,7 @@ files:
 - scripts/fetch
 - scripts/functions
 - scripts/gems
+- scripts/hash
 - scripts/initialize
 - scripts/install
 - scripts/irbrc