Auto merge of #5170 - amatsuda:mri_24, r=segiddins

Support :mri_24 platform

Current ruby trunk is versioned as "2.4.0".

% ruby -ve 'p RUBY_VERSION'
ruby 2.4.0dev (2016-11-15 trunk 56792) [x86_64-darwin15]
"2.4.0"

We'd like to run tests on some gems against ruby-trunk or 2.4 pre-releases, so here's a support for MRI 2.4.

(This is Ruby 2.4 version of #3865)

(cherry picked from commit aa9414e78f527ee2066d21783abb7d52a55f68a9)

3 files changed, 17 insertions, 3 deletions

diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 1b1808b40a..7b4ae44ef8 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -17,6 +17,7 @@ module Bundler
       :ruby_21  => Gem::Platform::RUBY,
       :ruby_22  => Gem::Platform::RUBY,
       :ruby_23  => Gem::Platform::RUBY,
+      :ruby_24  => Gem::Platform::RUBY,
       :mri      => Gem::Platform::RUBY,
       :mri_18   => Gem::Platform::RUBY,
       :mri_19   => Gem::Platform::RUBY,
@@ -24,6 +25,7 @@ module Bundler
       :mri_21   => Gem::Platform::RUBY,
       :mri_22   => Gem::Platform::RUBY,
       :mri_23   => Gem::Platform::RUBY,
+      :mri_24   => Gem::Platform::RUBY,
       :rbx      => Gem::Platform::RUBY,
       :jruby    => Gem::Platform::JAVA,
       :jruby_18 => Gem::Platform::JAVA,
@@ -35,12 +37,14 @@ module Bundler
       :mswin_21 => Gem::Platform::MSWIN,
       :mswin_22 => Gem::Platform::MSWIN,
       :mswin_23 => Gem::Platform::MSWIN,
+      :mswin_24 => Gem::Platform::MSWIN,
       :mswin64    => Gem::Platform::MSWIN64,
       :mswin64_19 => Gem::Platform::MSWIN64,
       :mswin64_20 => Gem::Platform::MSWIN64,
       :mswin64_21 => Gem::Platform::MSWIN64,
       :mswin64_22 => Gem::Platform::MSWIN64,
       :mswin64_23 => Gem::Platform::MSWIN64,
+      :mswin64_24 => Gem::Platform::MSWIN64,
       :mingw    => Gem::Platform::MINGW,
       :mingw_18 => Gem::Platform::MINGW,
       :mingw_19 => Gem::Platform::MINGW,
@@ -48,11 +52,13 @@ module Bundler
       :mingw_21 => Gem::Platform::MINGW,
       :mingw_22 => Gem::Platform::MINGW,
       :mingw_23 => Gem::Platform::MINGW,
+      :mingw_24 => Gem::Platform::MINGW,
       :x64_mingw    => Gem::Platform::X64_MINGW,
       :x64_mingw_20 => Gem::Platform::X64_MINGW,
       :x64_mingw_21 => Gem::Platform::X64_MINGW,
       :x64_mingw_22 => Gem::Platform::X64_MINGW,
-      :x64_mingw_23 => Gem::Platform::X64_MINGW
+      :x64_mingw_23 => Gem::Platform::X64_MINGW,
+      :x64_mingw_24 => Gem::Platform::X64_MINGW,
     }.freeze
 
     REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map|
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index da2157e971..e06e14fafc 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -185,6 +185,8 @@ There are a number of `Gemfile` platforms:
     _ruby_ `AND` version 2.2
   * `ruby_23`:
     _ruby_ `AND` version 2.3
+  * `ruby_24`:
+    _ruby_ `AND` version 2.4
   * `mri`:
     Same as _ruby_, but not Rubinius
   * `mri_18`:
@@ -199,6 +201,8 @@ There are a number of `Gemfile` platforms:
     _mri_ `AND` version 2.2
   * `mri_23`:
     _mri_ `AND` version 2.3
+  * `mri_24`:
+    _mri_ `AND` version 2.4
   * `rbx`:
     Same as _ruby_, but only Rubinius (not MRI)
   * `jruby`:
@@ -219,6 +223,8 @@ There are a number of `Gemfile` platforms:
     _mingw_ `AND` version 2.2
   * `mingw_23`:
     _mingw_ `AND` version 2.3
+  * `mingw_24`:
+    _mingw_ `AND` version 2.4
   * `x64_mingw`:
     Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
   * `x64_mingw_20`:
@@ -229,6 +235,8 @@ There are a number of `Gemfile` platforms:
     _x64_mingw_ `AND` version 2.2
   * `x64_mingw_23`:
     _x64_mingw_ `AND` version 2.3
+  * `x65_mingw_23`:
+    _x64_mingw_ `AND` version 2.4
 
 As with groups, you can specify one or more platforms:
 
diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
index 00d36dd55f..e7df91c06f 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -93,8 +93,8 @@ describe Bundler::Dsl do
   end
 
   describe "#gem" do
-    [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :mri, :mri_18, :mri_19,
-     :mri_20, :mri_21, :mri_22, :mri_23, :jruby, :rbx].each do |platform|
+    [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :mri, :mri_18, :mri_19,
+     :mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :jruby, :rbx].each do |platform|
       it "allows #{platform} as a valid platform" do
         subject.gem("foo", :platform => platform)
       end