rvm 0.0.62 → 0.0.63

data/config/db

@@ -1,6 +1,7 @@
 niceness=0
 ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
 rubinius_repo_url=git://github.com/evanphx/rubinius.git
+shyouhei_repo_url=git://github.com/shyouhei/ruby.git
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest
 jruby_repo_url=git://kenai.com/jruby~main
@@ -13,9 +14,9 @@ ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
 ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
-ree_1.8.7_url=http://rubyforge.org/frs/download.php/64475
+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=20090928
+ree_1.8.7_patch_level=2009.10
 ruby_1.9.1_patch_level=243
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 62
+:patch: 63

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.62"
+  s.version = "0.0.63"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-10-22}
+  s.date = %q{2009-10-26}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -51,6 +51,7 @@ Implementation
   jruby     - jRuby
   rbx       - rubinius
   ree       - ruby Enterprise Edition
+  mput      - shyouhei(mput)'s github repository
   system    - use the system ruby (eg. pre-rvm state)
   default   - use rvm set default ruby and system if it hasn't been set.
 
@@ -129,13 +130,10 @@ function __rvm_parse_args {
         rvm_ruby_interpreter="$rvm_token"
       ;;
 
-      jruby|ree|macruby|rbx|rubinius|default|all)
+      jruby|ree|macruby|rbx|rubinius|mput|shyouhei|default|all)
         rvm_ruby_interpreter="$rvm_token"
         rvm_action="${rvm_action:-use}"
-        #if [[ ! -z "$(echo $1 | awk '/^[0-9]/')" ]] ; then
-        if [[ ! -z "$1" ]] && [[ "$1" =~ ^[0-9] ]] ; then
-          rvm_ruby_version=$1 ; shift
-        fi
+        if match "$1" "^[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
       ;;
 
       gems|gemset)
@@ -191,14 +189,14 @@ function __rvm_parse_args {
             rvm_parse_break=1
           fi
         else
-          if [[ ! -z "$(echo $1 | awk '/^-/')" ]] ; then
+          if match "$1" "^-" ; then
             unset rvm_ruby_version
           else
-            if [[ ! -z "$(echo $1 | awk '/^[0-9]/')" ]] ; then
+            if match "$1" "^[0-9]" ; then
               rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
               unset rvm_ruby_interpreter
             else
-              if [[ "jruby" = "$1" ]] || [[ "rbx" = "$1" ]] || [[ "rubinius" = "$1" ]] || [[ "macruby" = "$1" ]] || [[ "ree" = "$1" ]] || [[  "ruby-enterprise" = "$1" ]] ; then
+              if [[ "jruby" = "$1" ]] || [[ "rbx" = "$1" ]] || [[ "rubinius" = "$1" ]] || [[ "macruby" = "$1" ]] || [[ "ree" = "$1" ]] || [[  "ruby-enterprise" = "$1" ]] || [[  "mput" = "$1" ]]  || [[  "shyouhei" = "$1" ]] ; then
                 rvm_ruby_interpreter=$1 ; shift
               else
                 unset rvm_ruby_interpreter rvm_ruby_version
@@ -351,7 +349,7 @@ function __rvm_parse_args {
       --make)               rvm_ruby_make="$1"        ; shift ;;
       --make-install)       rvm_ruby_make_install="$1"; shift ;;
       --nice)               rvm_niceness="$1"         ; shift ;;
-      -l|--level)           rvm_ruby_patch_level="$1" ; shift ;;
+      -l|--level)           rvm_ruby_patch_level="p$1" ; shift ;;
       # TODO: handle this below better (if $1 is null)
       -m|--gem-set)         rvm_gem_set_name="$1"     ; shift ;;
       tests|specs)          rvm_action="tests"                ;;
@@ -376,28 +374,29 @@ function __rvm_parse_args {
       *)
         if [[ ! -z "$rvm_token" ]] ; then
           if [[ "gems" = "$rvm_action" ]] ; then
-            if [[ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ]] ; then
-              rvm_file_name="$(echo $rvm_token | sed 's#\.gems##g').gems"
-              # elif [[ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ]] ; then
+            if [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
+              rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
+              # elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
             else
-              rvm_gem_set_name="$(echo $rvm_token | sed 's#\.gems##g')"
+              rvm_gem_set_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
               rvm_file_name="$rvm_gem_set_name.gems"
             fi
-          elif [[ ! -z "$(echo $rvm_token | awk '/,/')" ]] ; then
+          elif [[ ! -z "$(echo "$rvm_token" | awk '/,/')" ]] ; then
             rvm_ruby_version="$rvm_token"
             if [[ -z "$rvm_action" ]] ; then
               rvm_action="do" # Not sure if we really want to do this but we'll try it out.
             fi
-          elif [[ ! -z "$(echo $rvm_token | awk '/^.+%.+$/')" ]] ; then
-            rvm_gem_set_name="$(echo $rvm_token | awk -F'%' '{print $2}')"
-            rvm_ruby_string="$(echo $rvm_token | awk -F'%' '{print $1}')"
-          #elif [[ ! -z "$(echo $rvm_token | awk '/^[0-9].[0-9]/')" ]] ; then
-          elif [[ ! -z "$rvm_token" ]] && [[ "$rvm_token" =~ ^[0-9].[0-9] ]] ; then
+          elif match "$rvm_token" "^.+%.+$" ; then
+            rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
+            rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
+          elif match "$rvm_token" "^[0-9].[0-9]" ; then
+            rvm_ruby_string="$rvm_token"
+            rvm_action="${rvm_action:-use}"
+          elif match "$rvm_token" "^ree" ; then
             rvm_ruby_string="$rvm_token"
-            rvm_action="${rvm_action:-rvm_token}"
+            rvm_action="${rvm_action:-use}"
           else
-            if [[ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}')" ]] ; then # we have a specified ruby script
-            #if [[ ! -z "$rvm_token" ]] && [[ " ! $rvm_token =~ \.rb$ ]] ; then # we have a specified ruby script
+            if match "$rvm_token" "\.rb$" ; then # we have a specified ruby script
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
               if [[ -z "$rvm_action" ]] ; then

data/scripts/completion

@@ -148,7 +148,6 @@ function _rvm {
     version)    __rvm_version          ; result=$? ;;
     reset)      __rvm_reset            ; result=$? ;;
                 # TODO: how can we use bin_path here for reload, default file?
-    reload)     __rvm_reload           ; result=$? ;;
     implode)    __rvm_implode          ; result=$? ;;
     update)     __rvm_update           ; result=$? ;;
     readline)   __rvm_readline_install ; result=$? ;;
@@ -157,6 +156,7 @@ function _rvm {
     usage|help) __rvm_usage            ; result=$? ;;
     bench|benchmark)  __rvm_benchmark  ; result=$? ;;
     rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
+    reload)     source ~/.rvm/scripts/rvm  ; result=$? ;;
 
     gemsync)
       result=0

data/scripts/gems

