bundler 2.6.5 → 2.7.1

data/lib/bundler.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "bundler/rubygems_ext"
 require_relative "bundler/vendored_fileutils"
 require "pathname"
 require "rbconfig"
@@ -7,7 +8,6 @@ require "rbconfig"
 require_relative "bundler/errors"
 require_relative "bundler/environment_preserver"
 require_relative "bundler/plugin"
-require_relative "bundler/rubygems_ext"
 require_relative "bundler/rubygems_integration"
 require_relative "bundler/version"
 require_relative "bundler/current_ruby"
@@ -53,7 +53,6 @@ module Bundler
   autoload :FeatureFlag,            File.expand_path("bundler/feature_flag", __dir__)
   autoload :FREEBSD,                File.expand_path("bundler/constants", __dir__)
   autoload :GemHelper,              File.expand_path("bundler/gem_helper", __dir__)
-  autoload :GemHelpers,             File.expand_path("bundler/gem_helpers", __dir__)
   autoload :GemVersionPromoter,     File.expand_path("bundler/gem_version_promoter", __dir__)
   autoload :Graph,                  File.expand_path("bundler/graph", __dir__)
   autoload :Index,                  File.expand_path("bundler/index", __dir__)
@@ -114,13 +113,13 @@ module Bundler
     end
 
     def configured_bundle_path
-      @configured_bundle_path ||= settings.path.tap(&:validate!)
+      @configured_bundle_path ||= Bundler.settings.path.tap(&:validate!)
     end
 
     # Returns absolute location of where binstubs are installed to.
     def bin_path
       @bin_path ||= begin
-        path = settings[:bin] || "bin"
+        path = Bundler.settings[:bin] || "bin"
         path = Pathname.new(path).expand_path(root).expand_path
         mkdir_p(path)
         path
@@ -174,14 +173,14 @@ module Bundler
       self_manager.restart_with_locked_bundler_if_needed
     end
 
-    # Automatically install dependencies if Bundler.settings[:auto_install] exists.
+    # Automatically install dependencies if settings[:auto_install] exists.
     # This is set through config cmd `bundle config set --global 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 settings[:auto_install]
+      return unless Bundler.settings[:auto_install]
 
       begin
         definition.specs
@@ -239,10 +238,10 @@ module Bundler
     end
 
     def frozen_bundle?
-      frozen = settings[:frozen]
+      frozen = Bundler.settings[:frozen]
       return frozen unless frozen.nil?
 
-      settings[:deployment]
+      Bundler.settings[:deployment]
     end
 
     def locked_gems
@@ -343,7 +342,7 @@ module Bundler
 
     def app_cache(custom_path = nil)
       path = custom_path || root
-      Pathname.new(path).join(settings.app_cache_path)
+      Pathname.new(path).join(Bundler.settings.app_cache_path)
     end
 
     def tmp(name = Process.pid.to_s)
@@ -455,10 +454,14 @@ module Bundler
     end
 
     def local_platform
-      return Gem::Platform::RUBY if settings[:force_ruby_platform]
+      return Gem::Platform::RUBY if Bundler.settings[:force_ruby_platform]
       Gem::Platform.local
     end
 
+    def generic_local_platform
+      Gem::Platform.generic(local_platform)
+    end
+
     def default_gemfile
       SharedHelpers.default_gemfile
     end
@@ -564,7 +567,7 @@ module Bundler
     end
 
     def feature_flag
-      @feature_flag ||= FeatureFlag.new(VERSION)
+      @feature_flag ||= FeatureFlag.new(Bundler.settings[:simulate_version] || VERSION)
     end
 
     def reset!
@@ -580,7 +583,6 @@ module Bundler
 
     def reset_paths!
       @bin_path = nil
-      @bundler_major_version = nil
       @bundle_path = nil
       @configure = nil
       @configured_bundle_path = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.7.1
 platform: ruby
 authors:
 - André Arko
