From 5b7921ff68abcd3a4f9063cd8671299ffcf8f2d1 Mon Sep 17 00:00:00 2001 From: Logicer <81077770+Logicer16@users.noreply.github.com> Date: Sun, 18 Jul 2021 21:47:11 +1000 Subject: [PATCH 1/6] Add support for GitHub Oauth tokens from keychain --- Library/Homebrew/utils/github/api.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/github/api.rb b/Library/Homebrew/utils/github/api.rb index b92d53d715..55ef244855 100644 --- a/Library/Homebrew/utils/github/api.rb +++ b/Library/Homebrew/utils/github/api.rb @@ -21,7 +21,7 @@ module GitHub #{ALL_SCOPES_URL} #{Utils::Shell.set_variable_in_profile("HOMEBREW_GITHUB_API_TOKEN", "your_token_here")} EOS - GITHUB_PERSONAL_ACCESS_TOKEN_REGEX = /^(?:[a-f0-9]{40}|ghp_\w{36,251})$/.freeze + GITHUB_PERSONAL_ACCESS_TOKEN_REGEX = /^(?:[a-f0-9]{40}|gh[po]_\w{36,251})$/.freeze # Helper functions to access the GitHub API. # From 06f415e819df7c7020afa2e4fd579dd4a40b2d85 Mon Sep 17 00:00:00 2001 From: Logicer <81077770+Logicer16@users.noreply.github.com> Date: Mon, 19 Jul 2021 10:28:11 +1000 Subject: [PATCH 2/6] Dont ask to create PAT if one already exists --- Library/Homebrew/utils/github/api.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/github/api.rb b/Library/Homebrew/utils/github/api.rb index 55ef244855..10b59ff8a4 100644 --- a/Library/Homebrew/utils/github/api.rb +++ b/Library/Homebrew/utils/github/api.rb @@ -50,8 +50,7 @@ module GitHub @github_message = github_message super <<~EOS GitHub API Error: #{github_message} - Try again in #{pretty_ratelimit_reset(reset)}, or: - #{CREATE_GITHUB_PAT_MESSAGE} + Try again in #{pretty_ratelimit_reset(reset)}#{!API.credentials ? ", or:\n" + CREATE_GITHUB_PAT_MESSAGE : ""} EOS end From 71b61d28d1e577a66f43b64ce4fdadb19dc13b80 Mon Sep 17 00:00:00 2001 From: Logicer <81077770+Logicer16@users.noreply.github.com> Date: Mon, 19 Jul 2021 12:09:23 +1000 Subject: [PATCH 3/6] Fix Style --- Library/Homebrew/utils/github/api.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/github/api.rb b/Library/Homebrew/utils/github/api.rb index 10b59ff8a4..92a5c31543 100644 --- a/Library/Homebrew/utils/github/api.rb +++ b/Library/Homebrew/utils/github/api.rb @@ -50,7 +50,7 @@ module GitHub @github_message = github_message super <<~EOS GitHub API Error: #{github_message} - Try again in #{pretty_ratelimit_reset(reset)}#{!API.credentials ? ", or:\n" + CREATE_GITHUB_PAT_MESSAGE : ""} + Try again in #{pretty_ratelimit_reset(reset)}#{API.credentials ? "" : ", or:\n#{CREATE_GITHUB_PAT_MESSAGE}"} EOS end From 0c6f5ab23310dd528990b7e0134b3747c69591c4 Mon Sep 17 00:00:00 2001 From: Logicer <81077770+Logicer16@users.noreply.github.com> Date: Tue, 20 Jul 2021 09:18:16 +1000 Subject: [PATCH 4/6] Put `API.credentials` bit into separate variable --- Library/Homebrew/utils/github/api.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/github/api.rb b/Library/Homebrew/utils/github/api.rb index 92a5c31543..d5b4f737bd 100644 --- a/Library/Homebrew/utils/github/api.rb +++ b/Library/Homebrew/utils/github/api.rb @@ -48,9 +48,10 @@ module GitHub class RateLimitExceededError < Error def initialize(reset, github_message) @github_message = github_message + new_PAT_message = API.credentials ? "" : ", or:\n#{CREATE_GITHUB_PAT_MESSAGE}" super <<~EOS GitHub API Error: #{github_message} - Try again in #{pretty_ratelimit_reset(reset)}#{API.credentials ? "" : ", or:\n#{CREATE_GITHUB_PAT_MESSAGE}"} + Try again in #{pretty_ratelimit_reset(reset)}#{new_PAT_message} EOS end From ed4f840a679eb764371b710e8097717d934ab3ea Mon Sep 17 00:00:00 2001 From: Logicer <81077770+Logicer16@users.noreply.github.com> Date: Tue, 20 Jul 2021 09:22:34 +1000 Subject: [PATCH 5/6] Fix style --- Library/Homebrew/utils/github/api.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/github/api.rb b/Library/Homebrew/utils/github/api.rb index d5b4f737bd..dde14b05e2 100644 --- a/Library/Homebrew/utils/github/api.rb +++ b/Library/Homebrew/utils/github/api.rb @@ -48,10 +48,10 @@ module GitHub class RateLimitExceededError < Error def initialize(reset, github_message) @github_message = github_message - new_PAT_message = API.credentials ? "" : ", or:\n#{CREATE_GITHUB_PAT_MESSAGE}" + new_pat_message = API.credentials ? "" : ", or:\n#{CREATE_GITHUB_PAT_MESSAGE}" super <<~EOS GitHub API Error: #{github_message} - Try again in #{pretty_ratelimit_reset(reset)}#{new_PAT_message} + Try again in #{pretty_ratelimit_reset(reset)}#{new_pat_message} EOS end From 7beb1f227c428edaaa0f37f6d1f6f3d735535b72 Mon Sep 17 00:00:00 2001 From: Logicer <81077770+Logicer16@users.noreply.github.com> Date: Tue, 20 Jul 2021 12:06:04 +1000 Subject: [PATCH 6/6] Update Library/Homebrew/utils/github/api.rb Co-authored-by: Rylan Polster --- Library/Homebrew/utils/github/api.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/github/api.rb b/Library/Homebrew/utils/github/api.rb index dde14b05e2..20a2306f3a 100644 --- a/Library/Homebrew/utils/github/api.rb +++ b/Library/Homebrew/utils/github/api.rb @@ -48,7 +48,7 @@ module GitHub class RateLimitExceededError < Error def initialize(reset, github_message) @github_message = github_message - new_pat_message = API.credentials ? "" : ", or:\n#{CREATE_GITHUB_PAT_MESSAGE}" + new_pat_message = ", or:\n#{CREATE_GITHUB_PAT_MESSAGE}" if API.credentials.blank? super <<~EOS GitHub API Error: #{github_message} Try again in #{pretty_ratelimit_reset(reset)}#{new_pat_message}