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

internal json v3: parse ruby source checksum correctly

Browse Source 
Currently we are including this in the API but not actually
parsing and loading it correctly from the JSON. I think this
was an oversight when addressing feedback and refactoring
the JSON shape. Not a big deal, of course, because I'm the
only person using it right now.

I found this out while testing installs using the API and I got
this error while running `brew reinstall tree`.

```
Warning: Cannot verify integrity of '60fc4212023d3fef00e6de4b9f3f0d63402cf3eca00778d09f4f2d3481b524a1--tree.rb'.
No checksum was provided.
```
This commit is contained in:
apainintheneck 2024-02-28 21:06:10 -08:00
parent 154a21706a
commit cd5b93a2f2
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/dev-cmd/tests.rb
View File

@ -240,6 +240,7 @@ module Homebrew
# TODO: remove this and fix tests when possible. # TODO: remove this and fix tests when possible.
ENV["HOMEBREW_NO_INSTALL_FROM_API"] = "1" ENV["HOMEBREW_NO_INSTALL_FROM_API"] = "1"
ENV.delete("HOMEBREW_INTERNAL_JSON_V3")
ENV["USER"] ||= system_command!("id", args: ["-nu"]).stdout.chomp ENV["USER"] ||= system_command!("id", args: ["-nu"]).stdout.chomp

7
Library/Homebrew/formulary.rb
View File

@ -411,10 +411,11 @@ module Formulary
self.class.instance_variable_get(:@ruby_source_path_string) self.class.instance_variable_get(:@ruby_source_path_string)
end end
@ruby_source_checksum_hash = json_formula["ruby_source_checksum"] @ruby_source_checksum_string = json_formula.dig("ruby_source_checksum", "sha256")
@ruby_source_checksum_string ||= json_formula["ruby_source_sha256"]
def ruby_source_checksum def ruby_source_checksum
checksum_hash = self.class.instance_variable_get(:@ruby_source_checksum_hash) checksum = self.class.instance_variable_get(:@ruby_source_checksum_string)
Checksum.new(checksum_hash["sha256"]) if checksum_hash&.key?("sha256") Checksum.new(checksum) if checksum
end end
end end

26
Library/Homebrew/test/api/internal_tap_json/formula_spec.rb
View File

@ -85,16 +85,19 @@ RSpec.describe "Internal Tap JSON -- Formula" do
context "when loading formulae" do context "when loading formulae" do
let(:fennel_metadata) do let(:fennel_metadata) do
{ {
"dependencies" => ["lua"], "dependencies" => ["lua"],
"desc" => "Lua Lisp Language", "desc" => "Lua Lisp Language",
"full_name" => "fennel", "full_name" => "fennel",
"homepage" => "https://fennel-lang.org", "homepage" => "https://fennel-lang.org",
"license" => "MIT", "license" => "MIT",
"name" => "fennel", "name" => "fennel",
"ruby_source_path" => "Formula/f/fennel.rb", "ruby_source_path" => "Formula/f/fennel.rb",
"tap" => "homebrew/core", "tap" => "homebrew/core",
"tap_git_head" => tap_git_head, "tap_git_head" => tap_git_head,
"versions" => { "bottle"=>true, "head"=>nil, "stable"=>"1.4.0" }, "versions" => { "bottle"=>true, "head"=>nil, "stable"=>"1.4.0" },
"ruby_source_checksum" => {
"sha256" => "5856e655fd1cea11496d67bc27fb14fee5cfbdea63c697c3773c7f247581197d",
},
} }
end end
@ -112,6 +115,9 @@ RSpec.describe "Internal Tap JSON -- Formula" do
"uses_from_macos" => [{ "llvm"=>[:build, :test] }, "zlib"], "uses_from_macos" => [{ "llvm"=>[:build, :test] }, "zlib"],
"uses_from_macos_bounds" => [{}, {}], "uses_from_macos_bounds" => [{}, {}],
"versions" => { "bottle"=>true, "head"=>nil, "stable"=>"0.58.1" }, "versions" => { "bottle"=>true, "head"=>nil, "stable"=>"0.58.1" },
"ruby_source_checksum" => {
"sha256" => "81d51c25d18710191beb62f9f380bae3d878aad815a65ec1ee2a3b132c1fadb3",
},
} }
end end

3
Library/Homebrew/test/formulary_spec.rb
View File

@ -331,6 +331,7 @@ RSpec.describe Formulary do
"working_dir" => "/$HOME", "working_dir" => "/$HOME",
}, },
"ruby_source_path" => "Formula/#{formula_name}.rb", "ruby_source_path" => "Formula/#{formula_name}.rb",
"ruby_source_checksum" => { "sha256" => "ABCDEFGHIJKLMNOPQRSTUVWXYZ" },
}.merge(extra_items), }.merge(extra_items),
} }
end end
@ -419,6 +420,8 @@ RSpec.describe Formulary do
expect(formula.plist_name).to eq("custom.launchd.name") expect(formula.plist_name).to eq("custom.launchd.name")
expect(formula.service_name).to eq("custom.systemd.name") expect(formula.service_name).to eq("custom.systemd.name")
expect(formula.ruby_source_checksum.hexdigest).to eq("abcdefghijklmnopqrstuvwxyz")
expect do expect do
formula.install formula.install
end.to raise_error("Cannot build from source from abstract formula.") end.to raise_error("Cannot build from source from abstract formula.")