@@ -21,7 +21,7 @@ authors:
 - Yehuda Katz
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -55,6 +55,8 @@ files:
 - lib/bundler/cli/config.rb
 - lib/bundler/cli/console.rb
 - lib/bundler/cli/doctor.rb
+- lib/bundler/cli/doctor/diagnose.rb
+- lib/bundler/cli/doctor/ssl.rb
 - lib/bundler/cli/exec.rb
 - lib/bundler/cli/fund.rb
 - lib/bundler/cli/gem.rb
@@ -77,7 +79,6 @@ files:
 - lib/bundler/compact_index_client.rb
 - lib/bundler/compact_index_client/cache.rb
 - lib/bundler/compact_index_client/cache_file.rb
-- lib/bundler/compact_index_client/gem_parser.rb
 - lib/bundler/compact_index_client/parser.rb
 - lib/bundler/compact_index_client/updater.rb
 - lib/bundler/constants.rb
@@ -103,7 +104,6 @@ files:
 - lib/bundler/force_platform.rb
 - lib/bundler/friendly_errors.rb
 - lib/bundler/gem_helper.rb
-- lib/bundler/gem_helpers.rb
 - lib/bundler/gem_tasks.rb
 - lib/bundler/gem_version_promoter.rb
 - lib/bundler/graph.rb
@@ -210,6 +210,7 @@ files:
 - lib/bundler/resolver/package.rb
 - lib/bundler/resolver/root.rb
 - lib/bundler/resolver/spec_group.rb
+- lib/bundler/resolver/strategy.rb
 - lib/bundler/retry.rb
 - lib/bundler/ruby_dsl.rb
 - lib/bundler/ruby_version.rb
@@ -240,7 +241,6 @@ files:
 - lib/bundler/stub_specification.rb
 - lib/bundler/templates/.document
 - lib/bundler/templates/Executable
-- lib/bundler/templates/Executable.bundler
 - lib/bundler/templates/Executable.standalone
 - lib/bundler/templates/Gemfile
 - lib/bundler/templates/newgem/CHANGELOG.md.tt
@@ -283,22 +283,18 @@ files:
 - lib/bundler/uri_credentials_filter.rb
 - lib/bundler/uri_normalizer.rb
 - lib/bundler/vendor/.document
-- lib/bundler/vendor/connection_pool/.document
 - lib/bundler/vendor/connection_pool/LICENSE
 - lib/bundler/vendor/connection_pool/lib/connection_pool.rb
 - lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
 - lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 - lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
-- lib/bundler/vendor/fileutils/.document
 - lib/bundler/vendor/fileutils/COPYING
 - lib/bundler/vendor/fileutils/lib/fileutils.rb
-- lib/bundler/vendor/net-http-persistent/.document
 - lib/bundler/vendor/net-http-persistent/README.rdoc
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
-- lib/bundler/vendor/pub_grub/.document
 - lib/bundler/vendor/pub_grub/LICENSE.txt
 - lib/bundler/vendor/pub_grub/lib/pub_grub.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb
@@ -310,16 +306,15 @@ files:
 - lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/strategy.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
 - lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb
-- lib/bundler/vendor/securerandom/.document
 - lib/bundler/vendor/securerandom/COPYING
 - lib/bundler/vendor/securerandom/lib/securerandom.rb
-- lib/bundler/vendor/thor/.document
 - lib/bundler/vendor/thor/LICENSE.md
 - lib/bundler/vendor/thor/lib/thor.rb
 - lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -356,10 +351,8 @@ files:
 - lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb
 - lib/bundler/vendor/thor/lib/thor/util.rb
 - lib/bundler/vendor/thor/lib/thor/version.rb
-- lib/bundler/vendor/tsort/.document
 - lib/bundler/vendor/tsort/LICENSE.txt
 - lib/bundler/vendor/tsort/lib/tsort.rb
-- lib/bundler/vendor/uri/.document
 - lib/bundler/vendor/uri/COPYING
 - lib/bundler/vendor/uri/lib/uri.rb
 - lib/bundler/vendor/uri/lib/uri/common.rb
@@ -404,14 +397,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.3
+      version: 3.4.1
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.7.1
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []

data/lib/bundler/compact_index_client/gem_parser.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class CompactIndexClient
-    if defined?(Gem::Resolver::APISet::GemParser)
-      GemParser = Gem::Resolver::APISet::GemParser
-    else
-      class GemParser
-        EMPTY_ARRAY = [].freeze
-        private_constant :EMPTY_ARRAY
-
-        def parse(line)
-          version_and_platform, rest = line.split(" ", 2)
-          version, platform = version_and_platform.split("-", 2)
-          dependencies, requirements = rest.split("|", 2).map! {|s| s.split(",") } if rest
-          dependencies = dependencies ? dependencies.map! {|d| parse_dependency(d) } : EMPTY_ARRAY
-          requirements = requirements ? requirements.map! {|d| parse_dependency(d) } : EMPTY_ARRAY
-          [version, platform, dependencies, requirements]
-        end
-
-        private
-
-        def parse_dependency(string)
-          dependency = string.split(":")
-          dependency[-1] = dependency[-1].split("&") if dependency.size > 1
-          dependency[0] = -dependency[0]
-          dependency
-        end
-      end
-    end
-  end
-end

data/lib/bundler/gem_helpers.rb

