Merge pull request #21595 from Homebrew/fix-21582

bottle_specification: throw exception instead of panicking to be able to catch it

Author: botantony

Library/Homebrew/bottle_specification.rb

@@ -108,18 +108,22 @@ def tag?(tag, no_older_versions: false)
   #  sha256 cellar: :any_skip_relocation, big_sur: "69489ae397e4645..."
   #  sha256 cellar: :any, catalina: "449de5ea35d0e94..."
   # end
-  sig { params(hash: T::Hash[Symbol, T.any(String, Symbol)]).void }
+  sig { params(hash: T::Hash[T.any(Symbol, String), T.any(String, Symbol)]).void }
   def sha256(hash)
     sha256_regex = /^[a-f0-9]{64}$/i
 
     # find new `sha256 big_sur: "69489ae397e4645..."` format
     tag, digest = hash.find do |key, value|
+      # Don't use `odie` in this case. We want to be able to catch this exception
+      # in runtime when getting committed version info in formula auditor
+      raise LegacyDSLError.new(:sha256, hash) if key.is_a?(String) && key.match?(sha256_regex) && value.is_a?(Symbol)
+
       key.is_a?(Symbol) && value.is_a?(String) && value.match?(sha256_regex)
     end
 
     odie "Invalid sha256 hash: #{digest}" if !tag || !digest
 
-    tag = Utils::Bottles::Tag.from_symbol(tag)
+    tag = Utils::Bottles::Tag.from_symbol(T.cast(tag, Symbol))
 
     cellar = hash[:cellar] || tag.default_cellar
 

Library/Homebrew/exceptions.rb

@@ -77,6 +77,15 @@ def initialize(formula, attr, value)
   end
 end
 
+class LegacyDSLError < StandardError
+  attr_reader :attr
+
+  def initialize(attr, value)
+    @attr = attr
+    super "A legacy DSL was used: #{attr} (#{value.inspect})"
+  end
+end
+
 class FormulaSpecificationError < StandardError; end
 
 # Raised when a deprecated method is used.

Library/Homebrew/formula_auditor.rb

@@ -1218,7 +1218,7 @@ def committed_version_info(formula: @formula)
             origin_head_version_info[:version_scheme] ||= previous_version_info[:version_scheme]
             origin_head_version_info[:compatibility_version] ||= previous_version_info[:compatibility_version]
           end
-        rescue MacOSVersion::Error
+        rescue MacOSVersion::Error, LegacyDSLError
           break
         end
 

Library/Homebrew/formula_versions.rb

@@ -12,7 +12,7 @@ class FormulaVersions
   include Utils::Output::Mixin
 
   IGNORED_EXCEPTIONS = [
-    ArgumentError, NameError, SyntaxError, TypeError,
+    ArgumentError, NameError, SyntaxError, TypeError, LegacyDSLError,
     FormulaSpecificationError, FormulaValidationError,
     ErrorDuringExecution, LoadError, MethodDeprecatedError
   ].freeze