From 24cbb4fd2ec81a05991f759c647478f7a8aedcf8 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 16 Feb 2014 22:24:33 -0500 Subject: [PATCH] Add a more useful message when ratelimit is exceeded --- Library/Homebrew/utils.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index efc4d93a6f..1f305a3b84 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -280,10 +280,13 @@ module GitHub extend self end def handle_api_error(e) - if e.io.meta['x-ratelimit-remaining'].to_i <= 0 + if e.io.meta["x-ratelimit-remaining"].to_i <= 0 + reset = e.io.meta.fetch("x-ratelimit-reset").to_i + raise RateLimitExceededError, <<-EOS.undent, e.backtrace GitHub #{Utils::JSON.load(e.io.read)['message']} - You may want to create an API token: https://github.com/settings/applications + Try again in #{pretty_ratelimit_reset(reset)}, or create an API token: + https://github.com/settings/applications and then set HOMEBREW_GITHUB_API_TOKEN. EOS end @@ -298,6 +301,14 @@ module GitHub extend self end end + def pretty_ratelimit_reset(reset) + if (seconds = Time.at(reset) - Time.now) > 180 + "%d minutes %d seconds" % [seconds / 60, seconds % 60] + else + "#{seconds} seconds" + end + end + def issues_matching(query, qualifiers={}) uri = ISSUES_URI.dup uri.query = build_query_string(query, qualifiers)