@@ -34,7 +34,7 @@ __rvm_gems_select() {
       rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
     fi
 
-    if [[ ! -z "$rvm_gem_set_name" ]] && [[ ! "$rvm_gem_set_name" =~ ^\d\.\d ]] ; then
+    if [[ ! -z "$rvm_gem_set_name" ]] && ! 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
@@ -156,7 +156,7 @@ __rvm_gems_load() {
       # TODO: Switch to a different field separator than ; to allow for evals
       gem="$(echo $line | awk -F';' '{print $1}')"
       gem_prefix="$(echo $line | awk -F';' '{print $2}')"
-      if [[ ! -z "$gem" ]] && [[ "$gem" =~ \.gem$ ]] ; then
+      if match "$gem" "\.gem$" ; then
         gem_name="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{$NF=NULL;print}')"
         gem_version="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{print $NF}' )"
         gem_postfix="$(basename $gem | sed "s#.*\.gem##")"
@@ -169,7 +169,7 @@ __rvm_gems_load() {
       if [[ -f "$gem" ]] ; then
         gem_file_name="$gem"
         cache_file="$gem"
-      elif [[ ! -z "$gem" ]] && [[ "$gem" =~ ".gem$" ]] ; then
+      elif match "$gem" ".gem$" ]] ; then
         gem_file_name="$gem"
       elif [[ -z "${gem_version/ /}" ]] ; then # no version
         gem_file_name="${gem_name/ /}*.gem"
@@ -193,8 +193,8 @@ __rvm_gems_load() {
         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_ruby_gem_list" ]] && [[ "$rvm_ruby_gem_list" =~ $gem_string ]] ; then
             if [[ ! -z "$rvm_force_flag" ]] ; then
               cp $cache_file $rvm_temp_path/$gem_file_name
               gem="$rvm_temp_path/$gem_file_name" # install as a named local gem

data/scripts/ruby-installer

@@ -56,12 +56,12 @@ function __rvm_install_source {
       if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
         cd $rvm_ruby_src_path
         if [[ -z "$rvm_rev" ]] ; then
-          svn update
+          __rvm_run "svn.update" "svn update"
         else
-          svn checkout -q $rvm_rev
+          __rvm_run "svn.checkout" "svn checkout -q $rvm_rev"
         fi
       else
-        svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path
+        __rvm_run "svn.checkout" "svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path"
       fi
       if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     fi
@@ -322,6 +322,67 @@ RubyWrapper
       done ; unset rvm_gem_name
     ;;
 
+    mput|shyouhei)
+      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
+
+      rvm_ruby_repo_url=$rvm_shyouhei_repo_url
+      rvm_ruby_configure=" "
+      rvm_ruby_src_path=$rvm_ruby_home
+      # rvm_ruby_make="rake"
+      # rvm_ruby_make_install="rake install"
+      rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
+      # rvm_ruby_revision="head"
+
+      if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
+        rm -rf $rvm_ruby_src_path
+        __rvm_run "mput.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
+        cd $rvm_ruby_home
+      else
+        cd $rvm_ruby_home
+        __rvm_run "mput.repo" "git pull origin trunk" "Pulling from origin trunk"
+      fi
+
+      if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
+          rvm_autoconf="$(which autoconf)"
+          if [[ $? -gt 0 ]] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
+          __rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
+          # if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
+      fi
+
+      if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
+          __rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
+      elif [[ -s ./configure ]] ; then
+          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+          unset configure_parameters
+      elif [[ ! -z "rvm_ruby_configure" ]] ; then
+          $rvm_ruby_configure
+      else
+          __rvm_log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
+      fi
+
+      rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
+      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+
+      rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
+      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_package_name"
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+
+      __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
+
+      GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+      GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
+
+      __rvm_rubygems_setup
+      __rvm_bin_script
+      __rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
+      __rvm_post_install
+      __rvm_pushpop
+    ;;
+
     ruby)
       __rvm_install_source $*
     ;;
@@ -451,7 +512,7 @@ function __rvm_post_install {
 }
 
 function __rvm_rubygems_setup {
-  if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] ; then
+  if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
     # 1.9 has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"

data/scripts/rvm-prompt

@@ -1,8 +1,52 @@
 #!/bin/bash
-if [[ ! -z "$(which ruby | awk '/\.rvm/{print}')" ]] ; then
-  command=$(which ruby)
-  if [[ ! -z "$command" ]] ; then
-    echo "[$(echo $command | xargs dirname | xargs dirname | xargs basename | tr '-' ':')]"
-  fi ; unset command
+
+add(){
+  token="$1"
+  eval "${token}_flag=1" ; shift
+  if [[ ! -z "$format" ]] ; then
+    format="${format}-\$${token}"
+  else
+    format="\$${token}"
+  fi
+}
+
+if [[ ! -z "$(which ruby | awk '/rvm/{print}')" ]] ; then
+  unset format
+  while [[ $# -gt 0 ]] ; do
+    token="$1" ; shift
+    case "$token" in
+      i|interpreter)  add "interpreter"  ;;
+      v|version)      add "version"      ;;
+      p|patchlevel)   add "patchlevel"   ;;
+      r|revision)     add "revision"     ;;
+      a|architecture) add "architecture" ;;
+      *) echo "Unrecognized command line option '$token' for $0" ; exit 1 ;;
+    esac
+  done
+
+  if [[ -z "$format" ]] ; then
+    add "interpreter"
+    add "version"
+    add "patchlevel"
+  fi
+
+  ruby_string=$(dirname "$(which ruby)" | xargs dirname | xargs basename)
+  if [[ ! -z "$interpreter_flag" ]] ; then
+    interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
+  fi
+  if [[ ! -z "$version_flag" ]] ; then
+    version="$(echo $ruby_string | awk -F'-' '{print $2}')"
+  fi
+  if [[ ! -z "$patchlevel_flag" ]] ; then
+    patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
+  fi
+  if [[ ! -z "$architecture_flag" ]] ; then
+    architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
+  fi
+
+  command="prompt=\"[$format]\""
+  eval "$command"
+  echo "${prompt/-]/]}"
 fi
 
+exit 0

data/scripts/selector

