Merge branch 'hotfix/1.25.28' into stable

CONTRIBUTING.md

@@ -32,7 +32,7 @@ RVM: https://github.com/wayneeseguin/rvm/issues/new
 
 *When in doubt as to whether your issue might relate to another simply file a new bug and
 we will mark it as duplicate if it needs to be.  It's always better to file a new ticket and
-let us sort it out than to accidently add noise to another ticket.*
+let us sort it out than to accidentally add noise to another ticket.*
 
 If you wish to file a bug, the only thing we ask is that you
 provide a [gist](https://gist.github.com) of the command you used and if you are on stable,
@@ -47,7 +47,7 @@ this means that each command and it's output should be in it's own code block.
 
 If you're joining the #rvm channel on [Freenode](http://freenode.net/) to get help with a problem,
 please let us know what's wrong and stick around. Someone will always respond in time.
-If you can't stick around, please file a bug on github or email us via the
+If you can't stick around, please file a bug on GitHub or email us via the
 [google group](https://groups.google.com/forum/?fromgroups#!forum/rubyversionmanager).
 
 ## Filing issues

HACKING.md

@@ -36,7 +36,7 @@ you also need to do:
 
     $ rvm reload
 
-To get back to using orginal rvm installation run:
+To get back to using original rvm installation run:
 
     $ rvm switch ~/.rvm
 
@@ -55,7 +55,7 @@ It should fail.  Now repeat the following steps until the test passes:
     2. run `./install`
     3. re-run the test (you can also manually test via rvm commands on the CLI)
 
-Now `git commit`, `git push` to your github fork, then issue a pull
+Now `git commit`, `git push` to your GitHub fork, then issue a pull
 request, and if it is accepted then your place in hacker heaven is
 secured.
 

VERSION

@@ -1 +1 @@
-1.25.27
+1.25.28

bin/rvm-prompt

@@ -24,9 +24,8 @@ add_raw_token()
 }
 
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
-ruby_string="$( builtin command -v ruby )"
 if
-  [[ "$ruby_string" =~ rvm && "$ruby_string" != "$rvm_path/bin/ruby" ]]
+  [[ "${GEM_HOME:-}" =~ rvm && "$ruby_string" != "$rvm_path/bin/ruby" ]]
 then
   unset format
   while
@@ -55,12 +54,17 @@ then
       add "$default"
     done
   fi
-  # TODO this should be as simple as: ruby_string="${ruby_string%%*(/)bin*(/)ruby}"
-  ruby_string="${ruby_string%/ruby}"
-  ruby_string="${ruby_string%%/}"
-  ruby_string="${ruby_string%/bin}"
-  ruby_string="${ruby_string%%/}"
+  gemset=""
+  ruby_string="${GEM_HOME:-""}"
   ruby_string="${ruby_string##*/}"
+  case "${GEM_HOME:-""}" in
+    (*${rvm_gemset_separator:-"@"}*)
+      if (( ${gemset_flag:-0} ))
+      then gemset="${rvm_gemset_separator:-"@"}${ruby_string##*${rvm_gemset_separator:-"@"}}"
+      fi
+      ruby_string="${ruby_string%%${rvm_gemset_separator:-"@"}*}"
+      ;;
+  esac
   if
     [[ -n "$no_default" && -n "${format:-""}" ]]
   then
@@ -99,15 +103,6 @@ then
     architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
     (( ${architecture_prefix_flag:-0} )) && architecture="-${architecture}"
   fi
-  if
-    (( ${gemset_flag:-0} ))
-  then
-    case "${GEM_HOME:-""}" in
-      (*${rvm_gemset_separator:-"@"}*)
-        gemset="${rvm_gemset_separator:-"@"}${GEM_HOME/*${rvm_gemset_separator:-"@"}/}"
-        ;;
-    esac
-  fi
   if
     (( ${unicode_flag:-0} ))
   then

config/db

@@ -21,6 +21,10 @@ ruby_1.9.1_patch_level=p431
 ruby_1.8.7_patch_level=head
 ruby_1.8.6_patch_level=p420
 ruby_1.8.5_patch_level=p231
+CentOS_5_ruby_1.9.2_patch_level=p320
+CentOS_5_ruby_1.9.2_patch_level_warn=Warning, Centos 5 can not build head version of ruby, falling back to latest patchlevel, your ruby will be less secure bacuase of this.
+CentOS_5_ruby_1.8.7_patch_level=p374
+CentOS_5_ruby_1.8.7_patch_level_warn=Warning, Centos 5 can not build head version of ruby, falling back to latest patchlevel, your ruby will be less secure bacuase of this.
 rubygems_url=http://production.cf.rubygems.org/rubygems
 rubygems_repo_url=git://github.com/rubygems/rubygems.git
 rubygems_version=latest-2.2
@@ -35,7 +39,7 @@ ruby_head_rubygems_version=head
 gem_gem-wrappers_version=>=1.2.4
 gem_gem-empty_version=>=1.0.0
 gem_rdoc_version=>=4.1.1
-rbx_version=2.2.7
+rbx_version=2.2.10
 rbx_1.0.0_patch_level=20100514
 rbx_1.0.1_patch_level=20100603
 rbx_1.1.0_patch_level=20100923
@@ -62,7 +66,7 @@ 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
-jruby_version=1.7.12
+jruby_version=1.7.13
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
 macruby_version=0.12
@@ -106,7 +110,9 @@ mono_url=http://ftp.novell.com/pub/mono/sources/mono
 llvm_url=https://llvm.org/svn/llvm-project/llvm/trunk
 # CentOS / Fedora EPEL
 epel6_key=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
-epel6_rpm=https://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
+epel6_i386_rpm=https://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
+epel6_x86_64_rpm=https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
 epel5_key=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-5
-epel5_rpm=https://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+epel5_i386_rpm=https://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+epel5_x86_64_rpm=https://dl.fedoraproject.org/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
 maven_version=3.1.1

config/known

@@ -28,13 +28,14 @@ mruby[-head]
 
 # JRuby
 jruby-1.6.8
-jruby[-1.7.12]
+jruby[-1.7.13]
 jruby-head
 
 # Rubinius
+rbx-1.3.3
 rbx-2.0.0
 rbx-2.1.1
-rbx[-2.2.7]
+rbx[-2.2.10]
 rbx-head
 
 # Ruby Enterprise Edition

config/known_strings

@@ -1,10 +1,11 @@
 # this strings are matched only when partial version was provided
 jruby-1.5.6
 jruby-1.6.8
-jruby-1.7.12
+jruby-1.7.13
+rbx-1.3.3
 rbx-2.0.0
-rbx-2.1.0
-rbx-2.2.7
+rbx-2.1.1
+rbx-2.2.10
 ree-1.8.6
 ree-1.8.7-2012.02
 maglev-1.0.0