admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils: improve issue searching.

Browse Source 
* issues_matching now returns an array
* prints issues titles and URLs
* find_pull_requests shows closed PRs if no matching PRs are open

Closes Homebrew/homebrew#26032.
This commit is contained in:
Mike McQuaid 2014-01-20 17:46:33 -08:00
parent 28143fb653
commit a65f649cf5
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/exceptions.rb
View File

@ -211,7 +211,7 @@ class BuildError < Homebrew::InstallationError
puts puts
unless RUBY_VERSION < "1.8.6" || issues.empty? unless RUBY_VERSION < "1.8.6" || issues.empty?
puts "These open issues may also help:" puts "These open issues may also help:"
puts issues.map{ |s| " #{s}" }.join("\n") puts issues.map{ |i| "#{i['title']} (#{i['html_url']})" }.join("\n")
end end
end end
end end

34
Library/Homebrew/utils.rb
View File

@ -276,9 +276,9 @@ module GitHub extend self
raise Error, "Failed to connect to: #{url}\n#{e.message}" raise Error, "Failed to connect to: #{url}\n#{e.message}"
end end
def each_issue_matching(query, &block) def issues_matching(query)
uri = ISSUES_URI + uri_escape(query) uri = ISSUES_URI + uri_escape(query)
open(uri) { |f| Utils::JSON.load(f.read)['issues'].each(&block) } open(uri) { |f| Utils::JSON.load(f.read)['issues'] }
end end
def uri_escape(query) def uri_escape(query)
@ -297,26 +297,30 @@ module GitHub extend self
name = f.name if Formula === name name = f.name if Formula === name
issues = [] # don't include issues that just refer to the tool in their body
issues_matching(name).select {|issue| issue['title'].include? name }
each_issue_matching(name) do |issue|
# don't include issues that just refer to the tool in their body
issues << issue['html_url'] if issue['title'].include? name
end
issues
end end
def find_pull_requests rx def find_pull_requests rx
return if ENV['HOMEBREW_NO_GITHUB_API'] return if ENV['HOMEBREW_NO_GITHUB_API']
puts "Searching open pull requests..." puts "Searching pull requests..."
query = rx.source.delete('.*').gsub('\\', '') query = rx.source.delete('.*').gsub('\\', '')
each_issue_matching(query) do |issue| open_or_closed_prs = issues_matching(query).select do |issue|
if rx === issue['title'] && issue.has_key?('pull_request_url') && issue['state'] != 'closed' rx === issue['title'] && issue.has_key?('pull_request_url')
yield issue['pull_request_url']
end
end end
open_prs = open_or_closed_prs.select {|i| i['state'] != 'closed' }
if open_prs.any?
puts "Open pull requests:"
prs = open_prs
elsif open_or_closed_prs.any?
puts "Closed pull requests:"
prs = open_or_closed_prs
else
return
end
prs.each {|i| yield "#{i['title']} (#{i['pull_request_url']})" }
end end
end end