Merge pull request #1174 from Homebrew/inching-our-way-towards-sorbet…

…-typed

cmd/test-bot.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "abstract_command"

lib/junit.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

lib/step.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "system_command"

lib/test.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "utils/analytics"

lib/test_bot.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require_relative "step"

lib/test_bot.rbi

@@ -0,0 +1,7 @@
+# typed: strict
+
+module Homebrew
+ module TestBot
+ include Kernel
+ end
+end

lib/test_cleanup.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "os"

lib/test_cleanup.rbi

@@ -0,0 +1,7 @@
+# typed: strict
+
+module Homebrew
+ class TestCleanup
+ include Kernel
+ end
+end

lib/test_formulae.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew
@@ -10,7 +11,7 @@ def initialize(tap:, git:, dry_run:, fail_fast:, verbose:)
  super
 
  @skipped_or_failed_formulae = []
- @artifact_cache = Pathname("artifact-cache")
+ @artifact_cache = Pathname.new("artifact-cache")
  # Let's keep track of the artifacts we've already downloaded
  # to avoid repeatedly trying to download the same thing.
  @downloaded_artifacts = Hash.new { |h, k| h[k] = [] }

lib/test_formulae.rbi

@@ -0,0 +1,7 @@
+# typed: strict
+
+module Homebrew
+ module TestFormulae
+ include Kernel
+ end
+end

lib/test_runner.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require_relative "junit"
@@ -26,13 +27,13 @@ def ensure_blank_file_exists!(file)
  end
 
  def run!(tap, git:, args:)
- tests = []
+ tests = T.let([], T::Array[Homebrew::Test])
  skip_setup = args.skip_setup?
- skip_cleanup_before = false
+ skip_cleanup_before = T.let(false, T::Boolean)
 
- bottle_output_path = Pathname("bottle_output.txt")
- linkage_output_path = Pathname("linkage_output.txt")
- @skipped_or_failed_formulae_output_path = Pathname("skipped_or_failed_formulae-#{Utils::Bottles.tag}.txt")
+ bottle_output_path = Pathname.new("bottle_output.txt")
+ linkage_output_path = Pathname.new("linkage_output.txt")
+ @skipped_or_failed_formulae_output_path = Pathname.new("skipped_or_failed_formulae-#{Utils::Bottles.tag}.txt")
 
  if no_only_args?(args) || args.only_formulae?
  ensure_blank_file_exists!(bottle_output_path)
@@ -91,7 +92,7 @@ def run!(tap, git:, args:)
  end
  puts steps_output
 
- steps_output_path = Pathname("steps_output.txt")
+ steps_output_path = Pathname.new("steps_output.txt")
  steps_output_path.unlink if steps_output_path.exist?
  steps_output_path.write(steps_output)
 
@@ -209,9 +210,9 @@ def run_tests(tests, args:)
  ]
  else
  [
- Array(args.testing_formulae),
- Array(args.added_formulae),
- Array(args.deleted_formulae),
+ args.testing_formulae.to_a,
+ args.added_formulae.to_a,
+ args.deleted_formulae.to_a,
  ]
  end
 
@@ -224,7 +225,7 @@ def run_tests(tests, args:)
 
  formulae_test.skipped_or_failed_formulae
  elsif args.skipped_or_failed_formulae.present?
- Array(args.skipped_or_failed_formulae)
+ Array.new(args.skipped_or_failed_formulae)
  elsif @skipped_or_failed_formulae_output_path.exist?
  @skipped_or_failed_formulae_output_path.read.chomp.split(",")
  else

lib/test_runner.rbi

@@ -0,0 +1,7 @@
+# typed: strict
+
+module Homebrew
+ module TestRunner
+ include Kernel
+ end
+end

lib/tests/bottles_fetch.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

lib/tests/cleanup_after.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

lib/tests/cleanup_before.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

lib/tests/formulae.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew
@@ -81,7 +82,7 @@ def install_ca_certificates_if_needed
  end
 
  def install_gcc_if_needed(formula, deps)
- installed_gcc = false
+ installed_gcc = T.let(false, T::Boolean)
  begin
  deps.each { |dep| CompilerSelector.select_for(dep.to_formula) }
  CompilerSelector.select_for(formula)

lib/tests/formulae_dependents.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

lib/tests/formulae_detect.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew
@@ -42,8 +43,8 @@ def detect_formulae!(args:)
  @testing_formulae = []
  # Use GitHub Actions variables for pull request jobs.
  if github_ref.present? && github_repository.present? &&
- %r{refs/pull/(?<pr>\d+)/merge} =~ github_ref
- url = "https://github.com/#{github_repository}/pull/#{pr}/checks"
+ %r{refs/pull/(\d+)/merge} =~ github_ref
+ url = "https://github.com/#{github_repository}/pull/#{Regexp.last_match(1)}/checks"
  end
  elsif (canonical_formula_name = safe_formula_canonical_name(@argument, args:))
  unless canonical_formula_name.include?("/")
@@ -207,8 +208,7 @@ def safe_formula_canonical_name(formula_name, args:)
  retry unless steps.last.failed?
  onoe e
  puts e.backtrace if args.debug?
- rescue FormulaUnavailableError, TapFormulaAmbiguityError,
- TapFormulaWithOldnameAmbiguityError => e
+ rescue FormulaUnavailableError, TapFormulaAmbiguityError => e
  onoe e
  puts e.backtrace if args.debug?
  end

lib/tests/setup.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

lib/tests/tap_syntax.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Homebrew

spec/stub/os.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-module MacOS
- module_function
-
- def version
- :catalina
- end
-end
-
 module OS
  module_function
 

spec/stub/tap.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-module Tap
- module_function
-
- def fetch(*)
+class Tap
+ def self.fetch(*)
  OpenStruct.new(name: "Homebrew/homebrew-core")
  end
 
- def map
+ def self.map
  []
  end
 end