203 lines
6.3 KiB
Ruby
Raw Normal View History

2014-09-20 14:27:54 +01:00
# Gets a patch from a GitHub commit or pull request and applies it to Homebrew.
# Optionally, installs it too.
require 'utils'
require 'formula'
2015-02-23 14:49:10 +00:00
require 'cmd/tap'
2014-09-20 14:27:54 +01:00
module Homebrew
HOMEBREW_PULL_API_REGEX = %r{https://api\.github\.com/repos/([\w-]+)/homebrew(-[\w-]+)?/pulls/(\d+)}
2014-09-20 14:27:54 +01:00
def tap arg
match = arg.match(%r[homebrew-([\w-]+)/])
2014-09-20 14:27:54 +01:00
match[1].downcase if match
end
def pull_url url
# GitHub provides commits/pull-requests raw patches using this URL.
url += '.patch'
patchpath = HOMEBREW_CACHE + File.basename(url)
curl url, '-o', patchpath
ohai 'Applying patch'
patch_args = []
# Normally we don't want whitespace errors, but squashing them can break
# patches so an option is provided to skip this step.
if ARGV.include? '--ignore-whitespace' or ARGV.include? '--clean'
patch_args << '--whitespace=nowarn'
else
patch_args << '--whitespace=fix'
end
# Fall back to three-way merge if patch does not apply cleanly
patch_args << "-3"
patch_args << patchpath
begin
safe_system 'git', 'am', *patch_args
rescue ErrorDuringExecution
if ARGV.include? "--resolve"
odie "Patch failed to apply: try to resolve it."
else
system 'git', 'am', '--abort'
odie 'Patch failed to apply: aborted.'
end
ensure
patchpath.unlink
end
end
2014-09-20 14:27:54 +01:00
def pull
if ARGV.empty?
2015-03-20 17:45:48 +00:00
odie 'This command requires at least one argument containing a URL or pull request number'
2014-09-20 14:27:54 +01:00
end
if ARGV[0] == '--rebase'
2015-03-20 17:45:48 +00:00
odie 'You meant `git pull --rebase`.'
2014-09-20 14:27:54 +01:00
end
ARGV.named.each do |arg|
if arg.to_i > 0
url = 'https://github.com/Homebrew/homebrew/pull/' + arg
issue = arg
else
if (api_match = arg.match HOMEBREW_PULL_API_REGEX)
_, user, tap, pull = *api_match
arg = "https://github.com/#{user}/homebrew#{tap}/pull/#{pull}"
end
2014-09-20 14:27:54 +01:00
url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX
2015-03-20 17:45:48 +00:00
odie "Not a GitHub pull request or commit: #{arg}" unless url_match
2014-09-20 14:27:54 +01:00
url = url_match[0]
issue = url_match[3]
end
if ARGV.include?("--bottle") && issue.nil?
raise "No pull request detected!"
end
2014-09-20 14:27:54 +01:00
if tap_name = tap(url)
user = url_match[1].downcase
tap_dir = HOMEBREW_REPOSITORY/"Library/Taps/#{user}/homebrew-#{tap_name}"
safe_system "brew", "tap", "#{user}/#{tap_name}" unless tap_dir.exist?
Dir.chdir tap_dir
else
Dir.chdir HOMEBREW_REPOSITORY
end
# The cache directory seems like a good place to put patches.
HOMEBREW_CACHE.mkpath
# Store current revision and branch
2014-09-20 14:27:54 +01:00
revision = `git rev-parse --short HEAD`.strip
branch = `git symbolic-ref --short HEAD`.strip
2014-09-20 14:27:54 +01:00
unless branch == "master"
opoo "Current branch is #{branch}: do you need to pull inside master?"
end
pull_url url
2014-09-20 14:27:54 +01:00
changed_formulae = []
if tap_dir
formula_dir = %w[Formula HomebrewFormula].find { |d| tap_dir.join(d).directory? } || ""
else
formula_dir = "Library/Formula"
end
Utils.popen_read(
"git", "diff-tree", "-r", "--name-only",
"--diff-filter=AM", revision, "HEAD", "--", formula_dir
).each_line do |line|
name = File.basename(line.chomp, ".rb")
2014-09-20 14:27:54 +01:00
begin
changed_formulae << Formula[name]
# Make sure we catch syntax errors.
2015-03-07 15:34:51 +00:00
rescue Exception
2014-09-20 14:27:54 +01:00
next
end
end
unless ARGV.include? '--bottle'
2014-09-20 14:27:54 +01:00
changed_formulae.each do |f|
next unless f.bottle
2015-05-27 21:10:39 +08:00
opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?"
2014-09-20 14:27:54 +01:00
end
end
if issue && !ARGV.include?('--clean')
ohai "Patch closes issue ##{issue}"
message = `git log HEAD^.. --format=%B`
if ARGV.include? '--bump'
odie 'Can only bump one changed formula' unless changed_formulae.length == 1
formula = changed_formulae.first
subject = "#{formula.name} #{formula.version}"
2014-09-20 14:27:54 +01:00
ohai "New bump commit subject: #{subject}"
2015-02-11 14:20:22 +00:00
system "/bin/echo -n #{subject} | pbcopy"
2014-09-20 14:27:54 +01:00
message = "#{subject}\n\n#{message}"
end
# If this is a pull request, append a close message.
unless message.include? "Closes ##{issue}."
2014-09-20 14:27:54 +01:00
message += "\nCloses ##{issue}."
safe_system 'git', 'commit', '--amend', '--signoff', '--allow-empty', '-q', '-m', message
2014-09-20 14:27:54 +01:00
end
end
if ARGV.include? "--bottle"
bottle_commit_url = if tap_name
"https://github.com/BrewTestBot/homebrew-#{tap_name}/compare/homebrew:master...pr-#{issue}"
else
"https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
end
curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
bottle_branch = "pull-bottle-#{issue}"
safe_system "git", "checkout", "-B", bottle_branch, revision
pull_url bottle_commit_url
safe_system "git", "rebase", branch
safe_system "git", "checkout", branch
safe_system "git", "merge", "--ff-only", "--no-edit", bottle_branch
safe_system "git", "branch", "-D", bottle_branch
2015-02-17 18:57:19 +00:00
2015-02-18 12:56:10 +00:00
# Publish bottles on Bintray
bintray_user = ENV["BINTRAY_USER"]
bintray_key = ENV["BINTRAY_KEY"]
if bintray_user && bintray_key
2015-02-19 12:57:08 +00:00
repo = Bintray.repository(tap_name)
2015-02-18 12:56:10 +00:00
changed_formulae.each do |f|
ohai "Publishing on Bintray:"
2015-02-19 12:57:08 +00:00
package = Bintray.package f.name
version = f.pkg_version
curl "--silent", "--fail",
2015-02-18 12:56:10 +00:00
"-u#{bintray_user}:#{bintray_key}", "-X", "POST",
2015-02-19 12:57:08 +00:00
"https://api.bintray.com/content/homebrew/#{repo}/#{package}/#{version}/publish"
2015-02-18 12:56:10 +00:00
puts
sleep 2
2015-05-27 21:10:39 +08:00
safe_system "brew", "fetch", "--retry", "--force-bottle", f.full_name
2015-02-18 12:56:10 +00:00
end
else
opoo "You must set BINTRAY_USER and BINTRAY_KEY to add or update bottles on Bintray!"
2015-02-18 12:56:10 +00:00
end
end
2014-09-20 14:27:54 +01:00
ohai 'Patch changed:'
safe_system "git", "diff-tree", "-r", "--stat", revision, "HEAD"
if ARGV.include? '--install'
changed_formulae.each do |f|
2015-05-27 21:10:39 +08:00
ohai "Installing #{f.full_name}"
2014-09-20 14:27:54 +01:00
install = f.installed? ? 'upgrade' : 'install'
2015-05-27 21:10:39 +08:00
safe_system 'brew', install, '--debug', f.full_name
2014-09-20 14:27:54 +01:00
end
end
end
end
end