rvm 0.0.75 → 0.0.76

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 75
+:patch: 76

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.75"
+  s.version = "0.0.76"
 
   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-05}
+  s.date = %q{2009-11-11}
   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

@@ -23,6 +23,7 @@ __rvm_parse_args() {
 
       use)
         rvm_action=$rvm_token
+        rvm_verbose_flag=1
         if [[ "ruby" = "$1" ]] ; then shift ; fi
       ;;
 
@@ -44,6 +45,7 @@ __rvm_parse_args() {
 
       jruby|ree|macruby|rbx|rubinius|mput|shyouhei|default|all)
         rvm_ruby_interpreter="$rvm_token"
+        rvm_ruby_string="$rvm_token"
         rvm_action="${rvm_action:-use}"
         if match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
       ;;
@@ -61,9 +63,8 @@ __rvm_parse_args() {
 
       gemdir)
         rvm_action=$rvm_token
-        if [[ "system" = "$1" ]] ; then rvm_ruby_interpreter="system" ; shift ; fi
-        if [[ "user" = "$1"  ]]   ; then rvm_ruby_interpreter="user"   ; shift ; fi
-        rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}"
+        if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi
+        if [[ "user" = "$1"  ]]   ; then rvm_user_flag=1  ;  shift ; fi
       ;;
 
       --load|load|dump|clear)
@@ -89,7 +90,7 @@ __rvm_parse_args() {
 
       -S|-e)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token '$@'"
+        rvm_ruby_args="$rvm_token $@"
         rvm_parse_break=1
       ;;
 
@@ -138,24 +139,6 @@ __rvm_parse_args() {
         rvm_ruby_args="rake $rvm_token"
       ;;
 
-      #1.8|1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9|1.9.1|1.9.2)
-      #  rvm_ruby_interpreter=${rvm_ruby_interpreter:-ruby}
-      #  rvm_ruby_version="$rvm_token"
-      #  rvm_action=${rvm_action:-use}
-      #;;
-
-      #1.2.0|1.3|1.3.0|1.3.1|1.4|1.4.0)
-      #  if [[ "1.3" = "$rvm_token" ]] ; then
-      #    rvm_ruby_version="1.3.1"
-      #  elif [[ "1.4" = "$rvm_token" ]] ; then
-      #    rvm_ruby_version="1.4.0"
-      #  else
-      #    rvm_ruby_version="$rvm_token"
-      #  fi
-      #  rvm_ruby_interpreter=${rvm_ruby_interpreter:-jruby}
-      #  rvm_action=${rvm_action:-use}
-      #;;
-
       -v|--version)
         if [[ -z "$1" ]] ; then
           rvm_action="version"
@@ -281,7 +264,7 @@ __rvm_parse_args() {
       tests|specs)          rvm_action="tests"                 ;;
       --trace)              eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1" ; set -x ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete)
+      --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"
       ;;
 

data/scripts/gems

@@ -1,29 +1,5 @@
 #!/bin/bash
 
