Merge pull request #3522 from reitermarkus/caskroom

Remove unused writer methods for `Hbc.caskroom` and `Hbc.cache`.

4 files changed, 5 insertions, 16 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/locations.rb b/Library/Homebrew/cask/lib/hbc/locations.rb
index e55bdf15d..5c9a28f5d 100644
--- a/Library/Homebrew/cask/lib/hbc/locations.rb
+++ b/Library/Homebrew/cask/lib/hbc/locations.rb
@@ -7,14 +7,10 @@ module Hbc
     end
 
     module ClassMethods
-      attr_writer :caskroom
-
       def caskroom
         @caskroom ||= HOMEBREW_PREFIX.join("Caskroom")
       end
 
-      attr_writer :cache
-
       def cache
         @cache ||= HOMEBREW_CACHE.join("Cask")
       end
@@ -61,8 +57,6 @@ module Hbc
         @servicedir ||= Pathname.new("~/Library/Services").expand_path
       end
 
-      attr_writer :binarydir
-
       def binarydir
         @binarydir ||= HOMEBREW_PREFIX.join("bin")
       end
diff --git a/Library/Homebrew/compat/hbc/cli.rb b/Library/Homebrew/compat/hbc/cli.rb
index 60d298ed6..fb17a1d05 100644
--- a/Library/Homebrew/compat/hbc/cli.rb
+++ b/Library/Homebrew/compat/hbc/cli.rb
@@ -11,9 +11,8 @@ module Hbc
       EOS
     end)
 
-    option "--caskroom=PATH", (lambda do |value|
-      Hbc.caskroom = value
-      odeprecated "`brew cask` with the `--caskroom` flag", disable_on: Time.utc(2017, 10, 31)
+    option "--caskroom=PATH", (lambda do |*|
+      odisabled "`brew cask` with the `--caskroom` flag"
     end)
   end
 end
diff --git a/Library/Homebrew/test/cask/artifact/binary_spec.rb b/Library/Homebrew/test/cask/artifact/binary_spec.rb
index 6a3f1da34..e9514d9ae 100644
--- a/Library/Homebrew/test/cask/artifact/binary_spec.rb
+++ b/Library/Homebrew/test/cask/artifact/binary_spec.rb
@@ -7,10 +7,6 @@ describe Hbc::Artifact::Binary, :cask do
   let(:artifacts) { cask.artifacts.select { |a| a.is_a?(described_class) } }
   let(:expected_path) { Hbc.binarydir.join("binary") }
 
-  before(:each) do
-    Hbc.binarydir.mkpath
-  end
-
   after(:each) do
     FileUtils.rm expected_path if expected_path.exist?
   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 fc83149d0..e1afc44bf 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
@@ -8,18 +8,17 @@ require "test/support/helper/cask/never_sudo_system_command"
 
 HOMEBREW_CASK_DIRS = [
   :appdir,
-  :caskroom,
-  :cache,
   :prefpanedir,
   :qlplugindir,
   :servicedir,
-  :binarydir,
 ].freeze
 
 RSpec.shared_context "Homebrew-Cask" do
   around(:each) do |example|
     third_party_tap = Tap.fetch("third-party", "tap")
     begin
+      [Hbc.binarydir, Hbc.caskroom, Hbc.cache].each(&:mkpath)
+
       dirs = HOMEBREW_CASK_DIRS.map do |dir|
         Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap do |path|
           path.mkpath
@@ -40,6 +39,7 @@ RSpec.shared_context "Homebrew-Cask" do
       example.run
     ensure
       FileUtils.rm_rf dirs
+      FileUtils.rm_rf [Hbc.binarydir, Hbc.caskroom, Hbc.cache]
       Hbc.default_tap.path.unlink
       FileUtils.rm_rf Hbc.default_tap.path.parent
       third_party_tap.path.unlink