bundler 2.3.21 → 2.3.23

data/lib/bundler/resolver.rb

@@ -3,12 +3,11 @@
 module Bundler
   class Resolver
     require_relative "vendored_molinillo"
+    require_relative "resolver/base"
     require_relative "resolver/spec_group"
 
     include GemHelpers
 
-    attr_writer :platforms
-
     # Figures out the best possible configuration of gems that satisfies
     # the list of passed dependencies and any child dependencies without
     # causing any gem activation errors.
@@ -27,15 +26,13 @@ module Bundler
 
     def initialize(source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
       @source_requirements = source_requirements
-      @base = base
+      @base = Resolver::Base.new(base, additional_base_requirements)
       @resolver = Molinillo::Resolver.new(self, self)
       @results_for = {}
       @search_for = {}
-      @additional_base_requirements = additional_base_requirements
       @platforms = platforms
       @resolving_only_for_ruby = platforms == [Gem::Platform::RUBY]
       @gem_version_promoter = gem_version_promoter
-      @use_gvp = Bundler.feature_flag.use_gem_version_promoter_for_major_updates? || !@gem_version_promoter.major?
     end
 
     def start(requirements, exclude_specs: [])
@@ -45,18 +42,10 @@ module Bundler
         remove_from_candidates(spec)
       end
 
-      @base_dg = Molinillo::DependencyGraph.new
-      @base.each do |ls|
-        dep = Dependency.new(ls.name, ls.version)
-        @base_dg.add_vertex(ls.name, DepProxy.get_proxy(dep, ls.platform), true)
-      end
-      @additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
-
-      @gem_version_promoter.prerelease_specified = @prerelease_specified = {}
-      requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
+      requirements.each {|dep| prerelease_specified[dep.name] ||= dep.prerelease? }
 
       verify_gemfile_dependencies_are_found!(requirements)
-      result = @resolver.resolve(requirements, @base_dg).
+      result = @resolver.resolve(requirements).
         map(&:payload).
         reject {|sg| sg.name.end_with?("\0") }.
         map(&:to_specs).
@@ -64,8 +53,20 @@ module Bundler
 
       SpecSet.new(SpecSet.new(result).for(regular_requirements, false, @platforms))
     rescue Molinillo::VersionConflict => e
+      conflicts = e.conflicts
+
+      deps_to_unlock = conflicts.values.inject([]) do |deps, conflict|
+        deps |= conflict.requirement_trees.flatten.map {|req| base_requirements[req.name] }.compact
+      end
+
+      if deps_to_unlock.any?
+        @base.unlock_deps(deps_to_unlock)
+        reset_spec_cache
+        retry
+      end
+
       message = version_conflict_message(e)
-      raise VersionConflict.new(e.conflicts.keys.uniq, message)
+      raise VersionConflict.new(conflicts.keys.uniq, message)
     rescue Molinillo::CircularDependencyError => e
       names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
       raise CyclicDependencyError, "Your bundle requires gems that depend" \
@@ -120,31 +121,15 @@ module Bundler
       dependency = dependency_proxy.dep
       name = dependency.name
       @search_for[dependency_proxy] ||= begin
-        results = results_for(dependency) + @base[name].select {|spec| requirement_satisfied_by?(dependency, nil, spec) }
-
-        if vertex = @base_dg.vertex_named(name)
-          locked_requirement = vertex.payload.requirement
-        end
+        locked_results = @base[name].select {|spec| requirement_satisfied_by?(dependency, nil, spec) }
+        locked_requirement = base_requirements[name]
+        results = results_for(dependency) + locked_results
+        results = results.select {|spec| requirement_satisfied_by?(locked_requirement, nil, spec) } if locked_requirement
 
-        if !@prerelease_specified[name] && (!@use_gvp || locked_requirement.nil?)
-          # Move prereleases to the beginning of the list, so they're considered
-          # last during resolution.
-          pre, results = results.partition {|spec| spec.version.prerelease? }
-          results = pre + results
-        end
+        if results.any?
+          results = @gem_version_promoter.sort_versions(dependency, results)
 
-        spec_groups = if results.any?
-          nested = []
-          results.each do |spec|
-            version, specs = nested.last
-            if version == spec.version
-              specs << spec
-            else
-              nested << [spec.version, [spec]]
-            end
-          end
-          nested.reduce([]) do |groups, (version, specs)|
-            next groups if locked_requirement && !locked_requirement.satisfied_by?(version)
+          results.group_by(&:version).reduce([]) do |groups, (_, specs)|
             next groups unless specs.any? {|spec| spec.match_platform(platform) }
 
             specs_by_platform = Hash.new do |current_specs, current_platform|
@@ -167,13 +152,6 @@ module Bundler
         else
           []
         end
-        # GVP handles major itself, but it's still a bit risky to trust it with it
-        # until we get it settled with new behavior. For 2.x it can take over all cases.
-        if !@use_gvp
-          spec_groups
-        else
-          @gem_version_promoter.sort_versions(dependency, spec_groups)
-        end
       end
     end
 
@@ -199,12 +177,6 @@ module Bundler
       "Gemfile"
     end
 
-    def name_for_locking_dependency_source
-      Bundler.default_lockfile.basename.to_s
-    rescue StandardError
-      "Gemfile.lock"
-    end
-
     def requirement_satisfied_by?(requirement, activated, spec)
       requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
     end
@@ -218,7 +190,7 @@ module Bundler
         name = name_for(dependency)
         vertex = activated.vertex_named(name)
         [
-          @base_dg.vertex_named(name) ? 0 : 1,
+          @base[name].any? ? 0 : 1,
           vertex.payload ? 0 : 1,
           vertex.root? ? 0 : 1,
           amount_constrained(dependency),
@@ -237,9 +209,16 @@ module Bundler
 
     private
 
+    def base_requirements
+      @base.base_requirements
+    end
+
+    def prerelease_specified
+      @gem_version_promoter.prerelease_specified
+    end
+
     def remove_from_candidates(spec)
       @base.delete(spec)
-      @gem_version_promoter.reset
 
       @results_for.keys.each do |dep|
         next unless dep.name == spec.name
@@ -247,7 +226,12 @@ module Bundler
         @results_for[dep].reject {|s| s.name == spec.name && s.version == spec.version }
       end
 
+      reset_spec_cache
+    end
+
+    def reset_spec_cache
       @search_for = {}
+      @gem_version_promoter.reset
     end
 
     # returns an integer \in (-\infty, 0]
@@ -267,7 +251,7 @@ module Bundler
           all - 1_000_000
         else
           search = search_for(dependency)
-          search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
+          search = prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
           search - all
         end
       end
@@ -296,7 +280,7 @@ module Bundler
     end
 
     def gem_not_found_message(name, requirement, source, extra_message = "")
-      specs = source.specs.search(name)
+      specs = source.specs.search(name).sort_by {|s| [s.version, s.platform.to_s] }
       matching_part = name
       requirement_label = SharedHelpers.pretty_dependency(requirement)
       cache_message = begin
@@ -339,18 +323,6 @@ module Bundler
 
       e.message_with_trees(
         :full_message_for_conflict => lambda do |name, conflict|
-          o = if name.end_with?("\0")
-            String.new("Bundler found conflicting requirements for the #{name} version:")
-          else
-            String.new("Bundler could not find compatible versions for gem \"#{name}\":")
-          end
-          o << %(\n)
-          if conflict.locked_requirement
-            o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
-            o << %(    #{SharedHelpers.pretty_dependency(conflict.locked_requirement)}\n)
-            o << %(\n)
-          end
-          o << %(  In #{name_for_explicit_dependency_source}:\n)
           trees = conflict.requirement_trees
 
           # called first, because we want to reduce the amount of work required to find maximal empty sets
@@ -369,30 +341,41 @@ module Bundler
             trees.sort_by! {|t| t.reverse.map(&:name) }
           end
 
-          o << trees.map do |tree|
-            t = "".dup
-            depth = 2
+          if trees.size > 1 || name == "bundler"
+            o = if name.end_with?("\0")
+              String.new("Bundler found conflicting requirements for the #{name} version:")
+            else
+              String.new("Bundler could not find compatible versions for gem \"#{name}\":")
+            end
+            o << %(\n)
+            o << %(  In #{name_for_explicit_dependency_source}:\n)
+            o << trees.map do |tree|
+              t = "".dup
+              depth = 2
 
-            base_tree = tree.first
-            base_tree_name = base_tree.name
+              base_tree = tree.first
+              base_tree_name = base_tree.name
 
-            if base_tree_name.end_with?("\0")
-              t = nil
-            else
-              tree.each do |req|
-                t << "  " * depth << SharedHelpers.pretty_dependency(req)
-                unless tree.last == req
-                  if spec = conflict.activated_by_name[req.name]
-                    t << %( was resolved to #{spec.version}, which)
+              if base_tree_name.end_with?("\0")
+                t = nil
+              else
+                tree.each do |req|
+                  t << "  " * depth << SharedHelpers.pretty_dependency(req)
+                  unless tree.last == req
+                    if spec = conflict.activated_by_name[req.name]
+                      t << %( was resolved to #{spec.version}, which)
+                    end
+                    t << %( depends on)
                   end
-                  t << %( depends on)
+                  t << %(\n)
+                  depth += 1
                 end
-                t << %(\n)
-                depth += 1
               end
-            end
-            t
-          end.compact.join("\n")
+              t
+            end.compact.join("\n")
+          else
+            o = String.new
+          end
 
           if name == "bundler"
             o << %(\n  Current Bundler version:\n    bundler (#{Bundler::VERSION}))
@@ -416,17 +399,13 @@ module Bundler
             end
           elsif name.end_with?("\0")
             o << %(\n  Current #{name} version:\n    #{SharedHelpers.pretty_dependency(@metadata_requirements.find {|req| req.name == name })}\n\n)
-          elsif conflict.locked_requirement
-            o << "\n"
-            o << %(Deleting your #{name_for_locking_dependency_source} file and running `bundle install` will rebuild your snapshot from scratch, using only\n)
-            o << %(the gems in your Gemfile, which may resolve the conflict.\n)
           elsif !conflict.existing
             o << "\n"
 
             relevant_source = conflict.requirement.source || source_for(name)
 
-            extra_message = if conflict.requirement_trees.first.size > 1
-              ", which is required by gem '#{SharedHelpers.pretty_dependency(conflict.requirement_trees.first[-2])}',"
+            extra_message = if trees.first.size > 1
+              ", which is required by gem '#{SharedHelpers.pretty_dependency(trees.first[-2])}',"
             else
               ""
             end

data/lib/bundler/rubygems_ext.rb

@@ -237,8 +237,11 @@ module Gem
     MINGW = Gem::Platform.new("x86-mingw32")
     X64_MINGW = [Gem::Platform.new("x64-mingw32"),
                  Gem::Platform.new("x64-mingw-ucrt")].freeze
+    WINDOWS = [MSWIN, MSWIN64, MINGW, X64_MINGW].flatten.freeze
+    X64_LINUX = Gem::Platform.new("x86_64-linux")
+    X64_LINUX_MUSL = Gem::Platform.new("x86_64-linux-musl")
 
-    if Gem::Platform.new("x86_64-linux-musl") === Gem::Platform.new("x86_64-linux")
+    if X64_LINUX === X64_LINUX_MUSL
       remove_method :===
 
       def ===(other)
@@ -258,10 +261,21 @@ module Gem
           # version
           (
             (@os != "linux" && (@version.nil? || other.version.nil?)) ||
-            (@os == "linux" && ((@version.nil? && ["gnu", "musl"].include?(other.version)) || (@version == "gnu" && other.version.nil?))) ||
+            (@os == "linux" && (normalized_linux_version_ext == other.normalized_linux_version_ext || ["musl#{@version}", "musleabi#{@version}", "musleabihf#{@version}"].include?(other.version))) ||
             @version == other.version
           )
       end
+
+      # This is a copy of RubyGems 3.3.23 or higher `normalized_linux_method`.
+      # Once only 3.3.23 is supported, we can use the method in RubyGems.
+      def normalized_linux_version_ext
+        return nil unless @version
+
+        without_gnu_nor_abi_modifiers = @version.sub(/\Agnu/, "").sub(/eabi(hf)?\Z/, "")
+        return nil if without_gnu_nor_abi_modifiers.empty?
+
+        without_gnu_nor_abi_modifiers
+      end
     end
   end
 
@@ -274,14 +288,21 @@ module Gem
       def match_gem?(platform, gem_name)
         match_platforms?(platform, Gem.platforms)
       end
+    end
+
+    match_platforms_defined = Gem::Platform.respond_to?(:match_platforms?, true)
+
+    if !match_platforms_defined || Gem::Platform.send(:match_platforms?, Gem::Platform::X64_LINUX_MUSL, [Gem::Platform::X64_LINUX])
 
       private
 
+      remove_method :match_platforms? if match_platforms_defined
+
       def match_platforms?(platform, platforms)
         platforms.any? do |local_platform|
           platform.nil? ||
             local_platform == platform ||
-            (local_platform != Gem::Platform::RUBY && local_platform =~ platform)
+            (local_platform != Gem::Platform::RUBY && platform =~ local_platform)
         end
       end
     end

data/lib/bundler/settings.rb

@@ -45,7 +45,6 @@ module Bundler
       silence_root_warning
       suppress_install_using_messages
       update_requires_all_flag
-      use_gem_version_promoter_for_major_updates
     ].freeze
 
     NUMBER_KEYS = %w[

data/lib/bundler/spec_set.rb

@@ -114,10 +114,20 @@ module Bundler
       SpecSet.new(arr)
     end
 
+    def -(other)
+      SpecSet.new(to_a - other.to_a)
+    end
+
     def find_by_name_and_platform(name, platform)
       @specs.detect {|spec| spec.name == name && spec.match_platform(platform) }
     end
 
+    def delete_by_name_and_version(name, version)
+      @specs.reject! {|spec| spec.name == name && spec.version == version }
+      @lookup = nil
+      @sorted = nil
+    end
+
     def what_required(spec)
       unless req = find {|s| s.dependencies.any? {|d| d.type == :runtime && d.name == spec.name } }
         return [spec]
@@ -166,7 +176,7 @@ module Bundler
     def lookup
       @lookup ||= begin
         lookup = Hash.new {|h, k| h[k] = [] }
-        Index.sort_specs(@specs).reverse_each do |s|
+        @specs.each do |s|
           lookup[s.name] << s
         end
         lookup

data/lib/bundler/templates/newgem/gitlab-ci.yml.tt

@@ -1,8 +1,9 @@
-image: ruby:<%= RUBY_VERSION %>
+default:
+  image: ruby:<%= RUBY_VERSION %>
 
-before_script:
-  - gem install bundler -v <%= Bundler::VERSION %>
-  - bundle install
+  before_script:
+    - gem install bundler -v <%= Bundler::VERSION %>
+    - bundle install
 
 example_job:
   script:

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.3.21".freeze
+  VERSION = "2.3.23".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.3.21
+  version: 2.3.23
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -126,12 +126,16 @@ files:
 - lib/bundler/man/bundle-clean.1.ronn
 - lib/bundler/man/bundle-config.1
 - lib/bundler/man/bundle-config.1.ronn
+- lib/bundler/man/bundle-console.1
+- lib/bundler/man/bundle-console.1.ronn
 - lib/bundler/man/bundle-doctor.1
 - lib/bundler/man/bundle-doctor.1.ronn
 - lib/bundler/man/bundle-exec.1
 - lib/bundler/man/bundle-exec.1.ronn
 - lib/bundler/man/bundle-gem.1
 - lib/bundler/man/bundle-gem.1.ronn
+- lib/bundler/man/bundle-help.1
+- lib/bundler/man/bundle-help.1.ronn
 - lib/bundler/man/bundle-info.1
 - lib/bundler/man/bundle-info.1.ronn
 - lib/bundler/man/bundle-init.1
@@ -160,6 +164,8 @@ files:
 - lib/bundler/man/bundle-show.1.ronn
 - lib/bundler/man/bundle-update.1
 - lib/bundler/man/bundle-update.1.ronn
+- lib/bundler/man/bundle-version.1
+- lib/bundler/man/bundle-version.1.ronn
 - lib/bundler/man/bundle-viz.1
 - lib/bundler/man/bundle-viz.1.ronn
 - lib/bundler/man/bundle.1
@@ -184,6 +190,7 @@ files:
 - lib/bundler/process_lock.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
+- lib/bundler/resolver/base.rb
 - lib/bundler/resolver/spec_group.rb
 - lib/bundler/retry.rb
 - lib/bundler/ruby_dsl.rb
@@ -357,7 +364,7 @@ metadata:
   bug_tracker_uri: https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler
   changelog_uri: https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md
   homepage_uri: https://bundler.io/
-  source_code_uri: https://github.com/rubygems/rubygems/
+  source_code_uri: https://github.com/rubygems/rubygems/tree/master/bundler
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -373,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies