Merge branch 'hotfix/1.26.2' into stable

VERSION

@@ -1 +1 @@
-1.26.1
+1.26.2

config/db

@@ -9,10 +9,10 @@ ruby_url_fallback_1=http://ftp.ruby-lang.org/pub/ruby
 ruby_url_fallback_2=http://www.mirrorservice.org/sites/ftp.ruby-lang.org/pub/ruby
 unmaintained_ruby=1.9.3
 unmaintained_date=2014-02-23
-ruby_version=2.1.4
+ruby_version=2.1.5
 ruby_2.2.0_patch_level=preview1
-ruby_2.0.0_patch_level=p594
-ruby_1.9.3_patch_level=p550
+ruby_2.0.0_patch_level=p598
+ruby_1.9.3_patch_level=p551
 ruby_1.9.2_patch_level=p330
 ruby_1.9.1_patch_level=p431
 ruby_1.8.7_patch_level=head
@@ -79,7 +79,7 @@ ironruby_1.1.3_url=http://download-codeplex.sec.s-msft.com/Download/Release?Proj
 topaz_version=head
 topaz_repo_url=git://github.com/topazproject/topaz.git
 topaz_url=http://builds.topazruby.com
-rvm_remote_server_url=https://rvm.io/binaries
+rvm_remote_server_url=https://rvm_io.global.ssl.fastly.net/binaries
 rvm_remote_server_url1=https://s3.amazonaws.com/jruby.org
 rvm_remote_server_path1=downloads
 rvm_remote_server_url2=http://binaries.rubini.us

config/known

@@ -3,11 +3,10 @@
 [ruby-]1.8.7[-head] # security released on head
 [ruby-]1.9.1[-p431]
 [ruby-]1.9.2[-p330]
-[ruby-]1.9.3[-p550]
-[ruby-]2.0.0-p576
-[ruby-]2.0.0[-p594]
-[ruby-]2.1.3
-[ruby-]2.1[.4]
+[ruby-]1.9.3[-p551]
+[ruby-]2.0.0[-p598]
+[ruby-]2.1.4
+[ruby-]2.1[.5]
 [ruby-]2.1-head
 ruby-head
 

config/known_strings

@@ -15,6 +15,6 @@ ruby-1.8.6-p420
 ruby-1.8.7-head
 ruby-1.9.1-p431
 ruby-1.9.2-p330
-ruby-1.9.3-p550
-ruby-2.0.0-p594
-ruby-2.1.4
+ruby-1.9.3-p551
+ruby-2.0.0-p598
+ruby-2.1.5

docs/alt.md

@@ -2,39 +2,38 @@
 
 Other implementations allowing to switch ruby environment:
 
+- https://github.com/postmodern/chruby (Shell)
+- https://github.com/TomFreudenberg/rvm-mini (Shell)
 - https://github.com/vertiginous/pik (Windows)
-- https://github.com/kwatch/versionswitcher
-- https://github.com/wilmoore/ruby-version
-- https://github.com/postmodern/chruby
-- https://bitbucket.org/jonforums/uru
-- https://github.com/sam/rb-switch
-- https://github.com/jayferd/ry
+- https://github.com/kwatch/versionswitcher (Python)
+- https://bitbucket.org/jonforums/uru (Go)
+- https://github.com/jayferd/ry (Shell)
 - https://github.com/terlar/fry (Fish)
-- https://github.com/niw/rubies
-- https://github.com/hmans/rbfu (deprecated http://redd.it/196qri)
-- https://github.com/nmeum/rbi
-- https://github.com/brixen/mkruby
-- https://github.com/nkryptic/sandbox
-- https://github.com/regularfry/gemenv
-- https://github.com/sstephenson/rbenv
-- https://github.com/cpetschnig/switch-ruby
-- https://github.com/mugenken/p5-Ruby-VersionManager (Perl!)
-- http://zentest.rubyforge.org/ZenTest/Multiruby.html (Ruby)
+- https://github.com/niw/rubies (Shell)
+- https://github.com/nkryptic/sandbox (Ruby)
+- https://github.com/regularfry/gemenv (Ruby)
+- https://github.com/sstephenson/rbenv (Shell)
+- https://github.com/cpetschnig/switch-ruby (Ruby)
+- https://github.com/uninets/p5-Ruby-VersionManager (Perl)
+- https://github.com/seattlerb/zentest (Ruby)
 - http://www.dribin.org/dave/blog/archives/2006/01/07/rails_encap/ (Tutorial)
 - http://www.mjwall.com/2008/08/multiple-versions-of-ruby-with-stow/ (Tutorial)
+- https://github.com/hmans/rbfu (Deprecated)
+- https://github.com/wilmoore/ruby-version (Deprecated)
 
 # RVM is not the only Ruby Version Manager
 
 Other implementations allowing to install ruby versions:
 
 - you can use your system to install ruby,
   most distributions come with ruby 1.8 already installed
+- https://github.com/postmodern/ruby-install (Shell)
+- https://github.com/TomFreudenberg/rvm-mini (Shell)
 - https://github.com/vertiginous/pik (Windows)
-- https://github.com/kwatch/versionswitcher
-- https://github.com/jayferd/ry
-- https://github.com/sstephenson/ruby-build
-- https://github.com/mugenken/p5-Ruby-VersionManager (Perl!)
-
+- https://github.com/kwatch/versionswitcher (Python)
+- https://github.com/jayferd/ry (Shell)
+- https://github.com/sstephenson/ruby-build (Shell)
+- https://github.com/uninets/p5-Ruby-VersionManager (Perl)
 
 # RVM IDE support
 

help/cleanup.md

@@ -1,6 +1,6 @@
 ## Usage:
 
-    rvm cleanup {all,archives,repos,sources,logs,gemsets,links}
+    rvm cleanup {all,archives,checksums,repos,sources,logs,gemsets,links}
 
 ## Description:
 

patchsets/ruby/1.9.3/p551/railsexpress

@@ -0,0 +1,19 @@
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/01-fix-make-clean.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/02-zero-broken-tests.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/03-railsbench-gc.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/04-display-more-detailed-stack-trace.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/05-fork-support-for-gc-logging.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/06-track-live-dataset-size.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/07-webrick_204_304_keep_alive_fix.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/09-thread-variables.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/10-faster-loading.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/11-falcon-st-opt.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/12-falcon-sparse-array.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/13-falcon-array-queue.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/14-railsbench-gc-fixes.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/15-show-full-backtrace-on-stack-overflow.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/16-configurable-fiber-stack-sizes.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/17-backport-psych-20.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/18-fix-missing-c-return-event.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/1.9.3/p551/railsexpress/19-fix-process-daemon-call.patch

patchsets/ruby/2.0.0/p598/railsexpress

@@ -0,0 +1,4 @@
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/p598/railsexpress/01-zero-broken-tests.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/p598/railsexpress/02-railsexpress-gc.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/p598/railsexpress/03-display-more-detailed-stack-trace.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/p598/railsexpress/04-show-full-backtrace-on-stack-overflow.patch

patchsets/ruby/2.1.5/railsexpress

@@ -0,0 +1,8 @@
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/01-zero-broken-tests.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/02-improve-gc-stats.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/03-display-more-detailed-stack-trace.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/04-show-full-backtrace-on-stack-overflow.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/05-funny-falcon-stc-density.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/06-funny-falcon-stc-pool-allocation.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/07-aman-opt-aset-aref-str.patch
+https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.1.5/railsexpress/08-funny-falcon-method-cache.patch

scripts/cleanup

@@ -21,6 +21,17 @@ remove_or_log()
   }
 }
 
+empty_or_log()
+{
+  rvm_verbose_log " - emptying - $1"
+  chmod_unless_link "$1" &&
+  echo "" > "$1" ||
+  {
+    : $(( failed_counter+=1 ))
+    rvm_error " - failed emptying $1 - please check ownership and permissions"
+  }
+}
+
 cleanup_single()
 {
   typeset current_path entry
@@ -39,6 +50,12 @@ cleanup_single()
   fi
 }
 
+cleanup_checksums()
+{
+  empty_or_log "${rvm_user_path:-${rvm_path}/user}/md5"
+  empty_or_log "${rvm_user_path:-${rvm_path}/user}/sha512"
+}
+
 cleanup_gemsets()
 {
   typeset current_path ruby_path
@@ -111,7 +128,11 @@ cleanup()
   do
     rvm_log "Cleaning up rvm $1"
     case "$1" in
-      (gemsets|links)
+      (archives)
+        cleanup_checksums
+        cleanup_single $1
+        ;;
+      (checksums|gemsets|links)
         cleanup_$1
         ;;
       (logs)
@@ -130,7 +151,7 @@ cleanup()
 
 failed_counter=0
 case "$1" in
-  archives|repos|sources|tmp|gemsets|logs|links)
+  archives|checksums|repos|sources|tmp|gemsets|logs|links)
     cleanup "$1"
     ;;
   all)

scripts/functions/installer

