Enable strict typing in Homebrew::TestBot

Author: dduugg

Library/Homebrew/test/test_bot/setup_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require "test_bot"
-require "ostruct"
+require "dev-cmd/test-bot"
 
 RSpec.describe Homebrew::TestBot::Setup do
   subject(:setup) { described_class.new }
@@ -12,7 +11,7 @@
         .exactly(3).times
         .and_return(instance_double(Homebrew::TestBot::Step, passed?: true))
 
-      expect(setup.run!(args: instance_double(Homebrew::CLI::Args)).passed?).to be(true)
+      expect(setup.run!(args: instance_double(Homebrew::Cmd::TestBotCmd::Args)).passed?).to be(true)
     end
   end
 end

Library/Homebrew/test_bot.rb

@@ -1,4 +1,4 @@
-# typed: true # rubocop:todo Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 require "test_bot/step"
@@ -23,14 +23,17 @@ module TestBot
 
     HOMEBREW_TAP_REGEX = %r{^([\w-]+)/homebrew-([\w-]+)$}
 
+    sig { params(args: Homebrew::Cmd::TestBotCmd::Args).returns(T::Boolean) }
     def cleanup?(args)
       args.cleanup? || GitHub::Actions.env_set?
     end
 
+    sig { params(args: Homebrew::Cmd::TestBotCmd::Args).returns(T::Boolean) }
     def local?(args)
       args.local? || GitHub::Actions.env_set?
     end
 
+    sig { params(tap: T.nilable(String)).returns(T.nilable(Tap)) }
     def resolve_test_tap(tap = nil)
       return Tap.fetch(tap) if tap
 
@@ -52,6 +55,7 @@ def resolve_test_tap(tap = nil)
       end
     end
 
+    sig { params(args: Homebrew::Cmd::TestBotCmd::Args).void }
     def run!(args)
       $stdout.sync = true
       $stderr.sync = true

Library/Homebrew/test_bot/bottles_fetch.rb

@@ -4,8 +4,10 @@
 module Homebrew
   module TestBot
     class BottlesFetch < TestFormulae
+      sig { returns(T::Array[String]) }
       attr_accessor :testing_formulae
 
+      sig { params(args: Homebrew::Cmd::TestBotCmd::Args).void }
       def run!(args:)
         info_header "Testing formulae:"
         puts testing_formulae
@@ -19,6 +21,7 @@ def run!(args:)
 
       private
 
+      sig { returns(T::Hash[Symbol, T::Set[String]]) }
       def formulae_by_tag
         tags = Hash.new { |hash, key| hash[key] = Set.new }
 
@@ -38,6 +41,7 @@ def formulae_by_tag
         tags
       end
 
+      sig { params(tag: Symbol, formulae: T::Set[String], args: Homebrew::Cmd::TestBotCmd::Args).void }
       def fetch_bottles!(tag, formulae, args:)
         test_header(:BottlesFetch, method: "fetch_bottles!(#{tag})")
 

Library/Homebrew/test_bot/cleanup_after.rb

@@ -1,9 +1,10 @@
-# typed: true # rubocop:todo Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 module Homebrew
   module TestBot
     class CleanupAfter < TestCleanup
+      sig { params(args: Homebrew::Cmd::TestBotCmd::Args).void }
       def run!(args:)
         if ENV["HOMEBREW_GITHUB_ACTIONS"].present? && ENV["GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED"].blank? &&
            # don't need to do post-build cleanup unless testing test-bot itself.
@@ -27,6 +28,7 @@ def run!(args:)
 
       private
 
+      sig { void }
       def pkill_if_needed
         pgrep = ["pgrep", "-f", HOMEBREW_CELLAR.to_s]
 

Library/Homebrew/test_bot/cleanup_before.rb

@@ -1,9 +1,10 @@
-# typed: true # rubocop:todo Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 module Homebrew
   module TestBot
     class CleanupBefore < TestCleanup
+      sig { params(args: Homebrew::Cmd::TestBotCmd::Args).void }
       def run!(args:)
         test_header(:CleanupBefore)