bump: split multiple_versions on current/new

The `multiple_versions` boolean is true if the current or new versions
are split based on arch but this can cause unexpected behavior when
`multiple_versions` is used as a conditional. In some places we need
to check whether there are multiple current versions and in other
places we need to check if there are multiple new versions, so the
existing value isn't granular enough. This may not be a problem when
both current and new have the same version setup but it can cause
issues when there's a difference.

This changes `multiple_versions` to a hash with boolean values and
updates related conditions to use the contextually appropriate value.
This resolves a couple of issues:

* The current version for multi-arch casks with one `version` were
being split into arm/intel values in the output when the new versions
differ based on arch and vice versa. This effectively ensures that the
current and new versions are only split in the output when the version
differs.
* The `deprecated[:general]` value wasn't being properly set when the
current and new versions didn't have the same version setup, as the
fallback value specifically needs to be set when there aren't multiple
current versions.

Besides that, we also need to specifically check if there are multiple
current versions to be able to properly identify current versions that
are newer than the upstream version when both current and new don't
have the same version setup but this will be addressed in another
commit.

Author: samford

Library/Homebrew/dev-cmd/bump.rb

@@ -14,7 +14,7 @@ class Bump < AbstractCommand
       class VersionBumpInfo < T::Struct
         const :type, Symbol
         const :deprecated, T::Hash[Symbol, T::Boolean], default: {}
-        const :multiple_versions, T::Boolean
+        const :multiple_versions, T::Hash[Symbol, T::Boolean], default: {}
         const :version_name, String
         const :current_version, BumpVersionParser
         const :new_version, BumpVersionParser
@@ -385,9 +385,11 @@ def retrieve_versions_by_arch(formula_or_cask:, repositories:, name:)
           new_versions = { general: new_versions[:arm] }
         end
 
-        multiple_versions = old_versions.values_at(:arm, :intel).all?(&:present?) ||
-                            new_versions.values_at(:arm, :intel).all?(&:present?)
-        deprecated[:general] ||= deprecated[:arm] || false unless multiple_versions
+        multiple_versions = {}
+        multiple_versions[:current] = old_versions.values_at(:arm, :intel).all?(&:present?)
+        multiple_versions[:new] = new_versions.values_at(:arm, :intel).all?(&:present?)
+
+        deprecated = { general: deprecated[:arm] || false } unless multiple_versions[:current]
 
         current_version = BumpVersionParser.new(general: old_versions[:general],
                                                 arm:     old_versions[:arm],
@@ -421,7 +423,7 @@ def retrieve_versions_by_arch(formula_or_cask:, repositories:, name:)
            !newer_than_upstream.all? { |_k, v| v == true }
           # We use the ARM version for the pull request version. This is
           # consistent with the behavior of bump-cask-pr.
-          pull_request_version = if multiple_versions
+          pull_request_version = if multiple_versions[:new]
             new_version.arm.to_s
           else
             new_version.general.to_s
@@ -485,7 +487,7 @@ def retrieve_and_display_info_and_open_pr(formula_or_cask, name, repositories, a
         end
 
         # Conditionally format output based on type of formula_or_cask
-        current_versions = if multiple_versions
+        current_versions = if multiple_versions[:current]
           "arm:   #{current_version.arm || current_version.general}" \
             "#{NEWER_THAN_UPSTREAM_MSG if newer_than_upstream[:arm]}" \
             "#{" (deprecated)" if deprecated[:arm]}" \
@@ -499,7 +501,7 @@ def retrieve_and_display_info_and_open_pr(formula_or_cask, name, repositories, a
             "#{" (deprecated)" if deprecated[:general]}"
         end
 
-        new_versions = if multiple_versions && new_version.arm && new_version.intel
+        new_versions = if multiple_versions[:new] && new_version.arm && new_version.intel
           "arm:   #{new_version.arm}
                           intel: #{new_version.intel}"
         else
@@ -562,13 +564,13 @@ def retrieve_and_display_info_and_open_pr(formula_or_cask, name, repositories, a
           puts "#{title_name} was not bumped to the Repology version because it has a `livecheck` block."
         end
         if new_version.blank? || versions_equal ||
-           (!new_version.general.is_a?(Version) && !multiple_versions)
+           (!new_version.general.is_a?(Version) && !multiple_versions[:new])
           return
         end
 
         return if duplicate_pull_requests.present?
 
-        version_args = if multiple_versions
+        version_args = if multiple_versions[:new]
           %W[--version-arm=#{new_version.arm} --version-intel=#{new_version.intel}]
         else
           "--version=#{new_version.general}"