bundle/brew_services: typed strict

Author: branchv

Library/Homebrew/bundle/brew_services.rb

@@ -1,4 +1,4 @@
-# typed: true # rubocop:todo Sorbet/StrictSigil
+# typed: strict
 # frozen_string_literal: true
 
 require "services/system"
@@ -12,10 +12,12 @@ class Services < Homebrew::Bundle::Brew
         extend Utils::Output::Mixin
 
         class << self
+          sig { override.void }
           def reset!
-            @started_services = nil
+            @started_services = T.let(nil, T.nilable(T::Array[String]))
           end
 
+          sig { params(name: String, keep: T::Boolean, verbose: T::Boolean).returns(T.nilable(T::Boolean)) }
           def stop(name, keep: false, verbose: false)
             return true unless started?(name)
 
@@ -27,6 +29,7 @@ def stop(name, keep: false, verbose: false)
             true
           end
 
+          sig { params(name: String, file: T.nilable(Pathname), verbose: T::Boolean).returns(T.nilable(T::Boolean)) }
           def start(name, file: nil, verbose: false)
             args = ["services", "start", name]
             args << "--file=#{file}" if file
@@ -36,6 +39,7 @@ def start(name, file: nil, verbose: false)
             true
           end
 
+          sig { params(name: String, file: T.nilable(Pathname), verbose: T::Boolean).returns(T.nilable(T::Boolean)) }
           def run(name, file: nil, verbose: false)
             args = ["services", "run", name]
             args << "--file=#{file}" if file
@@ -45,6 +49,7 @@ def run(name, file: nil, verbose: false)
             true
           end
 
+          sig { params(name: String, file: T.nilable(Pathname), verbose: T::Boolean).returns(T.nilable(T::Boolean)) }
           def restart(name, file: nil, verbose: false)
             args = ["services", "restart", name]
             args << "--file=#{file}" if file
@@ -54,10 +59,12 @@ def restart(name, file: nil, verbose: false)
             true
           end
 
+          sig { params(name: String).returns(T::Boolean) }
           def started?(name)
             started_services.include? name
           end
 
+          sig { returns(T::Array[String]) }
           def started_services
             @started_services ||= begin
               if !Homebrew::Services::System.launchctl? && !Homebrew::Services::System.systemctl?
@@ -73,6 +80,7 @@ def started_services
             end
           end
 
+          sig { params(name: String).returns(T.nilable(Pathname)) }
           def versioned_service_file(name)
             env_version = Bundle.formula_versions_from_env(name)
             return if env_version.nil?
@@ -91,14 +99,17 @@ def versioned_service_file(name)
           end
         end
 
+        sig { override.params(name: Object, no_upgrade: T::Boolean).returns(String) }
         def failure_reason(name, no_upgrade:)
           _ = no_upgrade
 
           "Service #{name} needs to be started."
         end
 
+        sig { override.params(formula: Object, no_upgrade: T::Boolean).returns(T::Boolean) }
         def installed_and_up_to_date?(formula, no_upgrade: false)
           _ = no_upgrade
+          formula = T.cast(formula, Homebrew::Bundle::Dsl::Entry)
 
           return true unless formula_needs_to_start?(entry_to_formula(formula))
           return true if self.class.started?(formula.name)
@@ -109,21 +120,26 @@ def installed_and_up_to_date?(formula, no_upgrade: false)
           false
         end
 
+        sig { params(entry: Homebrew::Bundle::Dsl::Entry).returns(Homebrew::Bundle::Brew) }
         def entry_to_formula(entry)
           Homebrew::Bundle::Brew.new(entry.name, entry.options)
         end
 
+        sig { params(formula: Homebrew::Bundle::Brew).returns(T::Boolean) }
         def formula_needs_to_start?(formula)
           formula.start_service? || formula.restart_service?
         end
 
+        sig { params(service_name: String).returns(T.nilable(String)) }
         def lookup_old_name(service_name)
+          @old_names ||= T.let(nil, T.nilable(T::Hash[String, String]))
           @old_names ||= Homebrew::Bundle::Brew.formula_oldnames
           old_name = @old_names[service_name]
           old_name ||= @old_names[service_name.split("/").last]
           old_name
         end
 
+        sig { override.params(entries: T::Array[Object]).returns(T::Array[Object]) }
         def format_checkable(entries)
           checkable_entries(entries)
         end

Library/Homebrew/bundle/commands/exec.rb

@@ -312,10 +312,11 @@ def self.run(
             end
 
             conflicting_services.each do |conflict|
-              if Bundle::Brew::Services.stop(conflict["name"], keep: true)
-                services_to_restart << conflict["name"] if conflict["registered"]
+              name = T.cast(conflict["name"], String)
+              if Bundle::Brew::Services.stop(name, keep: true)
+                services_to_restart << name if conflict["registered"]
               else
-                opoo "Failed to stop #{conflict["name"]} service"
+                opoo "Failed to stop #{name} service"
               end
             end