bundler 2.5.13 → 2.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d55a4e4a51daffe5907ad748a96349876c9797fdf174433a32754c3d062236b
-  data.tar.gz: 3650a3a40f4b01e274b4a72f5a167354600e9d404aa3b688f8bb006023877eb3
+  metadata.gz: e72f84d19fe7fbbf434d993f34d7b4cd12272cd72d4c61d6f02e7eb664f5058b
+  data.tar.gz: d80704aaae9adfb1132c0902c4acfd0e41e4a082d4d7a5b8c174f0a4a14d28e1
 SHA512:
-  metadata.gz: 3f558a26f42b927607933af8ad62e30a9ee6350dfe8230584b8e9d57fbd414f5b4239ac119c289dbf52ca7881cd956d69255f44b4e389e87d522c168ff67178b
-  data.tar.gz: b50b14773bd8b8aab8d938b322c1e93e0454bef759fedd74a054dc64cdc25d85990c1a9e843e5a8ba2be15fd937ca73d64a41dce76496ad5fcb2f2bcca562953
+  metadata.gz: 5f3e9bea39eb37f092d0372e596a4803ed3ada1f70f00d0406554dc170ffef9f1c451cc98636d608669f673d199efa97c639f72c69be3adab05d417580d43a6e
+  data.tar.gz: e1694c53d80fda23087d492e6a6264e230c12cc7a488c479987550afcbb51904284b6476ab62eea7f992ac051675f564f2596d9dce9f7ba9f543a9e382d165df

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.5.14 (June 21, 2024)
+
+## Bug fixes:
+
+  - Fix credentials being re-added when re-resolving without a full unlock [#7767](https://github.com/rubygems/rubygems/pull/7767)
+  - Fix `bundle update <gem_name>` edge case [#7770](https://github.com/rubygems/rubygems/pull/7770)
+  - Fix `bundle fund` when the gemfile contains optional groups [#7758](https://github.com/rubygems/rubygems/pull/7758)
+
 # 2.5.13 (June 14, 2024)
 
 ## Bug fixes:

data/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2024-06-14".freeze
-    @git_commit_sha = "5525a3d9b0".freeze
+    @built_at = "2024-06-21".freeze
+    @git_commit_sha = "72920bc230".freeze
     @release = true
     # end ivars
 

data/lib/bundler/cli/fund.rb

@@ -16,7 +16,7 @@ module Bundler
       deps = if groups.any?
         Bundler.definition.dependencies_for(groups)
       else
-        Bundler.definition.current_dependencies
+        Bundler.definition.requested_dependencies
       end
 
       fund_info = deps.each_with_object([]) do |dep, arr|

data/lib/bundler/definition.rb

@@ -1058,6 +1058,7 @@ module Bundler
                 (@new_platform && platforms.last == platform) ||
                 @path_changes ||
                 @dependency_changes ||
+                @locked_spec_with_invalid_deps ||
                 !@originally_locked_specs.incomplete_for_platform?(dependencies, platform)
 
         remove_platform(platform)

data/lib/bundler/source/rubygems.rb

@@ -10,7 +10,7 @@ module Bundler
       # Ask for X gems per API request
       API_REQUEST_SIZE = 50
 
-      attr_reader :remotes
+      attr_accessor :remotes
 
       def initialize(options = {})
         @options = options
@@ -20,9 +20,10 @@ module Bundler
         @allow_cached = false
         @allow_local = options["allow_local"] || false
         @checksum_store = Checksum::Store.new
-        @original_remotes = nil
 
         Array(options["remotes"]).reverse_each {|r| add_remote(r) }
+
+        @lockfile_remotes = @remotes if options["from_lockfile"]
       end
 
       def caches
@@ -92,12 +93,7 @@ module Bundler
 
       def self.from_lock(options)
         options["remotes"] = Array(options.delete("remote")).reverse
-        new(options)
-      end
-
-      def remotes=(new_remotes)
-        @original_remotes = @remotes
-        @remotes = new_remotes
+        new(options.merge("from_lockfile" => true))
       end
 
       def to_lock
@@ -470,7 +466,7 @@ module Bundler
       private
 
       def lockfile_remotes
-        @original_remotes || credless_remotes
+        @lockfile_remotes || credless_remotes
       end
 
       # Checks if the requested spec exists in the global cache. If it does,

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.5.13".freeze
+  VERSION = "2.5.14".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.5.13
+  version: 2.5.14
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-14 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.2.3
 requirements: []
-rubygems_version: 3.5.13
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies