admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Formula: use CoreFormulaRepository, avoid duplicated logic

Browse Source
This commit is contained in:
Xu Cheng 2015-12-06 21:41:06 +08:00
parent 2c25303949
commit 871ec75524
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Library/Homebrew/formula.rb
View File

@ -1051,13 +1051,13 @@ class Formula
# an array of all core {Formula} names # an array of all core {Formula} names
# @private # @private
def self.core_names def self.core_names
@core_names ||= core_files.map { |f| f.basename(".rb").to_s }.sort CoreFormulaRepository.instance.formula_names
end end
# an array of all core {Formula} files # an array of all core {Formula} files
# @private # @private
def self.core_files def self.core_files
@core_files ||= Pathname.glob("#{HOMEBREW_LIBRARY}/Formula/*.rb") CoreFormulaRepository.instance.formula_files
end end
# an array of all tap {Formula} names # an array of all tap {Formula} names
@ -1130,13 +1130,13 @@ class Formula
# an array of all alias files of core {Formula} # an array of all alias files of core {Formula}
# @private # @private
def self.core_alias_files def self.core_alias_files
@core_alias_files ||= Pathname.glob("#{HOMEBREW_LIBRARY}/Aliases/*") CoreFormulaRepository.instance.alias_files
end end
# an array of all core aliases # an array of all core aliases
# @private # @private
def self.core_aliases def self.core_aliases
@core_aliases ||= core_alias_files.map { |f| f.basename.to_s }.sort CoreFormulaRepository.instance.aliases
end end
# an array of all tap aliases # an array of all tap aliases
@ -1160,24 +1160,13 @@ class Formula
# a table mapping core alias to formula name # a table mapping core alias to formula name
# @private # @private
def self.core_alias_table def self.core_alias_table
return @core_alias_table if @core_alias_table CoreFormulaRepository.instance.alias_table
@core_alias_table = Hash.new
core_alias_files.each do |alias_file|
@core_alias_table[alias_file.basename.to_s] = alias_file.resolved_path.basename(".rb").to_s
end
@core_alias_table
end end
# a table mapping core formula name to aliases # a table mapping core formula name to aliases
# @private # @private
def self.core_alias_reverse_table def self.core_alias_reverse_table
return @core_alias_reverse_table if @core_alias_reverse_table CoreFormulaRepository.instance.alias_reverse_table
@core_alias_reverse_table = Hash.new
core_alias_table.each do |alias_name, formula_name|
@core_alias_reverse_table[formula_name] ||= []
@core_alias_reverse_table[formula_name] << alias_name
end
@core_alias_reverse_table
end end
def self.[](name) def self.[](name)