Move fix from #3070 inside GitHub module.

This commit is contained in:
Markus Reiter 2017-08-20 16:23:15 +02:00
parent 1eccaf28db
commit 56ef168e70
2 changed files with 2 additions and 5 deletions

View File

@ -15,7 +15,6 @@ module Hbc
end end
def self.search_remote(query) def self.search_remote(query)
return [] if ENV["HOMEBREW_NO_GITHUB_API"]
matches = GitHub.search_code(user: "caskroom", path: "Casks", matches = GitHub.search_code(user: "caskroom", path: "Casks",
filename: query, extension: "rb") filename: query, extension: "rb")
matches.map do |match| matches.map do |match|

View File

@ -133,7 +133,7 @@ module GitHub
def open(url, data: nil, scopes: [].freeze) def open(url, data: nil, scopes: [].freeze)
# This is a no-op if the user is opting out of using the GitHub API. # This is a no-op if the user is opting out of using the GitHub API.
return if ENV["HOMEBREW_NO_GITHUB_API"] return block_given? ? yield({}) : {} if ENV["HOMEBREW_NO_GITHUB_API"]
args = %W[--header application/vnd.github.v3+json --write-out \n%{http_code}] args = %W[--header application/vnd.github.v3+json --write-out \n%{http_code}]
args += curl_args args += curl_args
@ -245,8 +245,6 @@ module GitHub
end end
def print_pull_requests_matching(query) def print_pull_requests_matching(query)
return [] if ENV["HOMEBREW_NO_GITHUB_API"]
open_or_closed_prs = search_issues(query, type: "pr") open_or_closed_prs = search_issues(query, type: "pr")
open_prs = open_or_closed_prs.select { |i| i["state"] == "open" } open_prs = open_or_closed_prs.select { |i| i["state"] == "open" }
@ -283,6 +281,6 @@ module GitHub
def search(entity, *queries, **qualifiers) def search(entity, *queries, **qualifiers)
uri = url_to "search", entity uri = url_to "search", entity
uri.query = query_string(*queries, **qualifiers) uri.query = query_string(*queries, **qualifiers)
open(uri) { |json| Array(json["items"]) } open(uri) { |json| json.fetch("items", []) }
end end
end end