bundler 1.10.6 → 1.11.2

data/lib/bundler/cli/outdated.rb

@@ -1,4 +1,4 @@
-require 'bundler/cli/common'
+require "bundler/cli/common"
 
 module Bundler
   class CLI::Outdated
@@ -18,7 +18,7 @@ module Bundler
       Bundler.definition.validate_ruby!
       current_specs = Bundler.ui.silence { Bundler.load.specs }
       current_dependencies = {}
-      Bundler.ui.silence { Bundler.load.dependencies.each { |dep| current_dependencies[dep.name] = dep } }
+      Bundler.ui.silence { Bundler.load.dependencies.each {|dep| current_dependencies[dep.name] = dep } }
 
       if gems.empty? && sources.empty?
         # We're doing a full update
@@ -32,18 +32,18 @@ module Bundler
 
       out_count = 0
       # Loop through the current specs
-      gemfile_specs, dependency_specs = current_specs.partition { |spec| current_dependencies.has_key? spec.name }
+      gemfile_specs, dependency_specs = current_specs.partition {|spec| current_dependencies.key? spec.name }
       [gemfile_specs.sort_by(&:name), dependency_specs.sort_by(&:name)].flatten.each do |current_spec|
         next if !gems.empty? && !gems.include?(current_spec.name)
 
         dependency = current_dependencies[current_spec.name]
 
         if options["strict"]
-          active_spec =  definition.specs.detect { |spec| spec.name == current_spec.name }
+          active_spec = definition.specs.detect {|spec| spec.name == current_spec.name }
         else
-          active_spec = definition.index[current_spec.name].sort_by { |b| b.version }
+          active_spec = definition.index[current_spec.name].sort_by(&:version)
           if !current_spec.version.prerelease? && !options[:pre] && active_spec.size > 1
-            active_spec = active_spec.delete_if { |b| b.respond_to?(:version) && b.version.prerelease? }
+            active_spec = active_spec.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
           end
           active_spec = active_spec.last
         end
@@ -62,7 +62,7 @@ module Bundler
 
           spec_version    = "#{active_spec.version}#{active_spec.git_version}"
           current_version = "#{current_spec.version}#{current_spec.git_version}"
