rvm 0.1.40 → 0.1.41

data/binscripts/rvm-prompt

@@ -87,7 +87,7 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
   
   command="prompt=\"$format\""
   eval "$command"
-  echo "$prompt" | sed -e 's#^\s*-*##g' -e 's#--*#-#g' -e 's#-*\s*$##' -e 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
+  echo "$prompt" | sed -e 's#^[[:space:]]*-*##g' -e 's#--*#-#g' -e 's#-*[[:space:]]*$##' -e 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
   
 else
   while [[ $# -gt 0 ]] ; do

data/binscripts/rvm-update-head

@@ -7,5 +7,7 @@ cd $rvm_path/src
 
 rm -rf ./rvm/ && git clone --depth 1 git://github.com/wayneeseguin/rvm.git
 cd rvm
-dos2unix scripts/* >/dev/null 2>&1
+# v v v This is a godo idea however it does not preserve the executible bit.
+# Needs more thought, perhaps a simple sed instead.
+# dos2unix scripts/* >/dev/null 2>&1
 bash scripts/install

data/binscripts/rvm-update-latest

@@ -16,6 +16,8 @@ tar zxf "rvm-${stable_version}.tar.gz"
 
 cd "rvm-${stable_version}"
 
-dos2unix scripts/* >/dev/null 2>&1
+# v v v This is a godo idea however it does not preserve the executible bit.
+# Needs more thought, perhaps a simple sed instead.
+#dos2unix scripts/* >/dev/null 2>&1
 
 bash scripts/install

data/config/db

@@ -4,7 +4,7 @@ niceness=0
 interpreter=ruby
 ruby_version=1.8.7
 ruby_configure_flags=--enable-shared
-ruby_patchlevel=174
+ruby_patchlevel=299
 ruby_configure=--enable-shared
 ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
 ruby_1.0_url=ftp://ftp.ruby-lang.org/pub/ruby/1.0
@@ -18,10 +18,10 @@ ruby_1.8_url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
 ruby_1.9_url=ftp://ftp.ruby-lang.org/pub/ruby/1.9
 ruby_2.0_url=ftp://ftp.ruby-lang.org/pub/ruby/2.0
 ruby_1.9.1_patch_level=378
-ruby_1.9.2_patch_level=preview3
+ruby_1.9.2_patch_level=rc1
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=399
-ruby_1.8.7_patch_level=174
+ruby_1.8.7_patch_level=299
 rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
@@ -46,7 +46,7 @@ macruby_version=0.6
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=23673
+maglev_version=23767
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 shyouhei_repo_url=git://github.com/shyouhei/ruby.git
@@ -55,13 +55,13 @@ ironruby_repo_url=git://github.com/ironruby/ironruby.git
 ironruby_1.0_url=http://rubyforge.org/frs/download.php/70179/
 # Packages
 readline_url=ftp://ftp.gnu.org/gnu/readline
-iconv_url=http://ftp.gnu.org/pub/gnu/libiconv
+libiconv_url=http://ftp.gnu.org/pub/gnu/libiconv
 curl_url=http://curl.haxx.se/download
 openssl_url=http://www.openssl.org/source
 zlib_url=http://www.zlib.net
 autoconf_url=ftp.gnu.org/gnu/autoconf
 ncurses_url=http://ftp.gnu.org/pub/gnu/ncurses
-pkgconfig_url=http://pkgconfig.freedesktop.org/releases
+pkg-config_url=http://pkgconfig.freedesktop.org/releases
 gettext_url=ftp://ftp.gnu.org/pub/gnu/gettext
 libxml2_url=ftp://xmlsoft.org/libxml2/
 glib_url=http://ftp.gnome.org/pub/gnome/sources/glib/2.23

data/config/known

@@ -1,13 +1,15 @@
 # MRI Rubies
 (ruby-)1.8.6(-p399)
 (ruby-)1.8.6-head
-(ruby-)1.8.7(-p174)
+(ruby-)1.8.7(-p299)
 (ruby-)1.8.7-head
-(ruby-)1.9.1(-p243)
-(ruby-)1.9.1(-p376)
+(ruby-)1.9.1-p243
+(ruby-)1.9.1-p376
+(ruby-)1.9.1(-p429)
 (ruby-)1.9.1-head
 (ruby-)1.9.2-preview1
 (ruby-)1.9.2-preview3
+(ruby-)1.9.2(-rc1)
 (ruby-)1.9.2-head
 ruby-head
 
@@ -29,7 +31,7 @@ ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev(-23673)
+maglev(-23767)
 maglev-head
 
 # Shyouhei head, the default mput

data/config/md5

@@ -15,13 +15,16 @@ ruby-1.8.7-p160.tar.gz=945398f97e2de6dd8ab6df68d10bb1a1
 ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
 ruby-1.8.7-p248.tar.gz=60a65374689ac8b90be54ca9c61c48e3
 ruby-1.8.7-p249.tar.gz=d7db7763cffad279952eb7e9bbfc221c
+ruby-1.8.7-p299.tar.gz=43533980ee0ea57381040d4135cf9677
 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.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
 ruby-1.9.1-p378.tar.gz=9fc5941bda150ac0a33b299e1e53654c
+ruby-1.9.1-p429.tar.gz=0f6d7630f26042e00bc59875755cf879
 ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
 ruby-1.9.2-preview3.tar.gz=209e59f3495a5503fa948c2732f1d705
+ruby-1.9.2-rc1.tar.gz=fdedd5b42ae89a9a46797823ad2d9acf
 ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
 ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
 ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
@@ -45,7 +48,8 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
 ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
-GemStone-23673.Darwin-i386.tar.gz=651ae34c80e45467f43f06fc63b5de65
-GemStone-23673.Linux-x86_64.tar.gz=2989946a575ca59c5b7591c0f3d256aa
-MagLev-23673.Darwin-i386.tar.gz=50ad4e1e4c9b3f8d2156f812beb9a7ed
-MagLev-23673.Linux-x86_64.tar.gz=8a63271554de58412eb0e5668072ef70
+GemStone-23767.Darwin-i386.tar.gz=639ca12a261e8626ff8cf63bd408b253
+GemStone-23767.Linux-x86_64.tar.gz=79ee9214a2df3427584a2b9b13437ddd
+MagLev-23767.Darwin-i386.tar.gz=e4eae8ef9f1c9264d00b90899e3896ca
+MagLev-23767.Linux-x86_64.tar.gz=d42bc9fdfb704e5723310352959e17cc
+

data/install

@@ -124,7 +124,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks help ; do
+for dir_name in config scripts examples lib hooks help patches; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -184,7 +184,7 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
   source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
@@ -192,7 +192,20 @@ for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
     mkdir -p "$destination_path"
     cp "$source_path/$gemset_file" "$destination"
   fi
-done ; unset destination destination_path source_path
+done ; unset destination destination_path source_path gemset_file
+
+spinner
+mkdir -p "$rvm_patchsets_path"
+for patchsets_file in $(cd gemsets ; find . -iname '*' | sed 's/^\.\///') ; do
+  source_path="$(pwd)/gemsets"
+  destination="$rvm_patchsets_path/$patchset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$patchset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path patchset_file
+
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
@@ -266,6 +279,10 @@ if [[ "root" = "$(whoami)" ]] ; then
   mkdir -p $rvm_bin_path
   chmod +x $rvm_bin_path/rvm
   chmod +x $rvm_bin_path/rvmsudo
+  printf "\n    Copying manpages into place."
+  for man_file in $(\ls "$install_source_path/man"); do
+    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
+  done
 fi
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 40
+:patch: 41

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.40"
+  s.version = "0.1.41"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-06-22}
+  s.date = %q{2010-07-08}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -92,11 +92,14 @@ Gem::Specification.new do |s|
      "scripts/log",
      "scripts/maglev",
      "scripts/manage",
+     "scripts/manpages",
      "scripts/match",
      "scripts/md5",
      "scripts/monitor",
      "scripts/notes",
      "scripts/package",
+     "scripts/patches",
+     "scripts/patchsets",
      "scripts/rubygems",
      "scripts/rvm",
      "scripts/rvm-install",

data/scripts/cd

@@ -25,6 +25,7 @@ if [[ "$rvm_project_rvmrc" -ne 0 ]] ; then
             fi
             rvm_rvmrc_cwd="$cwd"
             source "$cwd/.rvmrc"
+            cwd=$(dirname "$cwd")
           fi
           break
         else

data/scripts/cli

@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
 
 __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
+# alternate usage impl: uses man page
+#__rvm_usage() {
+  #if [[ `which man` ]]; then
+    #man 1 rvm ; }
+  #else
+    #cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less}
+  #fi
+#}
 
 __rvm_parse_args() {
 
@@ -207,15 +215,9 @@ __rvm_parse_args() {
         fi
       ;;
 
-      # For use with --patch
-      --patch-name) rvm_ruby_patch_name="$1" ; shift ;;
-      --patch)
-        if [[ -z "$rvm_ruby_patch" ]] ; then
-          rvm_ruby_patch="$1"
-        else
-          rvm_ruby_patch="$rvm_ruby_patch,$1";
-        fi ; shift
-        rvm_action="${rvm_action:-use}"
+      --patches|--patch)
+        rvm_patch_names="$1 $rvm_patch_names"; shift
+        rvm_patch_original_pwd="$PWD"
       ;;
 
       --head) rvm_head_flag=1 ;;
@@ -328,7 +330,7 @@ __rvm_parse_args() {
 
       -C|--configure)
         if [[ ! -z "$1" ]] ; then
-          rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
+          rvm_ruby_configure_flags="$(echo $1 | sed -e 's#,--# --#g')"
           shift
         else
           rvm_action="error"
@@ -450,8 +452,8 @@ rvm() {
   __rvm_initialize
   __rvm_parse_args "$@"
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_patch rvm_ruby_patch_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag
-  export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
+  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd
+  export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
 
   result=0
   case "$rvm_action" in

data/scripts/gemsets

@@ -393,8 +393,8 @@ gemset_pristine() {
 gemset_initial() {
   $rvm_scripts_path/log "info" "Importing initial gemsets for $(__rvm_environment_identifier)."
   mkdir -p "$rvm_gemsets_path/$(echo "$rvm_ruby_string" | tr '-' '/')" 2>/dev/null
-  for gemsets_path in "$rvm_gemsets_path" "$rvm_gemsets_path/$rvm_ruby_interpreter" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_ruby_patch_level" ; do
-    if [[ ! -z "$rvm_gemset_name" ]] ; then
+  for gemsets_path in $(__rvm_ruby_string_paths_under "$rvm_gemsets_path") ; do
+    if [[ -n "$rvm_gemset_name" ]] ; then
       if [[ -s "${gemsets_path}/${rvm_gemset_name}.gems" ]] ; then
         (source "$rvm_scripts_path/rvm"; rvm gemset import "${gemsets_path}/${rvm_gemset_name}.gems") > /dev/null
       fi
@@ -418,7 +418,7 @@ if ! command -v gem > /dev/null ; then
 fi
 
 action="$(echo $* | awk '{print $1}')"
-gems_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+gems_args="$(echo "$*" | awk '{$1="" ; print}' | __rvm_strip)"
 export rvm_gemset_name
 
 if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then

data/scripts/info

@@ -22,7 +22,7 @@ info_system() {
 
 info_rvm() {
   rvm_info="$rvm_info\n  rvm:"
-  rvm_info="$rvm_info\n    version:      \"$(__rvm_version | tr "\n" ' ' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')\""
+  rvm_info="$rvm_info\n    version:      \"$(__rvm_version | tr "\n" ' ' | __rvm_strip)\""
   rvm_info="$rvm_info\n"
 }
 

data/scripts/initialize

@@ -13,7 +13,9 @@ rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 
 if [[ "root" = "$(whoami)" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+  rvm_man_path="${rvm_man_path:-"/usr/local/share/man"}"
 else
+  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 fi
 
@@ -32,7 +34,9 @@ rvm_wrappers_path="${rvm_wrappers_path:-"$rvm_path/wrappers"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
+rvm_patches_path="${rvm_patches_path:-"$rvm_path/patches"}"
+rvm_patchsets_path="${rvm_patchsets_path:-"$rvm_path/patchsets"}"
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 
-export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_gemsets_path rvm_repo_path
+export rvm_path rvm_patches_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_gemsets_path rvm_repo_path rvm_patchsets_path
 

data/scripts/install

@@ -124,7 +124,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks help ; do
+for dir_name in config scripts examples lib hooks help patches; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -184,7 +184,7 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
   source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
@@ -192,7 +192,20 @@ for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
     mkdir -p "$destination_path"
     cp "$source_path/$gemset_file" "$destination"
   fi
-done ; unset destination destination_path source_path
+done ; unset destination destination_path source_path gemset_file
+
+spinner
+mkdir -p "$rvm_patchsets_path"
+for patchsets_file in $(cd gemsets ; find . -iname '*' | sed 's/^\.\///') ; do
+  source_path="$(pwd)/gemsets"
+  destination="$rvm_patchsets_path/$patchset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$patchset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path patchset_file
+
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
@@ -266,6 +279,10 @@ if [[ "root" = "$(whoami)" ]] ; then
   mkdir -p $rvm_bin_path
   chmod +x $rvm_bin_path/rvm
   chmod +x $rvm_bin_path/rvmsudo
+  printf "\n    Copying manpages into place."
+  for man_file in $(\ls "$install_source_path/man"); do
+    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
+  done
 fi
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then

data/scripts/list

@@ -2,12 +2,6 @@
 
 if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-# Query for valid rvm ruby strings
-# This is meant to be used with scripting.
-list_strings() {
-  echo $(\ls $rvm_rubies_path)
-}
-
 list_gemsets() {
   echo
   ruby=$(command -v ruby) ; current_ruby=""
@@ -74,6 +68,17 @@ list_ruby_svn_tags() {
   done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
 }
 
+# Query for valid rvm ruby strings
+# This is meant to be used with scripting.
+list_strings() {
+  echo $(\ls $rvm_rubies_path)
+}
+
+# This is meant to be used with scripting.
+list_known_strings() {
+  cat "$rvm_config_path/known" | sed -e 's/#.*$//g' -e 's/(//g' -e 's/)//g' | sort -r | uniq
+}
+
 list_known() {
   if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
     cat "$rvm_config_path/known"
@@ -82,6 +87,7 @@ list_known() {
   fi
 }
 
+
 list_rubies() {
   echo
   ruby=$(command -v ruby) ; current_ruby=""
@@ -128,6 +134,8 @@ action="$(echo "$1" | awk '{print $1}')"
 
 if [[ "known" = "$action" ]] ; then
   list_known
+elif [[ "known_strings" = "$action" ]] ; then
+  list_known_strings
 elif [[ "gemsets" = "$action" ]] ; then
   list_gemsets
 elif [[ "default" = "$action" ]] ; then
@@ -139,7 +147,7 @@ elif [[ "strings" = "$action" ]] ; then
 elif [[ "ruby_svn_tags" = "$action" ]] ; then
   list_ruby_svn_tags
 else # help
-  printf "\nUsage:  rvm list {known,gemsets,default,rubies,strings}"
+  printf "\nUsage:  rvm list {known,gemsets,default,rubies,strings,known_strings}"
 fi
 
 exit $?

data/scripts/manage

@@ -4,6 +4,7 @@ original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
 
 source "$rvm_scripts_path/base"
+source "$rvm_scripts_path/patches"
 
 # Checks for bison, returns zero iff it is found
 __rvm_check_for_bison() {
@@ -15,6 +16,45 @@ __rvm_check_for_bison() {
   fi
 }
 
+# Returns a number of patches, each on a new name
+# Expands patchsets etc.
+__rvm_current_patch_names() {
+  # TODO: Lookup default patches on rvm_ruby_string heirarchy.
+  local patches="$rvm_patch_names default"
+  for patch_name in $(echo "$patches" | tr ',' ' ' | __rvm_strip); do
+    __rvm_expand_patch_name "$patch_name"
+  done
+}
+
+__rvm_apply_patches() {
+  local patch_result=0
+  local patch_level_seperator="%"
+  local patch_fuzziness="25"
+  source_directory="${1:-"$rvm_ruby_src_path"}"
+  __rvm_pushpop "$source_directory"
+  unset source_directory
+  for patch_name in $(__rvm_current_patch_names | __rvm_strip); do
+    patch_level="1"
+    # If set, extract the patch level from the patch name.
+    if echo "$patch_name" | grep -q "$patch_level_seperator"; then
+      patch_level="$(echo "$patch_name" | awk -F"$patch_level_seperator" '{print $2}')"
+      patch_name="$(echo "$patch_name" | awk -F"$patch_level_seperator" '{print $1}')"
+    fi
+    full_patch_path="$(__rvm_lookup_full_patch_path "$patch_name")"
+    # Expand paths, and for those we found we then apply the patches.
+    if [[ -n "$full_patch_path" ]]; then
+      __rvm_run "patch.apply.$(basename "$patch_name")" "patch -F$patch_fuzziness -p$patch_level -f < '$full_patch_path'" "Applying patch '$patch_name' (located at $full_patch_path)"
+      # Detect failed patches
+      [[ "$?" -gt 0 ]] && patch_result=1
+    else
+      $rvm_scripts_path/log "warn" "Patch '$patch_name' not found."
+      patch_result=1
+    fi
+  done; unset patch_name full_patch_path patch_level
+  __rvm_pushpop
+  return $patch_result
+}
+
 __rvm_install_source() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
@@ -29,12 +69,20 @@ __rvm_install_source() {
   fi
 
   builtin cd $rvm_ruby_src_path
+
   result=$? ; if [[ "$result" -gt 0 ]] ; then
     $rvm_scripts_path/log "error" "There has been an error, source directory is missing. Did the download or extraction fail? Aborting the installation." ; __rvm_pushpop ; return $result
   fi
 
   if [[ -d "${rvm_path}/usr" ]] ; then export PATH="${rvm_path}/usr/bin:${PATH}" ; fi
 
+  __rvm_apply_patches
+  result="$?"
+  if [[ "$result" -gt 0 ]]; then
+    $rvm_scripts_path/log "fail" "There has been an error applying the specified patches. Aborting the installation."
+    return $result
+  fi
+
   if [[ -z "$rvm_ruby_configure" ]] && [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
     if command -v autoconf > /dev/null ; then
       __rvm_run "autoconf" "autoconf" "Running autoconf"
@@ -61,29 +109,8 @@ __rvm_install_source() {
     $rvm_scripts_path/log "error" "Skipping configure step, 'configure' does not exist, did autoconf not run successfully?"
   fi
 
-  if [[ ! -z "$rvm_ruby_patch" ]] ; then
-    for patch in $(echo $rvm_ruby_patch | tr ',' ' ') ; do
-      # detecting patch prefix (see '-p' option desc for 'patch')
-      # patch prefix is separated from patch path with '%' symbol
-      patch_prefix_separator='%'
-      # default prefix is 0
-      rvm_patch_prefix=0
-      # checking, if the patch file path has a prefix separator
-      patch_has_prefix=$(echo $patch | grep -q ${patch_prefix_separator}; echo $?)
-      if [[ "x${patch_has_prefix}" = "x0"  ]]; then
-        # so, if it has...
-        rvm_patch_prefix=$(echo $patch | cut -d ${patch_prefix_separator} -f 2)
-        patch=$(echo $patch | cut -d ${patch_prefix_separator} -f 1)
-      fi
-      __rvm_run "patch" "patch -p${rvm_patch_prefix} -f < $patch" "Applying patch '$patch'..."
-      if [[ $? -gt 0 ]] ; then
-        $rvm_scripts_path/log "error" "Patch $patch did not apply cleanly... back to the patching board :(" ; exit 1
-      fi
-    done
-  fi
-
   rvm_ruby_make=${rvm_ruby_make:-"make"}
-  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while depending on your cpu(s)..."
   result=$? ; if [[ "$result" -gt 0 ]] ; then
     $rvm_scripts_path/log "error" "There has been an error while running make. Aborting the installation." ; __rvm_pushpop ; return $result
   fi
@@ -225,10 +252,15 @@ RubyWrapper
 
         __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
 
-        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options $db_configure_flags $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
-          result=$? ; if [[ "$result" -gt 0 ]] ; then
-            $rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
-          fi
+        __rvm_apply_patches "$rvm_ruby_src_path/source"
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to apply patches to ree. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
+
+        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options $db_configure_flags $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while depending on your cpu(s)..."
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
 
         chmod +x $rvm_ruby_home/bin/*
 
@@ -262,7 +294,7 @@ RubyWrapper
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
-      if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
+      if [[ -n "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
         $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
@@ -286,12 +318,17 @@ RubyWrapper
 
       builtin cd "$rvm_ruby_src_path" ; chmod +x ./configure
 
+      __rvm_apply_patches
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to apply patches to rubinius. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
+
       __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
 
-      export ruby="$rvm_bin_path/$(__rvm_18_compat_ruby)"
+      export ruby="$(__rvm_18_compat_ruby)"
 
       rvm_ruby_configure_flags="${rvm_ruby_configure_flags:-"--skip-system"}"
-      rvm_ruby_configure="$ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags" ; message="Configuring rbx"
+      rvm_ruby_configure="$rvm_bin_path/$ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags" ; message="Configuring rbx"
       if [[ "$rvm_llvm_flag" = "0" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
       else
@@ -305,9 +342,9 @@ RubyWrapper
       fi
 
       if [[ "$rvm_trace_flag" -eq 1 ]] ; then
-        rvm_ruby_make="$ruby -S rake install --trace" ; message="Compiling rbx (with --trace)"
+        rvm_ruby_make="$rvm_wrappers_path/$ruby/rake install --trace" ; message="Compiling rbx (with --trace)"
       else
-        rvm_ruby_make="$ruby -S rake install" ; message="Compiling rbx"
+        rvm_ruby_make="$rvm_wrappers_path/$ruby/rake install" ; message="Compiling rbx"
       fi
       __rvm_run "rake" "$rvm_ruby_make" "$message"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -472,14 +509,14 @@ RubyWrapper
 
       if [[ ! -e ${rvm_ruby_home}/etc/conf.d/maglev.conf ]] ; then
         $rvm_scripts_path/log "info" "Creating default 'maglev' repository."
-        $rvm_bin_path/rvm "$(compatible_ruby)" rake "stone:create[maglev]" >/dev/null 2>&1
+        $rvm_wrappers_path/$compatible_ruby/rake "stone:create[maglev]" >/dev/null 2>&1
       fi
 
       $rvm_scripts_path/log "info" "Generating maglev HTML documentation"
-      $rvm_bin_path/rvm "$(compatible_ruby)" rake rdoc >/dev/null 2>&1
+      $rvm_wrappers_path/$compatible_ruby/rake rdoc >/dev/null 2>&1
 
       $rvm_scripts_path/log "info" "Generating smalltalk FFI."
-      $rvm_bin_path/rvm "$(compatible_ruby)" rake stwrappers >/dev/null 2>&1
+      $rvm_wrappers_path/$compatible_ruby/rake stwrappers >/dev/null 2>&1
 
       unset compatible_ruby
 
@@ -518,10 +555,10 @@ RubyWrapper
 
           compatible_ruby="$(__rvm_18_compat_ruby)"
 
-          $rvm_bin_path/rvm "$(compatible_ruby)" -S gem install pathname2 --no-rdoc --no-ri
+          $rvm_wrappers_path/$compatible_ruby/gem install pathname2 --no-rdoc --no-ri
 
           # MONO_LIB=/Library/Frameworks/Mono.framework/Versions/current/lib/
-          rvm_ruby_make="$rvm_bin_path/rvm $(compatible_ruby) -S rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
+          rvm_ruby_make="$rvm_wrappers_path/$compatible_ruby/rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
           __rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
           unset compatible_ruby
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
@@ -580,11 +617,16 @@ RubyWrapper
 
       __rvm_fetch_from_github "mput" "trunk"
 
+      __rvm_apply_patches
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to apply patches to mput. Aborting the installation." ; return $result
+      fi
+
       if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
         if command -v autoconf &> /dev/null ; then
           __rvm_run "autoconf" "autoconf" "Running autoconf"
         else
-          $rvm_scripts_path/log "fail" "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. Aborting installation." ; result=$? ; return $result
+          result=$?; $rvm_scripts_path/log "fail" "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. Aborting installation." ; return $result
         fi
       fi
 
@@ -606,7 +648,7 @@ RubyWrapper
       fi
 
       rvm_ruby_make=${rvm_ruby_make:-"make"}
-      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while depending on your cpu(s)..."
       result=$? ; if [[ "$result" -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "There has been an error while trying to run make. Aborting the installation." ; __rvm_pushpop ; return $result
       fi

data/scripts/manpages

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+source "$rvm_scripts_path/initialize"
+
+# Take if a semicolon is encountered at the end of the
+# manpath env variable, man also processes the usual,
+# generated manpaths as well as the variable contents.
+export MANPATH="${rvm_man_path}:${MANPATH}"

data/scripts/patches

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# General tools for manipulating patches
+# and dealing with patches.
+
+# Returns the path used to look for a patch given a specific name.
+__rvm_patch_lookup_path() {
+  echo "/" 
+  [[ -n "$rvm_patch_original_pwd" ]] && echo "$rvm_patch_original_pwd/"
+  echo "$PWD/"
+  __rvm_ruby_string_paths_under "$rvm_patches_path" | sed 's/$/\//'
+}
+
+__rvm_expand_patch_name() {
+  [[ -z "$1" ]] && return
+  expanded_patch_name="$($rvm_scripts_path/patchsets show "$1")"
+  if [[ "$?" == "0" ]]; then
+    echo "$expanded_patch_name"
+  elif [[ "$1" != "default" ]]; then
+    echo "$1"
+  fi
+  unset expanded_patch_name
+}
+
+# Return the full patch for a given patch.
+__rvm_lookup_full_patch_path() {
+  # Absolute path, pwd and then finally the rvm patches path.
+  for directory in $(__rvm_patch_lookup_path) ; do
+    for extension in {"",.patch,.diff}; do
+      patch_path="${directory}${1}${extension}"
+      if [[ -s "$patch_path" ]]; then
+        echo "$patch_path"
+        return
+      fi
+    done; unset extension patch_path
+  done; unset directory
+  return 1
+}

data/scripts/patchsets

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
+source "$rvm_scripts_path/patches"
+
+lookup_patchset() {
+  if [[ -z "$1" ]]; then
+    echo "Usage: rvm patchset show name"
+    return 1
+  fi
+  for lookup_path in $(__rvm_ruby_string_paths_under "$rvm_patchsets_path") ; do
+    if [[ -s "$lookup_path/$1" ]]; then
+      cat "$lookup_path/$1"
+      return
+    fi
+  done; unset lookup_path
+  return 1
+}
+
+# Return the full patch for a given patch.
+__rvm_lookup_full_patch_path() {
+  # Absolute path, pwd and then finally the rvm patches path.
+  for directory in $(__rvm_patch_lookup_path) ; do
+    for extension in {"",.patch,.diff}; do
+      patch_path="${directory}${1}${extension}"
+      if [[ -s "$patch_path" ]]; then
+        echo "$patch_path"
+        return
+      fi
+    done; unset extension patch_path
+  done; unset directory
+  return 1
+}
+
+usage() {
+  echo "Usage: 'rvm patchset {show,lookup}'"
+  echo "        Tools for manipulating patchsets."
+  return 1
+}
+
+case "$1" in
+  show|lookup) lookup_patchset "$2" ;;
+  *) usage ;;
+esac
+
+exit $?

data/scripts/rubygems

@@ -89,7 +89,7 @@ fi
 #
 if [[ $# -gt 0 ]] ; then
   version="$1" ; shift
-  args=$(echo "$@" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+  args="$(echo "$@" | __rvm_strip)" 
 else
   $rvm_scripts_path/log "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
   exit 1

data/scripts/rvm

@@ -62,6 +62,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     source $rvm_scripts_path/version
     source $rvm_scripts_path/selector
     source $rvm_scripts_path/cli
+    source $rvm_scripts_path/manpages
     source $rvm_scripts_path/cd
 
     rvm_loaded_flag=1

data/scripts/rvm-install

@@ -124,7 +124,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks help ; do
+for dir_name in config scripts examples lib hooks help patches; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -184,7 +184,7 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
   source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
@@ -192,7 +192,20 @@ for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
     mkdir -p "$destination_path"
     cp "$source_path/$gemset_file" "$destination"
   fi
-done ; unset destination destination_path source_path
+done ; unset destination destination_path source_path gemset_file
+
+spinner
+mkdir -p "$rvm_patchsets_path"
+for patchsets_file in $(cd gemsets ; find . -iname '*' | sed 's/^\.\///') ; do
+  source_path="$(pwd)/gemsets"
+  destination="$rvm_patchsets_path/$patchset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$patchset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path patchset_file
+
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
@@ -266,6 +279,10 @@ if [[ "root" = "$(whoami)" ]] ; then
   mkdir -p $rvm_bin_path
   chmod +x $rvm_bin_path/rvm
   chmod +x $rvm_bin_path/rvmsudo
+  printf "\n    Copying manpages into place."
+  for man_file in $(\ls "$install_source_path/man"); do
+    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
+  done
 fi
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then

data/scripts/selector

@@ -349,7 +349,6 @@ __rvm_ruby_string() {
   # * rvm_ruby_patch_level
   # * rvm_ruby_revision
   # * rvm_ruby_tag
-  # * rvm_ruby_patch
 
   # Alias'd rubies
   if [[ -z "$rvm_expanding_aliases" ]]; then
@@ -414,9 +413,6 @@ __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-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"
@@ -480,6 +476,7 @@ __rvm_ruby_string() {
         rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-p*#-#')"
       else
         rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
+        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-prc#-rc#')"
       fi
     fi
   fi

data/scripts/update

@@ -124,7 +124,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks help ; do
+for dir_name in config scripts examples lib hooks help patches; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -184,7 +184,7 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/^\.\///') ; do
   source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
@@ -192,7 +192,20 @@ for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
     mkdir -p "$destination_path"
     cp "$source_path/$gemset_file" "$destination"
   fi
-done ; unset destination destination_path source_path
+done ; unset destination destination_path source_path gemset_file
+
+spinner
+mkdir -p "$rvm_patchsets_path"
+for patchsets_file in $(cd gemsets ; find . -iname '*' | sed 's/^\.\///') ; do
+  source_path="$(pwd)/gemsets"
+  destination="$rvm_patchsets_path/$patchset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$patchset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path patchset_file
+
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
@@ -266,6 +279,10 @@ if [[ "root" = "$(whoami)" ]] ; then
   mkdir -p $rvm_bin_path
   chmod +x $rvm_bin_path/rvm
   chmod +x $rvm_bin_path/rvmsudo
+  printf "\n    Copying manpages into place."
+  for man_file in $(\ls "$install_source_path/man"); do
+    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
+  done
 fi
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then

data/scripts/utility

@@ -27,6 +27,17 @@ __rvm_teardown() {
   unset rvm_ruby_strings
 }
 
+# Return a list of directories under a given base path.
+# Derived from rvm_ruby_string.
+__rvm_ruby_string_paths_under() {
+  local patch_parts="$(echo "$rvm_ruby_string" | tr '-' ' ' | __rvm_strip)"
+  while true; do
+    echo "$1/$patch_parts" | tr ' ' '/' | sed 's#\/$##'
+    [[ -z "$patch_parts" ]] && break
+    patch_parts="$(echo "$patch_parts" | awk '{$NF=""; print}' | __rvm_strip)"
+  done
+}
+
 # Query the rvm key-value database for a specific key
 # Allow overrides from user specifications in $rvm_config_path/user
 __rvm_db() {
@@ -158,7 +169,7 @@ __rvm_cleanup_variables() {
 
   if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_ruby_aliases rvm_patch_names
 }
 
 # Unset ruby-specific variables
@@ -194,15 +205,12 @@ __rvm_18_compat_ruby() {
 __rvm_ensure_has_18_compat_ruby() {
   if [[ -z "$(__rvm_18_compat_ruby)" ]]; then
     # TODO: install currently doesn't return the correct status.
-    original_ruby="$(__rvm_environment_identifier)"
     local compat_result=0
-    if ! $rvm_bin_path/rvm install 1.8.7; then
+    if ! ( rvm install 1.8.7 ); then
       $rvm_scripts_path/log "fatal" "To proceed rvm requires a 1.8-compatible ruby is installed. We attempted to install 1.8.7 automatically but it failed."
       $rvm_scripts_path/log "fatal" "Please install it manually (or a compatible alternative) to proceed."
       compat_result=1
     fi
-    __rvm_unset_ruby_variables
-    __rvm_become "$original_ruby"
     unset original_ruby
     return $compat_result
   fi
@@ -708,6 +716,11 @@ __rvm_ensure_has_enviroment_files() {
   fi
 }
 
+# Strip whitespace and normalize it all.
+__rvm_strip() {
+  sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -e 's/[[:space:]]\{1,\}/ /g'
+}
+
 __rvm_using_gemset_globalcache() {
   $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" | grep -q '^true$'
 }

data/scripts/wrapper

@@ -7,7 +7,7 @@ unset rvm_default_flag rvm_wrapper_name
 source "$rvm_scripts_path/base"
 
 full_binary_name() {
-  echo "$binary_name" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
+  echo "$binary_name" | __rvm_strip 
 }
 
 wrap() {
@@ -61,7 +61,7 @@ ruby_string="$1"; shift
 prefix="$1"
 if [[ -n "$1" ]]; then shift; fi
 
-binaries="$(echo "$@" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
+binaries="$(echo "$@" | __rvm_strip)"
 
 if [[ 'system' == '$ruby_string' ]]; then
   $rvm_scripts_path/log "error" "Wrapper can't be called with system rubies - sorry!"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 73
   prerelease: false
   segments: 
   - 0
   - 1
-  - 40
-  version: 0.1.40
+  - 41
+  version: 0.1.41
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -04:00
+date: 2010-07-08 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -102,11 +102,14 @@ files:
 - scripts/log
 - scripts/maglev
 - scripts/manage
+- scripts/manpages
 - scripts/match
 - scripts/md5
 - scripts/monitor
 - scripts/notes
 - scripts/package
+- scripts/patches
+- scripts/patchsets
 - scripts/rubygems
 - scripts/rvm
 - scripts/rvm-install