rubygems-update 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750773ce8a64c0d956a7a38abc7e14a70a361510081982f6e34dbbf85c5cbf65
-  data.tar.gz: a6963c67ef4e2300c549c3d95b5d1e67ff54afcff113215b0a35e7f11973bdec
+  metadata.gz: a8b1ab86a06b30bdc5a03f3124e2e2c7ac40db3e5c5fb5d2e2ae9f42c6bfd549
+  data.tar.gz: c885501752d796f4a2b656a537242e889c04bb1e67f1d6d21da9047225e5d89f
 SHA512:
-  metadata.gz: 158cd64df064a030d8d350f0f66f9d9805018fea3dba122349a1ad239db0579e832d021035bb8f33cccb78f7a227fcfd0ceb4b0a4602a944102c12378f6b480e
-  data.tar.gz: d359d94fd7939b2c21f0830d64eb1d60d7b3dff016cb7e25299ca7391a24d76970cadb1a3287144a0354d72cf9461a1ca98faf22359e18df799a3a360580dd67
+  metadata.gz: bb514eb2ad2813f5ecf90fbe3ffd1c04bf5af6b34cad1b18f77da08a99c0755b18af42314c2ca1073b2d8af58db2eee81a946dd1890c5098ddaabf263cace321
+  data.tar.gz: 978538c03440b713418a53126275355e4b0cc3bf31ea0b6574c1813fcaa8b9efe643dcde824a48b2f19eebdf706d5aeba6a10e6ae488e928cf3058f00e2c6e9a

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 3.3.4 / 2021-12-29
+
+## Enhancements:
+
+* Don't redownload `rubygems-update` package if already there. Pull
+  request #5230 by deivid-rodriguez
+* Installs bundler 2.3.4 as a default gem.
+
+## Bug fixes:
+
+* Fix `gem update --system` crashing when latest version not supported.
+  Pull request #5191 by deivid-rodriguez
+
+## Performance:
+
+* Make SpecificationPolicy autoload constant. Pull request #5222 by pocke
+
 # 3.3.3 / 2021-12-24
 
 ## Enhancements:

data/bundler/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.3.4 (December 29, 2021)
+
+## Enhancements:
+
+  - Improve error message when `BUNDLED WITH` version does not exist [#5205](https://github.com/rubygems/rubygems/pull/5205)
+
+## Bug fixes:
+
+  - Fix `bundle update --bundler` no longer updating lockfile [#5224](https://github.com/rubygems/rubygems/pull/5224)
+
 # 2.3.3 (December 24, 2021)
 
 ## 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 = "2021-12-24".freeze
-    @git_commit_sha = "688b71febc".freeze
+    @built_at = "2021-12-29".freeze
+    @git_commit_sha = "2296a0d6cc".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/ruby_version.rb

@@ -103,7 +103,7 @@ module Bundler
 
     def self.system
       ruby_engine = RUBY_ENGINE.dup
-      ruby_version = ENV.fetch("BUNDLER_SPEC_RUBY_VERSION") { RUBY_VERSION }.dup
+      ruby_version = RUBY_VERSION.dup
       ruby_engine_version = RUBY_ENGINE_VERSION.dup
       patchlevel = RUBY_PATCHLEVEL.to_s
 

data/bundler/lib/bundler/self_manager.rb

@@ -15,10 +15,6 @@ module Bundler
     def install_locked_bundler_and_restart_with_it_if_needed
       return unless needs_switching?
 
-      Bundler.ui.info \
-        "Bundler #{current_version} is running, but your lockfile was generated with #{lockfile_version}. " \
-        "Installing Bundler #{lockfile_version} and restarting using that version."
-
       install_and_restart_with_locked_bundler
     end
 
@@ -26,8 +22,14 @@ module Bundler
 
     def install_and_restart_with_locked_bundler
       bundler_dep = Gem::Dependency.new("bundler", lockfile_version)
+      spec = fetch_spec_for(bundler_dep)
+      return if spec.nil?
 
-      Gem.install(bundler_dep)
+      Bundler.ui.info \
+        "Bundler #{current_version} is running, but your lockfile was generated with #{lockfile_version}. " \
+        "Installing Bundler #{lockfile_version} and restarting using that version."
+
+      spec.source.install(spec)
     rescue StandardError => e
       Bundler.ui.trace e
       Bundler.ui.warn "There was an error installing the locked bundler version (#{lockfile_version}), rerun with the `--verbose` flag for more details. Going on using bundler #{current_version}."
@@ -35,6 +37,17 @@ module Bundler
       restart_with_locked_bundler
     end
 
+    def fetch_spec_for(bundler_dep)
+      source = Bundler::Source::Rubygems.new("remotes" => "https://rubygems.org")
+      source.remote!
+      source.add_dependency_names("bundler")
+      spec = source.specs.search(bundler_dep).first
+      if spec.nil?
+        Bundler.ui.warn "Your lockfile is locked to a version of bundler (#{lockfile_version}) that doesn't exist at https://rubygems.org/. Going on using #{current_version}"
+      end
+      spec
+    end
+
     def restart_with_locked_bundler
       configured_gem_home = ENV["GEM_HOME"]
       configured_gem_path = ENV["GEM_PATH"]
@@ -56,7 +69,12 @@ module Bundler
         SharedHelpers.in_bundle? &&
         lockfile_version &&
         !lockfile_version.end_with?(".dev") &&
-        lockfile_version != current_version
+        lockfile_version != current_version &&
+        !updating?
+    end
+
+    def updating?
+      "update".start_with?(ARGV.first || " ") && ARGV[1..-1].any? {|a| a.start_with?("--bundler") }
     end
 
     def installed?

data/bundler/lib/bundler/version.rb

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

data/lib/rubygems/commands/update_command.rb

@@ -286,10 +286,11 @@ command to remove old versions.
 
     check_oldest_rubygems version
 
-    update_gem 'rubygems-update', version
-
     installed_gems = Gem::Specification.find_all_by_name 'rubygems-update', requirement
-    version        = installed_gems.first.version
+    installed_gems = update_gem('rubygems-update', version) if installed_gems.empty?
+    return if installed_gems.empty?
+
+    version = installed_gems.first.version
 
     install_rubygems version
   end

data/lib/rubygems/specification.rb

@@ -11,7 +11,6 @@ require_relative 'basic_specification'
 require_relative 'stub_specification'
 require_relative 'platform'
 require_relative 'requirement'
-require_relative 'specification_policy'
 require_relative 'util/list'
 
 ##

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = "3.3.3".freeze
+  VERSION = "3.3.4".freeze
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -1316,6 +1316,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   autoload :Source,             File.expand_path('rubygems/source', __dir__)
   autoload :SourceList,         File.expand_path('rubygems/source_list', __dir__)
   autoload :SpecFetcher,        File.expand_path('rubygems/spec_fetcher', __dir__)
+  autoload :SpecificationPolicy, File.expand_path('rubygems/specification_policy', __dir__)
   autoload :Util,               File.expand_path('rubygems/util', __dir__)
   autoload :Version,            File.expand_path('rubygems/version', __dir__)
 end

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.3.3"
+  s.version = "3.3.4"
   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"]
 

data/test/rubygems/test_gem_commands_update_command.rb

@@ -106,6 +106,31 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_empty out
   end
 
+  def test_execute_system_when_latest_does_not_support_your_ruby
+    spec_fetcher do |fetcher|
+      fetcher.download 'rubygems-update', 9 do |s|
+        s.files = %w[setup.rb]
+        s.required_ruby_version = '> 9'
+      end
+    end
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating rubygems-update", out.shift
+    assert_empty out
+
+    err = @ui.error.split "\n"
+    assert_equal "ERROR:  Error installing rubygems-update:", err.shift
+    assert_equal "\trubygems-update-9 requires Ruby version > 9. The current ruby version is #{Gem.ruby_version}.", err.shift
+    assert_empty err
+  end
+
   def test_execute_system_multiple
     spec_fetcher do |fetcher|
       fetcher.download 'rubygems-update', 8 do |s|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -804,7 +804,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.