Commit 'brew style --fix' results.

Library/Homebrew/test/cask/audit_spec.rb

@@ -42,7 +42,7 @@ describe Cask::Audit, :cask do
   let(:check_token_conflicts) { false }
   let(:fake_system_command) { class_double(SystemCommand) }
   let(:audit) {
-    Cask::Audit.new(cask, download:              download,
+    described_class.new(cask, download:              download,
                               check_token_conflicts: check_token_conflicts,
                               command:               fake_system_command)
   }

Library/Homebrew/test/cask/cask_spec.rb

@@ -30,19 +30,19 @@ describe Cask::Cask, :cask do
 
     it "returns an instance of the Cask for the given token" do
       c = Cask::CaskLoader.load("local-caffeine")
-      expect(c).to be_kind_of(Cask::Cask)
+      expect(c).to be_kind_of(described_class)
       expect(c.token).to eq("local-caffeine")
     end
 
     it "returns an instance of the Cask from a specific file location" do
       c = Cask::CaskLoader.load("#{tap_path}/Casks/local-caffeine.rb")
-      expect(c).to be_kind_of(Cask::Cask)
+      expect(c).to be_kind_of(described_class)
       expect(c.token).to eq("local-caffeine")
     end
 
     it "returns an instance of the Cask from a url" do
       c = Cask::CaskLoader.load("file://#{tap_path}/Casks/local-caffeine.rb")
-      expect(c).to be_kind_of(Cask::Cask)
+      expect(c).to be_kind_of(described_class)
       expect(c.token).to eq("local-caffeine")
     end
 
@@ -56,7 +56,7 @@ describe Cask::Cask, :cask do
 
     it "returns an instance of the Cask from a relative file location" do
       c = Cask::CaskLoader.load(relative_tap_path/"Casks/local-caffeine.rb")
-      expect(c).to be_kind_of(Cask::Cask)
+      expect(c).to be_kind_of(described_class)
       expect(c.token).to eq("local-caffeine")
     end
 

Library/Homebrew/test/cask/cmd/reinstall_spec.rb

@@ -24,7 +24,7 @@ describe Cask::Cmd::Reinstall, :cask do
     EOS
 
     expect {
-      Cask::Cmd::Reinstall.run("local-caffeine")
+      described_class.run("local-caffeine")
     }.to output(output).to_stdout
   end
 
@@ -33,14 +33,14 @@ describe Cask::Cmd::Reinstall, :cask do
 
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).to be_installed
 
-    Cask::Cmd::Reinstall.run("local-transmission")
+    described_class.run("local-transmission")
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).to be_installed
   end
 
   it "allows reinstalling a non installed Cask" do
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).not_to be_installed
 
-    Cask::Cmd::Reinstall.run("local-transmission")
+    described_class.run("local-transmission")
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).to be_installed
   end
 end

Library/Homebrew/test/cask/dsl/caveats_spec.rb

@@ -4,7 +4,7 @@ require "test/cask/dsl/shared_examples/base"
 
 describe Cask::DSL::Caveats, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
-  let(:dsl) { Cask::DSL::Caveats.new(cask) }
+  let(:dsl) { described_class.new(cask) }
 
   it_behaves_like Cask::DSL::Base
 

Library/Homebrew/test/cask/dsl/postflight_spec.rb

@@ -5,7 +5,7 @@ require "test/cask/dsl/shared_examples/staged"
 
 describe Cask::DSL::Postflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
-  let(:dsl) { Cask::DSL::Postflight.new(cask, FakeSystemCommand) }
+  let(:dsl) { described_class.new(cask, FakeSystemCommand) }
 
   it_behaves_like Cask::DSL::Base
 

Library/Homebrew/test/cask/dsl/preflight_spec.rb

@@ -5,7 +5,7 @@ require "test/cask/dsl/shared_examples/staged"
 
 describe Cask::DSL::Preflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
-  let(:dsl) { Cask::DSL::Preflight.new(cask, FakeSystemCommand) }
+  let(:dsl) { described_class.new(cask, FakeSystemCommand) }
 
   it_behaves_like Cask::DSL::Base
 

Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb

@@ -4,7 +4,7 @@ require "test/cask/dsl/shared_examples/base"
 
 describe Cask::DSL::UninstallPostflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