@@ -1,144 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  module GemHelpers
-    GENERIC_CACHE = { Gem::Platform::RUBY => Gem::Platform::RUBY } # rubocop:disable Style/MutableConstant
-    GENERICS = [
-      Gem::Platform::JAVA,
-      *Gem::Platform::WINDOWS,
-    ].freeze
-
-    def generic(p)
-      GENERIC_CACHE[p] ||= begin
-        found = GENERICS.find do |match|
-          p === match
-        end
-        found || Gem::Platform::RUBY
-      end
-    end
-    module_function :generic
-
-    def generic_local_platform
-      generic(local_platform)
-    end
-    module_function :generic_local_platform
-
-    def local_platform
-      Bundler.local_platform
-    end
-    module_function :local_platform
-
-    def generic_local_platform_is_ruby?
-      generic_local_platform == Gem::Platform::RUBY
-    end
-    module_function :generic_local_platform_is_ruby?
-
-    def platform_specificity_match(spec_platform, user_platform)
-      spec_platform = Gem::Platform.new(spec_platform)
-
-      PlatformMatch.specificity_score(spec_platform, user_platform)
-    end
-    module_function :platform_specificity_match
-
-    def select_all_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
-      matching = if force_ruby
-        specs.select {|spec| spec.match_platform(Gem::Platform::RUBY) && spec.force_ruby_platform! }
-      else
-        specs.select {|spec| spec.match_platform(platform) }
-      end
-
-      if prefer_locked
-        locked_originally = matching.select {|spec| spec.is_a?(LazySpecification) }
-        return locked_originally if locked_originally.any?
-      end
-
-      matching
-    end
-    module_function :select_all_platform_match
-
-    def select_best_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
-      matching = select_all_platform_match(specs, platform, force_ruby: force_ruby, prefer_locked: prefer_locked)
-
-      sort_and_filter_best_platform_match(matching, platform)
-    end
-    module_function :select_best_platform_match
-
-    def select_best_local_platform_match(specs, force_ruby: false)
-      matching = select_all_platform_match(specs, local_platform, force_ruby: force_ruby).filter_map(&:materialized_for_installation)
-
-      sort_best_platform_match(matching, local_platform)
-    end
-    module_function :select_best_local_platform_match
-
-    def sort_and_filter_best_platform_match(matching, platform)
-      return matching if matching.one?
-
-      exact = matching.select {|spec| spec.platform == platform }
-      return exact if exact.any?
-
-      sorted_matching = sort_best_platform_match(matching, platform)
-      exemplary_spec = sorted_matching.first
-
-      sorted_matching.take_while {|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
-    end
-    module_function :sort_and_filter_best_platform_match
-
-    def sort_best_platform_match(matching, platform)
-      matching.sort_by {|spec| platform_specificity_match(spec.platform, platform) }
-    end
-    module_function :sort_best_platform_match
-
-    class PlatformMatch
-      def self.specificity_score(spec_platform, user_platform)
-        return -1 if spec_platform == user_platform
-        return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
-
-        os_match(spec_platform, user_platform) +
-          cpu_match(spec_platform, user_platform) * 10 +
-          platform_version_match(spec_platform, user_platform) * 100
-      end
-
-      def self.os_match(spec_platform, user_platform)
-        if spec_platform.os == user_platform.os
-          0
-        else
-          1
-        end
-      end
-
-      def self.cpu_match(spec_platform, user_platform)
-        if spec_platform.cpu == user_platform.cpu
-          0
-        elsif spec_platform.cpu == "arm" && user_platform.cpu.to_s.start_with?("arm")
-          0
-        elsif spec_platform.cpu.nil? || spec_platform.cpu == "universal"
-          1
-        else
-          2
-        end
-      end
-
-      def self.platform_version_match(spec_platform, user_platform)
-        if spec_platform.version == user_platform.version
-          0
-        elsif spec_platform.version.nil?
-          1
-        else
-          2
-        end
-      end
-    end
-
-    def same_specificity(platform, spec, exemplary_spec)
-      platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
-    end
-    module_function :same_specificity
-
-    def same_deps(spec, exemplary_spec)
-      same_runtime_deps = spec.dependencies.sort == exemplary_spec.dependencies.sort
-      same_metadata_deps = spec.required_ruby_version == exemplary_spec.required_ruby_version && spec.required_rubygems_version == exemplary_spec.required_rubygems_version
-      same_runtime_deps && same_metadata_deps
-    end
-    module_function :same_deps
-  end
-end

data/lib/bundler/templates/Executable.bundler

@@ -1,109 +0,0 @@
-#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG["ruby_install_name"] %>
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application '<%= executable %>' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "rubygems"
-
-m = Module.new do
-  module_function
-
-  def invoked_as_script?
-    File.expand_path($0) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV["BUNDLER_VERSION"]
-  end
-
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1
-      update_index = i
-    end
-    bundler_version
-  end
-
-  def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    return gemfile if gemfile && !gemfile.empty?
-
-    File.expand_path("<%= relative_gemfile_path %>", __dir__)
-  end
-
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
-      else "#{gemfile}.lock"
-      end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    Regexp.last_match(1)
-  end
-
-  def bundler_requirement
-    @bundler_requirement ||=
-      env_var_version ||
-      cli_arg_version ||
-      bundler_requirement_for(lockfile_version)
-  end
-
-  def bundler_requirement_for(version)
-    return "#{Gem::Requirement.default}.a" unless version
-
-    bundler_gem_version = Gem::Version.new(version)
-
-    bundler_gem_version.approximate_recommendation
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    activate_bundler
-  end
-
-  def activate_bundler
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_requirement
-    end
-    return if gem_error.nil?
-    require_error = activation_error_handling do
-      require "bundler/version"
-    end
-    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
-  end
-end
-
-m.load_bundler!
-
-if m.invoked_as_script?
-  load Gem.bin_path("<%= spec.name %>", "<%= executable %>")
-end

data/lib/bundler/vendor/connection_pool/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented

data/lib/bundler/vendor/fileutils/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented

data/lib/bundler/vendor/net-http-persistent/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented

data/lib/bundler/vendor/pub_grub/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented

data/lib/bundler/vendor/securerandom/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented

data/lib/bundler/vendor/thor/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented

data/lib/bundler/vendor/tsort/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented

data/lib/bundler/vendor/uri/.document

@@ -1 +0,0 @@
-# Vendored files do not need to be documented