From d2c9b27e14a0a1e7e3620ee562ac6111da142873 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 6 Apr 2012 23:40:54 -0500 Subject: [PATCH] info: output correct URL for tapped dupes Tapped formulae that dupe those in core now display the correct URL when invoked like `brew info homebrew/dupes/openssl`. This also fixes the broken `brew info` test. Signed-off-by: Jack Nagel --- Library/Homebrew/cmd/info.rb | 8 ++++---- Library/Homebrew/test/testball.rb | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index 383ba41385..3edb6abcee 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -28,8 +28,8 @@ module Homebrew extend self end end - def github_info name - path = Formula.path(name).realpath + def github_info f + path = f.path.realpath if path.to_s =~ %r{#{HOMEBREW_REPOSITORY}/Library/Taps/(\w+)-(\w+)/(.*)} user = $1 @@ -47,7 +47,7 @@ module Homebrew extend self end def info_formula f - exec 'open', github_info(f.name) if ARGV.flag? '--github' + exec 'open', github_info(f) if ARGV.flag? '--github' puts "#{f.name} #{f.version}" puts f.homepage @@ -77,7 +77,7 @@ module Homebrew extend self puts "Not installed" end - history = github_info f.name + history = github_info(f) puts history if history the_caveats = (f.caveats || "").strip diff --git a/Library/Homebrew/test/testball.rb b/Library/Homebrew/test/testball.rb index a77d7709cc..15069033d5 100644 --- a/Library/Homebrew/test/testball.rb +++ b/Library/Homebrew/test/testball.rb @@ -6,6 +6,7 @@ class TestBall