Merge pull request #157456 from Bo98/style-dec2023

Fix various style issues under newer RuboCop

Formula/b/bwfmetaedit.rb

@@ -24,7 +24,7 @@ class Bwfmetaedit < Formula
 
   def install
     cd "Project/GNU/CLI" do
-      system "./configure",  "--disable-debug", "--prefix=#{prefix}"
+      system "./configure", "--disable-debug", "--prefix=#{prefix}"
       system "make", "install"
     end
   end

Formula/c/clojure-lsp.rb

@@ -12,7 +12,7 @@ class ClojureLsp < Formula
     regex(%r{^(?:release[._-])?v?(\d+(?:[T/.-]\d+)+)$}i)
     strategy :git do |tags, regex|
       # Convert tags like `2021.03.01-19.18.54` to `20210301T191854` format
-      tags.map { |tag| tag[regex, 1]&.gsub(".", "")&.gsub(%r{[/-]}, "T") }.compact
+      tags.map { |tag| tag[regex, 1]&.delete(".")&.gsub(%r{[/-]}, "T") }.compact
     end
   end
 

Formula/c/crystal.rb

@@ -32,7 +32,7 @@ class Crystal < Formula
   head do
     url "https://github.com/crystal-lang/crystal.git", branch: "master"
 
-    uses_from_macos "libffi"  # for the interpreter
+    uses_from_macos "libffi" # for the interpreter
 
     resource "shards" do
       url "https://github.com/crystal-lang/shards.git", branch: "master"

Formula/c/crytic-compile.rb

@@ -43,7 +43,7 @@ def install
     end
 
     resource("testdata").stage do
-      system bin/"crytic-compile", "variable-0.8.0.sol-0.8.15-compact.zip", \
+      system bin/"crytic-compile", "variable-0.8.0.sol-0.8.15-compact.zip",
              "--export-format=solc", "--export-dir=#{testpath}/export"
     end
 

Formula/d/dvanalyzer.rb

@@ -46,7 +46,7 @@ def install
     end
 
     cd "AVPS_DV_Analyzer/Project/GNU/CLI" do
-      system "./configure",  "--disable-debug", "--enable-staticlibs", "--prefix=#{prefix}"
+      system "./configure", "--disable-debug", "--enable-staticlibs", "--prefix=#{prefix}"
       system "make", "install"
     end
   end

Formula/e/eatmemory.rb

@@ -22,7 +22,7 @@ def install
   test do
     # test version match
     out = shell_output "#{bin}/eatmemory -?"
