diff options
author | Benoit Daloze <eregontp@gmail.com> | 2019-08-04 14:52:15 +0200 |
---|---|---|
committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-08-16 14:30:23 +0900 |
commit | 2b0f3aa095a410902b9b2e4fb14f909e0630c1a1 (patch) | |
tree | 6901f30fc32837107c3fb1771a49ec9e3cde93e6 /spec/bundler/support | |
parent | 6711343d5a630cc857f0fa503b403edb68415f48 (diff) |
[bundler/bundler] Use the standard RUBY_ENGINE_VERSION instead of JRUBY_VERSION
* RUBY_ENGINE and RUBY_ENGINE_VERSION are defined on every modern Ruby.
* There is no such constant as TRUFFLERUBY_VERSION or RBX_VERSION.
https://github.com/bundler/bundler/commit/f9d910403b
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2366
Diffstat (limited to 'spec/bundler/support')
-rw-r--r-- | spec/bundler/support/hax.rb | 6 | ||||
-rw-r--r-- | spec/bundler/support/platforms.rb | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/spec/bundler/support/hax.rb b/spec/bundler/support/hax.rb index 74daccc9db..4f8d9b89ec 100644 --- a/spec/bundler/support/hax.rb +++ b/spec/bundler/support/hax.rb @@ -53,9 +53,7 @@ class Object remove_const :RUBY_ENGINE RUBY_ENGINE = ENV["BUNDLER_SPEC_RUBY_ENGINE"] - if RUBY_ENGINE == "jruby" - remove_const :JRUBY_VERSION if defined?(JRUBY_VERSION) - JRUBY_VERSION = ENV["BUNDLER_SPEC_RUBY_ENGINE_VERSION"] - end + remove_const :RUBY_ENGINE_VERSION + RUBY_ENGINE_VERSION = ENV["BUNDLER_SPEC_RUBY_ENGINE_VERSION"] end end diff --git a/spec/bundler/support/platforms.rb b/spec/bundler/support/platforms.rb index 153704e666..f4d63c8ded 100644 --- a/spec/bundler/support/platforms.rb +++ b/spec/bundler/support/platforms.rb @@ -71,16 +71,7 @@ module Spec def local_engine_version return ENV["BUNDLER_SPEC_RUBY_ENGINE_VERSION"] if ENV["BUNDLER_SPEC_RUBY_ENGINE_VERSION"] - case local_ruby_engine - when "ruby" - RUBY_VERSION - when "rbx" - Rubinius::VERSION - when "jruby" - JRUBY_VERSION - else - RUBY_ENGINE_VERSION - end + RUBY_ENGINE_VERSION end def not_local_engine_version |