bundler 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5666713af257e893dd50d9f49adab026845e67791d3e908cc0d247a182e20309
-  data.tar.gz: e923d5fa0d4b280575655250f043f86b75aa992a0dd17a701035b34412ae58b4
+  metadata.gz: 3879231a44592278d9e95f3a7d14f6e996e5230743167aed240804bba6a38310
+  data.tar.gz: 59b18e9d1028711d8429a959d187874f4a59e5f8eb60b6fde8e20f2014a2696b
 SHA512:
-  metadata.gz: 20a8d843d39aa1fa433bd317ff79695307e9bb1943a6927b301003a8b90414367fc774df18fcb02f8cdd985008c4d92f7f55e73473a04b55366fa17925b6c2ab
-  data.tar.gz: 74babdfe5c2971a533d83f25f35a9a914d26eb49541f747ba78e11ab6202e7b346350d8275e28dc0a53f6f6e02438c6470fda1e3a48efa2ec871296a16f3a4bf
+  metadata.gz: a393173a63781a473018a2e8ad480743a3f57507afa8cc60fa4da939604b99cfa78efc5859f18805ed03f3242cbefb5fd4361916270e8eb7077e975a8c85821e
+  data.tar.gz: 94cf58b87543d46ad50b50043e20a6b4c5a2e3d495e3f781065013e3d7d28d6c6dfc9fbaa6edded6253a90f5dfba42d67c0efd0ec9a920a2784c7c653ee57130

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.4.1 (December 24, 2022)
+
+## Enhancements:
+
+  - Allow Bundler to run on old RubyGems + Ruby 2.7 without warnings [#6187](https://github.com/rubygems/rubygems/pull/6187)
+
+## Bug fixes:
+
+  - Fix dependencies scoped to other platforms making resolver fail [#6189](https://github.com/rubygems/rubygems/pull/6189)
+  - Restore annotated git tag support [#6186](https://github.com/rubygems/rubygems/pull/6186)
+
 # 2.4.0 (December 24, 2022)
 
 ## Security:

data/exe/bundle

@@ -15,7 +15,7 @@ else
   require "bundler"
 end
 
-if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("3.0.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"]
+if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("2.7.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"]
   Bundler.ui.warn \
     "Your RubyGems version (#{Gem::VERSION}) has a bug that prevents " \
     "`required_ruby_version` from working for Bundler. Any scripts that use " \

data/lib/bundler/build_metadata.rb

@@ -5,7 +5,7 @@ module Bundler
   module BuildMetadata
     # begin ivars
     @built_at = "2022-12-24".freeze
-    @git_commit_sha = "e67004d0fe".freeze
+    @git_commit_sha = "f3175f033c".freeze
     @release = true
     # end ivars
 

data/lib/bundler/resolver.rb

@@ -311,7 +311,16 @@ module Bundler
     def prepare_dependencies(requirements, packages)
       to_dependency_hash(requirements, packages).map do |dep_package, dep_constraint|
         name = dep_package.name
-        next if dep_package.platforms.empty?
+
+        # If a dependency is scoped to a platform different from the current
+        # one, we ignore it. However, it may reappear during resolution as a
+        # transitive dependency of another package, so we need to reset the
+        # package so the proper versions are considered if reintroduced later.
+        if dep_package.platforms.empty?
+          @packages.delete(name)
+          next
+        end
+
         next [dep_package, dep_constraint] if name == "bundler"
         next [dep_package, dep_constraint] unless versions_for(dep_package, dep_constraint.range).empty?
         next unless dep_package.current_platform?

data/lib/bundler/source/git/git_proxy.rb

@@ -58,6 +58,7 @@ module Bundler
           @explicit_ref = branch || tag || ref
           @revision = revision
           @git      = git
+          @commit_ref = nil
         end
 
         def revision
@@ -116,7 +117,7 @@ module Bundler
             end
           end
 
-          git "fetch", "--force", "--quiet", *extra_fetch_args, :dir => destination
+          git "fetch", "--force", "--quiet", *extra_fetch_args, :dir => destination if @commit_ref
 
           git "reset", "--hard", @revision, :dir => destination
 
@@ -185,11 +186,16 @@ module Bundler
         end
 
         def refspec
-          return ref if pinned_to_full_sha?
+          commit = pinned_to_full_sha? ? ref : @revision
 
-          ref_to_fetch = @revision || fully_qualified_ref
+          if commit
+            @commit_ref = "refs/#{commit}-sha"
+            return "#{commit}:#{@commit_ref}"
+          end
+
+          reference = fully_qualified_ref
 
-          ref_to_fetch ||= if ref.include?("~")
+          reference ||= if ref.include?("~")
             ref.split("~").first
           elsif ref.start_with?("refs/")
             ref
@@ -197,7 +203,7 @@ module Bundler
             "refs/*"
           end
 
-          "#{ref_to_fetch}:#{ref_to_fetch}"
+          "#{reference}:#{reference}"
         end
 
         def fully_qualified_ref
@@ -218,10 +224,6 @@ module Bundler
           ref =~ /\A\h{40}\z/
         end
 
-        def legacy_locked_revision?
-          !@revision.nil? && @revision =~ /\A\h{7}\z/
-        end
-
         def git_null(*command, dir: nil)
           check_allowed(command)
 
@@ -241,9 +243,9 @@ module Bundler
 
           out, err, status = capture(command, dir)
 
-          Bundler.ui.warn err unless err.empty?
+          raise GitCommandError.new(command_with_no_credentials, dir || SharedHelpers.pwd, err) unless status.success?
 
-          raise GitCommandError.new(command_with_no_credentials, dir || SharedHelpers.pwd, out) unless status.success?
+          Bundler.ui.warn err unless err.empty?
 
           out
         end
@@ -344,9 +346,10 @@ module Bundler
         end
 
         def extra_clone_args
-          return [] if full_clone?
+          args = depth_args
+          return [] if args.empty?
 
-          args = ["--depth", depth.to_s, "--single-branch"]
+          args += ["--single-branch"]
           args.unshift("--no-tags") if supports_cloning_with_no_tags?
 
           args += ["--branch", branch || tag] if branch || tag
@@ -361,7 +364,7 @@ module Bundler
 
         def extra_fetch_args
           extra_args = [path.to_s, *depth_args]
-          extra_args.push(revision) unless legacy_locked_revision?
+          extra_args.push(@commit_ref)
           extra_args
         end
 

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.4.0".freeze
+  VERSION = "2.4.1".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.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - André Arko