From a6033529cfdcfc6458aaa83a0bc9c4c141c60f96 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 2 Aug 2016 14:11:40 +0100 Subject: [PATCH] Revert "tap: add cask methods." This reverts commit 05daa0574732a7884bd158b2c3e14bd0709367da. --- Library/Homebrew/tap.rb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index c5692ae805..a564b31705 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -72,7 +72,6 @@ class Tap def clear_cache @remote = nil @formula_dir = nil - @cask_dir = nil @formula_files = nil @alias_dir = nil @alias_files = nil @@ -305,11 +304,6 @@ class Tap @formula_dir ||= [path/"Formula", path/"HomebrewFormula", path].detect(&:directory?) end - # path to the directory of all casks for caskroom/cask {Tap}. - def cask_dir - @cask_dir ||= [path/"Casks", path].detect(&:directory?) - end - # an array of all {Formula} files of this {Tap}. def formula_files @formula_files ||= if formula_dir @@ -325,7 +319,7 @@ class Tap def formula_file?(file) file = Pathname.new(file) unless file.is_a? Pathname file = file.expand_path(path) - file.extname == ".rb" && (file.parent == formula_dir || file.parent == cask_dir) + file.extname == ".rb" && file.parent == formula_dir end # an array of all {Formula} names of this {Tap}. @@ -568,14 +562,6 @@ class CoreTap < Tap end end - # @private - def cask_dir - @cask_dir ||= begin - self.class.ensure_installed! - super - end - end - # @private def alias_dir @alias_dir ||= begin