bump-formula-pr: support bumping resource using revision as version

Author: cho-m

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

@@ -750,40 +750,52 @@ def parse_resource_versions_arg
         ).returns(Symbol)
       }
       def update_resource_block!(formula, resource, new_version)
-        ohai "Updating resource \"#{resource.name}\" from #{resource.version} to #{new_version}"
+        old_version = resource.version.to_s
+        ohai "Updating resource \"#{resource.name}\" from #{old_version} to #{new_version}"
 
         old_url = resource.url
         raise ArgumentError, "resource \"#{resource.name}\" has no URL" if old_url.nil?
 
-        if (old_tag = resource.specs[:tag].presence) && resource.download_strategy <= GitDownloadStrategy
-          tag = update_url(old_tag, resource.version.to_s, new_version)
-          if tag == old_tag
-            opoo <<~EOS
-              You need to bump resource "#{resource.name}" manually since the new tag
-              and old tag are both:
-                #{tag}
-            EOS
-            return :tag_unchanged
-          end
+        if resource.download_strategy <= GitDownloadStrategy
+          old_tag = resource.specs[:tag].presence
+          old_revision = resource.specs[:revision].presence
+
+          if old_tag
+            tag = update_url(old_tag, old_version, new_version)
+            if tag == old_tag
+              opoo <<~EOS
+                You need to bump resource "#{resource.name}" manually since the new tag
+                and old tag are both:
+                  #{tag}
+              EOS
+              return :tag_unchanged
+            end
 
-          # `specs` omits `using:`, so pass it through to keep an explicit strategy
-          git_specs = { tag: }
-          if (using = resource.using.presence)
-            git_specs[:using] = using
-          end
-          resource_path, forced_version = fetch_resource_and_forced_version(resource, new_version, old_url,
-                                                                            **git_specs)
-          new_revision = Utils.popen_read("git", "-C", resource_path.to_s, "rev-parse", "-q", "--verify",
-                                          "HEAD").strip
-          if new_revision.blank?
-            opoo "Could not resolve a revision for resource \"#{resource.name}\" tag #{tag}."
+            # `specs` omits `using:`, so pass it through to keep an explicit strategy
+            git_specs = { tag: }
+            if (using = resource.using.presence)
+              git_specs[:using] = using
+            end
+            resource_path, forced_version = fetch_resource_and_forced_version(resource, new_version, old_url,
+                                                                              **git_specs)
+            new_revision = Utils.popen_read("git", "-C", resource_path.to_s, "rev-parse", "-q", "--verify",
+                                            "HEAD").strip
+            if new_revision.blank?
+              opoo "Could not resolve a revision for resource \"#{resource.name}\" tag #{tag}."
+              return :revision_unresolved
+            end
+          elsif old_revision == old_version
+            new_revision = new_version
+            forced_version = true
+          else
+            opoo "Could not resolve a revision for resource \"#{resource.name}\" version #{new_version}."
             return :revision_unresolved
           end
 
           resource_name = resource.name.to_s
           formula_ast = Utils::AST::FormulaAST.new(formula.path.read)
-          formula_ast.replace_resource_stanza_hash_value(resource_name, :url, :tag, tag)
-          if resource.specs[:revision].present?
+          formula_ast.replace_resource_stanza_hash_value(resource_name, :url, :tag, tag) if tag
+          if old_revision.present?
             formula_ast.replace_resource_stanza_hash_value(resource_name, :url, :revision, new_revision)
           end
 

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

@@ -424,6 +424,33 @@ class Gitresourceball < Formula
       expect(formula_path.read).to include("revision: \"#{"b" * 40}\"")
     end
 
+    it "updates revision for a git resource without a tag" do
+      old_revision = "a" * 40
+      new_revision = "b" * 40
+      formula_path = CoreTap.instance.new_formula_path("gitresourceball")
+      formula_path.dirname.mkpath
+      formula_path.write <<~RUBY
+        class Gitresourceball < Formula
+          url "https://brew.sh/gitresourceball-1.0.tar.gz"
+
+          resource "foo" do
+            url "https://brew.sh/foo.git",
+                revision: "#{old_revision}"
+            version "#{old_revision}"
+          end
+        end
+      RUBY
+      CoreTap.instance.clear_cache
+      Formulary.clear_cache
+      Formula.clear_cache
+      formula = Formulary.from_contents("gitresourceball", formula_path, formula_path.read)
+
+      resource_versions = { "foo" => { current_version: old_revision, latest_version: new_revision } }
+
+      expect(bump_formula_pr.update_resources!(formula, resource_versions:)).to eq({ "foo" => :success })
+      expect(formula_path.read).to include("revision: \"#{new_revision}\"", "version \"#{new_revision}\"")
+    end
+
     it "updates the URL for a non-git resource carrying a tag" do
       formula_path = CoreTap.instance.new_formula_path("tarballwithtag")
       formula_path.dirname.mkpath
@@ -478,6 +505,30 @@ class Sametagball < Formula
       expect(bump_formula_pr.update_resources!(formula, resource_versions:)).to eq({ "foo" => :tag_unchanged })
     end
 
+    it "reports git resources where new revision cannot be detected from new version" do
+      formula_path = CoreTap.instance.new_formula_path("sametagball")
+      formula_path.dirname.mkpath
+      formula_path.write <<~RUBY
+        class Sametagball < Formula
+          url "https://brew.sh/sametagball-1.0.tar.gz"
+
+          resource "foo" do
+            url "https://brew.sh/foo.git",
+                revision: "#{"a" * 40}"
+            version "1.2.3"
+          end
+        end
+      RUBY
+      CoreTap.instance.clear_cache
+      Formulary.clear_cache
+      Formula.clear_cache
+      formula = Formulary.from_contents("sametagball", formula_path, formula_path.read)
+
+      resource_versions = { "foo" => { current_version: "1.2.3", latest_version: "2.0.0" } }
+
+      expect(bump_formula_pr.update_resources!(formula, resource_versions:)).to eq({ "foo" => :revision_unresolved })
+    end
+
     it "downgrades to requested version" do
       version = "0.1.2"
       resource_versions = { "foo" => { current_version: "1.2.3", latest_version: version } }