From bb01afce4c0804b3603602496292077d3d92f0a4 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Wed, 22 Sep 2010 12:32:16 -0700
Subject: Move resolve_alias from ARGV to Formula

Also, call this function from a few places where the code was duplicated.
---
 Library/Homebrew/extend/ARGV.rb | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'Library/Homebrew/extend')

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index b52230d1e..9c6aaf1f0 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -13,15 +13,16 @@ module HomebrewArgvExtension
 
   def formulae
     require 'formula'
-    @formulae ||= downcased_unique_named.map{ |name| Formula.factory(resolve_alias(name)) }
+    @formulae ||= downcased_unique_named.map{ |name| Formula.factory(Formula.resolve_alias(name)) }
     raise FormulaUnspecifiedError if @formulae.empty?
     @formulae
   end
 
   def kegs
     require 'keg'
+    require 'formula'
     @kegs ||= downcased_unique_named.collect do |name|
-      d = HOMEBREW_CELLAR + resolve_alias(name)
+      d = HOMEBREW_CELLAR + Formula.resolve_alias(name)
       dirs = d.children.select{ |pn| pn.directory? } rescue []
       raise "No such keg: #{HOMEBREW_CELLAR}/#{name}" if not d.directory? or dirs.length == 0
       raise "#{name} has multiple installed versions" if dirs.length > 1
@@ -114,15 +115,6 @@ module HomebrewArgvExtension
     EOS
   end
 
-  def resolve_alias name
-    aka = HOMEBREW_REPOSITORY+"Library/Aliases/#{name}"
-    if aka.file?
-      aka.realpath.basename('.rb').to_s
-    else
-      name
-    end
-  end
-
   private
 
   def downcased_unique_named
-- 
cgit v1.2.3