Merge pull request #3044 from BenMusch/search-tap-fix

Replace search_tap with search_taps
This commit is contained in:
Mike McQuaid 2017-08-12 12:46:28 +01:00 committed by GitHub
commit 7ecc775848
2 changed files with 11 additions and 3 deletions

View File

@ -43,15 +43,15 @@ module Homebrew
Descriptions.search(regex, :desc).print
elsif ARGV.first =~ HOMEBREW_TAP_FORMULA_REGEX
query = ARGV.first
user, repo, name = query.split("/", 3)
begin
result = Formulary.factory(query).name
results = Array(result)
rescue FormulaUnavailableError
result = search_tap(user, repo, name)
_, _, name = query.split("/", 3)
results = search_taps(name)
end
results = Array(result)
puts Formatter.columns(results) unless results.empty?
else
query = ARGV.first

View File

@ -1,6 +1,7 @@
describe "brew search", :integration_test do
before(:each) do
setup_test_formula "testball"
setup_remote_tap "caskroom/cask"
end
it "lists all available Formulae when no argument is given" do
@ -24,6 +25,13 @@ describe "brew search", :integration_test do
.and be_a_success
end
it "falls back to a tap search when no formula is found" do
expect { brew "search", "caskroom/cask/firefox" }
.to output(/firefox/).to_stdout
.and not_to_output.to_stderr
.and be_a_success
end
describe "--desc" do
let(:desc_cache) { HOMEBREW_CACHE/"desc_cache.json" }