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

This commit is contained in:
Markus Reiter 2017-12-03 09:57:04 +01:00
parent c1b85a6f9d
commit e4bb09dd40
3 changed files with 4 additions and 8 deletions

View File

@ -7,14 +7,10 @@ module Hbc
end end
module ClassMethods module ClassMethods
attr_writer :caskroom
def caskroom def caskroom
@caskroom ||= HOMEBREW_PREFIX.join("Caskroom") @caskroom ||= HOMEBREW_PREFIX.join("Caskroom")
end end
attr_writer :cache
def cache def cache
@cache ||= HOMEBREW_CACHE.join("Cask") @cache ||= HOMEBREW_CACHE.join("Cask")
end end

View File

@ -12,8 +12,7 @@ module Hbc
end) end)
option "--caskroom=PATH", (lambda do |value| option "--caskroom=PATH", (lambda do |value|
Hbc.caskroom = value odisabled "`brew cask` with the `--caskroom` flag"
odeprecated "`brew cask` with the `--caskroom` flag", disable_on: Time.utc(2017, 10, 31)
end) end)
end end
end end

View File

@ -8,8 +8,6 @@ require "test/support/helper/cask/never_sudo_system_command"
HOMEBREW_CASK_DIRS = [ HOMEBREW_CASK_DIRS = [
:appdir, :appdir,
:caskroom,
:cache,
:prefpanedir, :prefpanedir,
:qlplugindir, :qlplugindir,
:servicedir, :servicedir,
@ -20,6 +18,8 @@ RSpec.shared_context "Homebrew-Cask" do
around(:each) do |example| around(:each) do |example|
third_party_tap = Tap.fetch("third-party", "tap") third_party_tap = Tap.fetch("third-party", "tap")
begin begin
[Hbc.caskroom, Hbc.cache].each(&:mkpath)
dirs = HOMEBREW_CASK_DIRS.map do |dir| dirs = HOMEBREW_CASK_DIRS.map do |dir|
Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap do |path| Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap do |path|
path.mkpath path.mkpath
@ -40,6 +40,7 @@ RSpec.shared_context "Homebrew-Cask" do
example.run example.run
ensure ensure
FileUtils.rm_rf dirs FileUtils.rm_rf dirs
FileUtils.rm_rf Hbc.caskroom, Hbc.cache
Hbc.default_tap.path.unlink Hbc.default_tap.path.unlink
FileUtils.rm_rf Hbc.default_tap.path.parent FileUtils.rm_rf Hbc.default_tap.path.parent
third_party_tap.path.unlink third_party_tap.path.unlink