Merge pull request #14920 from issyl0/rubocop-block-delimiters

rubocop: Clean up `Style/BlockDelimiters` excludes and autofix offenses

Library/.rubocop.yml

@@ -328,8 +328,6 @@ Style/BarePercentLiterals:
 Style/BlockDelimiters:
   BracesRequiredMethods:
     - "sig"
-  Exclude:
-    - "Homebrew/**/*_spec.rb"
 
 # Use consistent style for better readability.
 Style/CollectionMethods:

Library/Homebrew/test/ENV_spec.rb

@@ -30,12 +30,12 @@
       it "ensures the environment is restored" do
         before = subject.dup
 
-        expect {
+        expect do
           subject.with_build_environment do
             subject["foo"] = "bar"
             raise StandardError
           end
-        }.to raise_error(StandardError)
+        end.to raise_error(StandardError)
 
         expect(subject["foo"]).to be_nil
         expect(subject).to eq(before)

Library/Homebrew/test/api/cask_spec.rb

@@ -22,7 +22,7 @@ def mock_curl_download(stdout:)
   end
 
   describe "::all_casks" do
-    let(:casks_json) {
+    let(:casks_json) do
       <<~EOS
         [{
           "token": "foo",
@@ -32,13 +32,13 @@ def mock_curl_download(stdout:)
           "url": "https://brew.sh/bar"
         }]
       EOS
-    }
-    let(:casks_hash) {
+    end
+    let(:casks_hash) do
       {
         "foo" => { "url" => "https://brew.sh/foo" },
         "bar" => { "url" => "https://brew.sh/bar" },
       }
-    }
+    end
 
     it "returns the expected cask JSON list" do
       mock_curl_download stdout: casks_json

Library/Homebrew/test/api/formula_spec.rb

@@ -21,7 +21,7 @@ def mock_curl_download(stdout:)
   end
 
   describe "::all_formulae" do
-    let(:formulae_json) {
+    let(:formulae_json) do
       <<~EOS
         [{
           "name": "foo",
@@ -37,21 +37,21 @@ def mock_curl_download(stdout:)
           "aliases": []
         }]
       EOS
-    }
-    let(:formulae_hash) {
+    end
+    let(:formulae_hash) do
       {
         "foo" => { "url" => "https://brew.sh/foo", "aliases" => ["foo-alias1", "foo-alias2"] },
         "bar" => { "url" => "https://brew.sh/bar", "aliases" => ["bar-alias"] },
         "baz" => { "url" => "https://brew.sh/baz", "aliases" => [] },
       }
-    }
-    let(:formulae_aliases) {
+    end
+    let(:formulae_aliases) do
       {
         "foo-alias1" => "foo",
         "foo-alias2" => "foo",
         "bar-alias"  => "bar",
       }
-    }
+    end
 
     it "returns the expected formula JSON list" do
       mock_curl_download stdout: formulae_json

Library/Homebrew/test/api_spec.rb

@@ -63,9 +63,9 @@ def mock_curl_download(stdout:)
 
     it "raises an error if the JSON file is invalid" do
       mock_curl_download stdout: json_invalid
-      expect {
+      expect do
         described_class.fetch_json_api_file("baz.json", target: cache_dir/"baz.json")
-      }.to raise_error(SystemExit)
+      end.to raise_error(SystemExit)
     end
   end
 
@@ -78,9 +78,9 @@ def mock_curl_download(stdout:)
 
     it "raises an error if the file does not exist" do
       mock_curl_output success: false
-      expect {
+      expect do
         described_class.fetch_homebrew_cask_source("bar", git_head: "master")
-      }.to raise_error(ArgumentError, /No valid file found/)
+      end.to raise_error(ArgumentError, /No valid file found/)
     end
   end
 end

Library/Homebrew/test/bottle_filename_spec.rb

@@ -50,12 +50,12 @@
   describe "::create" do
     subject { described_class.create(f, :tag, 0) }
 
-    let(:f) {
+    let(:f) do
       formula do
         url "https://brew.sh/foo.tar.gz"
         version "1.0"
       end
-    }
+    end
 
     its(:to_s) { is_expected.to eq "formula_name--1.0.tag.bottle.tar.gz" }
   end

Library/Homebrew/test/cache_store_spec.rb

@@ -13,9 +13,9 @@
       cache_store = instance_double(described_class, "cache_store", write_if_dirty!: nil)
       expect(described_class).to receive(:new).with(type).and_return(cache_store)
       expect(cache_store).to receive(:write_if_dirty!)
-      described_class.use(type) { |_db|
+      described_class.use(type) do |_db|
         # do nothing
-      }
+      end
     end
   end
 

Library/Homebrew/test/cask/artifact/alt_target_spec.rb

@@ -5,11 +5,11 @@
   describe "activate to alternate target" do
     let(:cask) { Cask::CaskLoader.load(cask_path("with-alt-target")) }
 
-    let(:install_phase) {
+    let(:install_phase) do
       cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
         artifact.install_phase(command: NeverSudoSystemCommand, force: false)
       end
-    }
+    end
 
     let(:source_path) { cask.staged_path.join("Caffeine.app") }
     let(:target_path) { cask.config.appdir.join("AnotherName.app") }
@@ -29,15 +29,15 @@
     end
 
     describe "when app is in a subdirectory" do
-      let(:cask) {
+      let(:cask) do
         Cask::Cask.new("subdir") do
           url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
           homepage "https://brew.sh/local-caffeine"
           version "1.2.3"
           sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
           app "subdir/Caffeine.app", target: "AnotherName.app"
         end
-      }
+      end
 
       it "installs the given apps using the proper target directory" do
         appsubdir = cask.staged_path.join("subdir").tap(&:mkpath)

Library/Homebrew/test/cask/artifact/app_spec.rb

@@ -27,15 +27,15 @@
     end
 
     describe "when app is in a subdirectory" do
-      let(:cask) {
+      let(:cask) do
         Cask::Cask.new("subdir") do
           url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
           homepage "https://brew.sh/local-caffeine"
           version "1.2.3"
           sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
           app "subdir/Caffeine.app"
         end
-      }
+      end
 
       it "installs the given app using the proper target directory" do
         appsubdir = cask.staged_path.join("subdir").tap(&:mkpath)

Library/Homebrew/test/cask/artifact/binary_spec.rb

@@ -2,11 +2,11 @@
 # frozen_string_literal: true
 
 describe Cask::Artifact::Binary, :cask do
-  let(:cask) {
+  let(:cask) do
     Cask::CaskLoader.load(cask_path("with-binary")).tap do |cask|
       InstallHelper.install_without_artifacts(cask)
     end
-  }
+  end
   let(:artifacts) { cask.artifacts.select { |a| a.is_a?(described_class) } }
   let(:binarydir) { cask.config.binarydir }
   let(:expected_path) { binarydir.join("binary") }
@@ -21,9 +21,9 @@
   end
 
   context "when --no-binaries is specified" do
-    let(:cask) {
+    let(:cask) do
       Cask::CaskLoader.load(cask_path("with-binary"))
-    }
+    end
 
     it "doesn't link the binary when --no-binaries is specified" do
       Cask::Installer.new(cask, binaries: false).install
@@ -41,11 +41,11 @@
   end
 
   context "when the binary is not executable" do
-    let(:cask) {
+    let(:cask) do
       Cask::CaskLoader.load(cask_path("with-non-executable-binary")).tap do |cask|
         InstallHelper.install_without_artifacts(cask)
       end
-    }
+    end
 
     let(:expected_path) { cask.config.binarydir.join("naked_non_executable") }
 
@@ -65,23 +65,23 @@
   it "avoids clobbering an existing binary by linking over it" do
     FileUtils.touch expected_path
 
-    expect {
+    expect do
       artifacts.each do |artifact|
         artifact.install_phase(command: NeverSudoSystemCommand, force: false)
       end
-    }.to raise_error(Cask::CaskError)
+    end.to raise_error(Cask::CaskError)
 
     expect(expected_path).not_to be :symlink?
   end
 
   it "avoids clobbering an existing symlink" do
     expected_path.make_symlink("/tmp")
 
-    expect {
+    expect do
       artifacts.each do |artifact|
         artifact.install_phase(command: NeverSudoSystemCommand, force: false)
       end
-    }.to raise_error(Cask::CaskError)
+    end.to raise_error(Cask::CaskError)
 
     expect(File.readlink(expected_path)).to eq("/tmp")
   end
@@ -97,11 +97,11 @@
   end
 
   context "when the binary is inside an app package" do
-    let(:cask) {
+    let(:cask) do
       Cask::CaskLoader.load(cask_path("with-embedded-binary")).tap do |cask|
         InstallHelper.install_without_artifacts(cask)
       end
-    }
+    end
 
     it "links the binary to the proper directory" do
       cask.artifacts.select { |a| a.is_a?(Cask::Artifact::App) }.each do |artifact|

Library/Homebrew/test/cask/artifact/generic_artifact_spec.rb

@@ -4,13 +4,13 @@
 describe Cask::Artifact::Artifact, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("with-generic-artifact")) }
 
-  let(:install_phase) {
+  let(:install_phase) do
     lambda do
       cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
         artifact.install_phase(command: NeverSudoSystemCommand, force: false)
       end
     end
-  }
+  end
 
   let(:source_path) { cask.staged_path.join("Caffeine.app") }
   let(:target_path) { cask.config.appdir.join("Caffeine.app") }
@@ -21,25 +21,25 @@
 
   context "without target" do
     it "fails to load" do
-      expect {
+      expect do
         Cask::CaskLoader.load(cask_path("invalid/invalid-generic-artifact-no-target"))
-      }.to raise_error(Cask::CaskInvalidError, /Generic Artifact.*requires.*target/)
+      end.to raise_error(Cask::CaskInvalidError, /Generic Artifact.*requires.*target/)
     end
   end
 
   context "with relative target" do
     it "does not fail to load" do
-      expect {
+      expect do
         Cask::CaskLoader.load(cask_path("generic-artifact-relative-target"))
-      }.not_to raise_error
+      end.not_to raise_error
     end
   end
 
   context "with user-relative target" do
     it "does not fail to load" do
-      expect {
+      expect do
         Cask::CaskLoader.load(cask_path("generic-artifact-user-relative-target"))
-      }.not_to raise_error
+      end.not_to raise_error
     end
   end
 
@@ -53,9 +53,9 @@
   it "avoids clobbering an existing artifact" do
     target_path.mkpath
 
-    expect {
+    expect do
       install_phase.call
-    }.to raise_error(Cask::CaskError)
+    end.to raise_error(Cask::CaskError)
 
     expect(source_path).to be_a_directory
     expect(target_path).to be_a_directory

Library/Homebrew/test/cask/artifact/installer_spec.rb

@@ -16,9 +16,9 @@
       let(:args) { { manual: "installer" } }
 
       it "shows a message prompting to run the installer manually" do
-        expect {
+        expect do
           installer.install_phase(command: command)
-        }.to output(%r{run the installer at:\s+#{staged_path}/installer}).to_stdout
+        end.to output(%r{run the installer at:\s+#{staged_path}/installer}).to_stdout
       end
     end
 

Library/Homebrew/test/cask/artifact/manpage_spec.rb

@@ -13,13 +13,13 @@
   end
 
   context "with install" do
-    let(:install_phase) {
+    let(:install_phase) do
       lambda do
         cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
           artifact.install_phase(command: NeverSudoSystemCommand, force: false)
         end
       end
-    }
+    end
 
     let(:source_path) { cask.staged_path.join("manpage.1") }
     let(:target_path) { cask.config.manpagedir.join("man1/manpage.1") }

Library/Homebrew/test/cask/artifact/suite_spec.rb

@@ -4,13 +4,13 @@
 describe Cask::Artifact::Suite, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("with-suite")) }
 
-  let(:install_phase) {
+  let(:install_phase) do
     lambda do
       cask.artifacts.select { |a| a.is_a?(described_class) }.each do |artifact|
         artifact.install_phase(command: NeverSudoSystemCommand, force: false)
       end
     end
-  }
+  end
 
   let(:target_path) { cask.config.appdir.join("Caffeine") }
   let(:source_path) { cask.staged_path.join("Caffeine") }
@@ -28,9 +28,9 @@
   it "avoids clobbering an existing suite by moving over it" do
     target_path.mkpath
 
-    expect {
+    expect do
       install_phase.call
-    }.to raise_error(Cask::CaskError)
+    end.to raise_error(Cask::CaskError)
 
     expect(source_path).to be_a_directory
     expect(target_path).to be_a_directory