-__rvm_gems() {
-  unset GEM_PATH
-  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
-}
-
 __rvm_gems_select() {
   if [[ -z "$rvm_gem_set_name" ]] ; then
     if [[ ! -z "$GEM_HOME" ]] ; then
@@ -154,7 +130,7 @@ __rvm_gems_load() {
     echo "Loading $rvm_file_name file..."
     rvm_ruby_gem_list=$(\ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
 
-    while read line
+    while read -r line
     do # Keep this on 2nd line :(
       # TODO: Switch to a different field separator than ; to allow for evals
       gem="$(echo $line | awk -F';' '{print $1}')"
@@ -240,3 +216,41 @@ __rvm_gems_load() {
   fi
 }
 
+__rvm_gemdir() {
+  if [[ "$rvm_user_flag" -eq 1 ]] ; then
+    echo $(rvm system ; gem env | grep $HOME | awk '{print $NF}')
+  elif [[ "$rvm_system_flag" -eq 1 ]] ; then
+    echo $(rvm system ; gem env gemdir system)
+  elif [[ ! -z "$rvm_ruby_string" ]] ; then
+    echo $(rvm "$rvm_ruby_string" ; gem env gemdir)
+  elif [[ ! -z "$GEM_HOME" ]] ; then
+    echo "$GEM_HOME"
+  else
+    gem env gemdir
+  fi
+}
+
+__rvm_gems() {
+  unset GEM_PATH
+  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
+}
+

data/scripts/ruby-installer

@@ -487,7 +487,7 @@ __rvm_manage_rubies() {
     eval "__rvm_${rvm_action}_ruby"
   else # all
     if [[ "$rvm_action" != "install" ]] ; then
-      while read bin_line
+      while read -r bin_line
       do # Keep this on second line damnit!
         if [[ -x "$bin_line" ]] ; then
           rvm_ruby_string="$(dirname "$bin_line" | xargs dirname | xargs basename)"

data/scripts/rvm

@@ -6,10 +6,21 @@
 # http://gitub.com/wayneeseguin/rvm
 #
 
+if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
+
 if [[ "root" = "$(whoami)" ]] ; then
   rvm_prefix_path="${rvm_prefix_path:-/usr/local/}"
 else
-  rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
+  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  if [[ -f "$HOME/.rvm/scripts/rvm" ]] ; then
+    rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
+  elif [[ -f "/usr/local/rvm/scripts/rvm" ]] ; then
+    rvm_scripts_path="${rvm_scripts_path:-"/usr/local/rvm"}"
+    rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
+  else
+    echo -e "\nERROR: rvm scripts directory was not found in either ~/.rvm/ or /usr/local/rvm\n"
+    if [[ $# -gt 0 ]] ; then exit 0 ; else return 1 ; fi
+  fi
 fi
 
 if [[ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '.' ]] || [[ "${rvm_prefix_path#${rvm_prefix_path%?}}" = '/' ]] ; then
@@ -18,12 +29,13 @@ else
   rvm_path="${rvm_prefix_path}/rvm"
 fi
 
-source $rvm_path/scripts/color
-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
+rvm_scripts_path="${rvm_scripts_path:-$rvm_path}"
+source $rvm_scripts_path/scripts/color
+source $rvm_scripts_path/scripts/utility
+source $rvm_scripts_path/scripts/selector
+source $rvm_scripts_path/scripts/ruby-installer # TODO: Script not function.
+source $rvm_scripts_path/scripts/cli
+source $rvm_scripts_path/scripts/gems
 
 rvm_loaded_flag=1 ; export rvm_loaded_flag
 

data/scripts/selector

@@ -171,6 +171,10 @@ __rvm_use() {
 
     if [[ -s $rvm_path/default ]] ; then
       source $rvm_path/default
+
+      if [[ ! -z "$rvm_verbose_flag" ]] ; then
+        __rvm_log "info" "Now using default ruby."
+      fi
     else
       rvm_ruby_interpreter="system"
       __rvm_log "warn" "no default rvm specified, defaulting to pre-rvm system."
@@ -198,6 +202,10 @@ __rvm_use() {
       done
     fi
 
+    if [[ ! -z "$rvm_verbose_flag" ]] ; then
+      __rvm_log "info" "Now using system ruby."
+    fi
+
   else
     GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
     GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH
@@ -207,12 +215,19 @@ __rvm_use() {
     if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
     if [[ ! -d $MY_RUBY_HOME ]] ; then
-      __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed.\nTo install do: 'rvm install $rvm_ruby_string'"
+      __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
       if [[ ! -z "$rvm_install_on_use_flag" ]] ; then
         __rvm_install_ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
+      else
+        __rvm_log "info" "To install do: 'rvm install $rvm_ruby_string'"
+        return 1
       fi
     fi
 
+    if [[ ! -z "$rvm_verbose_flag" ]] ; then
+      __rvm_log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
+    fi
+
     __rvm_irbrc
 
     PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
@@ -249,8 +264,8 @@ __rvm_use() {
 
       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"
+        ln -fs "$rvm_path/$rvm_ruby_string/bin/gem" "$rvm_path/bin/default-gem"
+        ln -fs "$rvm_path/$rvm_ruby_string/bin/irb" "$rvm_path/bin/default-irb"
       else
         rm -f $rvm_path/bin/default*
       fi

data/scripts/utility

@@ -130,7 +130,7 @@ __rvm_run() {
 
 __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_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name rvm_benchmark_flag
+  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 rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag
 }
 
 __rvm_unset_ruby_variables() {
@@ -307,15 +307,6 @@ __rvm_implode() {
   done
 }
 
-__rvm_gemdir() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
-  if [[ ! -z "$GEM_HOME" ]] ; then
-    echo "$GEM_HOME"
-  else
-    gem env gemdir
-  fi
-}
-
 __rvm_source_dir() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   if [[ -z "$rvm_ruby_src_path" ]] ; then
@@ -399,74 +390,68 @@ __rvm_list() {
     fi
   else
     current_ruby="$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
-    echo -e "\nruby:\n"
     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 "=> $version : $string"
+        echo -e "=> $(tput setaf 2)$version$(tput sgr0):  $string"
         selected="1"
       else
-        echo -e "   $version : $string"
+        echo -e "   $(tput setaf 2)$version$(tput sgr0):  $string"
       fi
     done ; unset version
 
-    echo -e "\nree:\n"
     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 "=> $version : $string"
+        echo -e "=> $(tput setaf 2)$version$(tput sgr0):  $string"
         selected="1"
       else
-        echo -e "   $version : $string"
+        echo -e "   $(tput setaf 2)$version$(tput sgr0):  $string"
       fi
     done ; unset version
 
-    echo -e "\nmput:\n"
     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 "=> $version : $string"
+        echo -e "=> $(tput setaf 2)$version$(tput sgr0):  $string"
         selected="1"
       else
-        echo -e "   $version : $string"
+        echo -e "   $(tput setaf 2)$version$(tput sgr0):  $string"
       fi
     done ; unset version
 
-    echo -e "\njruby:\n"
     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 "=> $version : $string"
+        echo -e "=> $(tput setaf 2)$version$(tput sgr0):  $string"
         selected="1"
       else
-        echo -e "   $version : $string"
+        echo -e "   $(tput setaf 2)$version$(tput sgr0):  $string"
       fi
     done ; unset version
 
-    echo -e "\nrbx:\n"
     # 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 "=> $version : $string"
+          echo -e "=> $(tput setaf 2)$version$(tput sgr0):  $string"
           selected="1"
         else
-          echo -e "   $version : $string"
+          echo -e "   $(tput setaf 2)$version$(tput sgr0):  $string"
         fi
       fi
     done ; unset version
 
 
     if [[ "Darwin" = "$(uname)" ]] ; then
-      echo -e "\nmacruby:\n"
       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 "=> $version : $string"
+          echo -e "=> $(tput setaf 2)$version$(tput sgr0):  $string"
           selected="1"
         else
-          echo -e "   $version : $string"
+          echo -e "   $(tput setaf 2)$version$(tput sgr0):  $string"
         fi
       done ; unset version
     fi
@@ -474,24 +459,22 @@ __rvm_list() {
     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
-        echo -e "\ndefault:\n"
         string=$($rvm_path/$version/bin/ruby -v)
         if [[ "$version" = "$current_ruby" ]] ; then
-          echo -e "=> $version : $string"
+          echo -e "=> $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0):  $string"
           selected="1"
         else
-          echo -e "   $version : $string"
+          echo -e "   $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0):  $string"
         fi
       fi ; unset version
     fi
 
-    echo -e "\nsystem:\n"
     system_version=$(rvm system ; ruby -v 2> /dev/null)
     if [[ ! -z "$system_version" ]] ; then
       if [[ "$($(which ruby) -v)" = "$system_version" ]] ; then
-        echo -e "=> $system_version\n"
+        echo -e "=> $(tput setaf 2)system$(tput sgr0): $system_version\n"
       else
-        echo -e "   $system_version\n"
+        echo -e "   $(tput setaf 2)system$(tput sgr0): $system_version\n"
       fi
     fi ; unset current_ruby version selected
   fi
@@ -503,7 +486,11 @@ __rvm_initialize() {
     rvm_prefix_path="${rvm_prefix_path:-/usr/local/}"
     rc_files="/etc/profile /etc/zshenv"
   else
-    rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
+    if [[ -f "$HOME/.rvm/scripts/rvm" ]] ; then
+      rvm_prefix_path="${rvm_prefix_path:-"$HOME/."}"
+    else
+      rvm_prefix_path="${rvm_prefix_path:-"/usr/local/"}"
+    fi
     rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
   fi
 
@@ -602,7 +589,7 @@ __rvm_ruby_do() {
       if match "$rvm_ruby_args" "\.rb$" ; then
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
         if ! match "$rvm_ruby_args" "$prefix" ; then
-          rvm_ruby_args="$prefix '$rvm_ruby_args'"
+          rvm_ruby_args="$prefix $rvm_ruby_args"
         fi
       fi
       rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
@@ -650,7 +637,7 @@ __rvm_do() {
       unset rvm_ruby_string rvm_ruby_version
       __rvm_ruby_do
   else # all
-    while read bin_line
+    while read -r bin_line
     do # Keep this on second line damnit!
       if [[ -x "$bin_line" ]] ; then
         rvm_ruby_string="$(dirname $bin_line | xargs dirname | xargs basename)"
@@ -869,28 +856,35 @@ __rvm_ncurses_install() {
 
 __rvm_make_flags() {
   PATH=${rvm_path}/usr/bin:$PATH ; export PATH
+  # This is only an issue with Darwin :/
   if [[ "Darwin" = "$(uname)" ]] ; then
-
-    if [[ -z "$rvm_archflags" ]] ; then
-      # Build for the archtecture that is reported.
-      # The user may override via setting rvm_archflags in ~/.rvmrc
-      rvm_archflags="-arch $(uname -m )"
-    fi
-
-    if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
-      rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
-    elif [[ "-arch i386" = "$rvm_archflags" ]] ; then
-      rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
-    fi
-
-    if [[ -z "$rvm_sdk" ]] ; then
-      rvm_sdk="$(basename -a /Developer/SDKs/* | sort | tail -n 1)"
+    # ls /usr/lib/gcc/i686-apple-darwin10
+
+    # Set the build & host type
+    if [[ $(sysctl hw.cpu64bit_capable | awk '{print $2}') = 1 ]] ; then # we could also use: sysctl hw.optional.x86_64
+      #   64 bit capable
+      if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
+        :
+        #rvm_ruby_configure_flags="${rvm_ruby_configure_flags}" #" --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+      elif [[ "-arch i386" = "$rvm_archflags" ]] ; then
+        :
+        #rvm_ruby_configure_flags="${rvm_ruby_configure_flags}" #" --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
+      else
+        rvm_archflags="-arch x86_64"
+        #rvm_ruby_configure_flags="${rvm_ruby_configure_flags}" #" --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+      fi
+    else
+      #   32 bit capable only
+      if [[ -z "$rvm_archflags" ]] ; then rvm_archflags="-arch i386" ; fi
+      #rvm_ruby_configure_flags="${rvm_ruby_configure_flags}" #" --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
     fi
+    ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
 
+    # Use the latest sdk available.
+    if [[ -z "$rvm_sdk" ]] ; then rvm_sdk="$(basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)" ; fi
     CFLAGS="-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export CFLAGS
     LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export LDFLAGS
     # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$rvm_sdk " ; export CXXFLAGS
-    ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
   fi
 }
 
@@ -901,21 +895,19 @@ __rvm_monitor() {
     changed_test_files=() ; changed_spec_files=()
 
     if [[ -d "test/" ]] ; then
-      test_files=($(\ls test/**/*_test.rb))
-      for file in "${test_files[@]}"; do
+      while read -r line ; do
         if [[ $(timestamp $file) -gt $timestamp ]] ; then
-          array_push $changed_test_files
+          array_push $changed_test_files $file
         fi
-      done
+      done < <($(\ls test/**/*_test.rb))
     fi
 
     if [[ -d "spec/" ]] ; then
-      spec_files=($(\ls spec/**/*_spec.rb))
-      for file in "${spec_files[@]}"; do
+      while read -r line ; do
         if [[ $(timestamp $file) -gt $timestamp ]] ; then
-          array_push $changed_spec_files
+          array_push $changed_spec_files $file
         fi
-      done
+      done < <($(\ls spec/**/*_spec.rb))
     fi
     if [[ $(array_length $changed_test_files) -gt 0 ]] ; then
       testrb "${myarray[*]}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.75
+  version: 0.0.76
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -05:00
+date: 2009-11-11 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []