rvm 0.0.88 → 0.0.89

data/config/db

@@ -22,7 +22,7 @@ ree_1.8.7_patch_level=2009.10
 rbx_version=1.0.0-rc1
 rbx_patch_level=20091125
 rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc1-20091125.tar.gz
-ruby_1.9.1_patch_level=243
+ruby_1.9.1_patch_level=376
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=383

data/config/md5

@@ -17,6 +17,7 @@ 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.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
 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

data/install

@@ -44,6 +44,10 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
+if [[ ! -s "$rvm_path/config/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+fi
+
 #
 # Bin Scripts
 #

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 88
+:patch: 89

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.0.88"
+  s.version = "0.0.89"
 
   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-04}
+  s.date = %q{2009-12-08}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
      "scripts/log",
      "scripts/manage",
      "scripts/match",
+     "scripts/md5",
      "scripts/monitor",
      "scripts/notes",
      "scripts/rvm",
@@ -77,3 +78,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/scripts/cli

@@ -17,13 +17,13 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      fetch|install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
+      fetch|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
         rvm_action=$rvm_token
       ;;
 
       use)
         rvm_action=$rvm_token
-        rvm_verbose_flag=1
+        export rvm_verbose_flag=1
         if [[ "ruby" = "$1" ]] ; then shift ; fi
       ;;
 
@@ -33,8 +33,14 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
+      install|uninstall)
+        export ${rvm_token}_flag=1
+        rvm_action=$rvm_token
+      ;;
+
       rm|remove)
         rvm_action="remove"
+        export rvm_remove_flag=1
       ;;
 
       system|default)
@@ -53,23 +59,23 @@ __rvm_parse_args() {
       gems|gemset)
         rvm_action="gems"
         if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] ; then
-          eval "rvm_${1}_flag=1" ; shift
+          export rvm_${1}_flag=1 ; shift
         elif [[ "dump" = "$1" ]] || [[ "$1" = "load" ]] ; then
-          eval "rvm_${1}_flag=1" ; shift
+          export rvm_${1}_flag=1 ; shift
         else
-          rvm_use_flag=1 # Default is to use the (named) gem set.
+          export rvm_use_flag=1 # Default is to use the (named) gem set.
         fi
       ;;
 
       gemdir)
         rvm_action=$rvm_token
-        if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi
-        if [[ "user" = "$1"  ]]   ; then rvm_user_flag=1  ;  shift ; fi
+        if [[ "system" = "$1" ]] ; then export rvm_system_flag=1 ; shift ; fi
+        if [[ "user" = "$1"  ]]   ; then export rvm_user_flag=1  ;  shift ; fi
       ;;
 
       --load|load|dump|clear)
         rvm_action="gems"
-        eval "rvm_${rvm_token}_flag=1"
+        export rvm_${rvm_token}_flag=1
       ;;
 
       -S|-e)
@@ -167,7 +173,7 @@ __rvm_parse_args() {
       --head)
         if [[ -z "$rvm_ruby_string" ]] ; then rvm_ruby_string="head"; else rvm_ruby_string="${rvm_ruby_string}-head" ; fi
         rvm_ruby_revision="head"
-        rvm_head_flag=1
+        export rvm_head_flag=1
         rvm_action="${rvm_action:-use}"
       ;;
 
@@ -185,7 +191,7 @@ __rvm_parse_args() {
 
       --bin)
         if [[ "update" = "$rvm_action" ]] ; then
-          rvm_bin_flag=1
+          export rvm_bin_flag=1
         else
           rvm_bin_path="$1" ; shift
         fi
@@ -243,7 +249,7 @@ __rvm_parse_args() {
         rvm_ruby_string="$rvm_token"
       ;;
 
-      --install)            rvm_install_on_use_flag=1           ;;
+      --install)            export rvm_install_on_use_flag=1           ;;
       -h|--help|usage|help) rvm_action=help                     ;;
       -G|--gems)            rvm_gem_path="$1"          ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
@@ -261,7 +267,7 @@ __rvm_parse_args() {
       --trace)              export rvm_trace_flag=1    ; set -x ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose)
-        eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
+        export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;
 
@@ -366,14 +372,14 @@ rvm() {
     usage|help)    __rvm_usage               ; result=$?  ;;
     benchmark)     __rvm_benchmark           ; result=$?  ;;
     inspect)       __rvm_inspect             ; result=$?  ;;
-    gems)          __rvm_gems                ; result=$?  ;;
+    gems)          $rvm_scripts_path/gems ${rvm_ruby_file:-$rvm_ruby_args} ; result=$?  ;;
     ruby|gem|rake) __rvm_do                  ; result=$?  ;;
     monitor)
       export rvm_ruby_version rvm_ruby_string
       $rvm_scripts_path/monitor ; result=$?
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload) rvm_reload_flag=1                             ;;
+    reload)        rvm_reload_flag=1                      ;;
     fetch|install|uninstall|remove)
       if [[ ! -z "$rvm_ruby_string" ]] ; then
         $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
@@ -394,7 +400,7 @@ rvm() {
     info|debug)
       __rvm_version
       __rvm_info
-      if [[ "debug" = "$rvm_action" ]] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
+      if [[ "debug" = "$rvm_action" ]] ; then export rvm_debug_flag=1 ; __rvm_debug ; fi
     ;;
 
     error)

data/scripts/fetch

@@ -17,20 +17,22 @@ archive=$(basename "$1") ; downlaod=1
 (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Fetching $archive"
 
 # Check first if we have the correct archive
-if [[ -e "$archive" ]] && [[ -e "$archive.md5" ]] ; then
+archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive")"
+if [[ -e "$archive" ]] && [[ ! -z "$archive_md5" ]] ; then
   (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Found archive and its md5, testing correctness"
-  if [[ $(md5sum --status -c "$archive.md5") -gt 0 ]] ; then
+  if [[ $($rvm_scripts_path/md5 $archive $archive_md5) -gt 0 ]] ; then
     (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Archive is bad, downloading"
     download=1
   else
     (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Archive is good, not downloading"
     download=0
     result=0
-  fi
+  fi ; unset archive_md5
 else
   (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "No archive or no MD5, downloading"
   download=1
 fi
+
 if [[ $download -gt 0 ]] ; then
   eval $fetch_command "$1"
   result=$?

data/scripts/gems

@@ -1,42 +1,12 @@
 #!/usr/bin/env bash
 
-__rvm_gems_select() {
-  if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
+source $rvm_path/scripts/initialize
+source $rvm_path/scripts/utility
+source $rvm_path/scripts/selector
 
-  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}')
-    fi
+if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-    if [[ ! -z "$rvm_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then
-      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
-    else
-      if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
-        rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
-      elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
-        rvm_ruby_gem_home=$(gem env gemdir)
-      elif [[ ! -z "$GEM_HOME" ]] ; then
-        rvm_ruby_gem_home="$GEM_HOME"
-      else
-        unset rvm_ruby_gem_home
-      fi
-    fi
-    if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
-  else
-    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
-  fi
-}
-
-__rvm_gems_use() {
-  mkdir -p "$rvm_ruby_gem_home"
-  GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-  GEM_PATH="$GEM_HOME" ; export GEM_PATH
-  __rvm_use
-}
+trap "rm -f $rvm_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 __rvm_gems_name() {
   echo "$rvm_gem_set_name"
@@ -170,78 +140,81 @@ __rvm_gems_load() {
       else # version
         gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
       fi
-
-      #
-      # Evaluate
-      #
-      if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}spec" ]] ; then
-        unset gem
-        $rvm_scripts_path/log "info" "$($rvm_scripts_path/color "green")$gem_name $gem_version$($rvm_scripts_path/color "none") exists, skipping (--force to re-install)"
-      else
-        if [[ -f "$gem" ]] ; then
-          cache_file="$gem"
-        elif [[ -f "$rvm_gem_path/cache/${gem_file_name}" ]] ; then
-          cache_file="$rvm_gem_path/cache/${gem_file_name}"
-        else
-          cache_file="${cache_file:-$(\ls ${rvm_gem_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
-          if [[ ! -z "$cache_file" ]] && [[ -f "$cache_file" ]] ; then
-            if [[ "$(dirname $cache_file)" != "$rvm_gem_path/cache/" ]] ; then
-              cp "$cache_file" "$rvm_gem_path/cache/"
-              cache_file="$rvm_gem_path/cache/$(basename $cache_file)"
-            fi
-          fi
+      __rvm_gem_install
+    done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
+  else
+    $rvm_scripts_path/log "error" "$rvm_file_name does not exist to load from."
+  fi
+}
+__rvm_gem_install() {
+  #
+  # Evaluate
+  #
+  if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}spec" ]] ; then
+    unset gem
+    $rvm_scripts_path/log "info" "$($rvm_scripts_path/color "green")$gem_name $gem_version$($rvm_scripts_path/color "none") exists, skipping (--force to re-install)"
+  else
+    if [[ -f "$gem" ]] ; then
+      cache_file="$gem"
+    elif [[ -f "$rvm_gem_path/cache/${gem_file_name}" ]] ; then
+      cache_file="$rvm_gem_path/cache/${gem_file_name}"
+    else
+      cache_file="${cache_file:-$(\ls ${rvm_gem_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
+      if [[ ! -z "$cache_file" ]] && [[ -f "$cache_file" ]] ; then
+        if [[ "$(dirname $cache_file)" != "$rvm_gem_path/cache/" ]] ; then
+          cp "$cache_file" "$rvm_gem_path/cache/"
+          cache_file="$rvm_gem_path/cache/$(basename $cache_file)"
         fi
+      fi
+    fi
 
-        if [[ -z "$cache_file" ]] ; then
-          if [[ -f "$gem_file_name" ]] ; then
-            gem="$gem_file_name"
-          elif [[ -z "${gem_version/ /}" ]] ; then
-            gem="${gem_name/ /}"
-          else
-            gem="${gem_name/ /} -v $gem_version"
-          fi
-        else # cached
-          gem_file_name="$(basename "$cache_file")"
-          gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
+    if [[ -z "$cache_file" ]] ; then
+      if [[ -f "$gem_file_name" ]] ; then
+        gem="$gem_file_name"
+      elif [[ -z "${gem_version/ /}" ]] ; then
+        gem="${gem_name/ /}"
+      else
+        gem="${gem_name/ /} -v $gem_version"
+      fi
+    else # cached
+      gem_file_name="$(basename "$cache_file")"
+      gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
 
-          # TODO: Switch this to use match
-          if [[ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/${gem_name/ /} \(.*$gem_version/{print}")" ]] ; then
-            if [[ ! -z "$rvm_force_flag" ]] ; then
-              gem="$rvm_gem_path/cache/$gem_file_name" # install as a named local gem
-            fi
-          else
-            gem="$cache_file"
-          fi
+      # TODO: Switch this to use match
+      if [[ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/${gem_name/ /} \(.*$gem_version/{print}")" ]] ; then
+        if [[ ! -z "$rvm_force_flag" ]] ; then
+          gem="$rvm_gem_path/cache/$gem_file_name" # install as a named local gem
         fi
+      else
+        gem="$cache_file"
       fi
+    fi
+  fi
 
-      if [[ ! -z "$gem" ]] ; then
-        # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
-        __rvm_make_flags
-        $rvm_scripts_path/log "warn" "$gem_name $gem_version is not installed, installing..."
-        if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-          command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
-        else
-          if [[ ! -z "$rvm_ruby_home" ]] ; then
-            command="$gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
-          else
-            command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
-          fi
-        fi
-        if [[ -f "$gem" ]] ; then command="${command} -l" ; fi
-        eval $command > /dev/null 2>&1
-        result=$?
-        if [[ $result -eq 0 ]] ; then
-        $rvm_scripts_path/log "info" "$($rvm_scripts_path/color "green")$gem_name $gem_version$($rvm_scripts_path/color "none") installed."
-        else
-          $rvm_scripts_path/log "error" "$($rvm_scripts_path/color "red")$gem_name $gem_version$($rvm_scripts_path/color "none") failed to install."
-        fi
+  if [[ ! -z "$gem" ]] ; then
+    # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
+    if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+
+    $rvm_scripts_path/log "warn" "$gem_name $gem_version is not installed, installing..."
+    if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+    else
+      if [[ ! -z "$rvm_ruby_home" ]] ; then
+        command="$gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+      else
+        command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
       fi
-      unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
-    done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
-  else
-    $rvm_scripts_path/log "error" "$rvm_file_name does not exist to load from."
+    fi
+    if [[ -f "$gem" ]] ; then command="${command} -l" ; fi
+    eval $command > /dev/null 2>&1
+    result=$?
+    if [[ $result -eq 0 ]] ; then
+    $rvm_scripts_path/log "info" "$($rvm_scripts_path/color "green")$gem_name $gem_version$($rvm_scripts_path/color "none") installed."
+    else
+      $rvm_scripts_path/log "error" "$($rvm_scripts_path/color "red")$gem_name $gem_version$($rvm_scripts_path/color "none") failed to install."
+    fi
   fi
+  unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
 }
 
 __rvm_gemdir() {
@@ -259,32 +232,31 @@ __rvm_gemdir() {
   fi
 }
 
-__rvm_gems() {
-  unset GEM_PATH
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+unset GEM_PATH
 
-  if [[ -z "$(which gem 2>/dev/null)" ]] ; then
-    $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions."
-    return 1
-  fi
+if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
-  if [[ ! -z "$rvm_clear_flag" ]] ; then
-    __rvm_gems_clear
-  elif [[ ! -z "$rvm_load_flag" ]] ; then
-    __rvm_gems_load
-  elif [[ ! -z "$rvm_dump_flag" ]] ; then
-    __rvm_gems_dump
-  elif [[ ! -z "$rvm_delete_flag" ]] ; then
-    __rvm_gems_delete
-  elif [[ ! -z "$rvm_name_flag" ]] ; then
-    __rvm_gems_name
-  elif [[ ! -z "$rvm_dir_flag" ]] ; then
-    __rvm_gems_dir
-  elif [[ ! -z "$rvm_list_flag" ]] ; then
-    __rvm_gems_list
-  #elif [[ ! -z "$rvm_use_flag" ]] ; then
-  else
-    __rvm_gems_use
-  fi
-}
+if [[ -z "$(which gem 2>/dev/null)" ]] ; then
+  $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions."
+  return 1
+fi
 
+if [[ "$rvm_clear_flag" -eq 1 ]] ; then
+  __rvm_gems_clear
+elif [[ "$rvm_load_flag" -eq 1 ]] ; then
+  __rvm_gems_load
+elif [[ "$rvm_dump_flag" -eq 1 ]] ; then
+  __rvm_gems_dump
+elif [[ "$rvm_delete_flag" -eq 1 ]] ; then
+  __rvm_gems_delete
+elif [[ "$rvm_name_flag" -eq 1 ]] ; then
+  __rvm_gems_name
+elif [[ "$rvm_dir_flag" -eq 1 ]] ; then
+  __rvm_gems_dir
+elif [[ "$rvm_list_flag" -eq 1 ]] ; then
+  __rvm_gems_list
+elif [[ "$rvm_install_flag" -eq 1 ]] ; then
+  __rvm_gem_install
+else
+  gem $*
+fi

data/scripts/initialize

@@ -6,9 +6,19 @@ else
   rvm_rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
 fi
 
+if [[ ! -z "$rvm_archflags" ]] ; then rvm_make_flags_flag=1 ; fi
+
 rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
 rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-1}"
-rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
+if [[ -z "$rvm_scripts_path" ]] ; then
+  if [[ -d "$HOME/scripts" ]] ; then
+    rvm_scripts_path="$HOME/scripts"
+  elif [[ -d "/usr/local/rvm/scripts" ]] ; then
+    rvm_scripts_path="/usr/local/rvm/scripts"
+  else
+    rvm_scripts_path="$rvm_path/scripts"
+  fi
+fi
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"

data/scripts/install

@@ -44,6 +44,10 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
+if [[ ! -s "$rvm_path/config/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+fi
+
 #
 # Bin Scripts
 #

data/scripts/libraries

@@ -4,31 +4,39 @@
 # ruby supporting libraries:
 #
 __rvm_readline_install() {
-  __rvm_make_flags
+  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="readline" ; version="5.2" ; archive_format="tar.gz"
   # TODO: Figure out how to list, grab and apply the patches
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
-  builtin cd "$rvm_src_path/$package-$version"
-  if [[ "Darwin" = "$(uname)" ]] ; then
-    #sdk=$(\ls -t /Developer/SDKs/ | head -n 1)
-    #CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    #LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    #export CFLAGS LDFLAGS
-    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
-  else
-    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
-  fi
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  #ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz
+  for version in 5.2 6.0 ; do
+    $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+    $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
+    result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+    __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+    builtin cd "$rvm_src_path/$package-$version"
+    if [[ "Darwin" = "$(uname)" ]] ; then
+      #sdk=$(\ls -t /Developer/SDKs/ | head -n 1)
+      #CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
+      #LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
+      #export CFLAGS LDFLAGS
+      __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
+    else
+      __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
+    fi
+
+    if [[ "$rvm_install_flag" -eq 1 ]] ; then
+      __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+      __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+    elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+      __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+    fi
+  done
   __rvm_pushpop
 }
 
 __rvm_iconv_install() {
-  __rvm_make_flags
+  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
@@ -37,13 +45,17 @@ __rvm_iconv_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+    __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  fi
   __rvm_pushpop
 }
 
 __rvm_curl_install() {
-  __rvm_make_flags
+  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
@@ -52,18 +64,22 @@ __rvm_curl_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+    __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  fi
   __rvm_pushpop
 }
 
 __rvm_openssl_install() {
-  __rvm_make_flags
-    if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
-      openssl_os="os/compiler darwin64-x86_64-cc"
-    else
-      openssl_os="os/compiler darwin-i386-cc"
-    fi
+  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+  if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
+    openssl_os="os/compiler darwin64-x86_64-cc"
+  else
+    openssl_os="os/compiler darwin-i386-cc"
+  fi
   __rvm_pushpop $rvm_src_path
   package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
@@ -72,13 +88,17 @@ __rvm_openssl_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+    __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  fi
   __rvm_pushpop
 }
 
 __rvm_zlib_install() {
-  __rvm_make_flags
+  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
@@ -87,13 +107,17 @@ __rvm_zlib_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+    __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  fi
   __rvm_pushpop
 }
 
 __rvm_ncurses_install() {
-  __rvm_make_flags
+  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package"
@@ -102,8 +126,12 @@ __rvm_ncurses_install() {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  if [[ "$rvm_install_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+    __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  elif [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+    __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "uninstalling $package from $rvm_path/usr"
+  fi
   __rvm_pushpop
 }
 

data/scripts/manage

@@ -23,6 +23,8 @@ __rvm_install_source() {
   builtin cd $rvm_ruby_src_path
   if [[ $? -gt 0 ]] ; then result=$? ; $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
 
+  if [[ -d "${rvm_path}/usr/bin" ]] ; then export PATH="${rvm_path}/usr/bin:${PATH}" ; fi
+
   if [[ -z "$rvm_ruby_configure" ]] && [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
     rvm_autoconf="$(which autoconf 2>/dev/null)"
     if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
@@ -178,7 +180,7 @@ RubyWrapper
           result=1
         else
           rvm_ruby_repo_url=$rvm_url
-          __rvm_make_flags
+          if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
           __rvm_install_source $*
         fi
       fi
@@ -340,7 +342,7 @@ RubyWrapper
     ;;
 
     mput|shyouhei)
-      __rvm_make_flags
+      if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
@@ -401,7 +403,7 @@ RubyWrapper
     ;;
 
     ruby)
-      __rvm_make_flags
+      if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
       __rvm_install_source $*
     ;;
 
@@ -422,22 +424,23 @@ __rvm_fetch_ruby() {
   if [[ -z "$rvm_head_flag" ]] && [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
     rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_string"}"
     rvm_ruby_package_file="${rvm_ruby_package_file:-"$rvm_ruby_package_name"}"
-    if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.tar.gz" ]] ; then
+    rvm_archive_extension="tar.gz"
+    if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension" ]] ; then
       if [[ "ruby" = "$rvm_ruby_interpreter" ]] ; then
-        rvm_url="ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_file.tar.gz"
+        rvm_url="ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_file.$rvm_archive_extension"
       elif [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
-        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
       elif [[ "jruby" = "$rvm_ruby_interpreter" ]] ; then
-        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_version/$rvm_ruby_package_file.tar.gz"
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_version/$rvm_ruby_package_file.$rvm_archive_extension"
       else
-        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_package_file.tar.gz"
+        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=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-      __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
-      if [[ $? -gt 0 ]] ; then result=$? ; 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 ..."
+    if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
   else
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_src_path/.git" ]] ; then

data/scripts/md5

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
+
+file=$1 ; md5=$2
+
+if [[ "Linux" = "$(uname)" ]] ; then
+  command="md5sum"
+  #md5sum --status -c "$file"
+elif [[ "Darwin" = "$(uname)" ]] ; then
+  #md5 --status -c "$1"
+  command="md5"
+fi
+
+file_md5=$($command $file | awk '{print $NF}')
+
+if [[ "$file_md5" = "$md5" ]] ; then
+  exit 0
+else
+  exit 1
+fi

data/scripts/monitor

@@ -40,14 +40,16 @@ update_timestamp "test"
 update_timestamp "spec"
 
 while : ; do
-  changed_test_files=() ; changed_spec_files=()
+  changed_test_files=() ; changed_spec_files=() ; changed_code_files=()
+
+  for file in lib/**/*.rb lib/*.rb app/**/*.rb app/*.rb ; do
+    if [[ -f "$file" ]] ; then push_if_timestamp_changed $file "code" ; fi
+  done
 
   for framework in test spec ; do
 
     if [[ -d "$framework/" ]] ; then
 
-      #files=($(\ls ${framework}/**/*_${framework}.rb) $(ls ${framework}/*_${framework}.rb))
-      #for file in "${files[@]}" ; do
       for file in ${framework}/**/*_${framework}.rb ${framework}/*_${framework}.rb ; do
         if [[ -f "$file" ]] ; then
           push_if_timestamp_changed $file $framework
@@ -69,6 +71,21 @@ while : ; do
         fi
         update=1
       fi
+
+      if [[ "$(array_length "changed_code_files")" -gt 0 ]] ; then
+        rvm_ruby_version=$original_ruby_version
+        rvm_ruby_string=$original_ruby_string
+        if [[ "spec" = "$framework" ]] ; then
+          rvm_action="spec"
+          rvm_ruby_args="spec/"
+          __rvm_do
+        elif [[ "test" = "$framework" ]] ; then
+          rvm_action="rake"
+          rvm_ruby_args="test"
+          __rvm_do
+        fi
+        update=1
+      fi
     fi
 
     if [[ "$update" -eq 1 ]] ; then

data/scripts/notes

@@ -6,6 +6,8 @@ item="$(tput setaf 2)* $(tput sgr0)"
 
 echo -e "\n$(tput setaf 2)rvm notes for $system $(tput sgr0)\n"
 
+echo -e "    $item curl is required, be sure it is installed.\n"
+
 if [[ "Linux" = "$system" ]] ; then
   rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
   rvm_emerge_binary="$(which emerge 2> /dev/null)"
@@ -24,7 +26,7 @@ if [[ "Linux" = "$system" ]] ; then
 
   elif [[ ! -z "$rvm_pacman_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "       $ pacman -Sy jdk jre"
+    echo -e "       $ pacman -Sy jdk jre curl"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "    $item For ree (if you wish to use it) you will need:"

data/scripts/rvm

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

data/scripts/rvm-install

@@ -44,6 +44,10 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
+if [[ ! -s "$rvm_path/config/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+fi
+
 #
 # Bin Scripts
 #

data/scripts/selector

@@ -349,9 +349,12 @@ __rvm_ruby_string() {
       rvm_ruby_tag="$string"
     elif $rvm_scripts_path/match "$string" "^m[0-9]" ; then
       rvm_ruby_mode="$string"
-    elif $rvm_scripts_path/match "$string" "^h[a-z]" ; then
+    elif $rvm_scripts_path/match "$string" "^h[a-z0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
       rvm_ruby_patch="$string"
+    elif $rvm_scripts_path/match "$string" "^u[a-z0-9]" ; then
+      unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag rvm_ruby_patch
+      rvm_ruby_user_tag="$string"
     elif $rvm_scripts_path/match "$string" "^[a-z][a-z]" ; then
       rvm_ruby_interpreter="$string"
     else
@@ -394,6 +397,8 @@ __rvm_ruby_string() {
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch}"
   elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
+  elif [[ ! -z "$rvm_ruby_user_tag" ]]  ; then
+    rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_user_tag}"
   else
     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

data/scripts/update

@@ -44,6 +44,10 @@ for dir_name in config scripts examples lib hooks ; do
   fi
 done ; unset dir_name
 
+if [[ ! -s "$rvm_path/config/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_path/config/user
+fi
+
 #
 # Bin Scripts
 #

data/scripts/utility

@@ -140,11 +140,10 @@ __rvm_unset_ruby_variables() {
 
 __rvm_load_rvmrc() {
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-  if [[ -f $HOME/.rvmrc ]] ; then source $HOME/.rvmrc ; fi
+  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 }
 
 __rvm_bin_scripts() {
-  # for rvm_ruby_binary in $(\ls $rvm_path/*/bin/ruby 2> /dev/null) ; do
   for rvm_ruby_binary in $rvm_path/*/bin/ruby ; do
   if [[ -x "$rvm_ruby_binary" ]] ; then
     rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
@@ -272,7 +271,7 @@ __rvm_list() {
       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(-p174)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1"
+    echo -e "(ruby-)1.8.6(-p383)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p174)\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 "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
@@ -286,92 +285,40 @@ __rvm_list() {
       current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
     fi
 
-    for version in $(\ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }') ; do
-      string=$($rvm_path/$version/bin/ruby -v)
-      if [[ "$version" = "$current_ruby" ]] ; then
-        echo -e "=> $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-        selected="1"
+    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+      if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
+        string="$($version -v | awk '{print $NF}')"
       else
-        echo -e "   $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
+        string="[$(file $rvm_path/$version/bin/ruby | awk -F: '{print $2}' | awk '{print $NF}')]"
       fi
-    done ; unset version
-
-    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/ree-.*/ { print $NF }') ; do
-      string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
       if [[ "$version" = "$current_ruby" ]] ; then
-        echo -e "=> $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
+        echo -e "=> $(tput setaf 2)$version$(tput sgr0) $string"
         selected="1"
       else
-        echo -e "   $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
+        echo -e "   $(tput setaf 2)$version$(tput sgr0) $string"
       fi
     done ; unset version
 
-    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/mput-.*/ { print $NF }') ; do
-      string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
-      if [[ "$version" = "$current_ruby" ]] ; then
-        echo -e "=> $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-        selected="1"
-      else
-        echo -e "   $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-      fi
-    done ; unset version
-
-    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }') ; do
-      string=$($rvm_path/$version/bin/ruby -v)
-      if [[ "$version" = "$current_ruby" ]] ; then
-        echo -e "=> $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-        selected="1"
-      else
-        echo -e "   $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-      fi
-    done ; unset version
-
-    # for version in $(\ls $rvm_path/ 2> /dev/null | awk '/rbx-.*/ { print $NF }') ; do
-    for version in "rbx-head" ; do
-      if [[ -f "$rvm_path/$version/bin/ruby" ]] ; then
-        string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
-        if [[ "$version" = "$current_ruby" ]] ; then
-          echo -e "=> $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-          selected="1"
-        else
-          echo -e "   $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-        fi
-      fi
-    done ; unset version
-
-
-    if [[ "Darwin" = "$(uname)" ]] ; then
-      for version in $(\ls $rvm_path/ 2> /dev/null | awk '/macruby-.*/ { print $NF }') ; do
-        string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
-        if [[ "$version" = "$current_ruby" ]] ; then
-          echo -e "=> $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-          selected="1"
-        else
-          echo -e "   $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
-        fi
-      done ; unset version
-    fi
-
     if [[ -f "$rvm_path/default" ]] && [[ -s $rvm_path/default ]] ; then
       version=$(grep '^MY_RUBY_HOME' $rvm_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
-        string=$($rvm_path/$version/bin/ruby -v)
+        string=$(file $rvm_path/$version/bin/ruby)
         if [[ "$version" = "$current_ruby" ]] ; then
-          echo -e "=> $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
+          echo -e "=> $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
           selected="1"
         else
-          echo -e "   $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0)  ( ruby -v # => $string) )"
+          echo -e "   $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
         fi
       fi ; unset version
     fi
 
     system_ruby="$(rvm system ; which ruby 2>/dev/null)"
     if [[ ! -z "$system_ruby" ]] ; then
-      system_version=$($system_ruby -v)
+      system_version=$(file $(which ruby) | awk -F: '{print $2}' | grep 8 | awk '{print $NF}' | tr "\n" ' ')
       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"
+        echo -e "=> $(tput setaf 2)system$(tput sgr0) [$system_version]\n"
       else
-        echo -e "   $(tput setaf 2)system$(tput sgr0) ( ruby -v # => $system_version )\n"
+        echo -e "   $(tput setaf 2)system$(tput sgr0) [$system_version]\n"
       fi
     else
       $rvm_scripts_path/log "info" "No system ruby found."
@@ -419,7 +366,12 @@ __rvm_update_rvm() {
     fi
   else
     # TODO: rvm_install_path:
-    gem install rvm --no-rdoc --no-ri -q rvm && cd "$(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')/gems/rvm-$(gem list rvm | sed 's/.*(//' | awk -F',' '{print $1 ; exit}')" && ./install
+    if [ $(gem list rvm --installed) = 'true' ]; then
+        gem update rvm --no-rdoc --no-ri --quiet
+    else
+        gem install rvm --no-rdoc --no-ri --quiet
+    fi
+    builtin cd "$(rvm system ; 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
   fi
   __rvm_pushpop
   __rvm_hook "after_update"
@@ -470,7 +422,7 @@ __rvm_ruby_do() {
 
   load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
   # TODO: the else case below should be run if $rvm_ruby_args =~ /\.rb$/
-  if [[ "ruby" = "$binary" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
+  if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
     if $rvm_scripts_path/match "$rvm_ruby_args" "\.rb$" ; then
       if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
       if ! $rvm_scripts_path/match "$rvm_ruby_args" "$prefix" ; then
@@ -478,8 +430,10 @@ __rvm_ruby_do() {
       fi
     fi
     rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $rvm_ruby_args"
-  elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" '^install' ; then
-    rvm_command="$binary $rvm_ruby_mode $rvm_ruby_args --no-rdoc --no-ri"
+  elif [[ "gem" = "$(basename $binary)" ]] && $rvm_scripts_path/match "$rvm_ruby_args" '^install' ; then
+    #__rvm_gem_install
+    #$rvm_scripts_path/gem install $rvm_ruby_args
+    rvm_command="$rvm_scripts_path/gems $rvm_ruby_mode $rvm_ruby_args --no-rdoc --no-ri"
   else
     rvm_command="$binary $rvm_ruby_mode $rvm_ruby_args"
   fi
@@ -520,13 +474,12 @@ __rvm_do() {
       unset rvm_ruby_string rvm_ruby_version
       __rvm_ruby_do
   else # all
-    rubies=($(\ls $rvm_path/*/bin/ruby))
-    for full_binary in ${rubies[@]} ; do
+    for full_binary in $rvm_path/*/bin/ruby ; do
       if [[ -x "$full_binary" ]] ; then
         rvm_ruby_string="$(dirname $full_binary | xargs dirname | xargs basename)"
         __rvm_ruby_do
       fi
-    done ; unset full_binary rubies
+    done ; unset full_binary
   fi
 
   if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
@@ -653,7 +606,6 @@ __rvm_inspect() {
 }
 
 __rvm_make_flags() {
-  PATH=${rvm_path}/usr/bin:$PATH ; export PATH
   # This is only an issue with Darwin :/
   if [[ "Darwin" = "$(uname)" ]] ; then
     # ls /usr/lib/gcc/x86_64-apple-darwin10
@@ -697,3 +649,41 @@ __rvm_hook() {
   fi
 }
 
+__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}')
+    fi
+
+    if [[ ! -z "$rvm_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then
+      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
+    else
+      if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
+        rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
+      elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
+        rvm_ruby_gem_home=$(gem env gemdir)
+      elif [[ ! -z "$GEM_HOME" ]] ; then
+        rvm_ruby_gem_home="$GEM_HOME"
+      else
+        unset rvm_ruby_gem_home
+      fi
+    fi
+    if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
+  else
+    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
+  fi
+}
+
+__rvm_gems_use() {
+  mkdir -p "$rvm_ruby_gem_home"
+  GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+  GEM_PATH="$GEM_HOME" ; export GEM_PATH
+  __rvm_use
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.88
+  version: 0.0.89
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -05:00
+date: 2009-12-08 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -56,6 +56,7 @@ files:
 - scripts/log
 - scripts/manage
 - scripts/match
+- scripts/md5
 - scripts/monitor
 - scripts/notes
 - scripts/rvm