diff options
| author | Jack Nagel | 2015-01-01 01:21:59 -0500 | 
|---|---|---|
| committer | Jack Nagel | 2015-01-01 13:21:29 -0500 | 
| commit | e92df787dc2acf595d0c28412ff05e8d4c9cd136 (patch) | |
| tree | 14010f6e2d1e7c01fe7322061b03f1ef5d40a3ec | |
| parent | 4a6434aabd8aca4b9d6574b60cd5630dc96ce9df (diff) | |
| download | homebrew-e92df787dc2acf595d0c28412ff05e8d4c9cd136.tar.bz2 | |
Get rid of StandardLoader class
| -rw-r--r-- | Library/Homebrew/formulary.rb | 13 | 
1 files changed, 3 insertions, 10 deletions
| diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 60479a875..8fbf8113d 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -102,13 +102,6 @@ class Formulary      end    end -  # Loads formulae from Homebrew's provided Library -  class StandardLoader < FormulaLoader -    def initialize name, path=Formula.path(name) -      super -    end -  end -    class AliasLoader < FormulaLoader      def initialize alias_path        path = alias_path.resolved_path @@ -202,7 +195,7 @@ class Formulary      formula_with_that_name = Formula.path(ref)      if formula_with_that_name.file? -      return StandardLoader.new(ref, formula_with_that_name) +      return FormulaLoader.new(ref, formula_with_that_name)      end      possible_alias = Pathname.new("#{HOMEBREW_LIBRARY}/Aliases/#{ref}") @@ -212,9 +205,9 @@ class Formulary      possible_cached_formula = Pathname.new("#{HOMEBREW_CACHE_FORMULA}/#{ref}.rb")      if possible_cached_formula.file? -      return StandardLoader.new(ref, possible_cached_formula) +      return FormulaLoader.new(ref, possible_cached_formula)      end -    return StandardLoader.new(ref) +    return FormulaLoader.new(ref, Formula.path(ref))    end  end | 
