Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

add ruby-2.0.0-rc1, clean reading patch_level from db, improve detect…

…ing best ruby
  • Loading branch information...
commit f9a9b7a3451419a298917c231e5abce89a08297f 1 parent e129be0
@mpapis mpapis authored
View
18 config/db
@@ -2,9 +2,8 @@
niceness=0
# Rubies
interpreter=ruby
-ruby_version=1.9.3
+default_ruby=ruby
ruby_configure_flags=--enable-shared --disable-install-doc
-ruby_patchlevel=362
ruby_configure=--enable-shared
tcs_repo_url=git://github.com/thecodeshop/ruby.git
tcs_repo_branch=trunk
@@ -21,13 +20,14 @@ ruby_1.7_url=http://ftp.ruby-lang.org/pub/ruby/1.7
ruby_1.8_url=http://ftp.ruby-lang.org/pub/ruby/1.8
ruby_1.9_url=http://ftp.ruby-lang.org/pub/ruby/1.9
ruby_2.0_url=http://ftp.ruby-lang.org/pub/ruby/2.0
-ruby_2.0.0_patch_level=review2
-ruby_1.9.3_patch_level=362
-ruby_1.9.2_patch_level=320
-ruby_1.9.1_patch_level=431
-ruby_1.8.7_patch_level=371
-ruby_1.8.6_patch_level=420
-ruby_1.8.5_patch_level=231
+ruby_version=1.9.3
+ruby_2.0.0_patch_level=rc1
+ruby_1.9.3_patch_level=p362
+ruby_1.9.2_patch_level=p320
+ruby_1.9.1_patch_level=p431
+ruby_1.8.7_patch_level=p371
+ruby_1.8.6_patch_level=p420
+ruby_1.8.5_patch_level=p231
rubygems_url=http://production.cf.rubygems.org/rubygems
rubygems_repo_url=git://github.com/rubygems/rubygems.git
rubygems_version=latest-1.8
View
2  config/known
@@ -9,7 +9,7 @@
[ruby-]1.9.3-p327
[ruby-]1.9.3[-p362]
[ruby-]1.9.3-head
-[ruby-]2.0.0-preview2
+[ruby-]2.0.0-rc1
ruby-head
# GoRuby
View
1  config/md5
@@ -136,6 +136,7 @@ ruby-1.9.3-p327.tar.bz2=7d602aba93f31ceef32800999855fbca
ruby-1.9.3-p362.tar.bz2=13c26ea368d88a560f07cc8c5eb4fa05
ruby-2.0.0-preview1.tar.bz2=47a0f662f0e258aa1c5e429c310861b3
ruby-2.0.0-preview2.tar.bz2=a645a783c3302cc094a9963a5e700a4d
+ruby-2.0.0-rc1.tar.bz2=24cebdda11e01ff4889ac983cd7dc02c
ruby-enterprise-1.8.6-20080507.tar.gz=17e3c52e73e42809f57ad0000a6cb4ab
ruby-enterprise-1.8.6-20080621.tar.gz=626fc3811eee2dc92ac27ea63d37a8b2
ruby-enterprise-1.8.6-20080623.tar.gz=0bf8a3a93c6b37bb1260cc09b05e81fd
View
7 scripts/functions/manage/ruby
@@ -208,9 +208,14 @@ ruby_install()
# 1.9.3 provides a patch to compile better with LLVM
if [[ ! "${rvm_ruby_string}" =~ "ruby-1.9.3" ]] && (( patches_count > 0 ))
then
+ typeset _default _version _patch
+ _default=$(__rvm_db "default_ruby")
+ _version=$(__rvm_db "${_default}_version")
+ _patch=$(__rvm_db "${_default}_${_version}_patch_level")
+ _version="${_default}-${_version}${_patch:+-}${_patch:-}"
rvm_warn "Please be aware that you just installed a ruby that requires ${patches_count} patches just to be compiled on up to date linux system.
This may have known and unaccounted for security vulnerabilities.
-Please consider upgrading to Ruby $(__rvm_db "ruby_version")-$(__rvm_db "ruby_patchlevel") which will have all of the latest security patches."
+Please consider upgrading to ${_version} which will have all of the latest security patches."
fi
return ${result:-0}
View
36 scripts/selector
@@ -947,41 +947,11 @@ __rvm_ruby_string()
rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_user_tag}"
else
- patch_level="$(
- __rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level"
+ rvm_ruby_patch_level="$(
+ __rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level"
)"
-
- if [[ -n "${patch_level:-""}" ]]
- then
- case "$rvm_ruby_interpreter" in
- ree|kiji|rbx)
- # REE, Kiji & Rubinius use dates for their patch levels.
- rvm_ruby_patch_level="${patch_level}"
- ;;
- *)
- # MRI uses -pN+ to specify the patch level.
- rvm_ruby_patch_level="p${patch_level}"
- ;;
- esac
-
- fi
-
if [[ -n "${rvm_ruby_patch_level:-""}" ]]
- then
- rvm_ruby_patch_level="${rvm_ruby_patch_level/#pp/p}"
- rvm_ruby_patch_level="${rvm_ruby_patch_level/#prc/rc}"
- rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
-
- case "$rvm_ruby_interpreter" in
- (ree|kiji|rbx)
- rvm_ruby_string="${rvm_ruby_string//-p*/-}"
- ;;
-
- (*)
- rvm_ruby_string="${rvm_ruby_string//-pp/-p}"
- rvm_ruby_string="${rvm_ruby_string//-prc/-rc}"
- ;;
- esac
+ then rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
fi
fi
Please sign in to comment.
Something went wrong with that request. Please try again.