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

pull: Add --test-bot-user

Browse Source 
Infer the name of the test-bot GitHub user if it is not provided.
This commit is contained in:
Shaun Jackman 2017-10-06 16:17:00 -07:00
parent 76021db602
commit 9cd4fff051
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/dev-cmd/pull.rb
View File

@ -1,4 +1,4 @@
#: * `pull` [`--bottle`] [`--bump`] [`--clean`] [`--ignore-whitespace`] [`--resolve`] [`--branch-okay`] [`--no-pbcopy`] [`--no-publish`] [`--warn-on-publish-failure`] [`--bintray-org=`<bintray-org>] <patch-source> [<patch-source>]: #: * `pull` [`--bottle`] [`--bump`] [`--clean`] [`--ignore-whitespace`] [`--resolve`] [`--branch-okay`] [`--no-pbcopy`] [`--no-publish`] [`--warn-on-publish-failure`] [`--bintray-org=`<bintray-org>] [`--test-bot-user=`<test-bot-user>] <patch-source> [<patch-source>]:
#: #:
#: Gets a patch from a GitHub commit or pull request and applies it to Homebrew. #: Gets a patch from a GitHub commit or pull request and applies it to Homebrew.
#: Optionally, installs the formulae changed by the patch. #: Optionally, installs the formulae changed by the patch.
@ -44,6 +44,9 @@
#: #:
#: If `--bintray-org=`<bintray-org> is passed, publish at the given Bintray #: If `--bintray-org=`<bintray-org> is passed, publish at the given Bintray
#: organisation. #: organisation.
#:
#: If `--test-bot-user=`<test-bot-user> is passed, pull the bottle block
#: commit from the specified user on GitHub.
require "net/http" require "net/http"
require "net/https" require "net/https"
@ -228,7 +231,7 @@ module Homebrew
url url
else else
bottle_branch = "pull-bottle-#{issue}" bottle_branch = "pull-bottle-#{issue}"
"https://github.com/BrewTestBot/homebrew-#{tap.repo}/compare/homebrew:master...pr-#{issue}" "https://github.com/#{test_bot_user user}/homebrew-#{tap.repo}/compare/#{user}:master...pr-#{issue}"
end end
curl "--silent", "--fail", "--output", "/dev/null", "--head", bottle_commit_url curl "--silent", "--fail", "--output", "/dev/null", "--head", bottle_commit_url
@ -256,6 +259,13 @@ module Homebrew
verify_bintray_published(bintray_published_formulae) verify_bintray_published(bintray_published_formulae)
end end
def test_bot_user(user)
test_bot = ARGV.value "test-bot-user"
return test_bot if test_bot
return "BrewTestBot" if user.casecmp("homebrew").zero?
"#{user.capitalize}TestBot"
end
def force_utf8!(str) def force_utf8!(str)
str.force_encoding("UTF-8") if str.respond_to?(:force_encoding) str.force_encoding("UTF-8") if str.respond_to?(:force_encoding)
end end