Merge pull request #5076 from aimileus/search-perf
Remove redundant check in formula_files and cask_files
This commit is contained in:
commit
17154abf46
@ -382,7 +382,7 @@ class Tap
|
||||
# an array of all {Formula} files of this {Tap}.
|
||||
def formula_files
|
||||
@formula_files ||= if formula_dir.directory?
|
||||
formula_dir.children.select(&method(:formula_file?))
|
||||
formula_dir.children.select(&method(:ruby_file?))
|
||||
else
|
||||
[]
|
||||
end
|
||||
@ -391,19 +391,25 @@ class Tap
|
||||
# an array of all {Cask} files of this {Tap}.
|
||||
def cask_files
|
||||
@cask_files ||= if cask_dir.directory?
|
||||
cask_dir.children.select(&method(:cask_file?))
|
||||
cask_dir.children.select(&method(:ruby_file?))
|
||||
else
|
||||
[]
|
||||
end
|
||||
end
|
||||
|
||||
# returns true if the file has a Ruby extension
|
||||
# @private
|
||||
def ruby_file?(file)
|
||||
file.extname == ".rb"
|
||||
end
|
||||
|
||||
# return true if given path would present a {Formula} file in this {Tap}.
|
||||
# accepts both absolute path and relative path (relative to this {Tap}'s path)
|
||||
# @private
|
||||
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
|
||||
ruby_file?(file) && file.parent == formula_dir
|
||||
end
|
||||
|
||||
# return true if given path would present a {Cask} file in this {Tap}.
|
||||
@ -412,7 +418,7 @@ class Tap
|
||||
def cask_file?(file)
|
||||
file = Pathname.new(file) unless file.is_a? Pathname
|
||||
file = file.expand_path(path)
|
||||
file.extname == ".rb" && file.parent == cask_dir
|
||||
ruby_file?(file) && file.parent == cask_dir
|
||||
end
|
||||
|
||||
# an array of all {Formula} names of this {Tap}.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user