-          dependency_version = %|, requested #{dependency.requirement}| if dependency && dependency.specific?
+          dependency_version = %(, requested #{dependency.requirement}) if dependency && dependency.specific?
 
           if dependency
             groups = dependency.groups.join(", ")
@@ -82,6 +82,5 @@ module Bundler
         exit 1
       end
     end
-
   end
 end

data/lib/bundler/cli/package.rb

@@ -23,7 +23,7 @@ module Bundler
   private
 
     def install
-      require 'bundler/cli/install'
+      require "bundler/cli/install"
       options = self.options.dup
       if Bundler.settings[:cache_all_platforms]
         options["local"] = false

data/lib/bundler/cli/platform.rb

@@ -7,8 +7,8 @@ module Bundler
 
     def run
       platforms, ruby_version = Bundler.ui.silence do
-        [ Bundler.definition.platforms.map {|p| "* #{p}" },
-          Bundler.definition.ruby_version ]
+        [Bundler.definition.platforms.map {|p| "* #{p}" },
+         Bundler.definition.ruby_version]
       end
       output = []
 
@@ -38,6 +38,5 @@ module Bundler
 
       Bundler.ui.info output.join("\n\n")
     end
-
   end
 end

data/lib/bundler/cli/show.rb

@@ -1,4 +1,4 @@
-require 'bundler/cli/common'
+require "bundler/cli/common"
 
 module Bundler
   class CLI::Show
@@ -23,7 +23,7 @@ module Bundler
           spec = Bundler::CLI::Common.select_spec(gem_name, :regex_match)
           return unless spec
           path = spec.full_gem_path
-          if !File.directory?(path)
+          unless File.directory?(path)
             Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at:"
           end
         end
@@ -31,19 +31,19 @@ module Bundler
       end
 
       if options[:paths]
-        Bundler.load.specs.sort_by { |s| s.name }.map do |s|
+        Bundler.load.specs.sort_by(&:name).map do |s|
           Bundler.ui.info s.full_gem_path
         end
       else
         Bundler.ui.info "Gems included by the bundle:"
-        Bundler.load.specs.sort_by { |s| s.name }.each do |s|
+        Bundler.load.specs.sort_by(&:name).each do |s|
           desc = "  * #{s.name} (#{s.version}#{s.git_version})"
           if @verbose
-            latest = latest_specs.find { |l| l.name == s.name }
-            Bundler.ui.info <<-END.gsub(/^ +/, '')
+            latest = latest_specs.find {|l| l.name == s.name }
+            Bundler.ui.info <<-END.gsub(/^ +/, "")
               #{desc}
-              \tSummary:  #{s.summary || 'No description available.'}
-              \tHomepage: #{s.homepage || 'No website available.'}
+              \tSummary:  #{s.summary || "No description available."}
+              \tHomepage: #{s.homepage || "No website available."}
               \tStatus:   #{outdated?(s, latest) ? "Outdated - #{s.version} < #{latest.version}" : "Up to date"}
             END
           else
@@ -53,7 +53,7 @@ module Bundler
       end
     end
 
-    private
+  private
 
     def fetch_latest_specs
       definition = Bundler.definition(true)

data/lib/bundler/cli/update.rb

@@ -21,7 +21,7 @@ module Bundler
             "Run `bundle install` to update and install the bundled gems."
         end
         # cycle through the requested gems, just to make sure they exist
-        names = Bundler.locked_gems.specs.map{ |s| s.name }
+        names = Bundler.locked_gems.specs.map(&:name)
         gems.each do |g|
           next if names.include?(g)
           require "bundler/cli/common"
@@ -30,7 +30,7 @@ module Bundler
 
         if groups.any?
           specs = Bundler.definition.specs_for groups
-          sources.concat(specs.map(&:name))
+          gems.concat(specs.map(&:name))
         end
 
         Bundler.definition(:gems => gems, :sources => sources)
@@ -68,6 +68,5 @@ module Bundler
         Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
       end
     end
-
   end
 end

data/lib/bundler/cli/viz.rb

@@ -6,7 +6,7 @@ module Bundler
     end
 
     def run
-      require 'graphviz'
+      require "graphviz"
       output_file = File.expand_path(options[:file])
       graph = Graph.new(Bundler.load, output_file, options[:version], options[:requirements], options[:format], options[:without])
       graph.viz
@@ -22,6 +22,5 @@ module Bundler
         raise
       end
     end
-
   end
 end

data/lib/bundler/cli.rb

@@ -1,10 +1,10 @@
-require 'bundler'
-require 'bundler/vendored_thor'
+require "bundler"
+require "bundler/vendored_thor"
 
 module Bundler
   class CLI < Thor
     include Thor::Actions
-    AUTO_INSTALL_CMDS = %w[show binstubs outdated exec open console licenses clean]
+    AUTO_INSTALL_CMDS = %w(show binstubs outdated exec open console licenses clean)
 
     def self.start(*)
       super
@@ -17,7 +17,7 @@ module Bundler
       super
 
       custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
-      ENV['BUNDLE_GEMFILE']   = File.expand_path(custom_gemfile) if custom_gemfile
+      ENV["BUNDLE_GEMFILE"] = File.expand_path(custom_gemfile) if custom_gemfile && !custom_gemfile.empty?
 
       Bundler.settings[:retry] = options[:retry] if options[:retry]
 
@@ -29,6 +29,13 @@ module Bundler
       self.options ||= {}
       Bundler.ui = UI::Shell.new(options)
       Bundler.ui.level = "debug" if options["verbose"]
+
+      if ENV["RUBYGEMS_GEMDEPS"] && !ENV["RUBYGEMS_GEMDEPS"].empty?
+        Bundler.ui.warn(
+          "The RUBYGEMS_GEMDEPS environment variable is set. This enables RubyGems' " \
+          "experimental Gemfile mode, which may conflict with Bundler and cause unexpected errors. " \
+          "To remove this warning, unset RUBYGEMS_GEMDEPS.", :wrap => true)
+      end
     end
 
     check_unknown_options!(:except => [:config, :exec])
@@ -37,8 +44,8 @@ module Bundler
     default_task :install
     class_option "no-color", :type => :boolean, :desc => "Disable colorization in output"
     class_option "retry",    :type => :numeric, :aliases => "-r", :banner => "NUM",
-      :desc => "Specify the number of times you wish to attempt network commands"
-    class_option "verbose",  :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V"
+                             :desc => "Specify the number of times you wish to attempt network commands"
+    class_option "verbose", :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V"
 
     def help(cli = nil)
       case cli
@@ -48,14 +55,15 @@ module Bundler
       end
 
       manpages = %w(
-          bundle
-          bundle-config
-          bundle-exec
-          bundle-install
-          bundle-package
-          bundle-update
-          bundle-platform
-          gemfile.5)
+        bundle
+        bundle-config
+        bundle-exec
+        bundle-gem
+        bundle-install
+        bundle-package
+        bundle-update
+        bundle-platform
+        gemfile.5)
 
       if manpages.include?(command)
         root = File.expand_path("../man", __FILE__)