-  let(:dsl) { Cask::DSL::UninstallPostflight.new(cask, FakeSystemCommand) }
+  let(:dsl) { described_class.new(cask, FakeSystemCommand) }
 
   it_behaves_like Cask::DSL::Base
 end

Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb

@@ -5,7 +5,7 @@ require "test/cask/dsl/shared_examples/staged"
 
 describe Cask::DSL::UninstallPreflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
-  let(:dsl) { Cask::DSL::UninstallPreflight.new(cask, FakeSystemCommand) }
+  let(:dsl) { described_class.new(cask, FakeSystemCommand) }
 
   it_behaves_like Cask::DSL::Base
 

Library/Homebrew/test/cask/installer_spec.rb

@@ -9,7 +9,7 @@ describe Cask::Installer, :cask do
     it "downloads and installs a nice fresh Cask" do
       caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
 
-      Cask::Installer.new(caffeine).install
+      described_class.new(caffeine).install
 
       expect(Cask::Caskroom.path.join("local-caffeine", caffeine.version)).to be_a_directory
       expect(caffeine.config.appdir.join("Caffeine.app")).to be_a_directory
@@ -18,7 +18,7 @@ describe Cask::Installer, :cask do
     it "works with dmg-based Casks" do
       asset = Cask::CaskLoader.load(cask_path("container-dmg"))
 
-      Cask::Installer.new(asset).install
+      described_class.new(asset).install
 
       expect(Cask::Caskroom.path.join("container-dmg", asset.version)).to be_a_directory
       expect(asset.config.appdir.join("container")).to be_a_file
@@ -27,7 +27,7 @@ describe Cask::Installer, :cask do
     it "works with tar-gz-based Casks" do
       asset = Cask::CaskLoader.load(cask_path("container-tar-gz"))
 
-      Cask::Installer.new(asset).install
+      described_class.new(asset).install
 
       expect(Cask::Caskroom.path.join("container-tar-gz", asset.version)).to be_a_directory
       expect(asset.config.appdir.join("container")).to be_a_file
@@ -36,7 +36,7 @@ describe Cask::Installer, :cask do
     it "works with xar-based Casks" do
       asset = Cask::CaskLoader.load(cask_path("container-xar"))
 
-      Cask::Installer.new(asset).install
+      described_class.new(asset).install
 
       expect(Cask::Caskroom.path.join("container-xar", asset.version)).to be_a_directory
       expect(asset.config.appdir.join("container")).to be_a_file
@@ -45,7 +45,7 @@ describe Cask::Installer, :cask do
     it "works with pure bzip2-based Casks" do
       asset = Cask::CaskLoader.load(cask_path("container-bzip2"))
 
-      Cask::Installer.new(asset).install
+      described_class.new(asset).install
 
       expect(Cask::Caskroom.path.join("container-bzip2", asset.version)).to be_a_directory
       expect(asset.config.appdir.join("container")).to be_a_file
@@ -54,7 +54,7 @@ describe Cask::Installer, :cask do
     it "works with pure gzip-based Casks" do
       asset = Cask::CaskLoader.load(cask_path("container-gzip"))
 
-      Cask::Installer.new(asset).install
+      described_class.new(asset).install
 
       expect(Cask::Caskroom.path.join("container-gzip", asset.version)).to be_a_directory
       expect(asset.config.appdir.join("container")).to be_a_file
@@ -63,21 +63,21 @@ describe Cask::Installer, :cask do
     it "blows up on a bad checksum" do
       bad_checksum = Cask::CaskLoader.load(cask_path("bad-checksum"))
       expect {
-        Cask::Installer.new(bad_checksum).install
+        described_class.new(bad_checksum).install
       }.to raise_error(Cask::CaskSha256MismatchError)
     end
 
     it "blows up on a missing checksum" do
       missing_checksum = Cask::CaskLoader.load(cask_path("missing-checksum"))
       expect {
-        Cask::Installer.new(missing_checksum).install
+        described_class.new(missing_checksum).install
       }.to raise_error(Cask::CaskSha256MissingError)
     end
 
     it "installs fine if sha256 :no_check is used" do
       no_checksum = Cask::CaskLoader.load(cask_path("no-checksum"))
 
-      Cask::Installer.new(no_checksum).install
+      described_class.new(no_checksum).install
 
       expect(no_checksum).to be_installed
     end
@@ -85,14 +85,14 @@ describe Cask::Installer, :cask do
     it "fails to install if sha256 :no_check is used with --require-sha" do
       no_checksum = Cask::CaskLoader.load(cask_path("no-checksum"))
       expect {
-        Cask::Installer.new(no_checksum, require_sha: true).install
+        described_class.new(no_checksum, require_sha: true).install
       }.to raise_error(Cask::CaskNoShasumError)
     end
 
     it "installs fine if sha256 :no_check is used with --require-sha and --force" do
       no_checksum = Cask::CaskLoader.load(cask_path("no-checksum"))
 
-      Cask::Installer.new(no_checksum, require_sha: true, force: true).install
+      described_class.new(no_checksum, require_sha: true, force: true).install
 
       expect(no_checksum).to be_installed
     end
@@ -101,7 +101,7 @@ describe Cask::Installer, :cask do
       with_caveats = Cask::CaskLoader.load(cask_path("with-caveats"))
 
       expect {
-        Cask::Installer.new(with_caveats).install
+        described_class.new(with_caveats).install
       }.to output(/Here are some things you might want to know/).to_stdout
 
       expect(with_caveats).to be_installed
@@ -111,7 +111,7 @@ describe Cask::Installer, :cask do
       with_installer_manual = Cask::CaskLoader.load(cask_path("with-installer-manual"))
 
       expect {
-        Cask::Installer.new(with_installer_manual).install
+        described_class.new(with_installer_manual).install
       }.to output(
         <<~EOS,
           ==> Satisfying dependencies
@@ -131,7 +131,7 @@ describe Cask::Installer, :cask do
     it "does not extract __MACOSX directories from zips" do
       with_macosx_dir = Cask::CaskLoader.load(cask_path("with-macosx-dir"))
 
-      Cask::Installer.new(with_macosx_dir).install
+      described_class.new(with_macosx_dir).install
 
       expect(with_macosx_dir.staged_path.join("__MACOSX")).not_to be_a_directory
     end
@@ -141,10 +141,10 @@ describe Cask::Installer, :cask do
 
       expect(with_auto_updates).not_to be_installed
 
-      Cask::Installer.new(with_auto_updates).install
+      described_class.new(with_auto_updates).install
 
       expect {
-        Cask::Installer.new(with_auto_updates, force: true).install
+        described_class.new(with_auto_updates, force: true).install
       }.not_to raise_error
     end
 
@@ -154,7 +154,7 @@ describe Cask::Installer, :cask do
 
       expect(transmission).not_to be_installed
 
-      installer = Cask::Installer.new(transmission)
+      installer = described_class.new(transmission)
 
       installer.install
 
@@ -168,17 +168,17 @@ describe Cask::Installer, :cask do
 
       expect(transmission).not_to be_installed
 
-      Cask::Installer.new(transmission).install
+      described_class.new(transmission).install
 
       expect {
-        Cask::Installer.new(transmission, force: true).install
+        described_class.new(transmission, force: true).install
       }.not_to raise_error
     end
 
     it "works naked-pkg-based Casks" do
       naked_pkg = Cask::CaskLoader.load(cask_path("container-pkg"))
 
-      Cask::Installer.new(naked_pkg).install
+      described_class.new(naked_pkg).install
 
       expect(Cask::Caskroom.path.join("container-pkg", naked_pkg.version, "container.pkg")).to be_a_file
     end
@@ -186,7 +186,7 @@ describe Cask::Installer, :cask do
     it "works properly with an overridden container :type" do
       naked_executable = Cask::CaskLoader.load(cask_path("naked-executable"))
 
-      Cask::Installer.new(naked_executable).install
+      described_class.new(naked_executable).install
 
       expect(Cask::Caskroom.path.join("naked-executable", naked_executable.version, "naked_executable")).to be_a_file
     end
@@ -194,7 +194,7 @@ describe Cask::Installer, :cask do
     it "works fine with a nested container" do
       nested_app = Cask::CaskLoader.load(cask_path("nested-app"))
 
-      Cask::Installer.new(nested_app).install
+      described_class.new(nested_app).install
 
       expect(Cask::Config.global.appdir.join("MyNestedApp.app")).to be_a_directory
     end
@@ -202,7 +202,7 @@ describe Cask::Installer, :cask do
     it "generates and finds a timestamped metadata directory for an installed Cask" do
       caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
 
-      Cask::Installer.new(caffeine).install
+      described_class.new(caffeine).install
 
       m_path = caffeine.metadata_timestamped_path(timestamp: :now, create: true)
       expect(caffeine.metadata_timestamped_path(timestamp: :latest)).to eq(m_path)
@@ -211,7 +211,7 @@ describe Cask::Installer, :cask do
     it "generates and finds a metadata subdirectory for an installed Cask" do
       caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
 
-      Cask::Installer.new(caffeine).install
+      described_class.new(caffeine).install
 
       subdir_name = "Casks"
       m_subdir = caffeine.metadata_subdir(subdir_name, timestamp: :now, create: true)
@@ -222,7 +222,7 @@ describe Cask::Installer, :cask do
   describe "uninstall" do
     it "fully uninstalls a Cask" do
       caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
-      installer = Cask::Installer.new(caffeine)
+      installer = described_class.new(caffeine)
 
       installer.install
       installer.uninstall
@@ -236,7 +236,7 @@ describe Cask::Installer, :cask do
       caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
       mutated_version = caffeine.version + ".1"
 
-      Cask::Installer.new(caffeine).install
+      described_class.new(caffeine).install
 
       expect(Cask::Caskroom.path.join("local-caffeine", caffeine.version)).to be_a_directory
       expect(Cask::Caskroom.path.join("local-caffeine", mutated_version)).not_to be_a_directory
@@ -245,7 +245,7 @@ describe Cask::Installer, :cask do
       expect(Cask::Caskroom.path.join("local-caffeine", caffeine.version)).not_to be_a_directory
       expect(Cask::Caskroom.path.join("local-caffeine", mutated_version)).to be_a_directory
 
-      Cask::Installer.new(caffeine, force: true).uninstall
+      described_class.new(caffeine, force: true).uninstall
 
       expect(Cask::Caskroom.path.join("local-caffeine", caffeine.version)).not_to be_a_directory
       expect(Cask::Caskroom.path.join("local-caffeine", mutated_version)).not_to be_a_directory

Library/Homebrew/test/cask/macos_spec.rb

@@ -2,67 +2,67 @@
 
 describe MacOS, :cask do
   it "says '/' is undeletable" do
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "/",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "/.",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "/usr/local/Library/Taps/../../../..",
     )
   end
 
   it "says '/Applications' is undeletable" do
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "/Applications",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "/Applications/",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "/Applications/.",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "/Applications/Mail.app/..",
     )
   end
 
   it "says the home directory is undeletable" do
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       Dir.home,
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "#{Dir.home}/",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "#{Dir.home}/Documents/..",
     )
   end
 
   it "says the user library directory is undeletable" do
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "#{Dir.home}/Library",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "#{Dir.home}/Library/",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "#{Dir.home}/Library/.",
     )
-    expect(MacOS).to be_undeletable(
+    expect(described_class).to be_undeletable(
       "#{Dir.home}/Library/Preferences/..",
     )
   end
 
   it "says '/Applications/.app' is deletable" do
-    expect(MacOS).not_to be_undeletable(
+    expect(described_class).not_to be_undeletable(
       "/Applications/.app",
     )
   end
 
   it "says '/Applications/SnakeOil Professional.app' is deletable" do
-    expect(MacOS).not_to be_undeletable(
+    expect(described_class).not_to be_undeletable(
       "/Applications/SnakeOil Professional.app",
     )
   end

Library/Homebrew/test/cask/pkg_spec.rb

@@ -146,7 +146,7 @@ describe Cask::Pkg, :cask do
     end
 
     it "correctly parses a Property List" do
-      pkg = Cask::Pkg.new(pkg_id, fake_system_command)
+      pkg = described_class.new(pkg_id, fake_system_command)
 
       expect(fake_system_command).to receive(:run!).with(
         "/usr/sbin/pkgutil",

Library/Homebrew/test/pathname_spec.rb

@@ -259,7 +259,7 @@ describe Pathname do
 
   describe InstallRenamed do
     before do
-      dst.extend(InstallRenamed)
+      dst.extend(described_class)
     end
 
     it "renames the installed file if it already exists" do