[rubygems/rubygems] util/rubocop -A --only Style/FormatString

rubygems/rubygems@132a56569d
thesamesam · Apr 7, 2023 · 250e97c · 250e97c
1 parent 84ce6fc
commit 250e97c
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 56 deletions.
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
@@ -948,7 +948,7 @@ def self.time(msg, width = 0, display = Gem.configuration.verbose)
 
     elapsed = Time.now - now
 
-    ui.say "%2$*1$s: %3$3.3fs" % [-width, msg, elapsed] if display
+    ui.say format("%2$*1$s: %3$3.3fs", -width, msg, elapsed) if display
 
     value
   end

diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
@@ -343,7 +343,7 @@ def show_commands # :nodoc:
         end
 
       summary = wrap(summary, summary_width).split "\n"
-      out << sprintf(format, cmd_name, summary.shift)
+      out << format(format, cmd_name, summary.shift)
       until summary.empty? do
         out << "#{wrap_indent}#{summary.shift}"
       end

diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
@@ -74,11 +74,9 @@ def hash # :nodoc:
 
   def inspect # :nodoc:
     if prerelease?
-      "<%s type=%p name=%p requirements=%p prerelease=ok>" %
-        [self.class, type, name, requirement.to_s]
+      format("<%s type=%p name=%p requirements=%p prerelease=ok>", self.class, type, name, requirement.to_s)
     else
-      "<%s type=%p name=%p requirements=%p>" %
-        [self.class, type, name, requirement.to_s]
+      format("<%s type=%p name=%p requirements=%p>", self.class, type, name, requirement.to_s)
     end
   end
 

diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb
@@ -105,7 +105,7 @@ def find_name(full_name)
   end
 
   def inspect # :nodoc:
-    "%s %p>" % [super[0..-2], map(&:full_name)]
+    format("%s %p>", super[0..-2], map(&:full_name))
   end
 
   ##

diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
@@ -109,7 +109,7 @@ def deprecate(name, repl, year, month)
         msg = [
           "NOTE: #{target}#{name} is deprecated",
           repl == :none ? " with no replacement" : "; use #{repl} instead",
-          ". It will be removed on or after %4d-%02d." % [year, month],
+          format(". It will be removed on or after %4d-%02d.", year, month),
           "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
         ]
         warn "#{msg.join}." unless Gem::Deprecate.skip

diff --git a/lib/rubygems/errors.rb b/lib/rubygems/errors.rb
@@ -134,11 +134,7 @@ def add_platform(platform)
     ##
     # A wordy description of the error.
     def wordy
-      "Found %s (%s), but was for platform%s %s" %
-        [@name,
-         @version,
-         @platforms.size == 1 ? "" : "s",
-         @platforms.join(" ,")]
+      format("Found %s (%s), but was for platform%s %s", @name, @version, @platforms.size == 1 ? "" : "s", @platforms.join(" ,"))
     end
   end
 

diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
@@ -30,13 +30,13 @@ def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil, targets = [
     make_program = Shellwords.split(make_program_name)
 
     # The installation of the bundled gems is failed when DESTDIR is empty in mswin platform.
-    destdir = /\bnmake/i !~ make_program_name || ENV["DESTDIR"] && ENV["DESTDIR"] != "" ? "DESTDIR=%s" % ENV["DESTDIR"] : ""
+    destdir = /\bnmake/i !~ make_program_name || ENV["DESTDIR"] && ENV["DESTDIR"] != "" ? format("DESTDIR=%s", ENV["DESTDIR"]) : ""
 
     env = [destdir]
 
     if sitedir
-      env << "sitearchdir=%s" % sitedir
-      env << "sitelibdir=%s" % sitedir
+      env << format("sitearchdir=%s", sitedir)
+      env << format("sitelibdir=%s", sitedir)
     end
 
     targets.each do |target|

diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
@@ -70,15 +70,13 @@ def initialize(message, source = nil)
 
   class PathError < Error
     def initialize(destination, destination_dir)
-      super "installing into parent path %s of %s is not allowed" %
-        [destination, destination_dir]
+      super format("installing into parent path %s of %s is not allowed", destination, destination_dir)
     end
   end
 
   class SymlinkError < Error
     def initialize(name, destination, destination_dir)
-      super "installing symlink '%s' pointing to parent path %s of %s is not allowed" %
-        [name, destination, destination_dir]
+      super format("installing symlink '%s' pointing to parent path %s of %s is not allowed", name, destination, destination_dir)
     end
   end
 

diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb
@@ -241,6 +241,6 @@ def header(checksum = @checksum)
   end
 
   def oct(num, len)
-    "%0#{len}o" % num
+    format("%0#{len}o", num)
   end
 end
diff --git a/lib/rubygems/resolver/activation_request.rb b/lib/rubygems/resolver/activation_request.rb
@@ -92,9 +92,7 @@ def full_spec
   end
 
   def inspect # :nodoc:
-    "#<%s for %p from %s>" % [
-      self.class, @spec, @request
-    ]
+    format("#<%s for %p from %s>", self.class, @spec, @request)
   end
 
   ##

diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb
@@ -64,10 +64,7 @@ def explanation
     %s
       MATCHING
 
-      matching = matching % [
-        dependency,
-        alternates.join(", "),
-      ]
+      matching = format(matching, dependency, alternates.join(", "))
     end
 
     explanation = <<-EXPLANATION
@@ -82,12 +79,7 @@ def explanation
 %s
     EXPLANATION
 
-    explanation % [
-      activated, requirement,
-      request_path(@activated).reverse.join(", depends on\n    "),
-      request_path(@failed_dep).reverse.join(", depends on\n    "),
-      matching
-    ]
+    format(explanation, activated, requirement, request_path(@activated).reverse.join(", depends on\n    "), request_path(@failed_dep).reverse.join(", depends on\n    "), matching)
   end
 
   ##

diff --git a/lib/rubygems/resolver/index_specification.rb b/lib/rubygems/resolver/index_specification.rb
@@ -68,7 +68,7 @@ def hash
   end
 
   def inspect # :nodoc:
-    "#<%s %s source %s>" % [self.class, full_name, @source]
+    format("#<%s %s source %s>", self.class, full_name, @source)
   end
 
   def pretty_print(q) # :nodoc:

diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb
@@ -187,9 +187,7 @@ def prerelease=(allow_prerelease)
   def inspect # :nodoc:
     always_install = @always_install.map(&:full_name)
 
-    "#<%s domain: %s specs: %p always install: %p>" % [
-      self.class, @domain, @specs.keys, always_install
-    ]
+    format("#<%s domain: %s specs: %p always install: %p>", self.class, @domain, @specs.keys, always_install)
   end
 
   ##

diff --git a/lib/rubygems/security/policy.rb b/lib/rubygems/security/policy.rb
@@ -192,11 +192,8 @@ def subject(certificate) # :nodoc:
   end
 
   def inspect # :nodoc:
-    "[Policy: %s - data: %p signer: %p chain: %p root: %p " \
-     "signed-only: %p trusted-only: %p]" % [
-       @name, @verify_chain, @verify_data, @verify_root, @verify_signer,
-       @only_signed, @only_trusted
-     ]
+    format("[Policy: %s - data: %p signer: %p chain: %p root: %p " \
+     "signed-only: %p trusted-only: %p]", @name, @verify_chain, @verify_data, @verify_root, @verify_signer, @only_signed, @only_trusted)
   end
 
   ##

diff --git a/lib/rubygems/source/local.rb b/lib/rubygems/source/local.rb
@@ -29,7 +29,7 @@ def <=>(other)
 
   def inspect # :nodoc:
     keys = @specs ? @specs.keys.sort : "NOT LOADED"
-    "#<%s specs: %p>" % [self.class, keys]
+    format("#<%s specs: %p>", self.class, keys)
   end
 
   def load_specs(type) # :nodoc:

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
@@ -252,16 +252,10 @@ def parse_make_command_line_targets(line)
   def assert_contains_make_command(target, output, msg = nil)
     if output.include?("\n")
       msg = build_message(msg,
-        "Expected output containing make command \"%s\", but was \n\nBEGIN_OF_OUTPUT\n%sEND_OF_OUTPUT" % [
-          ("%s %s" % [make_command, target]).rstrip,
-          output,
-        ])
+        format("Expected output containing make command \"%s\", but was \n\nBEGIN_OF_OUTPUT\n%sEND_OF_OUTPUT", format("%s %s", make_command, target).rstrip, output))
     else
       msg = build_message(msg,
-        'Expected make command "%s", but was "%s"' % [
-          ("%s %s" % [make_command, target]).rstrip,
-          output,
-        ])
+        format('Expected make command "%s", but was "%s"', format("%s %s", make_command, target).rstrip, output))
     end
 
     assert scan_make_command_lines(output).any? {|line|

diff --git a/test/rubygems/package/tar_test_case.rb b/test/rubygems/package/tar_test_case.rb
@@ -124,7 +124,7 @@ def tar_file_contents(content)
   end
 
   def to_oct(n, pad_size)
-    "%0#{pad_size}o" % n
+    format("%0#{pad_size}o", n)
   end
 
   def util_entry(tar)

diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -158,7 +158,7 @@ def test_execute_env_shebang
 
     assert_path_exist gem_exec
 
-    ruby_exec = sprintf Gem.default_exec_format, "ruby"
+    ruby_exec = format Gem.default_exec_format, "ruby"
 
     bin_env = Gem.win_platform? ? "" : %w[/usr/bin/env /bin/env].find {|f| File.executable?(f) } + " "
 

diff --git a/test/rubygems/test_gem_commands_setup_command.rb b/test/rubygems/test_gem_commands_setup_command.rb
@@ -138,7 +138,7 @@ def test_env_shebang_flag
     @cmd.options[:env_shebang] = true
     @cmd.execute
 
-    ruby_exec = sprintf Gem.default_exec_format, "ruby"
+    ruby_exec = format Gem.default_exec_format, "ruby"
 
     bin_env = Gem.win_platform? ? "" : %w[/usr/bin/env /bin/env].find {|f| File.executable?(f) } + " "
     assert_match(/\A#!\s*#{bin_env}#{ruby_exec}/, File.read(default_gem_bin_path))

diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
@@ -987,7 +987,7 @@ def test_install
     assert_path_exist exe
 
     exe_mode = File.stat(exe).mode & 0111
-    assert_equal 0111, exe_mode, "0%o" % exe_mode unless Gem.win_platform?
+    assert_equal 0111, exe_mode, format("0%o", exe_mode) unless Gem.win_platform?
 
     assert_path_exist File.join gemdir, "lib", "code.rb"