@@ -65,6 +73,8 @@ module Bundler
         else
           puts File.read("#{root}/#{command}.txt")
         end
+      elsif command_path = Bundler.which("bundler-#{cli}")
+        Kernel.exec(command_path, "--help")
       else
         super
       end
@@ -84,7 +94,7 @@ module Bundler
     D
     method_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
     def init
-      require 'bundler/cli/init'
+      require "bundler/cli/init"
       Init.new(options.dup).run
     end
 
@@ -102,7 +112,7 @@ module Bundler
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     map "c" => "check"
     def check
-      require 'bundler/cli/check'
+      require "bundler/cli/check"
       Check.new(options).run
     end
 
@@ -151,14 +161,14 @@ module Bundler
       "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
     method_option "trust-policy", :alias => "P", :type => :string, :banner =>
       "Gem trust policy (like gem install -P). Must be one of " +
-        Bundler.rubygems.security_policy_keys.join('|')
+        Bundler.rubygems.security_policy_keys.join("|")
     method_option "without", :type => :array, :banner =>
       "Exclude gems that are part of the specified named group."
     method_option "with", :type => :array, :banner =>
       "Include gems that are part of the specified named group."
     map "i" => "install"
     def install
-      require 'bundler/cli/install'
+      require "bundler/cli/install"
       Install.new(options.dup).run
     end
 
@@ -183,7 +193,7 @@ module Bundler
     method_option "force", :type => :boolean, :banner =>
       "Force downloading every gem."
     def update(*gems)
-      require 'bundler/cli/update'
+      require "bundler/cli/update"
       Update.new(options, gems).run
     end
 
@@ -193,11 +203,11 @@ module Bundler
       Calling show with [GEM] will list the exact location of that gem on your machine.
     D
     method_option "paths", :type => :boolean,
-      :banner => "List the paths of all gems that are required by your Gemfile."
+                           :banner => "List the paths of all gems that are required by your Gemfile."
     method_option "outdated", :type => :boolean,
-      :banner => "Show verbose output including whether gems are outdated."
+                              :banner => "Show verbose output including whether gems are outdated."
     def show(gem_name = nil)
-      require 'bundler/cli/show'
+      require "bundler/cli/show"
       Show.new(options, gem_name).run
     end
     map %w(list) => "show"
@@ -205,14 +215,15 @@ module Bundler
     desc "binstubs GEM [OPTIONS]", "Install the binstubs of the listed gem"
     long_desc <<-D
       Generate binstubs for executables in [GEM]. Binstubs are put into bin,
-      or the --binstubs directory if one has been set.
+      or the --binstubs directory if one has been set. Calling binstubs with [GEM [GEM]]
+      will create binstubs for all given gems.
     D
     method_option "force", :type => :boolean, :default => false, :banner =>
       "Overwrite existing binstubs if they exist"
     method_option "path", :type => :string, :lazy_default => "bin", :banner =>
       "Binstub destination directory (default bin)"
     def binstubs(*gems)
-      require 'bundler/cli/binstubs'
+      require "bundler/cli/binstubs"
       Binstubs.new(options, gems).run
     end
 
@@ -230,16 +241,16 @@ module Bundler
     method_option "strict", :type => :boolean, :banner =>
       "Only list newer versions allowed by your Gemfile requirements"
     def outdated(*gems)
-      require 'bundler/cli/outdated'
+      require "bundler/cli/outdated"
       Outdated.new(options, gems).run
     end
 
     desc "cache [OPTIONS]", "Cache all the gems to vendor/cache", :hide => true
     method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
     method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms, not just the current one"
-    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
+    method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
     def cache
-      require 'bundler/cli/cache'
+      require "bundler/cli/cache"
       Cache.new(options).run
     end
 
@@ -249,8 +260,8 @@ module Bundler
     method_option "cache-path", :type => :string, :banner =>
       "Specify a different cache path than the default (vendor/cache)."
     method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
