From b63b56f4c2193c76a6a8674db36816509a7ea498 Mon Sep 17 00:00:00 2001 From: William Ma Date: Mon, 17 Aug 2020 12:40:40 -0400 Subject: [PATCH] home: Remove warning for cask with same name --- Library/Homebrew/cmd/home.rb | 16 +--------------- Library/Homebrew/test/cli/named_args_spec.rb | 1 - 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Library/Homebrew/cmd/home.rb b/Library/Homebrew/cmd/home.rb index cce7a1439b..318c7ffb02 100644 --- a/Library/Homebrew/cmd/home.rb +++ b/Library/Homebrew/cmd/home.rb @@ -25,10 +25,7 @@ module Homebrew end homepages = args.formulae_and_casks.map do |formula_or_cask| - disclaimer = disclaimers(formula_or_cask) - disclaimer = " (#{disclaimer})" if disclaimer.present? - - puts "Opening homepage for #{name_of(formula_or_cask)}#{disclaimer}" + puts "Opening homepage for #{name_of(formula_or_cask)}" formula_or_cask.homepage end @@ -42,15 +39,4 @@ module Homebrew "Cask #{formula_or_cask.token}" end end - - def disclaimers(formula_or_cask) - return unless formula_or_cask.is_a? Formula - - begin - cask = Cask::CaskLoader.load formula_or_cask.name - "for the cask, use #{cask.tap.name}/#{cask.token}" - rescue Cask::CaskUnavailableError - nil - end - end end diff --git a/Library/Homebrew/test/cli/named_args_spec.rb b/Library/Homebrew/test/cli/named_args_spec.rb index cccce6dc95..9ce8b4fd46 100644 --- a/Library/Homebrew/test/cli/named_args_spec.rb +++ b/Library/Homebrew/test/cli/named_args_spec.rb @@ -99,7 +99,6 @@ describe Homebrew::CLI::NamedArgs do named_args = described_class.new("foo", "baz") allow(named_args).to receive(:resolve_keg).and_call_original allow(named_args).to receive(:resolve_keg).with("foo").and_return foo_keg - stub_cask_loader baz, call_original: true kegs, casks = named_args.to_kegs_to_casks