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

Hoist requires out of methods

Browse Source
This commit is contained in:
Jack Nagel 2013-05-22 19:51:15 -05:00
parent 471502bc06
commit b24f8e2c9e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/utils.rb
View File

@ -1,6 +1,8 @@
require 'pathname' require 'pathname'
require 'exceptions' require 'exceptions'
require 'macos' require 'macos'
require 'vendor/multi_json'
require 'open-uri'
class Tty class Tty
class << self class << self
@ -258,14 +260,12 @@ end
module GitHub extend self module GitHub extend self
def open url, headers={}, &block def open url, headers={}, &block
require 'open-uri'
begin 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
require 'vendor/multi_json'
raise "GitHub #{MultiJson.decode(e.io.read)['message']}" raise "GitHub #{MultiJson.decode(e.io.read)['message']}"
else else
raise e raise e
@ -280,8 +280,6 @@ module GitHub extend self
name = f.name if Formula === name name = f.name if Formula === name
require 'vendor/multi_json'
issues = [] issues = []
uri = URI.parse("https://api.github.com/legacy/issues/search/mxcl/homebrew/open/#{name}") uri = URI.parse("https://api.github.com/legacy/issues/search/mxcl/homebrew/open/#{name}")
@ -297,8 +295,6 @@ module GitHub extend self
end end
def find_pull_requests rx def find_pull_requests rx
require 'vendor/multi_json'
query = rx.source.delete('.*').gsub('\\', '') query = rx.source.delete('.*').gsub('\\', '')
uri = URI.parse("https://api.github.com/legacy/issues/search/mxcl/homebrew/open/#{query}") uri = URI.parse("https://api.github.com/legacy/issues/search/mxcl/homebrew/open/#{query}")