Skip to content

Commit

Permalink
Merge branch 'master' into system-detection-arch-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mpapis committed Apr 8, 2017
2 parents 07bd176 + ccdad53 commit 920b1c0
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 46 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Expand Up @@ -11,11 +11,21 @@
#### Bug fixes:
* Use actual executable test instead of mount|grep noexec for robust noexec detection [\#3933](https://github.com/rvm/rvm/pull/3933)
* "Unknown ruby string (do not know how to handle)" when specifying Ruby version w/a gemset [\#3292](https://github.com/rvm/rvm/issue/3292)
* Fix the required openssl version for ruby 1.8 on OSX [\#3955](https://github.com/rvm/rvm/issue/3955)
* Detect `.` as an alternative to `source` in bash profile warning [\#3960](https://github.com/rvm/rvm/issues/3960)
* Allow users to specify irb history file using IRB.conf[:HISTORY_FILE] [\#3969](https://github.com/rvm/rvm/pull/3969)

#### Upgraded Ruby interpreters:
* Add support for Rubinius 3.72 [\#3934](https://github.com/rvm/rvm/pull/3934)
* Add support for Rubinius 3.72 [\#3934](https://github.com/rvm/rvm/pull/3934) and 3.73 [\#3979](https://github.com/rvm/rvm/pull/3979)
* Add support for JRuby 9.1.8.0 [\#3952](https://github.com/rvm/rvm/pull/3952)
* Add support for Ruby 2.4.1 [\#3963](https://github.com/rvm/rvm/pull/3963)
* Upgrade RubyGems to 2.6.11 [\#3962](https://github.com/rvm/rvm/pull/3962)
* Add support for Ruby 2.2.7 [\#3970](https://github.com/rvm/rvm/pull/3970)
* Add support for Ruby 2.3.4 [\#3973](https://github.com/rvm/rvm/pull/3973)

#### Binaries:
* Ubuntu x64 binary for Ruby 2.4.1 [\#3965](https://github.com/rvm/rvm/issues/3965)
* Ubuntu x64 binary for Ruby 2.2.7 [\#3971](https://github.com/rvm/rvm/issues/3971)

## [1.29.1](https://github.com/rvm/rvm/tag/1.29.1)

Expand Down
4 changes: 2 additions & 2 deletions config/db
Expand Up @@ -77,7 +77,7 @@ ruby_unmaintained_date=2016-02-24
ruby_unmaintained_version=2.0.0
ruby_url=https://cache.ruby-lang.org/pub/ruby
ruby_url_fallback_1=https://ftp.ruby-lang.org/pub/ruby
ruby_version=2.4.0
ruby_version=2.4.1
#
# REE
#
Expand Down Expand Up @@ -107,7 +107,7 @@ rbx_1.2.4_patch_level=20110705
rbx_2.0.0_url=https://s3.amazonaws.com/releases.rubini.us
rbx_repo_url=https://github.com/rubinius/rubinius.git
rbx_url=https://s3.amazonaws.com/asset.rubini.us
rbx_version=3.72
rbx_version=3.73
#
# MRuby
#
Expand Down
6 changes: 3 additions & 3 deletions config/known
Expand Up @@ -6,9 +6,9 @@
[ruby-]1.9.3[-p551]
[ruby-]2.0.0[-p648]
[ruby-]2.1[.10]
[ruby-]2.2[.6]
[ruby-]2.3[.3]
[ruby-]2.4[.0]
[ruby-]2.2[.7]
[ruby-]2.3[.4]
[ruby-]2.4[.1]
ruby-head

# for forks use: rvm install ruby-head-<name> --url https://github.com/github/ruby.git --branch 2.2
Expand Down
4 changes: 4 additions & 0 deletions config/known_strings
Expand Up @@ -158,6 +158,7 @@ rbx-2.5.8
rbx-3.70
rbx-3.71
rbx-3.72
rbx-3.73
ree-1.8.6-20080507
ree-1.8.6-20080621
ree-1.8.6-20080623
Expand Down Expand Up @@ -276,14 +277,17 @@ ruby-2.2.3
ruby-2.2.4
ruby-2.2.5
ruby-2.2.6
ruby-2.2.7
ruby-2.3.0-preview1
ruby-2.3.0-preview2
ruby-2.3.0
ruby-2.3.1
ruby-2.3.2
ruby-2.3.3
ruby-2.3.4
ruby-2.4.0-preview1
ruby-2.4.0-preview2
ruby-2.4.0-preview3
ruby-2.4.0-rc1
ruby-2.4.0
ruby-2.4.1
6 changes: 6 additions & 0 deletions config/md5
Expand Up @@ -560,11 +560,13 @@ https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.1.5.tar
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.1.9.tar.bz2=1c9787ca23ab930330fb2c24bafa3330
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.5.tar.bz2=c2ff70014815b5840f3de53706e37d18
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.6.tar.bz2=5884019c484888c2455fef33b300f80c
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.7.tar.bz2=abefdec3485bbfff4a4a985c85bf2315
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.0.tar.bz2=928f951e46c85c533fd5f1f6e1210a2f
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.1.tar.bz2=0a10f47d0182ca8e3df4fa7017255308
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.2.tar.bz2=37e2d33082d944488d8ac1ca03c652b5
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.3.tar.bz2=74478a06e4b9ed90475a42c36edd5981
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.4.0.tar.bz2=08d064ed710c18bd7dedb11580bb183d
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.4.1.tar.bz2=1e95a7cc99b0b4594c33a2e21780a245
https://s3.amazonaws.com/jruby.org/downloads/1.7.0/jruby-bin-1.7.0.tar.gz=21861e0ecdbf48cda713c8ade82fdddb
https://s3.amazonaws.com/jruby.org/downloads/1.7.1/jruby-bin-1.7.1.tar.gz=86e659863541d8b987cb7bfbe3b4cfb0
https://s3.amazonaws.com/jruby.org/downloads/1.7.2/jruby-bin-1.7.2.tar.gz=6ec9293b6dffd1e8ee57e9b7c6d18cbe
Expand Down Expand Up @@ -830,17 +832,20 @@ ruby-2.2.3.tar.bz2=f49a734729a71774d4a94a9a603114b2
ruby-2.2.4.tar.bz2=c3d65f6d2ebe90dda81a37885ea244f5
ruby-2.2.5.tar.bz2=0c7edd1ff3650c3b74da2efaf641bf34
ruby-2.2.6.tar.bz2=3d13cf447142b8a11cd9beb7bc63fee0
ruby-2.2.7.tar.bz2=ca7224d80c08b015bc3b8c226d0914c3
ruby-2.3.0-preview1.tar.bz2=776000d74ec6dd34bf355ff6921c8311
ruby-2.3.0-preview2.tar.bz2=3ad442ccb337e77e4acaa4113f25b76a
ruby-2.3.0.tar.bz2=f0d9f9bbdc87372ca98988a571875819
ruby-2.3.1.tar.bz2=c194281f63d7fcd816747fe78474be5e
ruby-2.3.2.tar.bz2=9d00f3772f1c8fa5eecdfea089e3032f
ruby-2.3.3.tar.bz2=04b9c461a2bc1eec0535ad1947cad4fb
ruby-2.3.4.tar.bz2=99961e97566aee6d63635e2da4cf73ac
ruby-2.4.0-preview1.tar.bz2=64b8983b5f53d053906e394f734aa296
ruby-2.4.0-preview2.tar.bz2=1074e8dea5baa89af7f7c2d1d2b9ebaa
ruby-2.4.0-preview3.tar.bz2=9f767e6bc61830735ea7dc9cd5a63653
ruby-2.4.0-rc1.tar.bz2=0f8b665acf4e883334adc121a42a206f
ruby-2.4.0.tar.bz2=98f29161860fe1b6c65396717847a358
ruby-2.4.1.tar.bz2=07b2ae5d2f46321c95b37066c8415900
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
Expand Down Expand Up @@ -949,6 +954,7 @@ rubygems-2.2.0.rc.1.tgz=f7d80b612339169569f2675155c202f1
rubygems-2.2.0.tgz=3c16e50673adb99d1ce76d5231f764bd
rubygems-2.4.8.tgz=dc77b51449dffe5b31776bff826bf559
rubygems-2.6.10.tgz=ab5a0028d2a0653691b29d7463bd0892
rubygems-2.6.11.tgz=8d514b836fcf3ae2c20b4fe8d5cdc3c5
yaml-0.1.4.tar.gz=36c852831d02cf90508c29852361d01b
zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
zlib-1.2.5.tar.gz=c735eab2d659a96e5a594c9e8541ad63
4 changes: 3 additions & 1 deletion config/remote
Expand Up @@ -534,8 +534,10 @@ https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.1.5.tar
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.1.9.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.5.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.6.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.7.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.0.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.1.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.2.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.3.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.4.0.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.4.0.tar.bz2
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.4.1.tar.bz2
6 changes: 6 additions & 0 deletions config/sha512
Expand Up @@ -538,11 +538,13 @@ https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.1.5.tar
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.1.9.tar.bz2=87ea2ae655c38d6653f82b8cc14fcedbe2842b55d10adba697a0f03a379d7c8a984e50760948a916c5099387c8ec1de8c15e7e5335a2f05cd384de603bce2f3a
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.5.tar.bz2=a665acffc149959b4c766059611b8bfc55f3153efcc29c58893646b31312fde894fabff3343e0e121689fdc52ce633175526e3a54f0bd6f2cef7407ba36026a7
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.6.tar.bz2=364377d5f7f4c2187e1f5d823deacfd8afceefee8cce2effe4d127da8b0f165663c2b8c0a15250969d739c58286625e761b9a0127fa29b427c1cae9deb3acbaf
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.2.7.tar.bz2=711e2358dd0d2c171e10c580f6789739af44735b76857b9c97af1cb1e2e149e563042a81efb8e3eb5de6be1f5d698d89767811cea94a6cdbc6b9a08f74fd8fb4
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.0.tar.bz2=866dca3ef7ffa1123d9866aa5aa9fbbd4cda847b91690183b3c8f49f017b4907286a7d114aeb4060ec6c9339c6804f1f22d4744c18c2786df752f2103731d266
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.1.tar.bz2=ccd3c02c84a03ffe889407828556a958fb8dadf8532c70ae6ebf82578906eb8906dd86a4dba790b067a9004c612fc0928f1270b889ca52d19e54ee9482b519c4
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.2.tar.bz2=d93e8996557d78f0b424f300d4d7aaeb78f467e07cb0ffdf819bfed4d70934ea19fa3f9098f57f1e79775fc8b8be911db9b7fa531a2930735f9c5dc0a9faf42e
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.3.3.tar.bz2=309724b89ab01a9690804ab572b9fc5e14a7d7e3f55a66cd6822375f353a5405aaa809fd3434073078d032a04f837201cc915db255e8b1bd8a8f37436b83f4fc
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.4.0.tar.bz2=8e44a183164b9067223c3c4cc8e98a4b7ca7b58d7a762043a0d82932174dd4087a34f1cd1893e8fe632cb0bb333785a3412d2c65275cdd7b1fd8aa57467182e3
https://rvm_io.global.ssl.fastly.net/binaries/ubuntu/16.04/x86_64/ruby-2.4.1.tar.bz2=2aa07623e101816d0e09a20dee617aaa48c507aa60bd64a3d202e5f217f2ce4a7ebccd6d9bb03d005617a78f4f32ef50f5c41f0683dc6d2fbd097e6910f92f94
https://s3.amazonaws.com/jruby.org/downloads/1.7.0/jruby-bin-1.7.0.tar.gz=1e466a3f8d52b553c9def09827fda4b8433576b0262c40ee505602754521a00defd821d5ead5052be52baf281c6cb080fd03a8b15c628a0ee67b4e417633e5e2
https://s3.amazonaws.com/jruby.org/downloads/1.7.1/jruby-bin-1.7.1.tar.gz=ef28381ca30664cf450f9d3df9927530db771d30e86ebcf535af38e1a7e26724ae2bcfe8487cd2eb349bf609a733a25528aae14beab4d13d298b5604ac7353cc
https://s3.amazonaws.com/jruby.org/downloads/1.7.2/jruby-bin-1.7.2.tar.gz=8155c81eea6743951db7383bd9f6b1750614927c9c0b25a6574f6d64898bb3ada2f626c6e0df6c5486561a03cc7d472fc12fe804ce66a3972d2fe02e3f407100
Expand Down Expand Up @@ -628,14 +630,18 @@ ruby-2.2.3.tar.bz2=795f1b66a6d4f0baef897068899c3a1a4370ce1268618e6a7d6d472023444
ruby-2.2.4.tar.bz2=d27ca2f19c214ce87f906b57edd41f2f8af35b2871c191470facded9cfda15ba46e5c3bc7d5540225a38da6bd65050fcc8aaa4ffbadbb6bf7dc891c1821da0df
ruby-2.2.5.tar.bz2=d3224814361c297bc36646c2e40f63c461ccf5a77fea5a3acdcb2c7ad1705bb229ac6abbd7ad1ae61cbe0fefd7a008c6102568d11366ad3107179302cd3e734e
ruby-2.2.6.tar.bz2=7a93f72d236521ac28c8a0bc0c73cf805797a8813d22e02f42c5fc05dd39f6e422817272e0db6a24c245f6f97ad4b2b412a9a47ac50156ab186df596918a5f34
ruby-2.2.7.tar.bz2=83756cd1c91516962b83961e0de59d858618f7ed3e9795f930aab4f199d47a95ed8f867d8aa9b51d508be26d9babf2140117c88241168bac41e6ef702cfadf20
ruby-2.3.0-preview1.tar.bz2=ae6d46c87f59e1fd3703b76dfc45bfcf208625f95ab9f4559f0b9f7050e8681f1a6e419f5fa06b704c83e56879c3a9ff1337dba443bcfca76fadb49c97d97a93
ruby-2.3.0-preview2.tar.bz2=e397f321d4338edba8d005d871408775f03d975da90c8abcfdb457a1bc7e6c87efe58c53b2c3bc122e9f58f619767b271bcc8d5d9663ed4b4288c60556e8d288
ruby-2.3.0.tar.bz2=77b707359e754c3616699d21697752741497c719dc3d6fdfb55ed639e76d52560d293ae54cbe5c63be78dc73fbe60f1b8615d704d017bdfe1994aa9747d26a6c
ruby-2.3.1.tar.bz2=a8659b96a3a481a3dbdbb6997eb18ff1f8cd926a9707a90d071e937315c21d372c89252f0d44732ae5007d2678fda8c8fbceafa4e4b4ff500d236fb796284d8d
ruby-2.3.2.tar.bz2=78699bae5b0a2382a58f9d51f7d891341f00ad3a90d9ca06b68b1b245cf5acebc3a82133e39bf6a412ac999a5c0f778a0dab177c2569ffbee085ffff6f6ec38e
ruby-2.3.3.tar.bz2=88f7782effd35bfe0b4c33140b5eb147d09b63fbb35b9c42d2200c010f387e2b70984ead1eca86569e8ec31f08b35289d440c0ca76b662dadb760f848e863d91
ruby-2.3.4.tar.bz2=ad1f16142615498232d0de85149585be1d2c5de2bc40ec160d272a09e098ef6f317d8b25026001735261fd1c5bc0d1f8513a8474e89f0d86eed5b2fe7338d64e
ruby-2.4.0-preview1.tar.bz2=c9873e8686eb54dbde61d6e23cd5197beebccd6cb31fd12c82763ebe1fde17095d7514d9d93c2c82b238032c98691df5479dc2d666a8a590e0fc54450ec29cb5
ruby-2.4.0-preview2.tar.bz2=0c9a59a2f57a99c4ee8539a30f41da1de7547566203f89d856e1be9dbb44365754e6c470145dc9336eb324e0feb2f53d9fef18a1564968ac21f9ee528905949f
ruby-2.4.0-preview3.tar.bz2=6602c65a7b1e3bc680acc48217108f4335e84fdd74a9cf06f2e2f9ad00a2fccacf9fa035a912bc9d5cc3f0c7a5e21475971dfac37b0364311ef3645f25c7ddf9
ruby-2.4.0-rc1.tar.bz2=b43902ac7794487197df55a45256819d2e7540b77f1ed4eb68def3e0473ee98860a400862075bafadbde74f242e1dfe36a18cd6fe05ac42aae1ea6dddc9978ce
ruby-2.4.0.tar.bz2=bef7bb53f63fb74073d071cc125fb67b273ed0779ef43c2d2969089b9ca21fff1bd012281c5b748f7a3c24dd26e71730d7248c05a01cb23ab2089eb4d02115fe
ruby-2.4.1.tar.bz2=1c80d4c30ecb51758a193b26b76802a06d214de7f15570f1e85b5fae4cec81bda7237f086b81f6f2b5767f2e93d347ad1fa3f49d7b5c2e084d5f57c419503f74
rubygems-2.6.11.tgz=3b0dd38c0aaf313c59e299dcf54f7bfb6e6d84b8b739573ddaf599e584da45ed7b1465f6521131b32f237e31a4796d9ef455b8be685064b3fd77a0355dfff13e
2 changes: 1 addition & 1 deletion scripts/functions/requirements/osx_brew
Expand Up @@ -315,7 +315,7 @@ requirements_osx_brew_libs_default()

# OpenSSL version depends on the version of Ruby being installed
case "$1" in
(ruby-2.3*|ruby-2.2*|ruby-2.1*|ruby-2.0*|ruby-1.9*)
(ruby-2.3*|ruby-2.2*|ruby-2.1*|ruby-2.0*|ruby-1.9*|ruby-1.8*)
brew_openssl_package="openssl"
;;

Expand Down
39 changes: 4 additions & 35 deletions scripts/irbrc.rb
@@ -1,41 +1,6 @@
# This is the common irbrc file used by all rvm ruby installations.
# This file will be overriden every time you update rvm.

# Turn on completion.
begin
require "readline"

require "irb/completion" rescue nil

# Turn on history saving.
# require "irb/ext/save-history"
# IRB.conf[:HISTORY_FILE] = File.join(ENV["HOME"], ".irb-history")

# Use an alternate way to on history saving until save-history is fixed.
#
# bug: http://redmine.ruby-lang.org/issues/show/1556
# patch: http://pastie.org/513500
#
# This technique was adopted from /etc/irbrc on OS X.
histfile = File.expand_path(".irb-history", ENV["HOME"])

if File.exist?(histfile)
lines = IO.readlines(histfile).collect { |line| line.chomp }
Readline::HISTORY.push(*lines)
end

Kernel::at_exit do
maxhistsize = 100
histfile = File::expand_path(".irb-history", ENV["HOME"])
lines = Readline::HISTORY.to_a.reverse.uniq.reverse
lines = lines[-maxhistsize, maxhistsize] if lines.compact.length > maxhistsize
File::open(histfile, "w+") { |io| io.puts lines.join("\n") }
end

rescue LoadError
puts "Readline was unable to be required, if you need completion or history install readline then reinstall the ruby.\nYou may follow 'rvm notes' for dependencies and/or read the docs page https://rvm.io/packages/readline/ . Be sure you 'rvm remove X ; rvm install X' to re-compile your ruby with readline support after obtaining the readline libraries."
end

# Calculate the ruby string.
rvm_ruby_string = ENV["rvm_ruby_string"] ||
(
Expand Down Expand Up @@ -64,6 +29,10 @@
IRB.conf[:PROMPT][:RVM] = @prompt
IRB.conf[:PROMPT_MODE] = :RVM if IRB.conf[:PROMPT_MODE] == :DEFAULT

require "irb/completion" rescue nil

IRB.conf[:SAVE_HISTORY] = 100

# Load the user's irbrc file, if possible.
# Report any errors that occur.
begin
Expand Down
5 changes: 2 additions & 3 deletions scripts/notes
Expand Up @@ -201,11 +201,10 @@ $notes_type Notes:
if
[[ -f "${__var}" ]]
then
__rvm_grep 'source.*profile' "${__var}" >/dev/null 2>&1 ||
__rvm_grep -E '(source|\.).+profile' "${__var}" >/dev/null 2>&1 ||
{
important_message "
* WARNING: You have '~/.profile' file, you might want to load it,
to do that add the following line to '${__var}':
* WARNING: '~/.profile' file found. To load it into your shell, add the following line to '${__var}':
source ~/.profile
"
Expand Down

0 comments on commit 920b1c0

Please sign in to comment.