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

pull: Add --bintray-org

Browse Source 
Infer the name of the Bintray organization if it's not provided.
This commit is contained in:
Shaun Jackman 2017-10-06 16:04:28 -07:00
parent cf349018d5
commit 76021db602
1 changed files with 9 additions and 5 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`] <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>] <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.
@ -41,6 +41,9 @@
#: #:
#: If `--warn-on-publish-failure` was passed, do not exit if there's a #: If `--warn-on-publish-failure` was passed, do not exit if there's a
#: failure publishing bottles on Bintray. #: failure publishing bottles on Bintray.
#:
#: If `--bintray-org=`<bintray-org> is passed, publish at the given Bintray
#: organisation.
require "net/http" require "net/http"
require "net/https" require "net/https"
@ -257,7 +260,7 @@ module Homebrew
str.force_encoding("UTF-8") if str.respond_to?(:force_encoding) str.force_encoding("UTF-8") if str.respond_to?(:force_encoding)
end end
def publish_changed_formula_bottles(_tap, changed_formulae_names) def publish_changed_formula_bottles(tap, changed_formulae_names)
if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"]
raise "Need to load formulae to publish them!" raise "Need to load formulae to publish them!"
end end
@ -268,7 +271,8 @@ module Homebrew
changed_formulae_names.each do |name| changed_formulae_names.each do |name|
f = Formula[name] f = Formula[name]
next if f.bottle_unneeded? || f.bottle_disabled? next if f.bottle_unneeded? || f.bottle_disabled?
next unless publish_bottle_file_on_bintray(f, bintray_creds) bintray_org = ARGV.value("bintray-org") || tap.user.downcase
next unless publish_bottle_file_on_bintray(f, bintray_org, bintray_creds)
published << f.full_name published << f.full_name
end end
else else
@ -420,7 +424,7 @@ module Homebrew
end end
# Publishes the current bottle files for a given formula to Bintray # Publishes the current bottle files for a given formula to Bintray
def publish_bottle_file_on_bintray(f, creds) def publish_bottle_file_on_bintray(f, bintray_org, creds)
repo = Utils::Bottles::Bintray.repository(f.tap) repo = Utils::Bottles::Bintray.repository(f.tap)
package = Utils::Bottles::Bintray.package(f.name) package = Utils::Bottles::Bintray.package(f.name)
info = FormulaInfoFromJson.lookup(f.name) info = FormulaInfoFromJson.lookup(f.name)
@ -437,7 +441,7 @@ module Homebrew
"--user", "#{creds[:user]}:#{creds[:key]}", "--request", "POST", "--user", "#{creds[:user]}:#{creds[:key]}", "--request", "POST",
"--header", "Content-Type: application/json", "--header", "Content-Type: application/json",
"--data", '{"publish_wait_for_secs": 0}', "--data", '{"publish_wait_for_secs": 0}',
"https://api.bintray.com/content/homebrew/#{repo}/#{package}/#{version}/publish" "https://api.bintray.com/content/#{bintray_org}/#{repo}/#{package}/#{version}/publish"
true true
rescue => e rescue => e
raise unless ARGV.include?("--warn-on-publish-failure") raise unless ARGV.include?("--warn-on-publish-failure")