rubygems-update 3.6.4 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc81b948a826d45be9743560cd9a4c6ffe9d92e0dea79ebb9d187dac9866f7f5
-  data.tar.gz: 36d43dc2ba4926c708fb9b37aea3b24f6027a32cb05fce0fe9f506ab0fa5c99a
+  metadata.gz: 5d1ec8a0b30ce414d0ea85439f4759b5142e0d75936af1cb6942f99487de49da
+  data.tar.gz: b9298777fcbf694f471da4b1ca6e2a533e21d50358b601cf6b040ee5c0ffb828
 SHA512:
-  metadata.gz: be2f64f101857b2b2f915eddef37db8050a9efd0e7a6da467592bdd82fd8bd6ffa0fdfe6a7ac4b34f20c52a7286b22dba8d50755ed5120a0ed15225664832c45
-  data.tar.gz: bbbc5bb8a5eb27416612738b05c053850546b538990db7be844ebf5afaeeb2c0c2d2c3edca38d66c769624884257567da16b2e0f2317b448026d854b58e56ee1
+  metadata.gz: 47499f9c05064f71bd1fa0819a47bce356b3495923cc8920a56677667a64811ec44e328079b549a8b53d1b6a8a9bed3a28ee6c82f0f959754a2405b8fce196b4
+  data.tar.gz: 4190fea70cdfdf8e212c7c7fe6c5e71a6228b1235bb5d9f229bfae52a514f43331df82232bef5085d11907cc14ee522f40e9af60b4c3b54ae4ee81dc021127f1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 3.6.5 / 2025-02-20
+
+## Enhancements:
+
+* Installs bundler 2.6.5 as a default gem.
+
+## Documentation:
+
+* Removed `gem server` from `gem help`. Pull request
+  [#8507](https://github.com/rubygems/rubygems/pull/8507) by hsbt
+
 # 3.6.4 / 2025-02-17
 
 ## Enhancements:

data/bundler/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.6.5 (February 20, 2025)
+
+## Enhancements:
+
+  - Fix lockfile platforms inconveniently added on JRuby [#8494](https://github.com/rubygems/rubygems/pull/8494)
+
+## Bug fixes:
+
+  - Fix resolver issue due to ill-defined version ranges being created [#8503](https://github.com/rubygems/rubygems/pull/8503)
+  - Make sure empty gems are not reinstalled every time [#8502](https://github.com/rubygems/rubygems/pull/8502)
+
 # 2.6.4 (February 17, 2025)
 
 ## Enhancements:

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 = "2025-02-17".freeze
-    @git_commit_sha = "87f7bf0ac12".freeze
+    @built_at = "2025-02-20".freeze
+    @git_commit_sha = "cffd973142d".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/definition.rb

@@ -490,7 +490,7 @@ module Bundler
     end
 
     def validate_platforms!
-      return if current_platform_locked?
+      return if current_platform_locked? || @platforms.include?(Gem::Platform::RUBY)
 
       raise ProductionError, "Your bundle only supports platforms #{@platforms.map(&:to_s)} " \
         "but your local platform is #{local_platform}. " \
@@ -731,7 +731,7 @@ module Bundler
     end
 
     def start_resolution
-      local_platform_needed_for_resolvability = @most_specific_non_local_locked_ruby_platform && !@platforms.include?(local_platform)
+      local_platform_needed_for_resolvability = @most_specific_non_local_locked_platform && !@platforms.include?(local_platform)
       @platforms << local_platform if local_platform_needed_for_resolvability
       add_platform(Gem::Platform::RUBY) if RUBY_ENGINE == "truffleruby"
 
@@ -739,9 +739,9 @@ module Bundler
 
       @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version
 
-      if @most_specific_non_local_locked_ruby_platform
-        if spec_set_incomplete_for_platform?(result, @most_specific_non_local_locked_ruby_platform)
-          @platforms.delete(@most_specific_non_local_locked_ruby_platform)
+      if @most_specific_non_local_locked_platform
+        if spec_set_incomplete_for_platform?(result, @most_specific_non_local_locked_platform)
+          @platforms.delete(@most_specific_non_local_locked_platform)
         elsif local_platform_needed_for_resolvability
           @platforms.delete(local_platform)
         end
@@ -758,23 +758,23 @@ module Bundler
 
     def current_platform_locked?
       @platforms.any? do |bundle_platform|
-        MatchPlatform.platforms_match?(bundle_platform, local_platform)
+        generic_local_platform == bundle_platform || local_platform === bundle_platform
       end
     end
 
     def add_current_platform
       return if @platforms.include?(local_platform)
 
-      @most_specific_non_local_locked_ruby_platform = find_most_specific_locked_ruby_platform
-      return if @most_specific_non_local_locked_ruby_platform
+      @most_specific_non_local_locked_platform = find_most_specific_locked_platform
+      return if @most_specific_non_local_locked_platform
 
       @new_platforms << local_platform
       @platforms << local_platform
       true
     end
 
-    def find_most_specific_locked_ruby_platform
-      return unless generic_local_platform_is_ruby? && current_platform_locked?
+    def find_most_specific_locked_platform
+      return unless current_platform_locked?
 
       @most_specific_locked_platform
     end

data/bundler/lib/bundler/resolver.rb

@@ -237,7 +237,7 @@ module Bundler
             sorted_versions[high]
           end
 
-        range = PubGrub::VersionRange.new(min: low, max: high, include_min: true)
+        range = PubGrub::VersionRange.new(min: low, max: high, include_min: !low.nil?)
 
         self_constraint = PubGrub::VersionConstraint.new(package, range: range)
 

data/bundler/lib/bundler/rubygems_ext.rb

@@ -259,7 +259,7 @@ module Gem
     end
 
     def installation_missing?
-      !default_gem? && (!Dir.exist?(full_gem_path) || Dir.empty?(full_gem_path))
+      !default_gem? && !File.directory?(full_gem_path)
     end
 
     unless VALIDATES_FOR_RESOLUTION

data/bundler/lib/bundler/version.rb

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

data/lib/rubygems/command.rb

@@ -650,9 +650,6 @@ RubyGems is a package manager for Ruby.
     gem help platforms           gem platforms guide
     gem help <COMMAND>           show help on COMMAND
                                    (e.g. 'gem help install')
-    gem server                   present a web page at
-                                 http://localhost:8808/
-                                 with info about installed gems
   Further information:
     https://guides.rubygems.org
   HELP

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.6.4"
+  VERSION = "3.6.5"
 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.6.4"
+  s.version = "3.6.5"
   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.6.4
+  version: 3.6.5
 platform: ruby
 authors:
 - Jim Weirich
@@ -15,7 +15,7 @@ authors:
 - Hiroshi SHIBATA
 bindir: exe
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -746,7 +746,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.4
+rubygems_version: 3.6.5
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby. This gem is downloaded
   and installed by `gem update --system`, so that the `gem` CLI can update itself.