rubygems-update 3.5.13 → 3.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba43972154c4bfe3b9e6700736425ca2934a30e7225778447376219a7cc40a57
-  data.tar.gz: be68d1a1754f86847cceec72d9f27867f38c53c9b5c80c6f96123fed943a3e30
+  metadata.gz: 101bb4d3835465ae355294d968d11286a9f40d1ffcd1ac3a99a54a93d40af5d8
+  data.tar.gz: 2f93681d561672e3b4096fdd0fada43eee91318fc8a851e0afc6afb6cdf2dd06
 SHA512:
-  metadata.gz: d54f3382258bcb1794e73d9c7fb4ce854435396bad2fe8ece3a5030bb3f0615c8d128590eceeb1cd0bd45c46958e2a924f905ec76878b014ec65223d685554c7
-  data.tar.gz: 5f26b6a23c3dc01f8c30988a9abc9d8c8c77a29d1cd48c28e22303468a39d7ddd94fd261ab3b70c18a4193f91dcea26c152747df51853368048c5d824ab4e9bc
+  metadata.gz: 501d248170dd4bf953705741e93816b1a9a706b0ce6e586383678bc575645420c42c8196e0c42fdaae75d4b53e621ba1c56308d02deb47b843e734a416922851
+  data.tar.gz: 7bba23888fa59d7d73c7db9c667845235672b000bb29fd0b652d202e6cc1f4279d3d3beb9b26e62eeadb21a1d64bbda58fcc2e9fc08a7dcdeb5b821b74cb6a0d

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 3.5.14 / 2024-06-21
+
+## Enhancements:
+
+* Installs bundler 2.5.14 as a default gem.
+
+## Bug fixes:
+
+* Make "bundler? update --bundler" behave identically. Pull request
+  [#7778](https://github.com/rubygems/rubygems/pull/7778) by x-yuri
+
 # 3.5.13 / 2024-06-14
 
 ## Enhancements:

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

data/lib/rubygems/bundler_version_finder.rb

@@ -21,7 +21,7 @@ module Gem::BundlerVersionFinder
   end
 
   def self.bundle_update_bundler_version
-    return unless File.basename($0) == "bundle"
+    return unless ["bundle", "bundler"].include? File.basename($0)
     return unless "update".start_with?(ARGV.first || " ")
     bundler_version = nil
     update_index = nil

data/lib/rubygems/requirement.rb

@@ -13,8 +13,8 @@ class Gem::Requirement
   OPS = { # :nodoc:
     "=" => lambda {|v, r| v == r },
     "!=" => lambda {|v, r| v != r },
-    ">" => lambda {|v, r| v >  r },
-    "<" => lambda {|v, r| v <  r },
+    ">" => lambda {|v, r| v > r },
+    "<" => lambda {|v, r| v < r },
     ">=" => lambda {|v, r| v >= r },
     "<=" => lambda {|v, r| v <= r },
     "~>" => lambda {|v, r| v >= r && v.release < r.bump },

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.5.13"
+  VERSION = "3.5.14"
 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.5.13"
+  s.version = "3.5.14"
   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.5.13
+  version: 3.5.14
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,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: |-
   A package (also known as a library) contains a set of functionality
@@ -727,7 +727,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby. This gem is downloaded