diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 0645087e4701529be3c819861209c612d6d1fc1a..2204e5235154682bf87027946a61f505149cbfd6 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -436,9 +436,15 @@ module Homebrew
end
end
- def merge(args:)
- bottles_hash = args.named.reduce({}) do |hash, json_file|
- hash.deep_merge(JSON.parse(IO.read(json_file))) do |key, first, second|
+ def parse_json_files(filenames)
+ filenames.map do |filename|
+ JSON.parse(IO.read(filename))
+ end
+ end
+
+ def merge_json_files(json_files)
+ json_files.reduce({}) do |hash, json_file|
+ hash.deep_merge(json_file) do |key, first, second|
if key == "cellar"
# Prioritize HOMEBREW_CELLAR over :any over :any_skip_relocation
cellars = [first, second]
@@ -452,6 +458,10 @@ module Homebrew
second
end
end
+ end
+
+ def merge(args:)
+ bottles_hash = merge_json_files(parse_json_files(args.named))
any_cellars = ["any", "any_skip_relocation"]
bottles_hash.each do |formula_name, bottle_hash|
diff --git a/Library/Homebrew/test/dev-cmd/bottle_spec.rb b/Library/Homebrew/test/dev-cmd/bottle_spec.rb
index c524f7d342de2ab9d10a48b0c2689619f69b8000..2b25ef624e2fa74f29d390744784b09763bd03ab 100644
--- a/Library/Homebrew/test/dev-cmd/bottle_spec.rb
+++ b/Library/Homebrew/test/dev-cmd/bottle_spec.rb
@@ -2,6 +2,7 @@
# frozen_string_literal: true
require "cmd/shared_examples/args_parse"
+require "dev-cmd/bottle"
describe "Homebrew.bottle_args" do
it_behaves_like "parseable arguments"
@@ -40,3 +41,156 @@ describe "brew bottle", :integration_test do
end
end
end
+
+describe Homebrew do
+ subject(:homebrew) { described_class }
+
+ def stub_hash(parameters)
+ <<~EOS
+ {
+ "#{parameters[:name]}":{
+ "formula":{
+ "pkg_version":"#{parameters[:version]}",
+ "path":"#{parameters[:path]}"
+ },
+ "bottle":{
+ "root_url":"https://homebrew.bintray.com/bottles",
+ "prefix":"/usr/local",
+ "cellar":"#{parameters[:cellar]}",
+ "rebuild":0,
+ "tags":{
+ "#{parameters[:os]}":{
+ "filename":"#{parameters[:filename]}",
+ "local_filename":"#{parameters[:local_filename]}",
+ "sha256":"#{parameters[:sha256]}"
+ }
+ }
+ },
+ "bintray":{
+ "package":"#{parameters[:name]}",
+ "repository":"bottles"
+ }
+ }
+ }
+ EOS
+ end
+
+ let(:hello_hash_big_sur) {
+ JSON.parse(
+ stub_hash(
+ {
+ "name": "hello",
+ "version": "1.0",
+ "path": "/home/hello.rb",
+ "cellar": "any_skip_relocation",
+ "os": "big_sur",
+ "filename": "hello-1.0.big_sur.bottle.tar.gz",
+ "local_filename": "hello--1.0.big_sur.bottle.tar.gz",
+ "sha256": "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f",
+ },
+ ),
+ )
+ }
+ let(:hello_hash_catalina) {
+ JSON.parse(
+ stub_hash(
+ {
+ "name": "hello",
+ "version": "1.0",
+ "path": "/home/hello.rb",
+ "cellar": "any_skip_relocation",
+ "os": "catalina",
+ "filename": "hello-1.0.catalina.bottle.tar.gz",
+ "local_filename": "hello--1.0.catalina.bottle.tar.gz",
+ "sha256": "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac",
+ },
+ ),
+ )
+ }
+ let(:unzip_hash_big_sur) {
+ JSON.parse(
+ stub_hash(
+ {
+ "name": "unzip",
+ "version": "2.0",
+ "path": "/home/unzip.rb",
+ "cellar": "any_skip_relocation",
+ "os": "big_sur",
+ "filename": "unzip-2.0.big_sur.bottle.tar.gz",
+ "local_filename": "unzip--2.0.big_sur.bottle.tar.gz",
+ "sha256": "16cf230afdfcb6306c208d169549cf8773c831c8653d2c852315a048960d7e72",
+ },
+ ),
+ )
+ }
+ let(:unzip_hash_catalina) {
+ JSON.parse(
+ stub_hash(
+ {
+ "name": "unzip",
+ "version": "2.0",
+ "path": "/home/unzip.rb",
+ "cellar": "any",
+ "os": "catalina",
+ "filename": "unzip-2.0.catalina.bottle.tar.gz",
+ "local_filename": "unzip--2.0.catalina.bottle.tar.gz",
+ "sha256": "d9cc50eec8ac243148a121049c236cba06af4a0b1156ab397d0a2850aa79c137",
+ },
+ ),
+ )
+ }
+
+ specify "::parse_json_files" do
+ Tempfile.open("hello--1.0.big_sur.bottle.json") do |f|
+ f.write(
+ stub_hash(
+ {
+ "name": "hello",
+ "version": "1.0",
+ "path": "/home/hello.rb",
+ "cellar": "any_skip_relocation",
+ "os": "big_sur",
+ "filename": "hello-1.0.big_sur.bottle.tar.gz",
+ "local_filename": "hello--1.0.big_sur.bottle.tar.gz",
+ "sha256": "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f",
+ },
+ ),
+ )
+ f.close
+ expect(
+ homebrew.parse_json_files([f.path]).first["hello"]["bottle"]["tags"]["big_sur"]["filename"],
+ ).to eq("hello-1.0.big_sur.bottle.tar.gz")
+ end
+ end
+
+ specify "::merge_json_files" do
+ bottles_hash = homebrew.merge_json_files(
+ [hello_hash_big_sur, hello_hash_catalina, unzip_hash_big_sur, unzip_hash_catalina],
+ )
+
+ hello_hash = bottles_hash["hello"]
+ expect(hello_hash["bottle"]["cellar"]).to eq("any_skip_relocation")
+ expect(hello_hash["bottle"]["tags"]["big_sur"]["filename"]).to eq("hello-1.0.big_sur.bottle.tar.gz")
+ expect(hello_hash["bottle"]["tags"]["big_sur"]["local_filename"]).to eq("hello--1.0.big_sur.bottle.tar.gz")
+ expect(hello_hash["bottle"]["tags"]["big_sur"]["sha256"]).to eq(
+ "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f",
+ )
+ expect(hello_hash["bottle"]["tags"]["catalina"]["filename"]).to eq("hello-1.0.catalina.bottle.tar.gz")
+ expect(hello_hash["bottle"]["tags"]["catalina"]["local_filename"]).to eq("hello--1.0.catalina.bottle.tar.gz")
+ expect(hello_hash["bottle"]["tags"]["catalina"]["sha256"]).to eq(
+ "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac",
+ )
+ unzip_hash = bottles_hash["unzip"]
+ expect(unzip_hash["bottle"]["cellar"]).to eq("any")
+ expect(unzip_hash["bottle"]["tags"]["big_sur"]["filename"]).to eq("unzip-2.0.big_sur.bottle.tar.gz")
+ expect(unzip_hash["bottle"]["tags"]["big_sur"]["local_filename"]).to eq("unzip--2.0.big_sur.bottle.tar.gz")
+ expect(unzip_hash["bottle"]["tags"]["big_sur"]["sha256"]).to eq(
+ "16cf230afdfcb6306c208d169549cf8773c831c8653d2c852315a048960d7e72",
+ )
+ expect(unzip_hash["bottle"]["tags"]["catalina"]["filename"]).to eq("unzip-2.0.catalina.bottle.tar.gz")
+ expect(unzip_hash["bottle"]["tags"]["catalina"]["local_filename"]).to eq("unzip--2.0.catalina.bottle.tar.gz")
+ expect(unzip_hash["bottle"]["tags"]["catalina"]["sha256"]).to eq(
+ "d9cc50eec8ac243148a121049c236cba06af4a0b1156ab397d0a2850aa79c137",
+ )
+ end
+end