-    method_option "no-install",  :type => :boolean, :banner => "Don't actually install the gems, just package."
-    method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
+    method_option "no-install", :type => :boolean, :banner => "Don't actually install the gems, just package."
+    method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
     method_option "path", :type => :string, :banner =>
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
@@ -261,7 +272,7 @@ module Bundler
       bundle without having to download any additional gems.
     D
     def package
-      require 'bundler/cli/package'
+      require "bundler/cli/package"
       Package.new(options).run
     end
     map %w(pack) => :package
@@ -275,7 +286,7 @@ module Bundler
     D
     map "e" => "exec"
     def exec(*args)
-      require 'bundler/cli/exec'
+      require "bundler/cli/exec"
       Exec.new(options, args).run
     end
 
@@ -292,19 +303,19 @@ module Bundler
       where they were specified.
     D
     def config(*args)
-      require 'bundler/cli/config'
+      require "bundler/cli/config"
       Config.new(options, args, self).run
     end
 
     desc "open GEM", "Opens the source directory of the given bundled gem"
     def open(name)
-      require 'bundler/cli/open'
+      require "bundler/cli/open"
       Open.new(options, name).run
     end
 
     desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
     def console(group = nil)
-      require 'bundler/cli/console'
+      require "bundler/cli/console"
       Console.new(options, group).run
     end
 
@@ -316,7 +327,7 @@ module Bundler
 
     desc "licenses", "Prints the license of all gems in the bundle"
     def licenses
-      Bundler.load.specs.sort_by { |s| s.license.to_s }.reverse.each do |s|
+      Bundler.load.specs.sort_by {|s| s.license.to_s }.reverse_each do |s|
         gem_name = s.name
         license  = s.license || s.licenses
 
@@ -328,39 +339,39 @@ module Bundler
       end
     end
 
-    desc 'viz [OPTIONS]', "Generates a visual dependency graph"
+    desc "viz [OPTIONS]", "Generates a visual dependency graph"
     long_desc <<-D
       Viz generates a PNG file of the current Gemfile as a dependency graph.
       Viz requires the ruby-graphviz gem (and its dependencies).
       The associated gems must also be installed via 'bundle install'.
     D
-    method_option :file, :type => :string, :default => 'gem_graph', :aliases => '-f', :banner => "The name to use for the generated file. see format option"
-    method_option :format, :type => :string, :default => "png", :aliases => '-F', :banner => "This is output format option. Supported format is png, jpg, svg, dot ..."
-    method_option :requirements, :type => :boolean, :default => false, :aliases => '-r', :banner => "Set to show the version of each required dependency."
-    method_option :version, :type => :boolean, :default => false, :aliases => '-v', :banner => "Set to show each gem version."
+    method_option :file, :type => :string, :default => "gem_graph", :aliases => "-f", :banner => "The name to use for the generated file. see format option"
+    method_option :format, :type => :string, :default => "png", :aliases => "-F", :banner => "This is output format option. Supported format is png, jpg, svg, dot ..."
+    method_option :requirements, :type => :boolean, :default => false, :aliases => "-r", :banner => "Set to show the version of each required dependency."
+    method_option :version, :type => :boolean, :default => false, :aliases => "-v", :banner => "Set to show each gem version."
     method_option :without, :type => :array, :default => [], :banner => "Exclude gems that are part of the specified named group."
     def viz
-      require 'bundler/cli/viz'
+      require "bundler/cli/viz"
       Viz.new(options).run
     end
 
     desc "gem GEM [OPTIONS]", "Creates a skeleton for creating a rubygem"
-    method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :desc => "Generate a binary for your library."
+    method_option :bin, :type => :boolean, :default => false, :aliases => "-b", :desc => "Generate a binary for your library."
     method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`."
     method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
-      :lazy_default => [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? },
-      :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
+                         :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
+                         :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
     method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
     method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`."
-    method_option :test, :type => :string, :lazy_default => 'rspec', :aliases => '-t', :banner => "rspec",
-      :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
+    method_option :test, :type => :string, :lazy_default => "rspec", :aliases => "-t", :banner => "rspec",
+                         :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
     def gem(name)
-      require 'bundler/cli/gem'
+      require "bundler/cli/gem"
       Gem.new(options, name, self).run
     end
 
     def self.source_root
-      File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      File.expand_path(File.join(File.dirname(__FILE__), "templates"))
     end
 
     desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory"
