bump: fix newer_than_upstream comparison

The `newer_than_upstream` booleans can be incorrect when there's one
current version but multiple new versions or vice versa. This occurs
because the related comparisons are strictly done between the same
`BumpVersionParser` values and it doesn't work as expected in this
scenario (i.e., the `:arm`/`:intel` values are `nil` when `:general`
is used for the version and vice versa).

This adds additional logic to define which comparisons are used
depending on whether the current and/or new versions have multiple
versions, notably comparing against the `:general` version when
there's a difference between current and new. One caveat is that
`bump` will fall back to the `newer_than_upstream[:arm]` value when
the current version uses one version and `:general` isn't present
(as is the case when `multiple_versions[:new]` is true) but this
aligns with other usage of ARM as the favored arch in `bump` and
`bump-cask-pr`. This isn't the most elegant solution overall but it
works as expected (I wasn't able to achieve the same result through
more modest modifications, not to say that it's not possible).

Author: samford

Library/Homebrew/dev-cmd/bump.rb

@@ -405,13 +405,35 @@ def retrieve_versions_by_arch(formula_or_cask:, repositories:, name:)
           new_version = BumpVersionParser.new(general: "unable to get versions")
         end
 
+        comparison_pairs = []
+        if !multiple_versions[:current] && !multiple_versions[:new]
+          comparison_pairs << [:general, :general]
+        elsif multiple_versions[:current] && multiple_versions[:new]
+          comparison_pairs << [:arm, :arm]
+          comparison_pairs << [:intel, :intel]
+        elsif multiple_versions[:current]
+          comparison_pairs << [:arm, :general]
+          comparison_pairs << [:intel, :general]
+        elsif multiple_versions[:new]
+          comparison_pairs << [:general, :arm]
+          comparison_pairs << [:general, :intel]
+        end
+
         newer_than_upstream = {}
-        BumpVersionParser::VERSION_SYMBOLS.each do |version_type|
-          new_version_value = new_version.send(version_type)
+        comparison_pairs.each do |current_version_type, new_version_type|
+          current_version_value = current_version.send(current_version_type)
+          next unless current_version_value.is_a?(Version)
+
+          new_version_value = new_version.send(new_version_type)
           next unless new_version_value.is_a?(Version)
 
+          version_type = if !multiple_versions[:current] && multiple_versions[:new]
+            new_version_type
+          else
+            current_version_type
+          end
+
           newer_than_upstream[version_type] =
-            (current_version_value = current_version.send(version_type)).is_a?(Version) &&
             (Livecheck::LivecheckVersion.create(formula_or_cask, current_version_value) >
               Livecheck::LivecheckVersion.create(formula_or_cask, new_version_value))
         end
@@ -497,7 +519,7 @@ def retrieve_and_display_info_and_open_pr(formula_or_cask, name, repositories, a
             "#{" (deprecated)" if deprecated[:intel]}"
         else
           "#{current_version.general}" \
-            "#{NEWER_THAN_UPSTREAM_MSG if newer_than_upstream[:general]}" \
+            "#{NEWER_THAN_UPSTREAM_MSG if newer_than_upstream[:general] || newer_than_upstream[:arm]}" \
             "#{" (deprecated)" if deprecated[:general]}"
         end