-    version_escaped = version.to_s.gsub(/\./, '\.')
+    version_escaped = version.to_s.gsub(".", '\.')
     assert_match %r{^eatmemory #{version_escaped} - https://github.com/julman99/eatmemory\n.*}, out
 
     # test for expected output

Formula/g/g3log.rb

@@ -24,7 +24,7 @@ def install
   end
 
   test do
-    (testpath/"test.cpp").write <<~EOS.gsub(/TESTDIR/, testpath)
+    (testpath/"test.cpp").write <<~EOS.gsub("TESTDIR", testpath)
       #include <g3log/g3log.hpp>
       #include <g3log/logworker.hpp>
       int main()

Formula/g/gdal.rb

@@ -27,7 +27,7 @@ class Gdal < Formula
     depends_on "doxygen" => :build
   end
 
-  depends_on "boost" => :build  # for `libkml`
+  depends_on "boost" => :build # for `libkml`
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
   depends_on "swig" => :build

Formula/h/haskell-language-server.rb

@@ -53,7 +53,7 @@ def install
   end
 
   def caveats
-    ghc_versions = ghcs.map(&:version).map(&:to_s).join(", ")
+    ghc_versions = ghcs.map { |ghc| ghc.version.to_s }.join(", ")
 
     <<~EOS
       #{name} is built for GHC versions #{ghc_versions}.

Formula/h/hyperspec.rb

@@ -9,7 +9,7 @@ class Hyperspec < Formula
     url :homepage
     regex(/href=.*?HyperSpec[._-]v?(\d+(?:[.-]\d+)+)\.t/i)
     strategy :page_match do |page, regex|
-      page.scan(regex).map { |match| match&.first&.gsub("-", ".") }
+      page.scan(regex).map { |match| match&.first&.tr("-", ".") }
     end
   end
 

Formula/i/icu4c.rb

@@ -10,7 +10,7 @@ class Icu4c < Formula
     url :stable
     regex(/^release[._-]v?(\d+(?:[.-]\d+)+)$/i)
     strategy :git do |tags, regex|
-      tags.map { |tag| tag[regex, 1]&.gsub("-", ".") }.compact
+      tags.map { |tag| tag[regex, 1]&.tr("-", ".") }.compact
     end
   end
 

Formula/i/iozone.rb

@@ -9,7 +9,7 @@ class Iozone < Formula
     url "https://www.iozone.org/src/current/"
     regex(/href=.*?iozone[._-]?v?(\d+(?:[._]\d+)+)\.t/i)
     strategy :page_match do |page, regex|
-      page.scan(regex).map { |match| match&.first&.gsub("_", ".") }
+      page.scan(regex).map { |match| match&.first&.tr("_", ".") }
     end
   end
 

Formula/j/julia.rb

@@ -193,8 +193,7 @@ def install
     # This also checks that these libraries can be loaded even when
     # the symlinks are broken (e.g. by version bumps).
     libs = (lib/"julia").glob(shared_library("*"))
-                        .map(&:basename)
-                        .map(&:to_s)
+                        .map { |library| library.basename.to_s }
                         .reject do |name|
                           name.start_with?("sys", "libjulia-internal", "libccalltest")
                         end

Formula/l/ledit.rb

@@ -10,7 +10,7 @@ class Ledit < Formula
     url :stable
     regex(/^ledit[._-]v?(\d+(?:[.-]\d+)+)$/i)
     strategy :git do |tags, regex|
-      tags.map { |tag| tag[regex, 1]&.gsub("-", ".") }.compact
+      tags.map { |tag| tag[regex, 1]&.tr("-", ".") }.compact
     end
   end
 

Formula/l/litecli.rb

@@ -87,7 +87,7 @@ def install
     # remove ANSI colors
     output.gsub!(/\e\[([;\d]+)?m/, "")
     # normalize line endings
-    output.gsub!(/\r\n/, "\n")
+    output.gsub!("\r\n", "\n")
 
     expected = <<~EOS
       name

Formula/m/millet.rb

@@ -46,22 +46,22 @@ def install
     parse_content_length = lambda { |header_part|
       content_length_header = header_part.split("\r\n")[0]
       content_length = content_length_header.split(":")[1].to_i
-      return content_length
+      content_length
     }
 
     read_header_part = lambda { |pipe|
-      return pipe.readline("\r\n\r\n")
+      pipe.readline("\r\n\r\n")
     }
 
     read_response = lambda { |pipe|
       header_part = read_header_part.call(pipe)
       content_length = parse_content_length.call(header_part)
-      return JSON.parse(pipe.readpartial(content_length))
+      JSON.parse(pipe.readpartial(content_length))
     }
 
     json_rpc_message = lambda { |msg|
       msg_string = msg.to_json
-      return "Content-Length: #{msg_string.length}\r\n\r\n" + msg_string
+      "Content-Length: #{msg_string.length}\r\n\r\n" + msg_string
     }
 
     send_message = lambda { |pipe, msg|

Formula/m/minio-mc.rb

@@ -35,7 +35,7 @@ def install
       system "go", "build", *std_go_args(output: bin/"mc")
     else
       minio_release = stable.specs[:tag]
-      minio_version = minio_release.gsub(/RELEASE\./, "").chomp.gsub(/T(\d+)-(\d+)-(\d+)Z/, 'T\1:\2:\3Z')
+      minio_version = minio_release.gsub("RELEASE.", "").chomp.gsub(/T(\d+)-(\d+)-(\d+)Z/, 'T\1:\2:\3Z')
       proj = "github.com/minio/mc"
       ldflags = %W[
         -X #{proj}/cmd.Version=#{minio_version}

Formula/m/minio.rb

@@ -33,7 +33,7 @@ def install
       system "go", "build", *std_go_args
     else
       release = `git tag --points-at HEAD`.chomp
-      version = release.gsub(/RELEASE\./, "").chomp.gsub(/T(\d+)-(\d+)-(\d+)Z/, 'T\1:\2:\3Z')
+      version = release.gsub("RELEASE.", "").chomp.gsub(/T(\d+)-(\d+)-(\d+)Z/, 'T\1:\2:\3Z')
 
       ldflags = %W[
         -s -w

Formula/o/opencascade.rb

@@ -16,7 +16,7 @@ class Opencascade < Formula
     url "https://git.dev.opencascade.org/repos/occt.git"
     regex(/^v?(\d+(?:[._]\d+)+(?:p\d+)?)$/i)
     strategy :git do |tags, regex|
-      tags.map { |tag| tag[regex, 1]&.gsub("_", ".") }.compact
+      tags.map { |tag| tag[regex, 1]&.tr("_", ".") }.compact
     end
   end
 
@@ -82,7 +82,7 @@ def install
     output = shell_output("#{bin}/DRAWEXE -b -c \"pload ALL\"")
 
     # Discard the first line ("DRAW is running in batch mode"), and check that the second line is "1"
-    assert_equal "1", output.split(/\n/, 2)[1].chomp
+    assert_equal "1", output.split("\n", 2)[1].chomp
 
     # Make sure hardcoded library name references in our CMake config files are valid.
     # https://github.com/Homebrew/homebrew-core/issues/129111

Formula/p/pinot.rb

@@ -56,7 +56,6 @@ def install
     sleep 40
 
     assert_match("HTTP/1.1 200 OK", shell_output("curl -i http://localhost:#{controller_port} 2>&1"))
-
   ensure
     Process.kill "TERM", controller_pid
     Process.wait controller_pid

Formula/p/pioneers.rb

@@ -36,7 +36,7 @@ def install
 
     # GNU ld-only options
     inreplace Dir["configure{,.ac}"] do |s|
-      s.gsub!(/ -Wl,--as-needed/, "")
+      s.gsub!(" -Wl,--as-needed", "")
       s.gsub!(/ -Wl,-z,(relro|now)/, "")
     end
 

Formula/p/pytorch.rb

@@ -80,7 +80,7 @@ def install
     # Update references to shared libraries
     inreplace "torch/__init__.py" do |s|
       s.sub!(/here = os.path.abspath\(__file__\)/, "here = \"#{lib}\"")
-      s.sub!(/get_file_path\('torch', 'bin', 'torch_shm_manager'\)/, "\"#{bin}/torch_shm_manager\"")
+      s.sub!("get_file_path('torch', 'bin', 'torch_shm_manager')", "\"#{bin}/torch_shm_manager\"")
     end
 
     inreplace "torch/utils/cpp_extension.py", "_TORCH_PATH = os.path.dirname(os.path.dirname(_HERE))",

Formula/q/qp.rb

@@ -32,7 +32,7 @@ def install
 
     resource("csp-js").stage { cp_r "index.js", buildpath/"src/csp.js" }
 
-    system "qjsc",  "-o", "#{bin}/qp",
+    system "qjsc", "-o", "#{bin}/qp",
                           "-fno-proxy",
                           "-fno-eval",
                           "-fno-string-normalize",

Formula/r/rdkit.rb

@@ -10,7 +10,7 @@ class Rdkit < Formula
     url :stable
     regex(/^Release[._-](\d+(?:[._]\d+)+)$/i)
     strategy :git do |tags|
-      tags.map { |tag| tag[regex, 1]&.gsub("_", ".") }.compact
+      tags.map { |tag| tag[regex, 1]&.tr("_", ".") }.compact
     end
   end
 

Formula/s/sqlite.rb

@@ -10,7 +10,7 @@ class Sqlite < Formula
     url :homepage
     regex(%r{href=.*?releaselog/v?(\d+(?:[._]\d+)+)\.html}i)
     strategy :page_match do |page, regex|
-      page.scan(regex).map { |match| match&.first&.gsub("_", ".") }
+      page.scan(regex).map { |match| match&.first&.tr("_", ".") }
     end
   end
 

Formula/t/tfel.rb

@@ -29,7 +29,7 @@ def install
       "-Denable-website=OFF",
       "-Dlocal-castem-header=ON",
       "-Denable-python=ON",
-      "-Denable-python-bindings=ON",  # requires boost-python
+      "-Denable-python-bindings=ON", # requires boost-python
       "-Denable-numpy-support=OFF",
       "-Denable-fortran=ON",
       "-Denable-cyrano=ON",