Merge pull request #23004 from Homebrew/bump-formula-pr-avoid-double-resource-update

dev-cmd/bump-formula-pr: avoid attempting same resource update

Author: MikeMcQuaid

Library/Homebrew/dev-cmd/bump-formula-pr.rb

@@ -330,11 +330,13 @@ def run
                                                               quiet:                    args.quiet?,
                                                               ignore_non_pypi_packages: true
 
+            resource_versions = parse_resource_versions_arg
             resource_update_results.merge!(
-              update_matching_version_resources!(commit_formula, version: new_formula_version.to_s),
+              update_matching_version_resources!(commit_formula,
+                                                 version:           new_formula_version.to_s,
+                                                 resource_versions:),
             )
 
-            resource_versions = parse_resource_versions_arg
             if resource_versions.present?
               resource_update_results.merge!(
                 update_resources!(commit_formula, resource_versions:),
@@ -733,16 +735,16 @@ def update_resource_block!(formula, resource, new_version)
 
       sig {
         params(
-          formula: Formula,
-          version: String,
+          formula:           Formula,
+          version:           String,
+          resource_versions: T.nilable(T::Hash[String, T::Hash[Symbol, T.nilable(String)]]),
         ).returns(T::Hash[String, Symbol])
       }
-      def update_matching_version_resources!(formula, version:)
-        results = {}
-        formula.resources.select { |r| r.livecheck.formula == :parent }.each do |resource|
-          results[resource.name] = update_resource_block!(formula, resource, version)
-        end
-        results
+      def update_matching_version_resources!(formula, version:, resource_versions: nil)
+        resource_versions ||= {}
+        formula.resources
+               .select { |r| r.livecheck.formula == :parent && resource_versions[r.name].blank? }
+               .to_h { |resource| [resource.name, update_resource_block!(formula, resource, version)] }
       end
 
       sig {

Library/Homebrew/test/dev-cmd/bump-formula-pr_spec.rb

@@ -186,4 +186,37 @@ class Couchdb < Formula
       end
     end
   end
+
+  describe "::update_matching_version_resources!" do
+    let(:f) do
+      formula("test") do
+        T.bind(self, T.class_of(Formula))
+        url "https://brew.sh/test-1.2.3.tgz"
+
+        resource "parent" do
+          url "https://brew.sh/parent-1.2.3.tar.gz"
+          livecheck do
+            formula :parent
+          end
+        end
+
+        resource "no-parent" do
+          url "https://brew.sh/no-parent-1.2.3.tar.gz"
+        end
+      end
+    end
+    let(:resource) { f.resource("parent") }
+    let(:version) { "1.2.4" }
+
+    it "only updates `:parent` resource" do
+      expect(bump_formula_pr).to receive(:update_resource_block!).with(f, resource, version).and_return(:success)
+      expect(bump_formula_pr.send(:update_matching_version_resources!, f, version:)).to eq({ "parent" => :success })
+    end
+
+    it "does not update `:parent` resource if set in `--resource-versions`" do
+      resource_versions = { "parent" => { current_version: "1.2.3", latest_version: version } }
+      expect(bump_formula_pr).not_to receive(:update_resource_block!)
+      expect(bump_formula_pr.send(:update_matching_version_resources!, f, version:, resource_versions:)).to eq({})
+    end
+  end
 end