Support :mri_23 platform and its variations

4 files changed, 46 insertions, 4 deletions

diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
index 8aef625290..671171dc37 100644
--- a/lib/bundler/current_ruby.rb
+++ b/lib/bundler/current_ruby.rb
@@ -27,8 +27,12 @@ module Bundler
       RUBY_VERSION =~ /^2\.2/
     end
 
+    def on_23?
+      RUBY_VERSION =~ /^2\.3/
+    end
+
     def on_2?
-      on_20? || on_21? || on_22?
+      on_20? || on_21? || on_22? || on_23?
     end
 
     def ruby?
@@ -55,6 +59,10 @@ module Bundler
       ruby? && on_22?
     end
 
+    def ruby_23?
+      ruby? && on_23?
+    end
+
     def ruby_2?
       ruby? && on_2?
     end
@@ -83,6 +91,10 @@ module Bundler
       mri? && on_22?
     end
 
+    def mri_23?
+      mri? && on_23?
+    end
+
     def rbx?
       ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
     end
@@ -127,6 +139,10 @@ module Bundler
       mswin? && on_22?
     end
 
+    def mswin_23?
+      mswin? && on_23?
+    end
+
     def mswin64?
       Bundler::WINDOWS && Gem::Platform.local.os == "mswin64" && Gem::Platform.local.cpu == "x64"
     end
@@ -147,6 +163,10 @@ module Bundler
       mswin64? && on_22?
     end
 
+    def mswin64_23?
+      mswin64? && on_23?
+    end
+
     def mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != "x64"
     end
@@ -171,6 +191,10 @@ module Bundler
       mingw? && on_22?
     end
 
+    def mingw_23?
+      mingw? && on_23?
+    end
+
     def x64_mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == "x64"
     end
@@ -186,5 +210,9 @@ module Bundler
     def x64_mingw_22?
       x64_mingw? && on_22?
     end
+
+    def x64_mingw_23?
+      x64_mingw? && on_23?
+    end
   end
 end
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 11c1c07952..660b3355bd 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -15,12 +15,14 @@ module Bundler
       :ruby_20  => Gem::Platform::RUBY,
       :ruby_21  => Gem::Platform::RUBY,
       :ruby_22  => Gem::Platform::RUBY,
+      :ruby_23  => Gem::Platform::RUBY,
       :mri      => Gem::Platform::RUBY,
       :mri_18   => Gem::Platform::RUBY,
       :mri_19   => Gem::Platform::RUBY,
       :mri_20   => Gem::Platform::RUBY,
       :mri_21   => Gem::Platform::RUBY,
       :mri_22   => Gem::Platform::RUBY,
+      :mri_23   => Gem::Platform::RUBY,
       :rbx      => Gem::Platform::RUBY,
       :jruby    => Gem::Platform::JAVA,
       :jruby_18 => Gem::Platform::JAVA,
@@ -31,21 +33,25 @@ module Bundler
       :mswin_20 => Gem::Platform::MSWIN,
       :mswin_21 => Gem::Platform::MSWIN,
       :mswin_22 => Gem::Platform::MSWIN,
+      :mswin_23 => 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,
       :mingw    => Gem::Platform::MINGW,
       :mingw_18 => Gem::Platform::MINGW,
       :mingw_19 => Gem::Platform::MINGW,
       :mingw_20 => Gem::Platform::MINGW,
       :mingw_21 => Gem::Platform::MINGW,
       :mingw_22 => Gem::Platform::MINGW,
+      :mingw_23 => 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_22 => Gem::Platform::X64_MINGW,
+      :x64_mingw_23 => Gem::Platform::X64_MINGW
     }.freeze
 
     def initialize(name, version, options = {}, &blk)
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index 94458d2464..be580d9c90 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -183,6 +183,8 @@ There are a number of `Gemfile` platforms:
     _ruby_ `AND` version 2.1
   * `ruby_22`:
     _ruby_ `AND` version 2.2
+  * `ruby_23`:
+    _ruby_ `AND` version 2.3
   * `mri`:
     Same as _ruby_, but not Rubinius
   * `mri_18`:
@@ -195,6 +197,8 @@ There are a number of `Gemfile` platforms:
     _mri_ `AND` version 2.1
   * `mri_22`:
     _mri_ `AND` version 2.2
+  * `mri_23`:
+    _mri_ `AND` version 2.3
   * `rbx`:
     Same as _ruby_, but only Rubinius (not MRI)
   * `jruby`:
@@ -213,6 +217,8 @@ There are a number of `Gemfile` platforms:
     _mingw_ `AND` version 2.1
   * `mingw_22`:
     _mingw_ `AND` version 2.2
+  * `mingw_23`:
+    _mingw_ `AND` version 2.3
   * `x64_mingw`:
     Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
   * `x64_mingw_20`:
@@ -221,6 +227,8 @@ There are a number of `Gemfile` platforms:
     _x64_mingw_ `AND` version 2.1
   * `x64_mingw_22`:
     _x64_mingw_ `AND` version 2.2
+  * `x64_mingw_23`:
+    _x64_mingw_ `AND` version 2.3
 
 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 7be60c3a71..3e8587fe9c 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -84,8 +84,8 @@ describe Bundler::Dsl do
   end
 
   describe "#gem" do
-    [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :mri, :mri_18, :mri_19,
-     :mri_20, :mri_21, :mri_22, :jruby, :rbx].each do |platform|
+    [: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|
       it "allows #{platform} as a valid platform" do
         subject.gem("foo", :platform => platform)
       end