diff options
| -rw-r--r-- | lib/bundler/current_ruby.rb | 28 | ||||
| -rw-r--r-- | lib/bundler/dependency.rb | 1 | ||||
| -rw-r--r-- | man/gemfile.5.ronn | 2 | ||||
| -rw-r--r-- | spec/bundler/dsl_spec.rb | 2 |
4 files changed, 32 insertions, 1 deletions
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb index 648eb75e15..ca601d111f 100644 --- a/lib/bundler/current_ruby.rb +++ b/lib/bundler/current_ruby.rb @@ -23,6 +23,10 @@ module Bundler RUBY_VERSION =~ /^2\.1/ end + def on_22? + RUBY_VERSION =~ /^2\.2/ + end + def ruby? !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev") end @@ -43,6 +47,10 @@ module Bundler ruby? && on_21? end + def ruby_22? + ruby? && on_22? + end + def mri? !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") end @@ -63,6 +71,10 @@ module Bundler mri? && on_21? end + def mri_22? + mri? && on_22? + end + def rbx? ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx" end @@ -103,6 +115,10 @@ module Bundler mswin? && on_21? end + def mswin_22? + mswin? && on_22? + end + def mswin64? Bundler::WINDOWS && Gem::Platform.local.os == "mswin64" && Gem::Platform.local.cpu == 'x64' end @@ -119,6 +135,10 @@ module Bundler mswin64? && on_21? end + def mswin64_22? + mswin64? && on_22? + end + def mingw? Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != 'x64' end @@ -139,6 +159,10 @@ module Bundler mingw? && on_21? end + def mingw_22? + mingw? && on_22? + end + def x64_mingw? Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == 'x64' end @@ -151,5 +175,9 @@ module Bundler x64_mingw? && on_21? end + def x64_mingw_22? + x64_mingw? && on_22? + end + end end diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index de2bee9afb..38e44d24ab 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -14,6 +14,7 @@ module Bundler :ruby_19 => Gem::Platform::RUBY, :ruby_20 => Gem::Platform::RUBY, :ruby_21 => Gem::Platform::RUBY, + :ruby_22 => Gem::Platform::RUBY, :mri => Gem::Platform::RUBY, :mri_18 => Gem::Platform::RUBY, :mri_19 => Gem::Platform::RUBY, diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn index a068b800a9..4a852dada3 100644 --- a/man/gemfile.5.ronn +++ b/man/gemfile.5.ronn @@ -181,6 +181,8 @@ There are a number of `Gemfile` platforms: _ruby_ `AND` version 2.0 * `ruby_21`: _ruby_ `AND` version 2.1 + * `ruby_22`: + _ruby_ `AND` version 2.2 * `mri`: Same as _ruby_, but not Rubinius * `mri_18`: diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb index 831a01f035..4528a1c7fb 100644 --- a/spec/bundler/dsl_spec.rb +++ b/spec/bundler/dsl_spec.rb @@ -85,7 +85,7 @@ describe Bundler::Dsl do end describe "#gem" do - [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :mri, :mri_18, :mri_19, + [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :mri, :mri_18, :mri_19, :mri_20, :mri_21, :jruby, :rbx].each do |platform| it "allows #{platform} as a valid platform" do subject.gem("foo", :platform => platform) |