aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/diagnostic.rb23
-rw-r--r--Library/Homebrew/tap.rb6
2 files changed, 28 insertions, 1 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index e8506ce80..64c155fde 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -1075,6 +1075,29 @@ module Homebrew
message
end
+ def check_for_tap_ruby_files_locations
+ bad_tap_files = {}
+ Tap.each do |tap|
+ unused_formula_dirs = tap.potential_formula_dirs - [tap.formula_dir]
+ unused_formula_dirs.each do |dir|
+ next unless dir.exist?
+ dir.children.each do |path|
+ next unless path.extname == ".rb"
+ bad_tap_files[tap] ||= []
+ bad_tap_files[tap] << path
+ end
+ end
+ end
+ return if bad_tap_files.empty?
+ bad_tap_files.keys.map do |tap|
+ <<-EOS.undent
+ Found Ruby file outside #{tap} tap formula directory
+ (#{tap.formula_dir}):
+ #{bad_tap_files[tap].join("\n ")}
+ EOS
+ end.join("\n")
+ end
+
def all
methods.map(&:to_s).grep(/^check_/)
end
diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 68b21ac60..4b59f2344 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -292,7 +292,11 @@ class Tap
# path to the directory of all {Formula} files for this {Tap}.
def formula_dir
- @formula_dir ||= [path/"Formula", path/"HomebrewFormula", path].detect(&:directory?)
+ @formula_dir ||= potential_formula_dirs.detect(&:directory?)
+ end
+
+ def potential_formula_dirs
+ @potential_formula_dirs ||= [path/"Formula", path/"HomebrewFormula", path].freeze
end
# path to the directory of all {Cask} files for this {Tap}.