Merge pull request #3044 from BenMusch/search-tap-fix
Replace search_tap with search_taps
This commit is contained in:
commit
7ecc775848
@ -43,15 +43,15 @@ module Homebrew
|
|||||||
Descriptions.search(regex, :desc).print
|
Descriptions.search(regex, :desc).print
|
||||||
elsif ARGV.first =~ HOMEBREW_TAP_FORMULA_REGEX
|
elsif ARGV.first =~ HOMEBREW_TAP_FORMULA_REGEX
|
||||||
query = ARGV.first
|
query = ARGV.first
|
||||||
user, repo, name = query.split("/", 3)
|
|
||||||
|
|
||||||
begin
|
begin
|
||||||
result = Formulary.factory(query).name
|
result = Formulary.factory(query).name
|
||||||
|
results = Array(result)
|
||||||
rescue FormulaUnavailableError
|
rescue FormulaUnavailableError
|
||||||
result = search_tap(user, repo, name)
|
_, _, name = query.split("/", 3)
|
||||||
|
results = search_taps(name)
|
||||||
end
|
end
|
||||||
|
|
||||||
results = Array(result)
|
|
||||||
puts Formatter.columns(results) unless results.empty?
|
puts Formatter.columns(results) unless results.empty?
|
||||||
else
|
else
|
||||||
query = ARGV.first
|
query = ARGV.first
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
describe "brew search", :integration_test do
|
describe "brew search", :integration_test do
|
||||||
before(:each) do
|
before(:each) do
|
||||||
setup_test_formula "testball"
|
setup_test_formula "testball"
|
||||||
|
setup_remote_tap "caskroom/cask"
|
||||||
end
|
end
|
||||||
|
|
||||||
it "lists all available Formulae when no argument is given" do
|
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
|
.and be_a_success
|
||||||
end
|
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
|
describe "--desc" do
|
||||||
let(:desc_cache) { HOMEBREW_CACHE/"desc_cache.json" }
|
let(:desc_cache) { HOMEBREW_CACHE/"desc_cache.json" }
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user