Merge branch 'hotfix/1.26.1' into stable

VERSION

@@ -1 +1 @@
-1.26.0
+1.26.1

bin/rvm

@@ -54,6 +54,10 @@ export rvm_is_not_a_shell_function
 # if to prevent fork-bomb
 if source "${rvm_scripts_path:="$rvm_path/scripts"}/rvm"
 then
+  typeset -f rvm >/dev/null 2>&1 || {
+    echo "RVM not loaded, aborting." >&2
+    exit 1
+  }
   rvm "$@"
 else
   echo "Error sourcing RVM!"  1>&2

bin/rvm-auto-ruby

@@ -48,6 +48,10 @@ else
   echo "Unable to detect rvm, please manually set the rvm_path env variable." >&2
   exit 1
 fi
+typeset -f rvm >/dev/null 2>&1 || {
+  echo "RVM not loaded, aborting." >&2
+  exit 1
+}
 
 [[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
 

bin/rvm-exec

@@ -58,12 +58,22 @@ if [[ -n "$1" && ! -f "$1" && -n "$(echo "$1" | GREP_OPTIONS="" \grep -v '^-')"
 fi
 
 rvm_shell_rvm_path="$(__rvm_shell_lookup_script)"
-if [[ -n "$rvm_shell_rvm_path" ]]; then
+if
+  [[ -n "$rvm_shell_rvm_path" ]]
+then
   source "$rvm_shell_rvm_path"
+  typeset -f rvm >/dev/null 2>&1 || {
+    echo "RVM not loaded, aborting." >&2
+    exit 1
+  }
   # Setup as expected.
-  if [[ -n "$rvm_shell_ruby_string" ]]; then
+  if
+    [[ -n "$rvm_shell_ruby_string" ]]
+  then
       rvm "$rvm_shell_ruby_string"
-      if [[ "$?" -gt 0 ]]; then
+      if
+        [[ "$?" -gt 0 ]]
+      then
         echo "Error: RVM was unable to use '$rvm_shell_ruby_string'" 1>&2
         exit 1
       fi

bin/rvm-shell

@@ -68,6 +68,10 @@ if
   [[ -n "$rvm_path" && -f "$rvm_scripts_path/rvm" ]]
 then
   source "$rvm_scripts_path/rvm"
+  typeset -f rvm >/dev/null 2>&1 || {
+    echo "RVM not loaded, aborting." >&2
+    exit 1
+  }
   # Setup as expected.
   if
     [[ -n "$rvm_shell_ruby_string" ]]

binscripts/rvm-installer

@@ -286,17 +286,17 @@ install_release()
   typeset _source _sources _url _version _verify_pgp
   _sources=(${!1})
   _version=$2
-  _verify_pgp=""
   debug "Downloading RVM version ${_version}"
   for _source in "${_sources[@]}"
   do
     case ${_source} in
       (bitbucket.org*)
-        _url=https://${_source}/get/${_version}.tar.gz
+        _url="https://${_source}/get/${_version}.tar.gz"
+        _verify_pgp="https://${_source}/downloads/${_version}.tar.gz.asc"
         ;;
       (*)
-        _url=https://${_source}/archive/${_version}.tar.gz
-        _verify_pgp=https://${_source}/releases/download/${_version}/${_version}.tar.gz.asc
+        _url="https://${_source}/archive/${_version}.tar.gz"
+        _verify_pgp="https://${_source}/releases/download/${_version}/${_version}.tar.gz.asc"
         ;;
     esac
     get_and_unpack "${_url}" "rvm-${_version}.tgz" "$_verify_pgp" && return
@@ -402,17 +402,27 @@ verify_package_pgp()
     log "GPG verified '$1'"
   else
     typeset _ret=$?
-    log "GPG signature verification failed for '$1' - '$3'!
+    log "\
+Warning, RVM 1.26.0 introduces signed releases and \
+automated check of signatures when GPG software found.
+Assuming you trust Michal Papis import the mpapis public \
+key (downloading the signatures).
+
+GPG signature verification failed for '$1' - '$3'!
 try downloading the signatures:
 
-    ${rvm_gpg_command##*/} --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
+    ${SUDO_USER:+sudo }${rvm_gpg_command##*/} --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
+
+or if it fails:
 
-they can be compared with:
+    command curl -sSL https://rvm.io/mpapis.asc | ${SUDO_USER:+sudo }${rvm_gpg_command##*/} --import -
+
+the key can be compared with:
 
     https://rvm.io/mpapis.asc
     https://keybase.io/mpapis
 "
-    return _ret
+    exit $_ret
   fi
 }
 
@@ -437,7 +447,7 @@ but no GPG software exists to validate it, skipping."
     return 0
   }
 
-  verify_package_pgp "${rvm_archives_path}/$2" "${rvm_archives_path}/$2.asc" "$1" || return $?
+  verify_package_pgp "${rvm_archives_path}/$2" "${rvm_archives_path}/$2.asc" "$1"
 }
 
 get_and_unpack()
@@ -769,42 +779,42 @@ follow this link for details how to fix:
 
 rvm_install_select_and_get_version()
 {
+  typeset _version_release
+
   for dir in "$rvm_src_path" "$rvm_archives_path"
   do
     [[ -d "$dir" ]] || mkdir -p "$dir"
   done
 
+  _version_release="${version}"
   case "${version}" in
     (head)
-      echo "${branch}" > "$rvm_path/RELEASE"
+      _version_release="${branch}"
       install_head sources[@] ${branch:-master} || exit $?
       ;;
 
     (latest)
-      echo "${version}" > "$rvm_path/RELEASE"
       install_release sources[@] $(fetch_version sources[@]) || exit $?
       ;;
 
     (latest-minor)
-      echo "${version}" > "$rvm_path/RELEASE"
       version="$(\cat "$rvm_path/VERSION")"
       install_release sources[@] $(fetch_version sources[@] ${version%.*}) || exit $?
       ;;
 
     (latest-*)
-      echo "${version}" > "$rvm_path/RELEASE"
       install_release sources[@] $(fetch_version sources[@] ${version#latest-}) || exit $?
       ;;
 
     (+([[:digit:]]).+([[:digit:]]).+([[:digit:]])) # x.y.z
-      echo "version" > "$rvm_path/RELEASE"
       install_release sources[@] ${version} || exit $?
       ;;
 
     (*)
       fail "Something went wrong, unrecognized version '$version'"
       ;;
   esac
+  echo "${_version_release}" > "$rvm_path/RELEASE"
 }
 
 rvm_install_main()

binscripts/rvm-installer.asc

@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAABAgAGBQJUUN2YAAoJEOIGwp+/BP8XbSUP/R+G+XDc2bH4yQMLt9otZKga
-awwq0SFl82wqc3PCN3wxk3npSSnl4QRzsk5C6mBlWldwU+0t8xEbNY2pjQsyL+mP
-eXK5oQurtOWMSM/dTjxv1hM5bM3FZN5VtDhockhi5hZpNAxbvaOLIwKUf75rgMvx
-5SGnTgjEov2URfDMuf+efWv8k5MtP5gZoE33tom4jXJgx7XiQjJt87UEqOMvdr98
-kTJmvIgIX6urIuggKWgnfVRXdGSuFTjlISt5JNn1PQrafA1YvCYiJ4YC9ULIVpAa
-plfVdH6A1rmE0PDQhf0EoGqEa2mEjlZbQHlnuchooLYTmB88lGSb5ZoJpZwXeTrE
-/HTpHvMvIMo2dYPNAQJ4TWSC8kikwpMunruP3XUdi7nB+8HRx2T1OkIJtVZcEL2K
-kLiFXnEGAlSAwdFnsadXC1ZYjFmIMlLQS44ajIESVlV/W88m0mAqP+3jQtUEuc7x
-qY3eWwn1LU9j0maTaZIqKB+tmVtg2ibuHbiHUQzxdkC1zpuRxyR3cVRXfJRSgTvf
-lMEVb2QINHjBNLU9m7u8rjVo/J3GPtK5+SL1oQ9JY/STdgaCHyuHCTJ8HLQ5jEv0
-pZ2HB06Rrl2rtBz0VJ7HJYwJzaOqcjXOCshSNWmRhgK/eB8lkKHcIcO3m1CpzLJa
-19qXP+hiV+UR5ci6N7ry
-=0YI8
+iQIcBAABAgAGBQJUXmL3AAoJEOIGwp+/BP8XZYAQAIFDRTMUww09VHS1rhbq9hHU
+TDunUCrxMXsnNOmT4LMW+aTx8X3uXQDvj4HNd5rqTJaO9VvTAnDqYFwegGPTwQKP
+4RR8SmyAROqw64A219kYtuaqxQgNeOvVBCtXsSGylsJlh5/RC7QXjjoPdECckSA8
+KnkJp0AQZYJrruHbjFqiQh6hmpmnWCox762VxwsiAXms/8XU+UGkA+WJPfslrPkS
+OXGnJOsfX6MA6sRV0258hwEq4nh44Tp3zkL7D2b/YEoUvmEzQ9lqqtFnBGaatn1a
+ktyeRaLaZCjqhvYaajgWvamD3/yxdlKcvISJIchwzqxX3GoTKxuAjrdfnXHUGI6A
+QF/wadnWDZ7eNStOYRr7mkIB9l8Y7KllMZRYM36q5cGvjS3ec7x+9fGERMCsZLDw
+O7GjwGz14RICfjCCbtLK8BOvBW53k7kHBsmY+WT+A/4C9cM0KSUvwTP20dH2Cg5m
+cbDph7MaK6ecdCK72Ref+JZzT2rV230L5a4KSehir2Yd+dI3drGRE2yVD0nL0Dhn
+g+RgTHXyK2ZmRDt2i6IcxHKzv1nCEjO76nTg3+SqBtvxsey9r0y/g1p4Xn/X7lkT
+zoLAMO9LMqWZ33ZeOKA1rPG1PYxusR5jmIQaY8159ZHEzuTVA5hbygi5HfRVZyew
+GtUxTqrMsFcbyz2v2663
+=TAQ2
 -----END PGP SIGNATURE-----

config/db

@@ -3,10 +3,6 @@ niceness=0
 # Rubies
 interpreter=ruby
 default_ruby=ruby
-tcs_repo_url=git://github.com/thecodeshop/ruby.git
-tcs_repo_branch=trunk
-jamesgolick_repo_url=git://github.com/jamesgolick/ruby.git
-jamesgolick_repo_branch=tcs-ruby_1_9_3
 ruby_repo_url=git://github.com/ruby/ruby.git
 ruby_url=http://cache.ruby-lang.org/pub/ruby
 ruby_url_fallback_1=http://ftp.ruby-lang.org/pub/ruby
@@ -63,8 +59,6 @@ ree_1.8.7_url=http://rubyenterpriseedition.googlecode.com/files
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187-330
 ree_1.8.7_patch_level=2012.02
 ree_1.8.7_2010.02_url=http://rubyforge.org/frs/download.php/71096
-kiji_repo_url=git://github.com/twitter/rubyenterpriseedition187-248.git
-kiji_version=head
 mruby_repo_url=git://github.com/mruby/mruby.git
 mruby_url=https://github.com/mruby/mruby/archive
 mruby_version=1.0.0

config/known

@@ -11,20 +11,7 @@
 [ruby-]2.1-head
 ruby-head
 
-# GoRuby
-goruby
-
-# Topaz
-topaz
-
-# TheCodeShop - MRI experimental patches
-tcs
-
-# jamesgolick - All around gangster
-jamesgolick
-
-# Minimalistic ruby implementation - ISO 30170:2012
-mruby[-head]
+# for forks use: rvm install ruby-head-<name> --url https://github.com/github/ruby.git --branch 2.1
 
 # JRuby
 jruby-1.6.8
@@ -38,12 +25,21 @@ rbx-2.1.1
 rbx[-2.2.10]
 rbx-head
 
+# Opal
+opal
+
+# Minimalistic ruby implementation - ISO 30170:2012
+mruby[-head]
+
 # Ruby Enterprise Edition
 ree-1.8.6
 ree[-1.8.7][-2012.02]
 
-# Kiji
-kiji
+# GoRuby
+goruby
+
+# Topaz
+topaz
 
 # MagLev
 maglev[-head]
@@ -56,9 +52,6 @@ macruby[-0.12]
 macruby-nightly
 macruby-head
 
-# Opal
-opal
-
 # IronRuby
 ironruby[-1.1.3]
 ironruby-head

config/pre_commit.yml

@@ -0,0 +1,5 @@
+---
+:checks_add:
+- :gpg
+:checks_remove:
+- :rails

patchsets/ruby/1.9.3/head/railsexpress

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

patchsets/ruby/1.9.3/p550/railsexpress

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

patchsets/ruby/2.0.0/head/railsexpress

@@ -2,4 +2,3 @@ https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/
 https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/head/railsexpress/02-railsexpress-gc.patch
 https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/head/railsexpress/03-display-more-detailed-stack-trace.patch
 https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/head/railsexpress/04-show-full-backtrace-on-stack-overflow.patch
-https://raw.githubusercontent.com/skaes/rvm-patchsets/master/patches/ruby/2.0.0/head/railsexpress/05-fix-missing-c-return-event.patch

patchsets/ruby/2.0.0/p594/railsexpress

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

patchsets/ruby/2.1.4/railsexpress

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

scripts/cli

@@ -353,13 +353,18 @@ __rvm_parse_args()
             rvm_ruby_strings="$rvm_token"
             ;;
 
-          opal*|jruby*|ree*|kiji*|macruby*|rbx*|rubinius*|goruby|mruby|ironruby*|default*|maglev*|topaz*|tcs*|jamesgolick*|ruby*|system|default|all)
+          opal*|jruby*|ree*|macruby*|rbx*|rubinius*|goruby|mruby|ironruby*|default*|maglev*|topaz*|ruby*|system|default|all)
             rvm_action="${rvm_action:-use}"
             rvm_ruby_interpreter="$rvm_token"
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
             ;;
 
+          kiji*|tcs*|jamesgolick*)
+            rvm_error_message="The $rvm_token was removed from RVM, use: rvm install ruby-head-<name> --url https://github.com/github/ruby.git --branch 2.1"
+            rvm_action="error"
+            ;;
+
           old)
             case "${rvm_action:-action-missing}" in
               remove)