rubygems-update 3.4.16 → 3.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be48b13a32b3121b742f3e75a1875f23a0c96137968ffef4f1473f4b95f786d3
-  data.tar.gz: 9cad526787941e6a6d773b964245a3303f392eee8850dfa0f8de69c33f1fc191
+  metadata.gz: 1dce699162c0d7d3dcb1a7e343a35614d1e4a0e872a86e3633aeeb67e4bd6cfd
+  data.tar.gz: 9a2b166b3a6e8b305be3a8b0de810e42b76f863276076febcad876320178add0
 SHA512:
-  metadata.gz: fbc3f7cfd6a239b7acdef9cc4557a62a3552357b0f87f5125f8348a4f2092201700d573089ed7de7cee44f556b9b3ca672b958e36757303e4605cbca66adae8e
-  data.tar.gz: 5fb7a1868602b74e427a48059d9d1aba9e11ab145f1d2e707f5303efc3468b76a5b9e9d05912dac17c46c32d752bd8ea61e13fa25f9bf2f8a5c10ca93f3e8fc0
+  metadata.gz: 01516f536a455a206fdcafcf3f6122d59329afbe037aca75e1caf46ea806ed51e20b6b18c6cbd23753ad9e416d30941dfd5db44aed9bbe58bfa29e8b6ad6cbaf
+  data.tar.gz: a602c953644e0484737428608fdf934d4cae92e3861cf107c71aae59446d82f719d2babe14eb14d0495ff4e4ab49bc39751160808a9a65440fd5aafc66e649b9

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 3.4.17 / 2023-07-14
+
+## Enhancements:
+
+* Installs bundler 2.4.17 as a default gem.
+
+## Performance:
+
+* Avoid unnecessary work for private local gem installation. Pull request
+  [#6810](https://github.com/rubygems/rubygems/pull/6810) by
+  deivid-rodriguez
+
 # 3.4.16 / 2023-07-10
 
 ## Enhancements:

data/bundler/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.4.17 (July 14, 2023)
+
+## Enhancements:
+
+  - Avoid printing "Using ..." messages when version has not changed [#6804](https://github.com/rubygems/rubygems/pull/6804)
+
+## Bug fixes:
+
+  - Fix `bundler/setup` unintendedly writing to the filesystem [#6814](https://github.com/rubygems/rubygems/pull/6814)
+
 # 2.4.16 (July 10, 2023)
 
 ## 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 = "2023-07-10".freeze
-    @git_commit_sha = "bd573c7f8b".freeze
+    @built_at = "2023-07-14".freeze
+    @git_commit_sha = "36ea2bc283".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/feature_flag.rb

@@ -37,7 +37,6 @@ module Bundler
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
     settings_flag(:print_only_version_number) { bundler_3_mode? }
     settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? }
-    settings_flag(:suppress_install_using_messages) { bundler_3_mode? }
     settings_flag(:update_requires_all_flag) { bundler_4_mode? }
 
     settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }

data/bundler/lib/bundler/man/bundle-config.1

@@ -284,9 +284,6 @@ The following is a list of all configuration keys and their purpose\. You can le
 \fBssl_verify_mode\fR (\fBBUNDLE_SSL_VERIFY_MODE\fR): The SSL verification mode Bundler uses when making HTTPS requests\. Defaults to verify peer\.
 .
 .IP "\(bu" 4
-\fBsuppress_install_using_messages\fR (\fBBUNDLE_SUPPRESS_INSTALL_USING_MESSAGES\fR): Avoid printing \fBUsing \.\.\.\fR messages during installation when the version of a gem has not changed\.
-.
-.IP "\(bu" 4
 \fBsystem_bindir\fR (\fBBUNDLE_SYSTEM_BINDIR\fR): The location where RubyGems installs binstubs\. Defaults to \fBGem\.bindir\fR\.
 .
 .IP "\(bu" 4

data/bundler/lib/bundler/man/bundle-config.1.ronn

@@ -265,9 +265,6 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
 * `ssl_verify_mode` (`BUNDLE_SSL_VERIFY_MODE`):
    The SSL verification mode Bundler uses when making HTTPS requests.
    Defaults to verify peer.
-* `suppress_install_using_messages` (`BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES`):
-   Avoid printing `Using ...` messages during installation when the version of
-   a gem has not changed.
 * `system_bindir` (`BUNDLE_SYSTEM_BINDIR`):
    The location where RubyGems installs binstubs. Defaults to `Gem.bindir`.
 * `timeout` (`BUNDLE_TIMEOUT`):

data/bundler/lib/bundler/settings.rb

@@ -43,7 +43,6 @@ module Bundler
       setup_makes_kernel_gem_public
       silence_deprecations
       silence_root_warning
-      suppress_install_using_messages
       update_requires_all_flag
     ].freeze
 

data/bundler/lib/bundler/source/git.rb

@@ -69,19 +69,7 @@ module Bundler
 
       def to_s
         begin
-          at = if local?
-            path
-          elsif user_ref = options["ref"]
-            if /\A[a-z0-9]{4,}\z/i.match?(ref)
-              shortref_for_display(user_ref)
-            else
-              user_ref
-            end
-          elsif ref
-            ref
-          else
-            current_branch
-          end
+          at = humanized_ref || current_branch
 
           rev = "at #{at}@#{shortref_for_display(revision)}"
         rescue GitError
@@ -91,6 +79,10 @@ module Bundler
         uri_with_specifiers([rev, glob_for_display])
       end
 
+      def identifier
+        uri_with_specifiers([humanized_ref, cached_revision, glob_for_display])
+      end
+
       def uri_with_specifiers(specifiers)
         specifiers.compact!
 
@@ -256,6 +248,20 @@ module Bundler
 
       private
 
+      def humanized_ref
+        if local?
+          path
+        elsif user_ref = options["ref"]
+          if /\A[a-z0-9]{4,}\z/i.match?(ref)
+            shortref_for_display(user_ref)
+          else
+            user_ref
+          end
+        elsif ref
+          ref
+        end
+      end
+
       def serialize_gemspecs_in(destination)
         destination = destination.expand_path(Bundler.root) if destination.relative?
         Dir["#{destination}/#{@glob}"].each do |spec_path|

data/bundler/lib/bundler/source.rb

@@ -100,7 +100,7 @@ module Bundler
     end
 
     def print_using_message(message)
-      if !message.include?("(was ") && Bundler.feature_flag.suppress_install_using_messages?
+      if !message.include?("(was ")
         Bundler.ui.debug message
       else
         Bundler.ui.info message

data/bundler/lib/bundler/version.rb

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

data/lib/rubygems/resolver/installer_set.rb

@@ -147,6 +147,8 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
       res << Gem::Resolver::InstalledSpecification.new(self, gemspec)
     end unless @ignore_installed
 
+    matching_local = []
+
     if consider_local?
       matching_local = @local.values.select do |spec, _|
         req.match? spec
@@ -167,7 +169,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
       end
     end
 
-    res.concat @remote_set.find_all req if consider_remote?
+    res.concat @remote_set.find_all req if consider_remote? && matching_local.empty?
 
     res
   end

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.4.16"
+  VERSION = "3.4.17"
 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.16"
+  s.version = "3.4.17"
   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_dependency_installer.rb

@@ -475,6 +475,40 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
   end
 
+  def test_install_local_dependency_no_network_for_target_gem
+    a1, a1_gem = util_gem "a", "1"
+    _, b1_gem = util_gem "b", "1" do |s|
+      s.add_dependency "a"
+    end
+
+    util_setup_spec_fetcher(a1)
+
+    a1_data = Gem.read_binary(a1_gem)
+    @fetcher.data["http://gems.example.com/gems/a-1.gem"] = a1_data
+
+    # compact index is available
+    compact_index_response = Net::HTTPResponse.new "1.1", 200, "OK"
+    compact_index_response.uri = URI("http://gems.example.com")
+    @fetcher.data["http://gems.example.com/"] = compact_index_response
+
+    # but private local gem not present there
+    @fetcher.data["http://gems.example.com/info/b"] =
+      proc do
+        raise "should not happen"
+      end
+
+    FileUtils.mv b1_gem, @tempdir
+
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::DependencyInstaller.new
+      inst.install "b-1.gem"
+    end
+
+    assert_equal %w[a-1 b-1], inst.installed_gems.map(&:full_name)
+  end
+
   def test_install_local_subdir
     util_setup_gems
 

data/test/rubygems/test_gem_request.rb

@@ -2,7 +2,6 @@
 require_relative "helper"
 require "rubygems/request"
 require "ostruct"
-require "base64"
 
 unless Gem::HAVE_OPENSSL
   warn "Skipping Gem::Request tests.  openssl not found."
@@ -20,6 +19,12 @@ class TestGemRequest < Gem::TestCase
     Gem::Request.create_with_proxy uri, request_class, last_modified, proxy
   end
 
+  # This method is same code as Base64.encode64
+  # We should not use Base64.encode64 because we need to avoid gem activation.
+  def base64_encode64(bin)
+    [bin].pack("m")
+  end
+
   def setup
     @proxies = %w[http_proxy https_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
     @old_proxies = @proxies.map {|k| ENV[k] }
@@ -208,7 +213,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{Base64.encode64('user:pass')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64('user:pass')}".strip, auth_header
     assert_includes @ui.output, "GET https://user:REDACTED@example.rubygems/specs.#{Gem.marshal_version}"
   end
 
@@ -225,7 +230,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{Base64.encode64('user:{DEScede}pass')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64('user:{DEScede}pass')}".strip, auth_header
     assert_includes @ui.output, "GET https://user:REDACTED@example.rubygems/specs.#{Gem.marshal_version}"
   end
 
@@ -242,7 +247,7 @@ class TestGemRequest < Gem::TestCase
     end
 
     auth_header = conn.payload["Authorization"]
-    assert_equal "Basic #{Base64.encode64('{DEScede}pass:x-oauth-basic')}".strip, auth_header
+    assert_equal "Basic #{base64_encode64('{DEScede}pass:x-oauth-basic')}".strip, auth_header
     assert_includes @ui.output, "GET https://REDACTED:x-oauth-basic@example.rubygems/specs.#{Gem.marshal_version}"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.4.16
+  version: 3.4.17
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -843,7 +843,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.16
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby. This gem is downloaded