Merge pull request #21124 from Homebrew/system_config_strict_type

system_config: `typed: strict`

Author: botantony

Library/Homebrew/extend/os/linux/system_config.rb

@@ -1,4 +1,4 @@
-# typed: true # rubocop:todo Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 require "compilers"
@@ -14,27 +14,31 @@ module ClassMethods
 
         HOST_RUBY_PATH = "/usr/bin/ruby"
 
+        sig { returns(T.any(String, Version)) }
         def host_glibc_version
           version = OS::Linux::Glibc.system_version
           return "N/A" if version.null?
 
           version
         end
 
+        sig { returns(T.any(String, Version)) }
         def host_libstdcxx_version
           version = OS::Linux::Libstdcxx.system_version
           return "N/A" if version.null?
 
           version
         end
 
+        sig { returns(String) }
         def host_gcc_version
           gcc = ::DevelopmentTools.host_gcc_path
           return "N/A" unless gcc.executable?
 
-          Utils.popen_read(gcc, "--version")[/ (\d+\.\d+\.\d+)/, 1]
+          Utils.popen_read(gcc, "--version")[/ (\d+\.\d+\.\d+)/, 1] || "N/A"
         end
 
+        sig { params(formula: T.any(Pathname, String)).returns(T.any(String, PkgVersion)) }
         def formula_linked_version(formula)
           return "N/A" if Homebrew::EnvConfig.no_install_from_api? && !CoreTap.instance.installed?
 
@@ -43,13 +47,15 @@ def formula_linked_version(formula)
           "N/A"
         end
 
+        sig { returns(String) }
         def host_ruby_version
           out, _, status = system_command(HOST_RUBY_PATH, args: ["-e", "puts RUBY_VERSION"], print_stderr: false).to_a
           return "N/A" unless status.success?
 
           out
         end
 
+        sig { params(out: T.any(File, StringIO, IO)).void }
         def dump_verbose_config(out = $stdout)
           kernel = Utils.safe_popen_read("uname", "-mors").chomp
           super

Library/Homebrew/extend/os/mac/system_config.rb

@@ -1,4 +1,4 @@
-# typed: true # rubocop:disable Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 require "system_command"
@@ -11,6 +11,12 @@ module ClassMethods
 
         requires_ancestor { T.class_of(::SystemConfig) }
 
+        sig { void }
+        def initialize
+          @xcode = T.let(nil, T.nilable(String))
+          @clt = T.let(nil, T.nilable(Version))
+        end
+
         sig { returns(String) }
         def describe_clang
           return "N/A" if ::SystemConfig.clang.null?
@@ -19,6 +25,7 @@ def describe_clang
           "#{::SystemConfig.clang} build #{clang_build_info}"
         end
 
+        sig { returns(T.nilable(String)) }
         def xcode
           @xcode ||= if MacOS::Xcode.installed?
             xcode = MacOS::Xcode.version.to_s
@@ -27,15 +34,18 @@ def xcode
           end
         end
 
+        sig { returns(T.nilable(Version)) }
         def clt
           @clt ||= MacOS::CLT.version if MacOS::CLT.installed?
         end
 
+        sig { params(out: T.any(File, StringIO, IO)).void }
         def core_tap_config(out = $stdout)
           dump_tap_config(CoreTap.instance, out)
           dump_tap_config(CoreCaskTap.instance, out)
         end
 
+        sig { params(out: T.any(File, StringIO, IO)).void }
         def dump_verbose_config(out = $stdout)
           super
           out.puts "macOS: #{MacOS.full_version}-#{kernel}"

Library/Homebrew/system_config.rb

@@ -1,4 +1,4 @@
-# typed: true # rubocop:todo Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 require "hardware"
@@ -13,6 +13,13 @@ module SystemConfig
   class << self
     include SystemCommand::Mixin
 
+    sig { void }
+    def initialize
+      @clang = T.let(nil, T.nilable(Version))
+      @clang_build = T.let(nil, T.nilable(Version))
+    end
+
+    sig { returns(Version) }
     def clang
       @clang ||= if DevelopmentTools.installed?
         DevelopmentTools.clang_version
@@ -21,6 +28,7 @@ def clang
       end
     end
 
+    sig { returns(Version) }
     def clang_build
       @clang_build ||= if DevelopmentTools.installed?
         DevelopmentTools.clang_build_version
@@ -65,12 +73,13 @@ def describe_clang
       end
     end
 
+    sig { params(path: T.nilable(Pathname)).returns(String) }
     def describe_path(path)
       return "N/A" if path.nil?
 
       realpath = path.realpath
       if realpath == path
-        path
+        path.to_s
       else
         "#{path} => #{realpath}"
       end
@@ -112,6 +121,7 @@ def describe_curl
       end
     end
 
+    sig { params(tap: Tap, out: T.any(File, StringIO, IO)).void }
     def dump_tap_config(tap, out = $stdout)
       case tap
       when CoreTap
@@ -140,10 +150,12 @@ def dump_tap_config(tap, out = $stdout)
       end
     end
 
+    sig { params(out: T.any(File, StringIO, IO)).void }
     def core_tap_config(out = $stdout)
       dump_tap_config(CoreTap.instance, out)
     end
 
+    sig { params(out: T.any(File, StringIO, IO)).void }
     def homebrew_config(out = $stdout)
       out.puts "HOMEBREW_VERSION: #{HOMEBREW_VERSION}"
       out.puts "ORIGIN: #{origin}"
@@ -152,6 +164,7 @@ def homebrew_config(out = $stdout)
       out.puts "Branch: #{branch}"
     end
 
+    sig { params(out: T.any(File, StringIO, IO)).void }
     def homebrew_env_config(out = $stdout)
       out.puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}"
       {
@@ -183,12 +196,14 @@ def homebrew_env_config(out = $stdout)
       out.puts "Homebrew Ruby: #{describe_homebrew_ruby}"
     end
 
+    sig { params(out: T.any(File, StringIO, IO)).void }
     def host_software_config(out = $stdout)
       out.puts "Clang: #{describe_clang}"
       out.puts "Git: #{describe_git}"
       out.puts "Curl: #{describe_curl}"
     end
 
+    sig { params(out: T.any(File, StringIO, IO)).void }
     def dump_verbose_config(out = $stdout)
       homebrew_config(out)
       core_tap_config(out)