From 7c807d347e6cba62e708058481c6996adfcef683 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 13 Aug 2016 02:28:33 -0700 Subject: [PATCH] pull: non-core tap support for Homebrew Testing jobs `test-bot --ci-testing` supports a `--tap` option for non-core taps, so `brew pull` should too when pulling Homebrew Testing jobs. --- Library/Homebrew/cmd/pull.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index f93ad095ab..24abbd9384 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -52,9 +52,16 @@ module Homebrew url = "https://github.com/Homebrew/homebrew-core/pull/#{arg}" tap = CoreTap.instance elsif (testing_match = arg.match %r{brew\.sh/job/Homebrew.*Testing/(\d+)/}) + tap = ARGV.value("tap") + tap = if tap && tap.start_with?("homebrew/") + Tap.fetch("homebrew", tap.strip_prefix("homebrew/")) + elsif tap + odie "Tap option did not start with \"homebrew/\": #{tap}" + else + CoreTap.instance + end _, testing_job = *testing_match - url = "https://github.com/Homebrew/homebrew-core/compare/master...BrewTestBot:testing-#{testing_job}" - tap = CoreTap.instance + url = "https://github.com/Homebrew/homebrew-#{tap.repo}/compare/master...BrewTestBot:testing-#{testing_job}" odie "Testing URLs require `--bottle`!" unless ARGV.include?("--bottle") elsif (api_match = arg.match HOMEBREW_PULL_API_REGEX) _, user, repo, issue = *api_match