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

Use implicit begin

Browse Source
This commit is contained in:
Jack Nagel 2013-05-22 19:58:11 -05:00
parent b24f8e2c9e
commit b2ff6e934b
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/utils.rb
View File

@ -260,16 +260,14 @@ end
module GitHub extend self module GitHub extend self
def open url, headers={}, &block def open url, headers={}, &block
begin default_headers = {'User-Agent' => HOMEBREW_USER_AGENT}
default_headers = {'User-Agent' => HOMEBREW_USER_AGENT} default_headers['Authorization'] = "token #{HOMEBREW_GITHUB_API_TOKEN}" if HOMEBREW_GITHUB_API_TOKEN
default_headers['Authorization'] = "token #{HOMEBREW_GITHUB_API_TOKEN}" if HOMEBREW_GITHUB_API_TOKEN Kernel.open(url, default_headers.merge(headers), &block)
Kernel.open(url, default_headers.merge(headers), &block) rescue OpenURI::HTTPError => e
rescue OpenURI::HTTPError => e if e.io.meta['x-ratelimit-remaining'].to_i <= 0
if e.io.meta['x-ratelimit-remaining'].to_i <= 0 raise "GitHub #{MultiJson.decode(e.io.read)['message']}"
raise "GitHub #{MultiJson.decode(e.io.read)['message']}" else
else raise e
raise e
end
end end
end end