@@ -369,7 +380,7 @@ module Bundler
     method_option "force", :type => :boolean, :default => false, :banner =>
       "Forces clean even if --path is not set"
     def clean
-      require 'bundler/cli/clean'
+      require "bundler/cli/clean"
       Clean.new(options.dup).run
     end
 
@@ -377,19 +388,19 @@ module Bundler
     method_option "ruby", :type => :boolean, :default => false, :banner =>
       "only display ruby related platform information"
     def platform
-      require 'bundler/cli/platform'
+      require "bundler/cli/platform"
       Platform.new(options).run
     end
 
     desc "inject GEM VERSION ...", "Add the named gem(s), with version requirements, to the resolved Gemfile"
     def inject(name, version, *gems)
-      require 'bundler/cli/inject'
+      require "bundler/cli/inject"
       Inject.new(options, name, version, gems).run
     end
 
     desc "lock", "Creates a lockfile without installing"
-    method_option "update", :type => :boolean, :default => false, :banner =>
-      "ignore the existing lockfile"
+    method_option "update", :type => :array, :lazy_default => [], :banner =>
+      "ignore the existing lockfile, update all gems by default, or update list of given gems"
     method_option "local", :type => :boolean, :default => false, :banner =>
       "do not attempt to fetch remote gemspecs and use the local gem cache only"
     method_option "print", :type => :boolean, :default => false, :banner =>
@@ -397,7 +408,7 @@ module Bundler
     method_option "lockfile", :type => :string, :default => nil, :banner =>
       "the path the lockfile should be written to"
     def lock
-      require 'bundler/cli/lock'
+      require "bundler/cli/lock"
       Lock.new(options).run
     end
 
@@ -406,26 +417,26 @@ module Bundler
       Env.new.write($stdout)
     end
 
-    private
-
-      # Automatically invoke `bundle install` and resume if
-      # Bundler.settings[:auto_install] exists. This is set through config cmd
-      # `bundle config auto_install 1`.
-      #
-      # Note that this method `nil`s out the global Definition object, so it
-      # should be called first, before you instantiate anything like an
-      # `Installer` that'll keep a reference to the old one instead.
-      def auto_install
-        return unless Bundler.settings[:auto_install]
-
-        begin
-          Bundler.definition.specs
-        rescue GemNotFound
-          Bundler.ui.info "Automatically installing missing gems."
-          Bundler.reset!
-          invoke :install, []
-          Bundler.reset!
-        end
+  private
+
+    # Automatically invoke `bundle install` and resume if
+    # Bundler.settings[:auto_install] exists. This is set through config cmd
+    # `bundle config auto_install 1`.
+    #
+    # Note that this method `nil`s out the global Definition object, so it
+    # should be called first, before you instantiate anything like an
+    # `Installer` that'll keep a reference to the old one instead.
+    def auto_install
+      return unless Bundler.settings[:auto_install]
+
+      begin
+        Bundler.definition.specs
+      rescue GemNotFound
+        Bundler.ui.info "Automatically installing missing gems."
+        Bundler.reset!
+        invoke :install, []
+        Bundler.reset!
       end
+    end
   end
 end

data/lib/bundler/constants.rb

@@ -1,5 +1,5 @@
 module Bundler
-  WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+  WINDOWS = RbConfig::CONFIG["host_os"] =~ /(msdos|mswin|djgpp|mingw)/
   FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/
   NULL    = WINDOWS ? "NUL" : "/dev/null"
 end

data/lib/bundler/current_ruby.rb

@@ -27,6 +27,14 @@ 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_23?
+    end
+
     def ruby?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
     end
@@ -51,6 +59,14 @@ module Bundler
       ruby? && on_22?
     end
 
+    def ruby_23?
+      ruby? && on_23?
+    end
+
+    def ruby_2?
+      ruby? && on_2?
+    end
+
     def mri?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
     end
@@ -75,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
@@ -119,8 +139,12 @@ 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'
+      Bundler::WINDOWS && Gem::Platform.local.os == "mswin64" && Gem::Platform.local.cpu == "x64"
     end
 
     def mswin64_19?
@@ -139,8 +163,12 @@ 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'
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != "x64"
     end
 
     def mingw_18?
@@ -163,8 +191,12 @@ 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'
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == "x64"
     end
 
     def x64_mingw_20?
@@ -179,5 +211,8 @@ module Bundler
       x64_mingw? && on_22?
     end
 
+    def x64_mingw_23?
+      x64_mingw? && on_23?
+    end
   end
 end