Merge branch 'master' into check-for-master-no-refactor

49 files changed, 1078 insertions, 209 deletions

diff --git a/Library/Homebrew/test/cask/artifact/alt_target_spec.rb b/Library/Homebrew/test/cask/artifact/alt_target_spec.rb
index 9e8d83bb4..02be796ed 100644
--- a/Library/Homebrew/test/cask/artifact/alt_target_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/alt_target_spec.rb
@@ -3,7 +3,7 @@ describe Hbc::Artifact::App, :cask do
     let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-alt-target.rb") }
 
     let(:install_phase) {
-      -> { Hbc::Artifact::App.new(cask).install_phase }
+      -> { described_class.for_cask(cask).each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) } }
     }
 
     let(:source_path) { cask.staged_path.join("Caffeine.app") }
diff --git a/Library/Homebrew/test/cask/artifact/app_spec.rb b/Library/Homebrew/test/cask/artifact/app_spec.rb
index 0add472e2..f67ffd31b 100644
--- a/Library/Homebrew/test/cask/artifact/app_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/app_spec.rb
@@ -2,13 +2,13 @@ describe Hbc::Artifact::App, :cask do
   let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb") }
   let(:command) { Hbc::SystemCommand }
   let(:force) { false }
-  let(:app) { Hbc::Artifact::App.new(cask, command: command, force: force) }
+  let(:app) { described_class.for_cask(cask).first }
 
   let(:source_path) { cask.staged_path.join("Caffeine.app") }
   let(:target_path) { Hbc.appdir.join("Caffeine.app") }
 
-  let(:install_phase) { app.install_phase }
-  let(:uninstall_phase) { app.uninstall_phase }
+  let(:install_phase) { app.install_phase(command: command, force: force) }
+  let(:uninstall_phase) { app.uninstall_phase(command: command, force: force) }
 
   before(:each) do
     InstallHelper.install_without_artifacts(cask)
@@ -105,8 +105,8 @@ describe Hbc::Artifact::App, :cask do
 
         describe "target is user-owned but contains read-only files" do
           before(:each) do
-            system "/usr/bin/touch", "--", "#{target_path}/foo"
-            system "/bin/chmod", "--", "0555", target_path
+            FileUtils.touch "#{target_path}/foo"
+            FileUtils.chmod 0555, target_path
           end
 
           it "overwrites the existing app" do
@@ -138,7 +138,7 @@ describe Hbc::Artifact::App, :cask do
           end
 
           after(:each) do
-            system "/bin/chmod", "--", "0755", target_path
+            FileUtils.chmod 0755, target_path
           end
         end
       end
@@ -206,8 +206,8 @@ describe Hbc::Artifact::App, :cask do
   end
 
   describe "summary" do
-    let(:description) { app.summary[:english_description] }
-    let(:contents) { app.summary[:contents] }
+    let(:description) { app.class.english_description }
+    let(:contents) { app.summarize_installed }
 
     it "returns the correct english_description" do
       expect(description).to eq("Apps")
@@ -217,14 +217,13 @@ describe Hbc::Artifact::App, :cask do
       it "returns the path to the app" do
         install_phase
 
-        expect(contents).to eq(["#{target_path} (#{target_path.abv})"])
+        expect(contents).to eq("#{target_path} (#{target_path.abv})")
       end
     end
 
     describe "app is missing" do
       it "returns a warning and the supposed path to the app" do
-        expect(contents.size).to eq(1)
-        expect(contents[0]).to match(/.*Missing App.*: #{target_path}/)
+        expect(contents).to match(/.*Missing App.*: #{target_path}/)
       end
     end
   end
diff --git a/Library/Homebrew/test/cask/artifact/binary_spec.rb b/Library/Homebrew/test/cask/artifact/binary_spec.rb
index ce00e3935..5ffaca861 100644
--- a/Library/Homebrew/test/cask/artifact/binary_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/binary_spec.rb
@@ -26,7 +26,8 @@ describe Hbc::Artifact::Binary, :cask do
   end
 
   it "links the binary to the proper directory" do
-    Hbc::Artifact::Binary.new(cask).install_phase
+    described_class.for_cask(cask)
+      .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
     expect(expected_path).to be_a_symlink
     expect(expected_path.readlink).to exist
@@ -45,7 +46,8 @@ describe Hbc::Artifact::Binary, :cask do
       expect(FileUtils).to receive(:chmod)
         .with("+x", cask.staged_path.join("naked_non_executable")).and_call_original
 
-      Hbc::Artifact::Binary.new(cask).install_phase
+      described_class.for_cask(cask)
+      .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect(expected_path).to be_a_symlink
       expect(expected_path.readlink).to be_executable
@@ -56,7 +58,8 @@ describe Hbc::Artifact::Binary, :cask do
     FileUtils.touch expected_path
 
     expect {
-      Hbc::Artifact::Binary.new(cask).install_phase
+      described_class.for_cask(cask)
+        .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
     }.to raise_error(Hbc::CaskError)
 
     expect(expected_path).not_to be :symlink?
@@ -65,7 +68,8 @@ describe Hbc::Artifact::Binary, :cask do
   it "clobbers an existing symlink" do
     expected_path.make_symlink("/tmp")
 
-    Hbc::Artifact::Binary.new(cask).install_phase
+    described_class.for_cask(cask)
+      .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
     expect(File.readlink(expected_path)).not_to eq("/tmp")
   end
@@ -73,7 +77,8 @@ describe Hbc::Artifact::Binary, :cask do
   it "creates parent directory if it doesn't exist" do
     FileUtils.rmdir Hbc.binarydir
 
-    Hbc::Artifact::Binary.new(cask).install_phase
+    described_class.for_cask(cask)
+      .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
     expect(expected_path.exist?).to be true
   end
@@ -86,8 +91,10 @@ describe Hbc::Artifact::Binary, :cask do
     }
 
     it "links the binary to the proper directory" do
-      Hbc::Artifact::App.new(cask).install_phase
-      Hbc::Artifact::Binary.new(cask).install_phase
+      Hbc::Artifact::App.for_cask(cask)
+        .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
+      described_class.for_cask(cask)
+        .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect(expected_path).to be_a_symlink
       expect(expected_path.readlink).to exist
diff --git a/Library/Homebrew/test/cask/artifact/generic_artifact_spec.rb b/Library/Homebrew/test/cask/artifact/generic_artifact_spec.rb
index cb2ef9850..bec8c2742 100644
--- a/Library/Homebrew/test/cask/artifact/generic_artifact_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/generic_artifact_spec.rb
@@ -2,7 +2,7 @@ describe Hbc::Artifact::Artifact, :cask do
   let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-generic-artifact.rb") }
 
   let(:install_phase) {
-    -> { Hbc::Artifact::Artifact.new(cask).install_phase }
+    -> { described_class.for_cask(cask).each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) } }
   }
 
   let(:source_path) { cask.staged_path.join("Caffeine.app") }
@@ -12,11 +12,11 @@ describe Hbc::Artifact::Artifact, :cask do
     InstallHelper.install_without_artifacts(cask)
   end
 
-  describe "with no target" do
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-generic-artifact-no-target.rb") }
-
-    it "fails to install with no target" do
-      expect(install_phase).to raise_error(Hbc::CaskInvalidError)
+  context "without target" do
+    it "fails to load" do
+      expect {
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-generic-artifact-no-target.rb")
+      }.to raise_error(Hbc::CaskInvalidError, /target required for Generic Artifact/)
     end
   end
 
diff --git a/Library/Homebrew/test/cask/artifact/nested_container_spec.rb b/Library/Homebrew/test/cask/artifact/nested_container_spec.rb
index be7ba5ff8..41d143764 100644
--- a/Library/Homebrew/test/cask/artifact/nested_container_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/nested_container_spec.rb
@@ -5,7 +5,8 @@ describe Hbc::Artifact::NestedContainer, :cask do
         InstallHelper.install_without_artifacts(c)
       end
 
-      Hbc::Artifact::NestedContainer.new(cask).install_phase
+      described_class.for_cask(cask)
+        .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect(cask.staged_path.join("MyNestedApp.app")).to be_a_directory
     end
diff --git a/Library/Homebrew/test/cask/artifact/pkg_spec.rb b/Library/Homebrew/test/cask/artifact/pkg_spec.rb
index 3e62616ea..c6a45c49a 100644
--- a/Library/Homebrew/test/cask/artifact/pkg_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/pkg_spec.rb
@@ -8,7 +8,7 @@ describe Hbc::Artifact::Pkg, :cask do
 
   describe "install_phase" do
     it "runs the system installer on the specified pkgs" do
-      pkg = Hbc::Artifact::Pkg.new(cask, command: fake_system_command)
+      pkg = described_class.for_cask(cask).first
 
       expect(fake_system_command).to receive(:run!).with(
         "/usr/sbin/installer",
@@ -17,7 +17,7 @@ describe Hbc::Artifact::Pkg, :cask do
         print_stdout: true,
       )
 
-      pkg.install_phase
+      pkg.install_phase(command: fake_system_command)
     end
   end
 
@@ -25,7 +25,7 @@ describe Hbc::Artifact::Pkg, :cask do
     let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-choices.rb") }
 
     it "passes the choice changes xml to the system installer" do
-      pkg = Hbc::Artifact::Pkg.new(cask, command: fake_system_command)
+      pkg = described_class.for_cask(cask).first
 
       file = double(path: Pathname.new("/tmp/choices.xml"))
 
@@ -57,7 +57,7 @@ describe Hbc::Artifact::Pkg, :cask do
         print_stdout: true,
       )
 
-      pkg.install_phase
+      pkg.install_phase(command: fake_system_command)
     end
   end
 end
diff --git a/Library/Homebrew/test/cask/artifact/postflight_block_spec.rb b/Library/Homebrew/test/cask/artifact/postflight_block_spec.rb
index 51b1431f0..4a44bb59b 100644
--- a/Library/Homebrew/test/cask/artifact/postflight_block_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/postflight_block_spec.rb
@@ -11,7 +11,8 @@ describe Hbc::Artifact::PostflightBlock, :cask do
         end
       end
 
-      described_class.new(cask).install_phase
+      described_class.for_cask(cask)
+        .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect(called).to be true
       expect(yielded_arg).to be_kind_of(Hbc::DSL::Postflight)
@@ -30,7 +31,8 @@ describe Hbc::Artifact::PostflightBlock, :cask do
         end
       end
 
-      described_class.new(cask).uninstall_phase
+      described_class.for_cask(cask)
+        .each { |artifact| artifact.uninstall_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect(called).to be true
       expect(yielded_arg).to be_kind_of(Hbc::DSL::UninstallPostflight)
diff --git a/Library/Homebrew/test/cask/artifact/preflight_block_spec.rb b/Library/Homebrew/test/cask/artifact/preflight_block_spec.rb
index b13c4ab9d..d7d4e72d9 100644
--- a/Library/Homebrew/test/cask/artifact/preflight_block_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/preflight_block_spec.rb
@@ -11,7 +11,8 @@ describe Hbc::Artifact::PreflightBlock, :cask do
         end
       end
 
-      described_class.new(cask).install_phase
+      described_class.for_cask(cask)
+        .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect(called).to be true
       expect(yielded_arg).to be_kind_of Hbc::DSL::Preflight
@@ -30,7 +31,8 @@ describe Hbc::Artifact::PreflightBlock, :cask do
         end
       end
 
-      described_class.new(cask).uninstall_phase
+      described_class.for_cask(cask)
+        .each { |artifact| artifact.uninstall_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect(called).to be true
       expect(yielded_arg).to be_kind_of Hbc::DSL::UninstallPreflight
diff --git a/Library/Homebrew/test/cask/artifact/suite_spec.rb b/Library/Homebrew/test/cask/artifact/suite_spec.rb
index 8c217a9e0..2f913fecc 100644
--- a/Library/Homebrew/test/cask/artifact/suite_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/suite_spec.rb
@@ -1,7 +1,9 @@
 describe Hbc::Artifact::Suite, :cask do
   let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-suite.rb") }
 
-  let(:install_phase) { -> { Hbc::Artifact::Suite.new(cask).install_phase } }
+  let(:install_phase) {
+    -> { described_class.for_cask(cask).each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) } }
+  }
 
   let(:target_path) { Hbc.appdir.join("Caffeine") }
   let(:source_path) { cask.staged_path.join("Caffeine") }
diff --git a/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb b/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb
index a1fdd3b74..f6e0d3c97 100644
--- a/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/two_apps_correct_spec.rb
@@ -3,7 +3,7 @@ describe Hbc::Artifact::App, :cask do
     let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-two-apps-correct.rb") }
 
     let(:install_phase) {
-      -> { Hbc::Artifact::App.new(cask).install_phase }
+      -> { described_class.for_cask(cask).each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) } }
     }
 
     let(:source_path_mini) { cask.staged_path.join("Caffeine Mini.app") }
diff --git a/Library/Homebrew/test/cask/artifact/uninstall_no_zap_spec.rb b/Library/Homebrew/test/cask/artifact/uninstall_no_zap_spec.rb
index 8cd0b1e41..d6a8393da 100644
--- a/Library/Homebrew/test/cask/artifact/uninstall_no_zap_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/uninstall_no_zap_spec.rb
@@ -2,7 +2,7 @@ describe Hbc::Artifact::Zap, :cask do
   let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installable.rb") }
 
   let(:zap_artifact) {
-    Hbc::Artifact::Zap.new(cask)
+    described_class.for_cask(cask).first
   }
 
   before(:each) do
diff --git a/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb b/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb
index 0e522bc21..06eec4a01 100644
--- a/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb
+++ b/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb
@@ -1,12 +1,12 @@
 shared_examples "#uninstall_phase or #zap_phase" do
-  let(:artifact_name) { described_class.artifact_name }
-  let(:artifact) { described_class.new(cask, command: fake_system_command) }
+  let(:artifact_dsl_key) { described_class.dsl_key }
+  let(:artifact) { described_class.for_cask(cask).first }
   let(:fake_system_command) { Hbc::FakeSystemCommand }
 
-  subject { artifact.public_send(:"#{artifact_name}_phase") }
+  subject { artifact.public_send(:"#{artifact_dsl_key}_phase", command: fake_system_command) }
 
   context "using :launchctl" do
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-launchctl.rb") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-launchctl.rb") }
     let(:launchctl_list_cmd) { %w[/bin/launchctl list my.fancy.package.service] }
     let(:launchctl_remove_cmd) { %w[/bin/launchctl remove my.fancy.package.service] }
     let(:unknown_response) { "launchctl list returned unknown response\n" }
@@ -61,7 +61,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
   context "using :pkgutil" do
     let(:fake_system_command) { class_double(Hbc::SystemCommand) }
 
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-pkgutil.rb") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-pkgutil.rb") }
 
     let(:main_pkg_id) { "my.fancy.package.main" }
     let(:agent_pkg_id) { "my.fancy.package.agent" }
@@ -85,7 +85,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
   end
 
   context "using :kext" do
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-kext.rb") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-kext.rb") }
     let(:kext_id) { "my.fancy.package.kernelextension" }
 
     it "is supported" do
@@ -110,7 +110,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
   end
 
   context "using :quit" do
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-quit.rb") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-quit.rb") }
     let(:bundle_id) { "my.fancy.package.app" }
     let(:quit_application_script) do
       %Q(tell application id "#{bundle_id}" to quit)
@@ -130,7 +130,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
   end
 
   context "using :signal" do
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-signal.rb") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-signal.rb") }
     let(:bundle_id) { "my.fancy.package.app" }
     let(:signals) { %w[TERM KILL] }
     let(:unix_pids) { [12_345, 67_890] }
@@ -170,10 +170,10 @@ shared_examples "#uninstall_phase or #zap_phase" do
       end
 
       let(:fake_system_command) { Hbc::NeverSudoSystemCommand }
-      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-#{directive}.rb") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-#{directive}.rb") }
 
       before(:each) do
-        allow_any_instance_of(Hbc::Artifact::UninstallBase).to receive(:trash_paths)
+        allow_any_instance_of(Hbc::Artifact::AbstractUninstall).to receive(:trash_paths)
           .and_wrap_original do |method, *args|
             result = method.call(*args)
             FileUtils.rm_rf result.stdout.split("\0")
@@ -196,7 +196,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
 
   context "using :rmdir" do
     let(:fake_system_command) { Hbc::NeverSudoSystemCommand }
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-rmdir.rb") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-rmdir.rb") }
     let(:empty_directory) { Pathname.new("#{TEST_TMPDIR}/empty_directory_path") }
     let(:ds_store) { empty_directory.join(".DS_Store") }
 
@@ -223,7 +223,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
   [:script, :early_script].each do |script_type|
     context "using #{script_type.inspect}" do
       let(:fake_system_command) { Hbc::NeverSudoSystemCommand }
-      let(:token) { "with-#{artifact_name}-#{script_type}".tr("_", "-") }
+      let(:token) { "with-#{artifact_dsl_key}-#{script_type}".tr("_", "-") }
       let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/#{token}.rb") }
       let(:script_pathname) { cask.staged_path.join("MyFancyPkg", "FancyUninstaller.tool") }
 
@@ -250,7 +250,7 @@ shared_examples "#uninstall_phase or #zap_phase" do
   end
 
   context "using :login_item" do
-    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_name}-login-item.rb") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-#{artifact_dsl_key}-login-item.rb") }
 
     it "is supported" do
       Hbc::FakeSystemCommand.expects_command(
diff --git a/Library/Homebrew/test/cask/audit_spec.rb b/Library/Homebrew/test/cask/audit_spec.rb
index ddc773e3e..7e140acb2 100644
--- a/Library/Homebrew/test/cask/audit_spec.rb
+++ b/Library/Homebrew/test/cask/audit_spec.rb
@@ -265,19 +265,14 @@ describe Hbc::Audit, :cask do
     end
 
     describe "generic artifact checks" do
-      context "with no target" do
-        let(:cask_token) { "generic-artifact-no-target" }
-        it { is_expected.to fail_with(/target required for generic artifact/) }
-      end
-
       context "with relative target" do
         let(:cask_token) { "generic-artifact-relative-target" }
-        it { is_expected.to fail_with(/target must be absolute path for generic artifact/) }
+        it { is_expected.to fail_with(/target must be absolute path for Generic Artifact/) }
       end
 
       context "with absolute target" do
         let(:cask_token) { "generic-artifact-absolute-target" }
-        it { should_not fail_with(/target required for generic artifact/) }
+        it { should_not fail_with(/target required for Generic Artifact/) }
       end
     end
 
diff --git a/Library/Homebrew/test/cask/cask_spec.rb b/Library/Homebrew/test/cask/cask_spec.rb
index a6ecc207f..5858a7c6d 100644
--- a/Library/Homebrew/test/cask/cask_spec.rb
+++ b/Library/Homebrew/test/cask/cask_spec.rb
@@ -171,4 +171,38 @@ describe Hbc::Cask, :cask do
       end
     end
   end
+
+  describe "full_name" do
+    context "when it is a core cask" do
+      it "is the cask token" do
+        c = Hbc::CaskLoader.load("local-caffeine")
+        expect(c.full_name).to eq("local-caffeine")
+      end
+    end
+
+    context "when it is from a non-core tap" do
+      it "returns the fully-qualified name of the cask" do
+        c = Hbc::CaskLoader.load("third-party/tap/third-party-cask")
+        expect(c.full_name).to eq("third-party/tap/third-party-cask")
+      end
+    end
+
+    context "when it is from no known tap" do
+      it "retuns the cask token" do
+        file = Tempfile.new(%w[tapless-cask .rb])
+
+        begin
+          cask_name = File.basename(file.path, ".rb")
+          file.write "cask '#{cask_name}'"
+          file.close
+
+          c = Hbc::CaskLoader.load(file.path)
+          expect(c.full_name).to eq(cask_name)
+        ensure
+          file.close
+          file.unlink
+        end
+      end
+    end
+  end
 end
diff --git a/Library/Homebrew/test/cask/cli/audit_spec.rb b/Library/Homebrew/test/cask/cli/audit_spec.rb
index 01f506c8c..30ab437cb 100644
--- a/Library/Homebrew/test/cask/cli/audit_spec.rb
+++ b/Library/Homebrew/test/cask/cli/audit_spec.rb
@@ -1,8 +1,10 @@
 describe Hbc::CLI::Audit, :cask do
-  let(:cask) { double("cask", token: nil) }
+  let(:cask) { Hbc::Cask.new(nil) }
 
   describe "selection of Casks to audit" do
     it "audits all Casks if no tokens are given" do
+      expect(cask).to be_a Hbc::Cask
+
       allow(Hbc).to receive(:all).and_return([cask, cask])
 
       expect(Hbc::Auditor).to receive(:audit).twice.and_return(true)
diff --git a/Library/Homebrew/test/cask/cli/cat_spec.rb b/Library/Homebrew/test/cask/cli/cat_spec.rb
index b726a0b36..5a4b29c6f 100644
--- a/Library/Homebrew/test/cask/cli/cat_spec.rb
+++ b/Library/Homebrew/test/cask/cli/cat_spec.rb
@@ -35,8 +35,7 @@ describe Hbc::CLI::Cat, :cask do
 
   it "raises an exception when the Cask does not exist" do
     expect { Hbc::CLI::Cat.run("notacask") }
-      .to output(/is unavailable/).to_stderr
-      .and raise_error(Hbc::CaskError, "Cat incomplete.")
+      .to raise_error(Hbc::CaskUnavailableError, /is unavailable/)
   end
 
   describe "when no Cask is specified" do
diff --git a/Library/Homebrew/test/cask/cli/create_spec.rb b/Library/Homebrew/test/cask/cli/create_spec.rb
index d77b0a2aa..17d426f78 100644
--- a/Library/Homebrew/test/cask/cli/create_spec.rb
+++ b/Library/Homebrew/test/cask/cli/create_spec.rb
@@ -39,7 +39,7 @@ describe Hbc::CLI::Create, :cask do
   it "raises an exception when more than one Cask is given" do
     expect {
       described_class.run("additional-cask", "another-cask")
-    }.to raise_error(/Only one Cask can be created at a time./)
+    }.to raise_error(/Only one Cask can be created at a time\./)
   end
 
   it "raises an exception when the Cask already exists" do
diff --git a/Library/Homebrew/test/cask/cli/edit_spec.rb b/Library/Homebrew/test/cask/cli/edit_spec.rb
index 5d5cbf4b9..51542807f 100644
--- a/Library/Homebrew/test/cask/cli/edit_spec.rb
+++ b/Library/Homebrew/test/cask/cli/edit_spec.rb
@@ -12,7 +12,7 @@ describe Hbc::CLI::Edit, :cask do
   it "raises an error when given more than one argument" do
     expect {
       described_class.new("local-caffeine", "local-transmission")
-    }.to raise_error(/Only one Cask can be created at a time./)
+    }.to raise_error(/Only one Cask can be edited at a time\./)
   end
 
   it "raises an exception when the Cask doesnt exist" do
diff --git a/Library/Homebrew/test/cask/cli/fetch_spec.rb b/Library/Homebrew/test/cask/cli/fetch_spec.rb
index f71c23fb6..faaa69b35 100644
--- a/Library/Homebrew/test/cask/cli/fetch_spec.rb
+++ b/Library/Homebrew/test/cask/cli/fetch_spec.rb
@@ -42,7 +42,7 @@ describe Hbc::CLI::Fetch, :cask do
   it "properly handles Casks that are not present" do
     expect {
       Hbc::CLI::Fetch.run("notacask")
-    }.to raise_error(Hbc::CaskError, "Fetch incomplete.")
+    }.to raise_error(Hbc::CaskUnavailableError)
   end
 
   describe "when no Cask is specified" do
diff --git a/Library/Homebrew/test/cask/cli/info_spec.rb b/Library/Homebrew/test/cask/cli/info_spec.rb
index bffe900ec..aec7080de 100644
--- a/Library/Homebrew/test/cask/cli/info_spec.rb
+++ b/Library/Homebrew/test/cask/cli/info_spec.rb
@@ -10,7 +10,7 @@ describe Hbc::CLI::Info, :cask do
       ==> Name
       None
       ==> Artifacts
-      Caffeine.app (app)
+      Caffeine.app (App)
     EOS
   end
 
@@ -24,7 +24,7 @@ describe Hbc::CLI::Info, :cask do
         ==> Name
         None
         ==> Artifacts
-        Caffeine.app (app)
+        Caffeine.app (App)
         local-transmission: 2.61
         http://example.com/local-transmission
         Not installed
@@ -32,7 +32,7 @@ describe Hbc::CLI::Info, :cask do
         ==> Name
         None
         ==> Artifacts
-        Transmission.app (app)
+        Transmission.app (App)
       EOS
     }
 
@@ -60,7 +60,7 @@ describe Hbc::CLI::Info, :cask do
       ==> Name
       None
       ==> Artifacts
-      Caffeine.app (app)
+      Caffeine.app (App)
       ==> Caveats
       Here are some things you might want to know.
 
@@ -86,7 +86,7 @@ describe Hbc::CLI::Info, :cask do
       ==> Name
       None
       ==> Artifacts
-      Caffeine.app (app)
+      Caffeine.app (App)
     EOS
   end
 
diff --git a/Library/Homebrew/test/cask/cli/install_spec.rb b/Library/Homebrew/test/cask/cli/install_spec.rb
index 64feacce9..e30489789 100644
--- a/Library/Homebrew/test/cask/cli/install_spec.rb
+++ b/Library/Homebrew/test/cask/cli/install_spec.rb
@@ -56,27 +56,19 @@ describe Hbc::CLI::Install, :cask do
   it "properly handles Casks that are not present" do
     expect {
       Hbc::CLI::Install.run("notacask")
-    }.to raise_error(Hbc::CaskError, "Install incomplete.")
+    }.to raise_error(Hbc::CaskUnavailableError)
   end
 
   it "returns a suggestion for a misspelled Cask" do
     expect {
-      begin
-        Hbc::CLI::Install.run("localcaffeine")
-      rescue Hbc::CaskError
-        nil
-      end
-    }.to output(/Cask 'localcaffeine' is unavailable: No Cask with this name exists\. Did you mean:\nlocal-caffeine/).to_stderr
+      Hbc::CLI::Install.run("localcaffeine")
+    }.to raise_error(Hbc::CaskUnavailableError, /Cask 'localcaffeine' is unavailable: No Cask with this name exists\. Did you mean “local-caffeine”?/)
   end
 
   it "returns multiple suggestions for a Cask fragment" do
     expect {
-      begin
-        Hbc::CLI::Install.run("local-caf")
-      rescue Hbc::CaskError
-        nil
-      end
-    }.to output(/Cask 'local-caf' is unavailable: No Cask with this name exists\. Did you mean one of:\nlocal-caffeine/).to_stderr
+      Hbc::CLI::Install.run("local")
+    }.to raise_error(Hbc::CaskUnavailableError, /Cask 'local' is unavailable: No Cask with this name exists\. Did you mean one of these\?\nlocal-caffeine\nlocal-transmission/)
   end
 
   describe "when no Cask is specified" do
diff --git a/Library/Homebrew/test/cask/cli/list_spec.rb b/Library/Homebrew/test/cask/cli/list_spec.rb
index ecca3035f..d2d7efd3b 100644
--- a/Library/Homebrew/test/cask/cli/list_spec.rb
+++ b/Library/Homebrew/test/cask/cli/list_spec.rb
@@ -14,6 +14,26 @@ describe Hbc::CLI::List, :cask do
     EOS
   end
 
+  it "lists full names" do
+    casks = %w[
+      local-caffeine
+      third-party/tap/third-party-cask
+      local-transmission
+    ].map { |c| Hbc::CaskLoader.load(c) }
+
+    casks.each do |c|
+      InstallHelper.install_with_caskfile(c)
+    end
+
+    expect {
+      Hbc::CLI::List.run("--full-name")
+    }.to output(<<-EOS.undent).to_stdout
+      local-caffeine
+      local-transmission
+      third-party/tap/third-party-cask
+    EOS
+  end
+
   describe "lists versions" do
     let(:casks) { ["local-caffeine", "local-transmission"] }
     let(:expected_output) {
@@ -48,7 +68,8 @@ describe Hbc::CLI::List, :cask do
     it "lists the installed files for those Casks" do
       casks.each(&InstallHelper.method(:install_without_artifacts_with_caskfile))
 
-      Hbc::Artifact::App.new(transmission).install_phase
+      Hbc::Artifact::App.for_cask(transmission)
+        .each { |artifact| artifact.install_phase(command: Hbc::NeverSudoSystemCommand, force: false) }
 
       expect {
         Hbc::CLI::List.run("local-transmission", "local-caffeine")
diff --git a/Library/Homebrew/test/cask/cli/search_spec.rb b/Library/Homebrew/test/cask/cli/search_spec.rb
index e237ad464..3d58e6a15 100644
--- a/Library/Homebrew/test/cask/cli/search_spec.rb
+++ b/Library/Homebrew/test/cask/cli/search_spec.rb
@@ -4,6 +4,8 @@ describe Hbc::CLI::Search, :cask do
   end
 
   it "lists the available Casks that match the search term" do
+    allow(GitHub).to receive(:search_code).and_return([])
+
     expect {
       Hbc::CLI::Search.run("local")
     }.to output(<<-EOS.undent).to_stdout.as_tty
@@ -14,6 +16,8 @@ describe Hbc::CLI::Search, :cask do
   end
 
   it "outputs a plain list when stdout is not a TTY" do
+    allow(GitHub).to receive(:search_code).and_return([])
+
     expect {
       Hbc::CLI::Search.run("local")
     }.to output(<<-EOS.undent).to_stdout
@@ -22,16 +26,37 @@ describe Hbc::CLI::Search, :cask do
     EOS
   end
 
+  it "returns matches even when online search failed" do
+    allow(GitHub).to receive(:search_code).and_raise(GitHub::Error.new("reason"))
+
+    expect {
+      Hbc::CLI::Search.run("local")
+    }.to output(<<-EOS.undent).to_stdout
+      local-caffeine
+      local-transmission
+    EOS
+    .and output(/^Warning: Error searching on GitHub: reason/).to_stderr
+  end
+
   it "shows that there are no Casks matching a search term that did not result in anything" do
     expect {
       Hbc::CLI::Search.run("foo-bar-baz")
-    }.to output("No Cask found for \"foo-bar-baz\".\n").to_stdout.as_tty
+    }.to output(<<-EOS.undent).to_stdout.as_tty
+      No Cask found for "foo-bar-baz".
+    EOS
   end
 
-  it "lists all available Casks with no search term" do
-    expect {
-      Hbc::CLI::Search.run
-    }.to output(/local-caffeine/).to_stdout.as_tty
+  it "doesn't output anything to non-TTY stdout when there are no matches" do
+    expect { Hbc::CLI::Search.run("foo-bar-baz") }
+      .to not_to_output.to_stdout
+      .and not_to_output.to_stderr
+  end
+
+  it "lists all Casks available offline with no search term" do
+    allow(GitHub).to receive(:search_code).and_raise(GitHub::Error.new("reason"))
+    expect { Hbc::CLI::Search.run }
+      .to output(/local-caffeine/).to_stdout.as_tty
+      .and not_to_output.to_stderr
   end
 
   it "ignores hyphens in search terms" do
@@ -55,19 +80,29 @@ describe Hbc::CLI::Search, :cask do
   it "accepts a regexp argument" do
     expect {
       Hbc::CLI::Search.run("/^local-c[a-z]ffeine$/")
-    }.to output("==> Regexp Matches\nlocal-caffeine\n").to_stdout.as_tty
+    }.to output(<<-EOS.undent).to_stdout.as_tty
+      ==> Regexp Matches
+      local-caffeine
+    EOS
   end
 
-  it "Returns both exact and partial matches" do
+  it "returns both exact and partial matches" do
     expect {
       Hbc::CLI::Search.run("test-opera")
-    }.to output(/^==> Exact Match\ntest-opera\n==> Partial Matches\ntest-opera-mail/).to_stdout.as_tty
+    }.to output(<<-EOS.undent).to_stdout.as_tty
+      ==> Exact Match
+      test-opera
+      ==> Partial Matches
+      test-opera-mail
+    EOS
   end
 
   it "does not search the Tap name" do
     expect {
       Hbc::CLI::Search.run("caskroom")
-    }.to output(/^No Cask found for "caskroom"\.\n/).to_stdout.as_tty
+    }.to output(<<-EOS.undent).to_stdout.as_tty
+      No Cask found for "caskroom".
+    EOS
   end
 
   it "doesn't highlight packages that aren't installed" do
diff --git a/Library/Homebrew/test/cask/cli/uninstall_spec.rb b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
index 1a1c57e88..2ec506839 100644
--- a/Library/Homebrew/test/cask/cli/uninstall_spec.rb
+++ b/Library/Homebrew/test/cask/cli/uninstall_spec.rb
@@ -16,14 +16,12 @@ describe Hbc::CLI::Uninstall, :cask do
 
   it "shows an error when a bad Cask is provided" do
     expect { Hbc::CLI::Uninstall.run("notacask") }
-      .to output(/is unavailable/).to_stderr
-      .and raise_error(Hbc::CaskError, "Uninstall incomplete.")
+      .to raise_error(Hbc::CaskUnavailableError, /is unavailable/)
   end
 
   it "shows an error when a Cask is provided that's not installed" do
     expect { Hbc::CLI::Uninstall.run("local-caffeine") }
-    .to output(/is not installed/).to_stderr
-    .and raise_error(Hbc::CaskError, "Uninstall incomplete.")
+    .to raise_error(Hbc::CaskNotInstalledError, /is not installed/)
   end
 
   it "tries anyway on a non-present Cask when --force is given" do
@@ -76,8 +74,7 @@ describe Hbc::CLI::Uninstall, :cask do
     Hbc.appdir.join("MyFancyApp.app").rmtree
 
     expect { Hbc::CLI::Uninstall.run("with-uninstall-script-app") }
-    .to output(/does not exist/).to_stderr
-    .and raise_error(Hbc::CaskError, "Uninstall incomplete.")
+    .to raise_error(Hbc::CaskError, /uninstall script .* does not exist/)
 
     expect(cask).to be_installed
 
diff --git a/Library/Homebrew/test/cask/cli/zap_spec.rb b/Library/Homebrew/test/cask/cli/zap_spec.rb
index fdc5b4125..502bf8e69 100644
--- a/Library/Homebrew/test/cask/cli/zap_spec.rb
+++ b/Library/Homebrew/test/cask/cli/zap_spec.rb
@@ -1,8 +1,7 @@
 describe Hbc::CLI::Zap, :cask do
   it "shows an error when a bad Cask is provided" do
     expect { Hbc::CLI::Zap.run("notacask") }
-      .to output(/is unavailable/).to_stderr
-      .and raise_error(Hbc::CaskError, "Zap incomplete.")
+      .to raise_error(Hbc::CaskUnavailableError, /is unavailable/)
   end
 
   it "can zap and unlink multiple Casks at once" do
diff --git a/Library/Homebrew/test/cask/conflicts_with_spec.rb b/Library/Homebrew/test/cask/conflicts_with_spec.rb
index 0dc51cb2d..00dc252fe 100644
--- a/Library/Homebrew/test/cask/conflicts_with_spec.rb
+++ b/Library/Homebrew/test/cask/conflicts_with_spec.rb
@@ -8,7 +8,7 @@ describe "conflicts_with", :cask do
       Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-conflicts-with.rb")
     }
 
-    it "installs the dependency of a Cask and the Cask itself", :focus do
+    it "installs the dependency of a Cask and the Cask itself" do
       Hbc::Installer.new(local_caffeine).install
 
       expect(local_caffeine).to be_installed
diff --git a/Library/Homebrew/test/cask/depends_on_spec.rb b/Library/Homebrew/test/cask/depends_on_spec.rb
index c603cf6e1..fb92a9a24 100644
--- a/Library/Homebrew/test/cask/depends_on_spec.rb
+++ b/Library/Homebrew/test/cask/depends_on_spec.rb
@@ -31,7 +31,7 @@ describe "Satisfy Dependencies and Requirements", :cask do
       it { is_expected.not_to raise_error }
     end
 
-    context "given a comparisson" do
+    context "given a comparison" do
       let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-comparison.rb") }
       it { is_expected.not_to raise_error }
     end
diff --git a/Library/Homebrew/test/cask/dsl_spec.rb b/Library/Homebrew/test/cask/dsl_spec.rb
index 7f2207a87..aec1e917f 100644
--- a/Library/Homebrew/test/cask/dsl_spec.rb
+++ b/Library/Homebrew/test/cask/dsl_spec.rb
@@ -186,12 +186,12 @@ describe Hbc::DSL, :cask do
         app "Bar.app"
       end
 
-      expect(Array(cask.artifacts[:app])).to eq([["Foo.app"], ["Bar.app"]])
+      expect(cask.artifacts[:app].map(&:to_s)).to eq(["Foo.app (App)", "Bar.app (App)"])
     end
 
     it "allow app stanzas to be empty" do
       cask = Hbc::Cask.new("cask-with-no-apps")
-      expect(Array(cask.artifacts[:app])).to eq([])
+      expect(cask.artifacts[:app]).to be_empty
     end
   end
 
@@ -219,7 +219,7 @@ describe Hbc::DSL, :cask do
         pkg "Bar.pkg"
       end
 
-      expect(Array(cask.artifacts[:pkg])).to eq([["Foo.pkg"], ["Bar.pkg"]])
+      expect(cask.artifacts[:pkg].map(&:to_s)).to eq(["Foo.pkg (Pkg)", "Bar.pkg (Pkg)"])
     end
   end
 
@@ -471,10 +471,10 @@ describe Hbc::DSL, :cask do
       let(:token) { "with-installer-script" }
 
       it "allows installer script to be specified" do
-        expect(cask.artifacts[:installer].first.script[:executable]).to eq("/usr/bin/true")
-        expect(cask.artifacts[:installer].first.script[:args]).to eq(["--flag"])
-        expect(cask.artifacts[:installer].to_a[1].script[:executable]).to eq("/usr/bin/false")
-        expect(cask.artifacts[:installer].to_a[1].script[:args]).to eq(["--flag"])
+        expect(cask.artifacts[:installer].first.path).to eq(Pathname("/usr/bin/true"))
+        expect(cask.artifacts[:installer].first.args[:args]).to eq(["--flag"])
+        expect(cask.artifacts[:installer].to_a[1].path).to eq(Pathname("/usr/bin/false"))
+        expect(cask.artifacts[:installer].to_a[1].args[:args]).to eq(["--flag"])
       end
     end
 
@@ -482,7 +482,9 @@ describe Hbc::DSL, :cask do
       let(:token) { "with-installer-manual" }
 
       it "allows installer manual to be specified" do
-        expect(cask.artifacts[:installer].first.manual).to eq("Caffeine.app")
+        installer = cask.artifacts[:installer].first
+        expect(installer).to be_a(Hbc::Artifact::Installer::ManualInstaller)
+        expect(installer.path).to eq(cask.staged_path.join("Caffeine.app"))
       end
     end
   end
@@ -492,7 +494,7 @@ describe Hbc::DSL, :cask do
       let(:token) { "stage-only" }
 
       it "allows stage_only stanza to be specified" do
-        expect(cask.artifacts[:stage_only].first).to eq([true])
+        expect(cask.artifacts[:stage_only]).not_to be_empty
       end
     end
 
@@ -518,7 +520,7 @@ describe Hbc::DSL, :cask do
       let(:token) { "appdir-interpolation" }
 
       it "is allowed" do
-        expect(cask.artifacts[:binary].first).to eq(["#{Hbc.appdir}/some/path"])
+        expect(cask.artifacts[:binary].first.source).to eq(Hbc.appdir/"some/path")
       end
     end
 
@@ -531,7 +533,7 @@ describe Hbc::DSL, :cask do
           binary "#{appdir}/some/path"
         end
 
-        expect(cask.artifacts[:binary].first).to eq(["#{original_appdir}/some/path"])
+        expect(cask.artifacts[:binary].first.source).to eq(original_appdir/"some/path")
       ensure
         Hbc.appdir = original_appdir
       end
diff --git a/Library/Homebrew/test/cleanup_spec.rb b/Library/Homebrew/test/cleanup_spec.rb
index 4e5e42efa..da262c5ca 100644
--- a/Library/Homebrew/test/cleanup_spec.rb
+++ b/Library/Homebrew/test/cleanup_spec.rb
@@ -5,6 +5,7 @@ require "pathname"
 
 describe Homebrew::Cleanup do
   let(:ds_store) { Pathname.new("#{HOMEBREW_PREFIX}/Library/.DS_Store") }
+  let(:sec_in_a_day) { 60 * 60 * 24 }
 
   around(:each) do |example|
     begin
@@ -104,14 +105,30 @@ describe Homebrew::Cleanup do
     expect(f4).to be_installed
   end
 
-  specify "::cleanup_logs" do
-    path = (HOMEBREW_LOGS/"delete_me")
-    path.mkpath
-    ARGV << "--prune=all"
+  describe "::cleanup_logs" do
+    let(:path) { (HOMEBREW_LOGS/"delete_me") }
 
-    described_class.cleanup_logs
+    before do
+      path.mkpath
+    end
+
+    it "cleans all logs if prune all" do
+      ARGV << "--prune=all"
+      described_class.cleanup_logs
+      expect(path).not_to exist
+    end
 
-    expect(path).not_to exist
+    it "cleans up logs if older than 14 days" do
+      allow_any_instance_of(Pathname).to receive(:mtime).and_return(Time.now - sec_in_a_day * 15)
+      described_class.cleanup_logs
+      expect(path).not_to exist
+    end
+
+    it "does not clean up logs less than 14 days old" do
+      allow_any_instance_of(Pathname).to receive(:mtime).and_return(Time.now - sec_in_a_day * 2)
+      described_class.cleanup_logs
+      expect(path).to exist
+    end
   end
 
   describe "::cleanup_cache" do
@@ -124,6 +141,15 @@ describe Homebrew::Cleanup do
       expect(incomplete).not_to exist
     end
 
+    it "cleans up 'glide_home'" do
+      glide_home = (HOMEBREW_CACHE/"glide_home")
+      glide_home.mkpath
+
+      described_class.cleanup_cache
+
+      expect(glide_home).not_to exist
+    end
+
     it "cleans up 'java_cache'" do
       java_cache = (HOMEBREW_CACHE/"java_cache")
       java_cache.mkpath
@@ -141,5 +167,99 @@ describe Homebrew::Cleanup do
 
       expect(npm_cache).not_to exist
     end
+
+    it "cleans up all files and directories" do
+      git = (HOMEBREW_CACHE/"gist--git")
+      gist = (HOMEBREW_CACHE/"gist")
+      svn = (HOMEBREW_CACHE/"gist--svn")
+
+      git.mkpath
+      gist.mkpath
+      FileUtils.touch svn
+
+      allow(ARGV).to receive(:value).with("prune").and_return("all")
+
+      described_class.cleanup_cache
+
+      expect(git).not_to exist
+      expect(gist).to exist
+      expect(svn).not_to exist
+    end
+
+    it "does not clean up directories that are not VCS checkouts" do
+      git = (HOMEBREW_CACHE/"git")
+      git.mkpath
+      allow(ARGV).to receive(:value).with("prune").and_return("all")
+
+      described_class.cleanup_cache
+
+      expect(git).to exist
+    end
+
+    it "cleans up VCS checkout directories with modified time < prune time" do
+      foo = (HOMEBREW_CACHE/"--foo")
+      foo.mkpath
+      allow(ARGV).to receive(:value).with("prune").and_return("1")
+      allow_any_instance_of(Pathname).to receive(:mtime).and_return(Time.now - sec_in_a_day * 2)
+      described_class.cleanup_cache
+      expect(foo).not_to exist
+    end
+
+    it "does not clean up VCS checkout directories with modified time >= prune time" do
+      foo = (HOMEBREW_CACHE/"--foo")
+      foo.mkpath
+      allow(ARGV).to receive(:value).with("prune").and_return("1")
+      described_class.cleanup_cache
+      expect(foo).to exist
+    end
+
+    context "cleans old files in HOMEBREW_CACHE" do
+      let(:bottle) { (HOMEBREW_CACHE/"testball-0.0.1.bottle.tar.gz") }
+      let(:testball) { (HOMEBREW_CACHE/"testball-0.0.1") }
+
+      before(:each) do
+        FileUtils.touch(bottle)
+        FileUtils.touch(testball)
+        (HOMEBREW_CELLAR/"testball"/"0.0.1").mkpath
+        FileUtils.touch(CoreTap.instance.formula_dir/"testball.rb")
+      end
+
+      it "cleans up file if outdated" do
+        allow(Utils::Bottles).to receive(:file_outdated?).with(any_args).and_return(true)
+        described_class.cleanup_cache
+        expect(bottle).not_to exist
+        expect(testball).not_to exist
+      end
+
+      it "cleans up file if ARGV has -s and formula not installed" do
+        ARGV << "-s"
+        described_class.cleanup_cache
+        expect(bottle).not_to exist
+        expect(testball).not_to exist
+      end
+
+      it "cleans up file if stale" do
+        described_class.cleanup_cache
+        expect(bottle).not_to exist
+        expect(testball).not_to exist
+      end
+    end
+  end
+
+  describe "::prune?" do
+    before do
+      foo.mkpath
+    end
+
+    let(:foo) { HOMEBREW_CACHE/"foo" }
+
+    it "returns true when path_modified_time < days_default" do
+      allow_any_instance_of(Pathname).to receive(:mtime).and_return(Time.now - sec_in_a_day * 2)
+      expect(described_class.prune?(foo, days_default: "1")).to be_truthy
+    end
+
+    it "returns false when path_modified_time >= days_default" do
+      expect(described_class.prune?(foo, days_default: "2")).to be_falsey
+    end
   end
 end
diff --git a/Library/Homebrew/test/cmd/commands_spec.rb b/Library/Homebrew/test/cmd/commands_spec.rb
index cf6f56740..46ed3ddcf 100644
--- a/Library/Homebrew/test/cmd/commands_spec.rb
+++ b/Library/Homebrew/test/cmd/commands_spec.rb
@@ -68,7 +68,7 @@ describe Homebrew do
 
       expect(cmds).to include("t1"), "Executable files should be included"
       expect(cmds).to include("t2"), "Executable Ruby files should be included"
-      expect(cmds).not_to include("t3"), "Executable files with a non Ruby extension shoudn't be included"
+      expect(cmds).not_to include("t3"), "Executable files with a non Ruby extension shouldn't be included"
       expect(cmds).not_to include("t4"), "Non-executable files shouldn't be included"
     end
   end
diff --git a/Library/Homebrew/test/cmd/home_spec.rb b/Library/Homebrew/test/cmd/home_spec.rb
index 5a4070492..cf9453af2 100644
--- a/Library/Homebrew/test/cmd/home_spec.rb
+++ b/Library/Homebrew/test/cmd/home_spec.rb
@@ -7,10 +7,10 @@ describe "brew home", :integration_test do
   end
 
   it "opens the homepage for a given Formula" do
-    setup_test_formula "testball"
+    setup_test_formula "testballhome"
 
-    expect { brew "home", "testball", "HOMEBREW_BROWSER" => "echo" }
-      .to output("#{Formula["testball"].homepage}\n").to_stdout
+    expect { brew "home", "testballhome", "HOMEBREW_BROWSER" => "echo" }
+      .to output("#{Formula["testballhome"].homepage}\n").to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
   end
diff --git a/Library/Homebrew/test/cmd/search_remote_tap_spec.rb b/Library/Homebrew/test/cmd/search_remote_tap_spec.rb
index b0beb122c..eb256b924 100644
--- a/Library/Homebrew/test/cmd/search_remote_tap_spec.rb
+++ b/Library/Homebrew/test/cmd/search_remote_tap_spec.rb
@@ -2,6 +2,9 @@ require "cmd/search"
 
 describe Homebrew do
   specify "#search_taps" do
+    # Otherwise the tested method returns [], regardless of our stub
+    ENV.delete("HOMEBREW_NO_GITHUB_API")
+
     json_response = {
       "items" => [
         {
diff --git a/Library/Homebrew/test/dependency_expansion_spec.rb b/Library/Homebrew/test/dependency_expansion_spec.rb
index f955237a9..d6ecdf552 100644
--- a/Library/Homebrew/test/dependency_expansion_spec.rb
+++ b/Library/Homebrew/test/dependency_expansion_spec.rb
@@ -69,7 +69,7 @@ describe Dependency do
     end
   end
 
-  it "merges dependencies and perserves env_proc" do
+  it "merges dependencies and preserves env_proc" do
     env_proc = double
     dep = described_class.new("foo", [], env_proc)
     allow(dep).to receive(:to_formula).and_return(double(deps: [], name: "foo"))
diff --git a/Library/Homebrew/test/dev-cmd/audit_spec.rb b/Library/Homebrew/test/dev-cmd/audit_spec.rb
index 037865fdf..3e99bd06b 100644
--- a/Library/Homebrew/test/dev-cmd/audit_spec.rb
+++ b/Library/Homebrew/test/dev-cmd/audit_spec.rb
@@ -150,70 +150,6 @@ describe FormulaAuditor do
     end
   end
 
-  describe "#audit_class" do
-    specify "missing test" do
-      fa = formula_auditor "foo", <<-EOS.undent
-        class Foo < Formula
-          url "http://example.com/foo-1.0.tgz"
-        end
-      EOS
-
-      fa.audit_class
-      expect(fa.problems).to eq([])
-
-      fa = formula_auditor "foo", <<-EOS.undent, strict: true
-        class Foo < Formula
-          url "http://example.com/foo-1.0.tgz"
-        end
-      EOS
-
-      fa.audit_class
-      expect(fa.problems).to eq(["A `test do` test block should be added"])
-    end
-
-    specify "GithubGistFormula", :needs_compat do
-      ENV.delete("HOMEBREW_DEVELOPER")
-
-      fa = formula_auditor "foo", <<-EOS.undent
-        class Foo < GithubGistFormula
-          url "http://example.com/foo-1.0.tgz"
-        end
-      EOS
-
-      fa.audit_class
-      expect(fa.problems)
-        .to eq(["GithubGistFormula is deprecated, use Formula instead"])
-    end
-
-    specify "ScriptFileFormula", :needs_compat do
-      ENV.delete("HOMEBREW_DEVELOPER")
-
-      fa = formula_auditor "foo", <<-EOS.undent
-        class Foo < ScriptFileFormula
-          url "http://example.com/foo-1.0.tgz"
-        end
-      EOS
-
-      fa.audit_class
-      expect(fa.problems)
-        .to eq(["ScriptFileFormula is deprecated, use Formula instead"])
-    end
-
-    specify "AmazonWebServicesFormula", :needs_compat do
-      ENV.delete("HOMEBREW_DEVELOPER")
-
-      fa = formula_auditor "foo", <<-EOS.undent
-        class Foo < AmazonWebServicesFormula
-          url "http://example.com/foo-1.0.tgz"
-        end
-      EOS
-
-      fa.audit_class
-      expect(fa.problems)
-        .to eq(["AmazonWebServicesFormula is deprecated, use Formula instead"])
-    end
-  end
-
   describe "#line_problems" do
     specify "pkgshare" do
       fa = formula_auditor "foo", <<-EOS.undent, strict: true
diff --git a/Library/Homebrew/test/os/mac/diagnostic_spec.rb b/Library/Homebrew/test/os/mac/diagnostic_spec.rb
index d6186e46b..83d95c2ef 100644
--- a/Library/Homebrew/test/os/mac/diagnostic_spec.rb
+++ b/Library/Homebrew/test/os/mac/diagnostic_spec.rb
@@ -47,15 +47,10 @@ describe Homebrew::Diagnostic::Checks do
   end
 
   specify "#check_ruby_version" do
-    allow(MacOS).to receive(:version).and_return(OS::Mac::Version.new("10.13"))
-    stub_const("RUBY_VERSION", "2.3.3p222")
+    allow(MacOS).to receive(:version).and_return(OS::Mac::Version.new("10.12"))
+    stub_const("RUBY_VERSION", "1.8.6")
 
     expect(subject.check_ruby_version)
-      .to match <<-EOS.undent
-      Ruby version 2.3.3p222 is unsupported on 10.13. Homebrew
-      is developed and tested on Ruby 2.0, and may not work correctly
-      on other Rubies. Patches are accepted as long as they don't cause breakage
-      on supported Rubies.
-    EOS
+      .to match "Ruby version 1.8.6 is unsupported on 10.12"
   end
 end
diff --git a/Library/Homebrew/test/pathname_spec.rb b/Library/Homebrew/test/pathname_spec.rb
index 0bc19c5ac..69314e5f4 100644
--- a/Library/Homebrew/test/pathname_spec.rb
+++ b/Library/Homebrew/test/pathname_spec.rb
@@ -295,7 +295,7 @@ describe FileUtils do
   let(:dst) { mktmpdir }
 
   describe "#mkdir" do
-    it "creates indermediate directories" do
+    it "creates intermediate directories" do
       described_class.mkdir dst/"foo/bar/baz" do
         expect(dst/"foo/bar/baz").to exist, "foo/bar/baz was not created"
         expect(dst/"foo/bar/baz").to be_a_directory, "foo/bar/baz was not a directory structure"
diff --git a/Library/Homebrew/test/requirement_spec.rb b/Library/Homebrew/test/requirement_spec.rb
index 71372aa69..11a3da8f4 100644
--- a/Library/Homebrew/test/requirement_spec.rb
+++ b/Library/Homebrew/test/requirement_spec.rb
@@ -48,7 +48,7 @@ describe Requirement do
       it { is_expected.to be_fatal }
     end
 
-    context "#fatal is ommitted" do
+    context "#fatal is omitted" do
       it { is_expected.not_to be_fatal }
     end
   end
@@ -184,7 +184,7 @@ describe Requirement do
       it { is_expected.to have_a_default_formula }
     end
 
-    context "#default_formula ommitted" do
+    context "#default_formula omitted" do
       it { is_expected.not_to have_a_default_formula }
     end
   end
diff --git a/Library/Homebrew/test/rubocops/class_cop_spec.rb b/Library/Homebrew/test/rubocops/class_cop_spec.rb
new file mode 100644
index 000000000..676dd4f6e
--- /dev/null
+++ b/Library/Homebrew/test/rubocops/class_cop_spec.rb
@@ -0,0 +1,81 @@
+require "rubocop"
+require "rubocop/rspec/support"
+require_relative "../../extend/string"
+require_relative "../../rubocops/class_cop"
+
+describe RuboCop::Cop::FormulaAudit::ClassName do
+  subject(:cop) { described_class.new }
+
+  context "When auditing formula" do
+    it "with deprecated inheritance" do
+      formulas = [{
+        "class" => "GithubGistFormula",
+      }, {
+        "class" => "ScriptFileFormula",
+      }, {
+        "class" => "AmazonWebServicesFormula",
+      }]
+
+      formulas.each do |formula|
+        source = <<-EOS.undent
+        class Foo < #{formula["class"]}
+          url 'http://example.com/foo-1.0.tgz'
+        end
+        EOS
+
+        expected_offenses = [{  message: "#{formula["class"]} is deprecated, use Formula instead",
+                                severity: :convention,
+                                line: 1,
+                                column: 12,
+                                source: source }]
+
+        inspect_source(cop, source)
+
+        expected_offenses.zip(cop.offenses.reverse).each do |expected, actual|
+          expect_offense(expected, actual)
+        end
+      end
+    end
+
+    it "with deprecated inheritance and autocorrect" do
+      source = <<-EOS.undent
+        class Foo < AmazonWebServicesFormula
+          url 'http://example.com/foo-1.0.tgz'
+        end
+      EOS
+      corrected_source = <<-EOS.undent
+        class Foo < Formula
+          url 'http://example.com/foo-1.0.tgz'
+        end
+      EOS
+
+      new_source = autocorrect_source(cop, source)
+      expect(new_source).to eq(corrected_source)
+    end
+  end
+end
+
+describe RuboCop::Cop::FormulaAuditStrict::Test do
+  subject(:cop) { described_class.new }
+
+  context "When auditing formula" do
+    it "without a test block" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          url 'http://example.com/foo-1.0.tgz'
+        end
+      EOS
+      expected_offenses = [{  message: described_class::MSG,
+                              severity: :convention,
+                              line: 1,
+                              column: 0,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
index 4fbab6c9e..3af0f9669 100644
--- a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
@@ -22,7 +22,7 @@ describe RuboCop::Cop::FormulaAudit::Conflicts do
                               column: 2,
                               source: source }]
 
-      inspect_source(cop, source)
+      inspect_source(cop, source, "/homebrew-core/Formula/foo@2.0.rb")
 
       expected_offenses.zip(cop.offenses).each do |expected, actual|
         expect_offense(expected, actual)
@@ -36,7 +36,7 @@ describe RuboCop::Cop::FormulaAudit::Conflicts do
           desc 'Bar'
         end
       EOS
-      inspect_source(cop, source)
+      inspect_source(cop, source, "/homebrew-core/Formula/foo@2.0.rb")
       expect(cop.offenses).to eq([])
     end
   end
diff --git a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
index 74ce478fb..48342e8bc 100644
--- a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
@@ -37,7 +37,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
 
       msg = <<-EOS.undent
         Description is too long. "name: desc" should be less than 80 characters.
-        Length is calculated as Foo + desc. (currently 95)
+        Length is calculated as foo + desc. (currently 95)
       EOS
       expected_offenses = [{ message: msg,
                              severity: :convention,
@@ -45,7 +45,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
                              column: 2,
                              source: source }]
 
-      inspect_source(cop, source)
+      inspect_source(cop, source, "/homebrew-core/Formula/foo.rb")
       expected_offenses.zip(cop.offenses).each do |expected, actual|
         expect_offense(expected, actual)
       end
@@ -62,7 +62,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
 
       msg = <<-EOS.undent
         Description is too long. "name: desc" should be less than 80 characters.
-        Length is calculated as Foo + desc. (currently 98)
+        Length is calculated as foo + desc. (currently 98)
       EOS
       expected_offenses = [{ message: msg,
                              severity: :convention,
@@ -70,7 +70,7 @@ describe RuboCop::Cop::FormulaAuditStrict::DescLength do
                              column: 2,
                              source: source }]
 
-      inspect_source(cop, source)
+      inspect_source(cop, source, "/homebrew-core/Formula/foo.rb")
       expected_offenses.zip(cop.offenses).each do |expected, actual|
         expect_offense(expected, actual)
       end
@@ -156,7 +156,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
                              column: 8,
                              source: source }]
 
-      inspect_source(cop, source)
+      inspect_source(cop, source, "/homebrew-core/Formula/foo.rb")
       expected_offenses.zip(cop.offenses).each do |expected, actual|
         expect_offense(expected, actual)
       end
@@ -176,7 +176,7 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do
         end
       EOS
 
-      corrected_source = autocorrect_source(cop, source)
+      corrected_source = autocorrect_source(cop, source, "/homebrew-core/Formula/foo.rb")
       expect(corrected_source).to eq(correct_source)
     end
   end
diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
index b0ed8f4d1..d93962688 100644
--- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
@@ -200,5 +200,317 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
         expect_offense(expected, actual)
       end
     end
+
+    it "with invalid rebuild" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          bottle do
+            rebuild 0
+            sha256 "fe0679b932dd43a87fd415b609a7fbac7a069d117642ae8ebaac46ae1fb9f0b3" => :sierra
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: "'rebuild 0' should be removed",
+                              severity: :convention,
+                              line: 5,
+                              column: 4,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with OS.linux? check" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          bottle do
+            if OS.linux?
+              nil
+            end
+            sha256 "fe0679b932dd43a87fd415b609a7fbac7a069d117642ae8ebaac46ae1fb9f0b3" => :sierra
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: "Don't use OS.linux?; Homebrew/core only supports macOS",
+                              severity: :convention,
+                              line: 5,
+                              column: 7,
+                              source: source }]
+
+      inspect_source(cop, source, "/homebrew-core/")
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with fails_with :llvm" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          bottle do
+            sha256 "fe0679b932dd43a87fd415b609a7fbac7a069d117642ae8ebaac46ae1fb9f0b3" => :sierra
+          end
+          fails_with :llvm do
+            build 2335
+            cause "foo"
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: "'fails_with :llvm' is now a no-op so should be removed",
+                              severity: :convention,
+                              line: 7,
+                              column: 2,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with def test" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+
+          def test
+            assert_equals "1", "1"
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: "Use new-style test definitions (test do)",
+                              severity: :convention,
+                              line: 5,
+                              column: 2,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with def options" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+
+          def options
+            [["--bar", "desc"]]
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: "Use new-style option definitions",
+                              severity: :convention,
+                              line: 5,
+                              column: 2,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with deprecated skip_clean call" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          skip_clean :all
+        end
+      EOS
+
+      expected_offenses = [{ message: <<-EOS.undent.chomp,
+                              `skip_clean :all` is deprecated; brew no longer strips symbols
+                                      Pass explicit paths to prevent Homebrew from removing empty folders.
+                             EOS
+                             severity: :convention,
+                             line: 4,
+                             column: 2,
+                             source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with build.universal?" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          if build.universal?
+             "foo"
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: "macOS has been 64-bit only since 10.6 so build.universal? is deprecated.",
+                              severity: :convention,
+                              line: 4,
+                              column: 5,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with build.universal? exempted formula" do
+      source = <<-EOS.undent
+        class Wine < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          if build.universal?
+             "foo"
+          end
+        end
+      EOS
+
+      inspect_source(cop, source, "/homebrew-core/Formula/wine.rb")
+      expect(cop.offenses).to eq([])
+    end
+
+    it "with ENV.universal_binary" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          if build?
+             ENV.universal_binary
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: "macOS has been 64-bit only since 10.6 so ENV.universal_binary is deprecated.",
+                              severity: :convention,
+                              line: 5,
+                              column: 5,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with ENV.universal_binary" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          if build?
+             ENV.x11
+          end
+        end
+      EOS
+
+      expected_offenses = [{  message: 'Use "depends_on :x11" instead of "ENV.x11"',
+                              severity: :convention,
+                              line: 5,
+                              column: 5,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with ruby-macho alternatives" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          system "install_name_tool", "-id"
+        end
+      EOS
+
+      expected_offenses = [{  message: 'Use ruby-macho instead of calling "install_name_tool"',
+                              severity: :convention,
+                              line: 4,
+                              column: 10,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with ruby-macho alternatives audit exempted formula" do
+      source = <<-EOS.undent
+        class Cctools < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          system "install_name_tool", "-id"
+        end
+      EOS
+
+      inspect_source(cop, source, "/homebrew-core/Formula/cctools.rb")
+      expect(cop.offenses).to eq([])
+    end
+
+    it "with npm install without language::Node args" do
+      source = <<-EOS.undent
+        class Foo < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          system "npm", "install"
+        end
+      EOS
+
+      expected_offenses = [{  message: "Use Language::Node for npm install args",
+                              severity: :convention,
+                              line: 4,
+                              column: 2,
+                              source: source }]
+
+      inspect_source(cop, source)
+
+      expected_offenses.zip(cop.offenses).each do |expected, actual|
+        expect_offense(expected, actual)
+      end
+    end
+
+    it "with npm install without language::Node args in kibana" do
+      source = <<-EOS.undent
+        class KibanaAT44 < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          system "npm", "install"
+        end
+      EOS
+
+      inspect_source(cop, source, "/homebrew-core/Formula/kibana@4.4.rb")
+      expect(cop.offenses).to eq([])
+    end
   end
 end
diff --git a/Library/Homebrew/test/support/fixtures/third-party/Casks/third-party-cask.rb b/Library/Homebrew/test/support/fixtures/third-party/Casks/third-party-cask.rb
new file mode 100644
index 000000000..d7add0522
--- /dev/null
+++ b/Library/Homebrew/test/support/fixtures/third-party/Casks/third-party-cask.rb
@@ -0,0 +1,9 @@
+cask 'third-party-cask' do
+  version '1.2.3'
+  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
+
+  url 'http://example.com/ThirdParty.dmg'
+  homepage 'http://example.com/'
+
+  app 'ThirdParty.app'
+end
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
index c51d339a7..fc83149d0 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
@@ -18,6 +18,7 @@ HOMEBREW_CASK_DIRS = [
 
 RSpec.shared_context "Homebrew-Cask" do
   around(:each) do |example|
+    third_party_tap = Tap.fetch("third-party", "tap")
     begin
       dirs = HOMEBREW_CASK_DIRS.map do |dir|
         Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap do |path|
@@ -31,11 +32,18 @@ RSpec.shared_context "Homebrew-Cask" do
         FileUtils.ln_sf TEST_FIXTURE_DIR.join("cask"), tap.path
       end
 
+      third_party_tap.tap do |tap|
+        FileUtils.mkdir_p tap.path.dirname
+        FileUtils.ln_sf TEST_FIXTURE_DIR.join("third-party"), tap.path
+      end
+
       example.run
     ensure
       FileUtils.rm_rf dirs
       Hbc.default_tap.path.unlink
       FileUtils.rm_rf Hbc.default_tap.path.parent
+      third_party_tap.path.unlink
+      FileUtils.rm_rf third_party_tap.path.parent
     end
   end
 end
diff --git a/Library/Homebrew/test/utils/analytics_spec.rb b/Library/Homebrew/test/utils/analytics_spec.rb
new file mode 100644
index 000000000..bb6cda0b1
--- /dev/null
+++ b/Library/Homebrew/test/utils/analytics_spec.rb
@@ -0,0 +1,88 @@
+require "utils/analytics"
+require "formula_installer"
+
+describe Utils::Analytics do
+  describe "::os_prefix_ci" do
+    context "when anonymous_os_prefix_ci is not set" do
+      before(:each) do
+        described_class.clear_anonymous_os_prefix_ci_cache
+      end
+
+      it "returns OS_VERSION and prefix when HOMEBREW_PREFIX is not /usr/local" do
+        stub_const("HOMEBREW_PREFIX", "blah")
+        expect(described_class.os_prefix_ci).to include("#{OS_VERSION}, non-/usr/local")
+      end
+
+      it "includes CI when ENV['CI'] is set" do
+        ENV["CI"] = "true"
+        expect(described_class.os_prefix_ci).to include("CI")
+      end
+
+      it "does not include prefix when HOMEBREW_PREFIX is /usr/local" do
+        stub_const("HOMEBREW_PREFIX", "/usr/local")
+        expect(described_class.os_prefix_ci).not_to include("non-/usr/local")
+      end
+    end
+  end
+
+  describe "::report_event" do
+    let(:f) { formula { url "foo-1.0" } }
+    let(:options) { FormulaInstaller.new(f).display_options(f) }
+    let(:action)  { "#{f.full_name} #{options}".strip }
+
+    context "when ENV vars is set" do
+      it "returns nil when HOMEBREW_NO_ANALYTICS is true" do
+        ENV["HOMEBREW_NO_ANALYTICS"] = "true"
+        expect(described_class.report_event("install", action)).to be_nil
+      end
+
+      it "returns nil when HOMEBREW_NO_ANALYTICS_THIS_RUN is true" do
+        ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "true"
+        expect(described_class.report_event("install", action)).to be_nil
+      end
+
+      it "returns nil when HOMEBREW_ANALYTICS_DEBUG is true" do
+        ENV.delete("HOMEBREW_NO_ANALYTICS_THIS_RUN")
+        ENV.delete("HOMEBREW_NO_ANALYTICS")
+        ENV["HOMEBREW_ANALYTICS_DEBUG"] = "true"
+        expect(described_class.report_event("install", action)).to be_nil
+      end
+    end
+  end
+
+  describe "::report_build_error" do
+    context "when tap is installed" do
+      let(:err) { BuildError.new(f, "badprg", %w[arg1 arg2], {}) }
+      let(:f) { formula { url "foo-1.0" } }
+
+      it "reports event if BuildError raised for a formula with a public remote repository" do
+        allow_any_instance_of(Tap).to receive(:custom_remote?).and_return(false)
+        expect(described_class).to respond_to(:report_event)
+        described_class.report_build_error(err)
+      end
+
+      it "does not report event if BuildError raised for a formula with a private remote repository" do
+        expect(described_class.report_build_error(err)).to be_nil
+      end
+    end
+
+    context "when formula does not have a tap" do
+      let(:err) { BuildError.new(f, "badprg", %w[arg1 arg2], {}) }
+      let(:f) { double(Formula, name: "foo", path: "blah", tap: nil) }
+
+      it "does not report event if BuildError is raised" do
+        expect(described_class.report_build_error(err)).to be_nil
+      end
+    end
+
+    context "when tap for a formula is not installed" do
+      let(:err) { BuildError.new(f, "badprg", %w[arg1 arg2], {}) }
+      let(:f) { double(Formula, name: "foo", path: "blah", tap: CoreTap.instance) }
+
+      it "does not report event if BuildError is raised" do
+        allow_any_instance_of(Pathname).to receive(:directory?).and_return(false)
+        expect(described_class.report_build_error(err)).to be_nil
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/utils/git_spec.rb b/Library/Homebrew/test/utils/git_spec.rb
new file mode 100644
index 000000000..48fc1338e
--- /dev/null
+++ b/Library/Homebrew/test/utils/git_spec.rb
@@ -0,0 +1,150 @@
+require "utils/git"
+
+describe Git do
+  before(:each) do
+    git = HOMEBREW_SHIMS_PATH/"scm/git"
+
+    HOMEBREW_CACHE.cd do
+      system git, "init"
+
+      File.open(file, "w") { |f| f.write("blah") }
+      system git, "add", HOMEBREW_CACHE/file
+      system git, "commit", "-m", "'File added'"
+      @h1 = `git rev-parse HEAD`
+
+      File.open(file, "w") { |f| f.write("brew") }
+      system git, "add", HOMEBREW_CACHE/file
+      system git, "commit", "-m", "'written to File'"
+      @h2 = `git rev-parse HEAD`
+    end
+  end
+
+  let(:file) { "blah.rb" }
+  let(:hash1) { @h1[0..6] }
+  let(:hash2) { @h2[0..6] }
+
+  describe "#last_revision_commit_of_file" do
+    it "gives last revision commit when before_commit is nil" do
+      expect(
+        described_class.last_revision_commit_of_file(HOMEBREW_CACHE, file),
+      ).to eq(hash1)
+    end
+
+    it "gives revision commit based on before_commit when it is not nil" do
+      expect(
+        described_class.last_revision_commit_of_file(HOMEBREW_CACHE,
+                                                    file,
+                                                    before_commit: hash2),
+      ).to eq(hash2)
+    end
+  end
+
+  describe "#last_revision_of_file" do
+    it "returns last revision of file" do
+      expect(
+        described_class.last_revision_of_file(HOMEBREW_CACHE,
+                                              HOMEBREW_CACHE/file),
+      ).to eq("blah")
+    end
+
+    it "returns last revision of file based on before_commit" do
+      expect(
+        described_class.last_revision_of_file(HOMEBREW_CACHE, HOMEBREW_CACHE/file,
+                                              before_commit: "0..3"),
+      ).to eq("brew")
+    end
+  end
+end
+
+describe Utils do
+  before(:each) do
+    described_class.clear_git_available_cache
+  end
+
+  describe "::git_available?" do
+    it "returns true if git --version command succeeds" do
+      expect(described_class.git_available?).to be_truthy
+    end
+
+    it "returns false if git --version command does not succeed" do
+      stub_const("HOMEBREW_SHIMS_PATH", HOMEBREW_PREFIX/"bin/shim")
+      expect(described_class.git_available?).to be_falsey
+    end
+  end
+
+  describe "::git_path" do
+    it "returns nil when git is not available" do
+      stub_const("HOMEBREW_SHIMS_PATH", HOMEBREW_PREFIX/"bin/shim")
+      expect(described_class.git_path).to eq(nil)
+    end
+
+    it "returns path of git when git is available" do
+      expect(described_class.git_path).to end_with("git")
+    end
+  end
+
+  describe "::git_version" do
+    it "returns nil when git is not available" do
+      stub_const("HOMEBREW_SHIMS_PATH", HOMEBREW_PREFIX/"bin/shim")
+      expect(described_class.git_path).to eq(nil)
+    end
+
+    it "returns version of git when git is available" do
+      expect(described_class.git_version).not_to be_nil
+    end
+  end
+
+  describe "::ensure_git_installed!" do
+    it "returns nil if git already available" do
+      expect(described_class.ensure_git_installed!).to be_nil
+    end
+
+    context "when git is not already available" do
+      before do
+        stub_const("HOMEBREW_SHIMS_PATH", HOMEBREW_PREFIX/"bin/shim")
+      end
+
+      it "can't install brewed git if homebrew/core is unavailable" do
+        allow_any_instance_of(Pathname).to receive(:directory?).and_return(false)
+        expect { described_class.ensure_git_installed! }.to raise_error("Git is unavailable")
+      end
+
+      it "raises error if can't install git" do
+        stub_const("HOMEBREW_BREW_FILE", HOMEBREW_PREFIX/"bin/brew")
+        expect { described_class.ensure_git_installed! }.to raise_error("Git is unavailable")
+      end
+
+      it "installs git" do
+        allow(Homebrew).to receive(:_system).with(any_args).and_return(true)
+        described_class.ensure_git_installed!
+      end
+    end
+  end
+
+  describe "::git_remote_exists" do
+    it "returns true when git is not available" do
+      stub_const("HOMEBREW_SHIMS_PATH", HOMEBREW_PREFIX/"bin/shim")
+      expect(described_class.git_remote_exists("blah")).to be_truthy
+    end
+
+    context "when git is available" do
+      it "returns true when git remote exists", :needs_network do
+        git = HOMEBREW_SHIMS_PATH/"scm/git"
+        url = "https://github.com/Homebrew/homebrew.github.io"
+        repo = HOMEBREW_CACHE/"hey"
+        repo.mkpath
+
+        repo.cd do
+          system git, "init"
+          system git, "remote", "add", "origin", url
+        end
+
+        expect(described_class.git_remote_exists(url)).to be_truthy
+      end
+
+      it "returns false when git remote does not exist" do
+        expect(described_class.git_remote_exists("blah")).to be_falsey
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/utils/github_spec.rb b/Library/Homebrew/test/utils/github_spec.rb
index 9322898ee..a132894f9 100644
--- a/Library/Homebrew/test/utils/github_spec.rb
+++ b/Library/Homebrew/test/utils/github_spec.rb
@@ -2,7 +2,7 @@ require "utils/github"
 
 describe GitHub do
   describe "::search_code", :needs_network do
-    it "queries GitHub code with the passed paramaters" do
+    it "queries GitHub code with the passed parameters" do
       results = subject.search_code(repo: "Homebrew/brew", path: "/",
                                     filename: "readme", language: "markdown")
 
diff --git a/Library/Homebrew/test/utils/svn_spec.rb b/Library/Homebrew/test/utils/svn_spec.rb
new file mode 100644
index 000000000..4edb365a0
--- /dev/null
+++ b/Library/Homebrew/test/utils/svn_spec.rb
@@ -0,0 +1,39 @@
+require "utils/svn"
+
+describe Utils do
+  describe "#self.svn_available?" do
+    before(:each) do
+      described_class.clear_svn_version_cache
+    end
+
+    it "returns svn version if svn available" do
+      expect(described_class.svn_available?).to be_truthy
+    end
+  end
+
+  describe "#self.svn_remote_exists" do
+    it "returns true when svn is not available" do
+      allow(Utils).to receive(:svn_available?).and_return(false)
+      expect(described_class.svn_remote_exists("blah")).to be_truthy
+    end
+
+    context "when svn is available" do
+      before do
+        allow(Utils).to receive(:svn_available?).and_return(true)
+      end
+
+      it "returns false when remote does not exist" do
+        expect(described_class.svn_remote_exists(HOMEBREW_CACHE/"install")).to be_falsey
+      end
+
+      it "returns true when remote exists", :needs_network do
+        remote = "http://github.com/Homebrew/install"
+        svn = HOMEBREW_SHIMS_PATH/"scm/svn"
+
+        HOMEBREW_CACHE.cd { system svn, "checkout", remote }
+
+        expect(described_class.svn_remote_exists(HOMEBREW_CACHE/"install")).to be_truthy
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/utils_spec.rb b/Library/Homebrew/test/utils_spec.rb
index 37bd83c4f..3b5355b15 100644
--- a/Library/Homebrew/test/utils_spec.rb
+++ b/Library/Homebrew/test/utils_spec.rb
@@ -296,4 +296,33 @@ describe "globally-scoped helper methods" do
       expect(ENV["PATH"]).not_to eq("/bin")
     end
   end
+
+  describe "#tap_and_name_comparison" do
+    describe "both strings are only names" do
+      it "alphabetizes the strings" do
+        expect(%w[a b].sort(&tap_and_name_comparison)).to eq(%w[a b])
+        expect(%w[b a].sort(&tap_and_name_comparison)).to eq(%w[a b])
+      end
+    end
+
+    describe "both strings include tap" do
+      it "alphabetizes the strings" do
+        expect(%w[a/z/z b/z/z].sort(&tap_and_name_comparison)).to eq(%w[a/z/z b/z/z])
+        expect(%w[b/z/z a/z/z].sort(&tap_and_name_comparison)).to eq(%w[a/z/z b/z/z])
+
+        expect(%w[z/a/z z/b/z].sort(&tap_and_name_comparison)).to eq(%w[z/a/z z/b/z])
+        expect(%w[z/b/z z/a/z].sort(&tap_and_name_comparison)).to eq(%w[z/a/z z/b/z])
+
+        expect(%w[z/z/a z/z/b].sort(&tap_and_name_comparison)).to eq(%w[z/z/a z/z/b])
+        expect(%w[z/z/b z/z/a].sort(&tap_and_name_comparison)).to eq(%w[z/z/a z/z/b])
+      end
+    end
+
+    describe "only one string includes tap" do
+      it "prefers the string without tap" do
+        expect(%w[a/z/z z].sort(&tap_and_name_comparison)).to eq(%w[z a/z/z])
+        expect(%w[z a/z/z].sort(&tap_and_name_comparison)).to eq(%w[z a/z/z])
+      end
+    end
+  end
 end
diff --git a/Library/Homebrew/test/version_spec.rb b/Library/Homebrew/test/version_spec.rb
index cee57e935..d670d79c8 100644
--- a/Library/Homebrew/test/version_spec.rb
+++ b/Library/Homebrew/test/version_spec.rb
@@ -241,8 +241,18 @@ describe Version do
 
   describe "::detect" do
     matcher :be_detected_from do |url, specs = {}|
-      match do |version|
-        Version.detect(url, specs) == version
+      detected = Version.detect(url, specs)
+
+      match do |expected|
+        detected == expected
+      end
+
+      failure_message do |expected|
+        message = <<-EOS
+        expected: %s
+        detected: %s
+        EOS
+        format(message, expected, detected)
       end
     end