@@ -1154,7 +1154,7 @@ setup_user_profile_login()
       {
         touch "$profile_file"
         if
-          [[ "$profile_file" == "$HOME/.bash_profile" && -f "$HOME/.profile" ]]
+          [[ "$profile_file" == "$HOME/.bash_"* && -f "$HOME/.profile" ]]
         then
           printf "%b" "
 [[ -s \"\$HOME/.profile\" ]] && source \"\$HOME/.profile\" # Load the default .profile
@@ -1340,6 +1340,11 @@ restore_missing_environments()
         [[ "${ruby_version}" == "*" || -e "$environment_path" ]]
       then
         true
+      elif
+        [[ "${ruby_version}" == "gems" ]]
+      then
+        rvm_out "    Removing unexpected ruby: ${ruby_version}."
+        \command \rm -rf "${ruby_path}"
       elif
         [[ -L "$ruby_path" ]]
       then
@@ -1479,7 +1484,7 @@ configure_autolibs()
   fi
 
   if [[ -x "${rvm_bin_path}/brew" && -L "${rvm_bin_path}/brew" ]]
-  then rm -rf "${rvm_bin_path}/brew"
+  then \command \rm -rf "${rvm_bin_path}/brew"
   fi
 )
 

scripts/functions/manage/base_install

@@ -259,7 +259,7 @@ Continuing with compilation. Please read 'rvm help mount' to get more informatio
       __rvm_check_available_space "${rvm_ruby_string}"
       if
         rvm_verify_downloads_flag=${__rvm_ruby_verify_download_flag} rvm_remote_flag=1 \
-          "${rvm_scripts_path}/mount" mount "${__rvm_ruby_url}" "${rvm_ruby_string}"
+          "${rvm_scripts_path}/mount" mount "${__rvm_ruby_url}" "${rvm_ruby_string}" autodetect
       then
         return 0
       else

scripts/functions/manage/rubinius

@@ -142,6 +142,7 @@ rubinius_install()
   then rvm_ruby_make="CONFIGURE_ARGS=${rvm_configure_args## } "
   fi
 
+  __setup_lang_fallback
   __rvm_log_command rake "$rvm_ruby_string - #compiling" \
     "${rvm_ruby_make:-}$rvm_wrappers_path/$ruby/rake" install --trace ||
     return $?

scripts/functions/rubygems

@@ -167,25 +167,6 @@ __rvm_warn_on_rubyopt()
   fi
 }
 
-rubygems_setup_lang_fallback()
-{
-  if
-    [[ -z "${LANG:-}" ]]
-  then
-    LANG="$(
-      {
-        locale -a | __rvm_grep "^en_US.utf8" ||
-        locale -a | __rvm_grep "^en_US" ||
-        locale -a | __rvm_grep "^en" ||
-        locale -a
-      } 2>/dev/null | \command \head -n 1
-    )"
-    : LANG=${LANG:=en_US.utf-8}
-    export LANG
-    rvm_warn "\$LANG was empty, setting up LANG=$LANG, if it fails again try setting LANG to something sane and try again."
-  fi
-}
-
 rubygems_setup()
 {
   export version="$1"
@@ -257,7 +238,10 @@ rubygems_setup()
   if [[ ${rvm_debug_flag:-0} == 1 || ${rvm_trace_flag:-0} == 1 ]]
   then __command+=( --verbose )
   fi
-  rubygems_setup_lang_fallback
+  if (( ${rvm_docs_flag:-0} == 0 ))
+  then __command+=( --no-document )
+  fi
+  __setup_lang_fallback
   __rvm_log_command "rubygems.install" \
     "$rvm_ruby_string - #installing $rvm_gem_package_name" \
     "${__command[@]}" ||

scripts/functions/support

@@ -467,6 +467,25 @@ __rvm_read_lines()
   fi
 }
 
+__setup_lang_fallback()
+{
+  if
+    [[ -z "${LANG:-}" ]]
+  then
+    LANG="$(
+      {
+        locale -a | __rvm_grep "^en_US.utf8" ||
+        locale -a | __rvm_grep "^en_US" ||
+        locale -a | __rvm_grep "^en" ||
+        locale -a
+      } 2>/dev/null | \command \head -n 1
+    )"
+    : LANG=${LANG:=en_US.utf-8}
+    export LANG
+    rvm_warn "\$LANG was empty, setting up LANG=$LANG, if it fails again try setting LANG to something sane and try again."
+  fi
+}
+
 __rvm_ruby_config_save()
 {
   typeset ruby_path