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

Extract alias resolution to a separate loader class

Browse Source
This commit is contained in:
Jack Nagel 2014-04-05 22:03:34 -05:00
parent caaa32325c
commit 0d90deac27
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/formulary.rb
View File

@ -110,6 +110,14 @@ class Formulary
end end
end end
class AliasLoader < FormulaLoader
def initialize alias_path
path = alias_path.resolved_path
name = path.basename(".rb").to_s
super name, path
end
end
# Loads formulae from disk using a path # Loads formulae from disk using a path
class FromPathLoader < FormulaLoader class FromPathLoader < FormulaLoader
def initialize path def initialize path
@ -192,12 +200,9 @@ class Formulary
return StandardLoader.new(ref, formula_with_that_name) return StandardLoader.new(ref, formula_with_that_name)
end end
# test if the name is a formula alias
possible_alias = Pathname.new("#{HOMEBREW_LIBRARY}/Aliases/#{ref}") possible_alias = Pathname.new("#{HOMEBREW_LIBRARY}/Aliases/#{ref}")
if possible_alias.file? if possible_alias.file?
path = possible_alias.resolved_path return AliasLoader.new(possible_alias)
name = path.basename(".rb").to_s
return StandardLoader.new(name, path)
end end
possible_cached_formula = Pathname.new("#{HOMEBREW_CACHE_FORMULA}/#{ref}.rb") possible_cached_formula = Pathname.new("#{HOMEBREW_CACHE_FORMULA}/#{ref}.rb")