rubygems-update 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: defa5f3855c57554726a4a03c00cffbe64a1ba06e3c4c95f9f9841c5bc7317bd
-  data.tar.gz: 242f793a3af341087dabd3a38fba0271b56a89c01c912b5f35246e5356982956
+  metadata.gz: 9ff07798220eea8fe771daf272bc87ef2e3e37cc0a6868107be9c6778956fa35
+  data.tar.gz: 0c77e50152f414b51e7d57d07d270b883b8b775cd55e1804cbac0318384b323b
 SHA512:
-  metadata.gz: 27c0065f1c65feb271ad19465d846e67d70781be9e34511c4e5c394f767a83f1bd2b05c76b93101f7f3dcfcc00ee8c8c8e45ae33b36184e65430a1382f2d508f
-  data.tar.gz: 45b3105bbef280a6203a7d852e7cf53b501669833b053b5a747b898a6740fd82a7cb40cd55e643509b316bae89e6b90cb27a371aa68aba2d6c505e183694629c
+  metadata.gz: 9d75fee7a19d1b77e660665c3880063201df700d261c21e28d050d07102a5817f7561f5832f6cd4aadd3aba0f29606ba264e38db378d87d38c1133dee2fb8e3b
+  data.tar.gz: cf3773f53b3f5fb0555286da101354b7259412af4476991b6e854d0d3755837275b0712c8ad994955f1e374918cf8f220e50c1983aee7f9611058e1cb4a4d1f8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.4.1 / 2022-12-24
+
+## Enhancements:
+
+* Installs bundler 2.4.1 as a default gem.
+
 # 3.4.0 / 2022-12-24
 
 ## Breaking changes:

data/bundler/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/bundler/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/bundler/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/bundler/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/bundler/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/bundler/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

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.4.0".freeze
+  VERSION = "3.4.1".freeze
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.4.0"
+  s.version = "3.4.1"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Jim Weirich