@@ -2,29 +2,13 @@
 
 # __rvm_select implementation version patch_level
 function __rvm_select {
-  if [[ ! -z "$rvm_ruby_string" ]] ; then
-    if [[ ! -z "$(echo "$rvm_ruby_string" | awk '/^.+%.+$/')" ]] ; then
-      rvm_gem_set_name="$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')"
-      rvm_ruby_string="$(echo "$rvm_ruby_string" | awk -F'%' '{print $1}')"
-    fi
-
-    if [[ ! -z "$(echo "$rvm_ruby_string" | awk '/^[0-9]/')" ]] ; then
-      rvm_ruby_interpreter="${rvm_ruby_interpreter:-ruby}"
-      rvm_ruby_version=$rvm_ruby_string
-    else
-      rvm_ruby_interpreter="$rvm_ruby_string"
-      unset rvm_ruby_version
-    fi
-  elif [[ ! -z "$rvm_ruby_interpreter" ]] ; then
-    if [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^[0-9]/')" ]] ; then
-      rvm_ruby_version=$rvm_ruby_interpreter
-      rvm_ruby_interpreter="ruby"
-    else
-      rvm_ruby_interpreter="${rvm_ruby_interpreter:-ruby}" # Default is standard ruby
-    fi
+  if [[ -z "$rvm_ruby_string" ]] ; then
+    rvm_ruby_string="$rvm_ruby_interpreter"
+    if [[ ! -z "$rvm_ruby_version" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_version" ; fi
+    if [[ ! -z "$rvm_ruby_patch_level" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_patch_level" ; fi
+    if [[ ! -z "$rvm_ruby_revision" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_revision" ; fi
   fi
-
-  if [[ ! -z "$rvm_ruby_string" ]] ; then __rvm_ruby_string ; fi
+  __rvm_ruby_string
   if [[ "1.8" = "$rvm_ruby_version" ]] ; then rvm_ruby_version="1.8.6" ; fi
   if [[ "1.9" = "$rvm_ruby_version" ]] ; then rvm_ruby_version="1.9.1" ; fi
 
@@ -49,6 +33,7 @@ function __rvm_select {
       #rvm_ruby_revision="head"
       unset rvm_ruby_patch_level
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-"$(__rvm_db "rubinius_repo_url")"}
+      rvm_ruby_string="rbx-head"
       rvm_url=$rvm_ruby_repo_url
       rvm_ruby_configure=""
       rvm_ruby_make="build"
@@ -56,19 +41,18 @@ function __rvm_select {
     ;;
 
     jruby)
-      rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
       rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
-      if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1.4/')" ]] ; then
+      rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
+      unset rvm_ruby_patch_level
+      if match "$rvm_ruby_version" "^1.4" ; then
         rvm_ruby_version="1.4.0RC1"
+        rvm_ruby_string="jruby-1.4.0RC1"
         rvm_package_file="$rvm_ruby_interpreter-bin-${rvm_ruby_version}"
       else
         rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
+        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
       fi
       rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
-      unset rvm_ruby_patch_level
-      if [[ -z "$(echo $rvm_ruby_version | awk '/^1\.[2-4]/')" ]] ; then
-        __rvm_log "fail" "Unknown jRuby version: $rvm_ruby_version"
-      fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
     ;;
@@ -76,22 +60,44 @@ function __rvm_select {
     ruby-enterprise|ree)
       rvm_ruby_interpreter=ree
       rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
-      if [[ "$rvm_ruby_version" != "head" ]] ; then
+      if [[ -z "$rvm_ruby_patch_level" ]] ; then
         rvm_ruby_patch_level="${rvm_ruby_patch_level:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")}"
+      else
+        rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^p##')"
       fi
-      rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_patch_level"
-      rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
-      if [[ -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ]] ; then
+      rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}-${rvm_ruby_patch_level}"
+
+      if [[ "$rvm_ruby_version" != "head" ]]  ; then
+        if [[ ! -z "$rvm_ruby_revision" ]] ; then
+          unset rvm_ruby_patch_level rvm_ruby_package_file
+          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_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
+        fi
+      fi
+      if ! match "$rvm_ruby_version" "^1\.8" ; then
         __rvm_log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
       fi
     ;;
 
+    mput|shyouhei)
+      rvm_ruby_interpreter="mput"
+      rvm_ruby_version="head"
+      rvm_ruby_string="mput-head"
+      unset rvm_ruby_patch_level
+      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)
       if [[ ! -z "$rvm_ruby_tag" ]] ; then
         rvm_ruby_version=$(echo $rvm_ruby_tag | sed 's#^v##' | sed 's#/##' | awk -F'_' '{print 1 "." $2 "." $3 }')
         # rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's#^v##' | sed 's#/##' | awk -F'_' '{print $4 }')
-        if [[ -z "$rvm_ruby_patch_level" ]] ; then rvm_ruby_patch_level=$rvm_Ruby_tag ; fi
+        if [[ -z "$rvm_ruby_patch_level" ]] ; then rvm_ruby_patch_level=$rvm_ruby_tag ; fi
       fi
+      if [[ ! -z "$rvm_head_flag" ]] ; then rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}" ; fi
       if [[ -z "$rvm_ruby_version" ]] ; then rvm_ruby_version=$(__rvm_db "ruby_version") ; fi
       if [[ -z "$rvm_ruby_patch_level" ]] ; then rvm_ruby_patch_level="$(__rvm_db "ruby_${rvm_ruby_version/ /}_patch_level")" ; fi
       if [[ -z "$rvm_ruby_patch_level" ]] ; then unset rvm_ruby_patch_level ; fi
@@ -124,26 +130,18 @@ function __rvm_select {
   if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "system" != "$rvm_ruby_interpreter" ]] ; then
     rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
     rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
-
-    if [[ -z "$rvm_ruby_patch_level" ]] ; then
-      rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version"}"
-      rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"}"
-    else
-      if [[ "$rvm_ruby_interpreter" != "ree" ]] ; then
-        if [[ ! -z "$(echo $rvm_ruby_patch_level | awk '/^[0-9]/')" ]] ; then
-          rvm_ruby_patch_level="p$rvm_ruby_patch_level"
-        fi
-        rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')" # sanity check, thanks sfpyra
-      fi
-      rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
-      rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
-    fi
-
-    rvm_ruby_string="$rvm_ruby_package_name"
-    rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_package_name"
+    rvm_ruby_package_name="$rvm_ruby_string"
+    rvm_ruby_home="$rvm_path/$rvm_ruby_string"
+    rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_string"
     rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
+    if [[ -z "$rvm_gem_set_name" ]] ; then
+      rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_interpreter}/${rvm_ruby_version}"
+    else
+      rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_interpreter}/${rvm_ruby_version}%${rvm_gem_set_name}"
+    fi
+
     rvm_ruby_selected_flag=1
 
     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_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
@@ -188,7 +186,7 @@ function __rvm_use {
     GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
     GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH
     MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
-    RUBY_VERSION=$rvm_ruby_package_name ; export RUBY_VERSION
+    RUBY_VERSION=$rvm_ruby_string ; export RUBY_VERSION
     IRBRC="$rvm_ruby_irbrc" ; export IRBRC
     if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
@@ -227,10 +225,10 @@ function __rvm_use {
         fi
       done ; unset variable value
 
-      if [[ -s $rvm_path/bin/$rvm_ruby_package_name ]] ; then
-        ln -fs $rvm_path/bin/$rvm_ruby_package_name $rvm_path/bin/default-ruby # So that people know what it's for :)
-        ln -fs $rvm_path/bin/gem-$rvm_ruby_package_name $rvm_path/bin/default-gem
-        ln -fs $rvm_path/bin/irb-$rvm_ruby_package_name $rvm_path/bin/default-irb
+      if [[ -s "$rvm_path/bin/$rvm_ruby_string" ]] ; then
+        ln -fs "$rvm_path/bin/$rvm_ruby_string" "$rvm_path/bin/default-ruby" # So that people know what it's for :)
+        ln -fs "$rvm_path/bin/gem-$rvm_ruby_string" "$rvm_path/bin/default-gem"
+        ln -fs "$rvm_path/bin/irb-$rvm_ruby_string" "$rvm_path/bin/default-irb"
       else
         rm -f $rvm_path/bin/default*
       fi
@@ -243,65 +241,107 @@ function __rvm_use {
 }
 
 function __rvm_ruby_string {
-  if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-    rvm_ruby_string="system"
-  elif [[ ! -z "$rvm_ruby_string" ]] ; then
-    ruby_string=$(echo "$rvm_ruby_string" | sed 's#ruby-enterprise#ree#g') # dash-antics
-    if [[ ! -z "$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')" ]] ; then
-      rvm_gem_set_name=$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')
-    fi
-    set +x
-    ruby_string=$(echo "$rvm_ruby_string" | awk -F'%' '{print $1}')
-    __rvm_unset_ruby_variables
-
-    rvm_ruby_interpreter=$(echo $ruby_string |  awk -F'-' '{print $1}')
-    rvm_ruby_version=$(echo $ruby_string |  awk -F'-' '{print $2}')
-    if [[ "$rvm_ruby_version" != "head" ]] ; then
-      patch_level=$(echo $ruby_string |  awk -F'-' '{print $3}')
-      if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="$patch_level" ; fi
+  if [[ ! -z "$rvm_ruby_string" ]] ; then
+    if [[ "system" = "$rvm_ruby_string" ]] ; then
+      __rvm_unset_ruby_variables
+      rvm_ruby_interpreter="system"
     else
-      rvm_ruby_patch_level="head"
-    fi
+      ruby_string="${rvm_ruby_string/ruby-enterprise/ree}"
 
-    if [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^1\.[8-9]/')" ]] ; then
-      rvm_ruby_patch_level=$rvm_ruby_version
-      rvm_ruby_version=$rvm_ruby_interpreter
-      rvm_ruby_interpreter="ruby"
-      if [[ -z "$rvm_ruby_patch_level" ]] ; then
-        if [[ "$rvm_ruby_version" != "head" ]] ; then
-          rvm_ruby_patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
-        else
-          rvm_ruby_patch_level="head"
+      __rvm_unset_ruby_variables
+
+      if [[ ! -z "$(echo "$ruby_string" | awk -F'%' '{print $2}')" ]] ; then
+        rvm_gem_set_name=$(echo "$ruby_string" | awk -F'%' '{print $2}')
+      fi
+
+      ruby_string=$(echo "$ruby_string" | awk -F'%' '{print $1}')
+      rvm_ruby_interpreter=$(echo $ruby_string |  awk -F'-' '{print $1}')
+      rvm_ruby_version=$(echo $ruby_string |  awk -F'-' '{print $2}')
+
+      if [[ "$rvm_ruby_version" != "head" ]] ; then
+        patch_level=$(echo $ruby_string |  awk -F'-' '{print $3}')
+        if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="$patch_level" ; fi
+      else
+        unset rvm_ruby_version
+        rvm_head_flag=1
+        rvm_ruby_revision="head"
+        rvm_ruby_patch_level="head"
+      fi
+
+      if match "$rvm_ruby_interpreter" "^1\.[8-9]" ; then
+        rvm_ruby_patch_level=$rvm_ruby_version
+        rvm_ruby_version=$rvm_ruby_interpreter
+        rvm_ruby_interpreter="ruby"
+        if [[ -z "$rvm_ruby_patch_level" ]] ; then
+          if [[ "$rvm_ruby_version" != "head" ]] ; then
+            rvm_ruby_patch_level="p$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+          else
+            unset rvm_ruby_version
+            rvm_head_flag=1
+            rvm_ruby_revision="head"
+            rvm_ruby_patch_level="head"
+          fi
         fi
+      elif match "$rvm_ruby_interpreter" "^1\.[3-4]" ; then
+        rvm_ruby_version=$rvm_ruby_interpreter
+        rvm_ruby_interpreter=jruby
+        unset rvm_ruby_patch_level
       fi
-    elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^1\.[3-4]/')" ]] ; then
-      rvm_ruby_version=$rvm_ruby_interpreter
-      rvm_ruby_interpreter=jruby
-      unset rvm_ruby_patch_level
-    fi
 
-    if [[ "head" = "$rvm_ruby_version" ]] ; then
-      revision="head"
-      if [[ "ree" = "$rvm_ruby_interpreter" ]] ; then rvm_ruby_version="1.8.7" ; fi
-      if [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then unset revision ; fi
-    else
-      revision=$(echo $ruby_string | awk -F'-' '{print $3}')
-    fi
+      if match "$rvm_ruby_patch_level" "^r" ; then
+        rvm_ruby_revision=$rvm_ruby_patch_level
+        unset rvm_ruby_patch_level
+      fi
 
-    if [[ "head" = "$revision" ]] || [[ "preview" = "$revision" ]] ; then
-      rvm_ruby_revision="$revision"
-    else
-      if [[ ! -z "$(echo $revision | awk '/^p[0-9]\+/')" ]] ; then
-        rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(echo $revision | awk -F'p' '{print $2}')}
+      if [[ "head" = "$rvm_ruby_version" ]] || [[ "head" = "$rvm_ruby_patch_level" ]] || [[ 1 = "$rvm_head_flag" ]] ; then
+        rvm_ruby_patch_level="head"
+        rvm_head_flag=1
+        if [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then unset rvm_ruby_patch_level ; fi
+        if [[ "mput" = "$rvm_ruby_interpreter" ]] ; then unset rvm_ruby_patch_level ; fi
       else
-        if [[ ! -z "$(echo $revision | awk '/^[0-9]\+/')" ]] ; then
-          rvm_ruby_revision="$revision"
+        revision=$(echo $ruby_string | awk -F'-' '{print $3}')
+        if [[ ! -z "$revision" ]] ; then
+          if match "$revision" "^p" ; then
+            rvm_ruby_patch_level="$revision"
+            # if [[ "preview" == "$revision" ]] ; then
+          elif match "$revision" "^[0-9]" ; then
+            if [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
+              rvm_ruby_patch_level="$revision"
+              unset rvm_ruby_revision
+            else
+              rvm_ruby_revision="r$revision"
+            fi
+          elif match "$revision" "^r" ; then
+            rvm_ruby_revision="$revision"
+          elif match "$revision" "^t" ; then
+            rvm_ruby_tag="$revision"
+          else
+            unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
+          fi ; unset revision
         else
-          unset rvm_ruby_revision
+          patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+          if [[ ! -z "$patch_level" ]] ; then
+            rvm_ruby_patch_level="p$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+          else
+            unset rvm_ruby_patch_level
+          fi ; unset patch_level
+        fi
+      fi
+
+      if [[ ! -z "$rvm_ruby_revision" ]] ; then
+        rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_revision"
+      elif [[ ! -z "$rvm_ruby_patch_level" ]] ; then
+        if match "$rvm_ruby_patch_level" "^[0-9]" ; then
+          rvm_ruby_patch_level="p$rvm_ruby_patch_level"
         fi
+        rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')" # sanity check, thanks sfpyra
+        rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"
+      else
+        rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version"
       fi
+
+      unset ruby_string
     fi
-    unset ruby_string
   fi
   return 0
 }

data/scripts/utility

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function __rvm_info {
+__rvm_info() {
   full_version=$(ruby -v)
   cat <<Info
 
@@ -113,11 +113,11 @@ function __rvm_run {
 
 function __rvm_cleanup_variables {
   __rvm_unset_ruby_variables
-  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path 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_head_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name
+  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path 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_log_path rvm_file_name
 }
 
 function __rvm_unset_ruby_variables {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -342,7 +342,7 @@ function __rvm_gem_sync {
   fi
 }
 
-function __rvm_db {
+__rvm_db() {
   rvm_hash_file="$rvm_config_path/db"
   touch $rvm_hash_file
   key="$1" ; shift
@@ -367,12 +367,13 @@ function __rvm_db {
   fi
 }
 
-function __rvm_list {
+__rvm_list() {
   if [[ ! -z "$rvm_all_flag" ]] ; then
     svn list http://svn.ruby-lang.org/repos/ruby/tags/ | grep 'v1_[8|9]' | sed 's#^v1_##' | sed 's#/$##' | awk -F'_' '{print "1."$1"."$2 " -l "$3}' | sed 's#p$##'
     echo -e "jruby 1.2.0\njruby 1.3.0\njruby (1.3.1, the default)\njruby 1.4.1\njruby --head"
     echo -e "rbx head (rubinius head, the default)\nrbx head --jit"
     echo -e "ree 1.8.6 --head\nree (1.8.7, the default)"
+    echo -e "mput head (shyouhei head, the default)"
   else
     current_ruby="$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
     echo -e "\nruby:\n"
@@ -408,6 +409,17 @@ function __rvm_list {
       fi
     done ; unset version
 
+    echo -e "\nmput:\n"
+    for version in $(/bin/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 "=> $version : $string"
+        selected="1"
+      else
+        echo -e "   $version : $string"
+      fi
+    done ; unset version
+
     if [[ -f "$rvm_path/default" ]] && [[ -s $rvm_path/default ]] ; then
       version=$(grep '^MY_RUBY_HOME' ~/.rvm/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
@@ -465,6 +477,7 @@ function __rvm_initialize {
   rvm_ruby_repo_url="${rvm_ruby_repo_url:-"http://svn.ruby-lang.org/repos/ruby"}"
   # Rubinius sha1's will be available after RC1.
   rvm_rubinius_repo_url="${rvm_rubinius_repo_url:-"git://github.com/evanphx/rubinius.git"}"
+  rvm_shyouhei_repo_url="${rvm_shyouhei_repo_url:-"git://github.com/shyouhei/ruby.git"}"
   rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
   rvm_ruby_load_path="."
   rvm_ruby_require=""
@@ -478,19 +491,18 @@ function __rvm_initialize {
   mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path
 }
 
-function __rvm_update {
+__rvm_update() {
   if [[ "head" = "$rvm_ruby_revision" ]] || [[ ! -z "$rvm_self_flag" ]] || [[ "update" = "$rvm_action" ]] || [[ ! -z "$rvm_update_flag" ]] ; then
     __rvm_version
     __rvm_update_rvm
-    __rvm_version
   fi
-  __rvm_reload
   if [[ ! -z "$rvm_bin_flag" ]] ; then __rvm_bin_scripts ; fi
   if [[ ! -z "$rvm_rubygems_flag" ]] ; then __rvm_rubygems_setup ; fi
 }
 
-function __rvm_update_rvm {
-  mkdir -p $rvm_src_path
+__rvm_update_rvm() {
+  mkdir -p "$rvm_src_path"
+  __rvm_pushpop "$rvm_src_path"
   if [[ "head" = "$rvm_ruby_revision" ]] ; then
     if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
       cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
@@ -499,9 +511,9 @@ function __rvm_update_rvm {
     fi
   else
     # TODO: rvm_install_path:
-    GEM_HOME="${GEM_HOME:-$(gem env gemdir user)}"
-    gem install rvm --no-rdoc --no-ri -q && $GEM_HOME/bin/rvm-install && source ~/.rvm/scripts/rvm
+    gem install rvm --no-rdoc --no-ri -q rvm && $(gem env gemdir user)/bin/rvm-install && source ~/.rvm/scripts/rvm
   fi
+  __rvm_pushpop
 }
 
 __rvm_reboot() {
@@ -540,10 +552,9 @@ __rvm_ruby_do() {
   if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
     load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
     if [[ "ruby" = "$binary" ]] ; then
-      if [[ -z "$(echo $rvm_ruby_args | awk '/\.rb$/')" ]] ; then
-        #if [[ $rvm_ruby_args =~ '\.rb$' ]] ; then
+      if match "$rvm_ruby_args" "\.rb$" ; then
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
-        if [[ ! -z "$rvm_ruby_args" ]] && [[ ! "$rvm_ruby_args" =~ "$prefix" ]] ; then
+        if ! match "$rvm_ruby_args" "$prefix" ; then
           rvm_ruby_args="$prefix $rvm_ruby_args"
         fi
       fi
@@ -836,16 +847,41 @@ __rvm_make_flags() {
     fi
     CFLAGS="-isysroot /Developer/SDKs/$sdk $rvm_archflags" ; export CFLAGS
     LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$sdk $rvm_archflags" ; export LDFLAGS
+    # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$sdk " ; export CXXFLAGS
     ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
   fi
 }
 
 __rvm_monitor() {
-  if [[ -d "test/" ]] ; then
-    :
-  elif [[ -d "spec/" ]] ; then
-    :
-  fi
+  if [[ -d "test/" ]] ; then test_timestamp=$(timestamp "test/") ; fi
+  if [[ -d "spec/" ]] ; then spec_timestamp=$(timestamp "spec/") ; fi
+  while : ; do
+    changed_test_files=() ; changed_spec_files=()
+
+    if [[ -d "test/" ]] ; then
+      test_files=($(/bin/ls test/**/*_test.rb))
+      for file in "${test_files[@]}"; do
+        if [[ $(timestamp $file) -gt $timestamp ]] ; then
+          array_push $changed_test_files
+        fi
+      done
+    fi
+
+    if [[ -d "spec/" ]] ; then
+      spec_files=($(/bin/ls spec/**/*_spec.rb))
+      for file in "${spec_files[@]}"; do
+        if [[ $(timestamp $file) -gt $timestamp ]] ; then
+          array_push $changed_spec_files
+        fi
+      done
+    fi
+    if [[ $(array_length $changed_test_files) -gt 0 ]] ; then
+      testrb "${myarray[*]}"
+    fi
+    if [[ $(array_length $changed_spec_files) -gt 0 ]] ; then
+      spec "${myarray[*]}"
+    fi
+  done
 }
 
 #
@@ -853,9 +889,9 @@ __rvm_monitor() {
 #
 timestamp() {
   if [[ "Darwin" = "$(uname)" ]] ; then
-   echo $(stat -c "%Y" $1)
-  else
     echo $(stat -f "%m" $1)
+  else
+    echo $(stat -c "%Y" $1)
   fi
 }
 
@@ -870,3 +906,28 @@ contains() {
   echo -1 ; return 1
 }
 
+array_length() {
+  array=$1 ; return "${#array[*]}"
+}
+
+array_push() {
+  array=$1 ; shift ; item=$2
+  # TODO: allow loop over more arguments.
+  eval "index=\$((\${#${array}[*]} + $__array_start))"
+  eval "${array}[${index}]=${item}"
+}
+
+match() {
+  if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] && [[ ${BASH_VERSION:2:1} -ge 1 ]] ; then
+    [[ "$1" =~ $2 ]] ; return $?
+  # elif [[ ! -z "$ZSH_VERSION"]] && [[ ${ZSH_VERSION:0:1} -gt 3 ]] && [[ ${ZSH_VERSION:2:1} -ge 2 ]] && [[ ${ZSH_VERSION:4:1} -ge 4 ]] ; then
+  # return [[ "$1" =~ "$2" ]]
+  else
+    if [ ! -z "$(echo "$1" | awk "/${2}/")" ] ; then
+      return 0
+    else
+      return 1
+    fi
+  fi
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.62
+  version: 0.0.63
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -04:00
+date: 2009-10-26 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []