Merge pull request #1559 from Homebrew/sorbet-true

Bump some files to Sorbet `typed: true`

Gemfile

@@ -9,4 +9,5 @@ group :test do
   gem "rspec"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
+  gem "sorbet-runtime"
 end

Gemfile.lock

@@ -50,6 +50,7 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
+    sorbet-runtime (0.5.11758)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uri (1.0.2)
@@ -62,6 +63,7 @@ DEPENDENCIES
   rspec
   simplecov
   simplecov-cobertura
+  sorbet-runtime
 
 RUBY VERSION
    ruby 3.3.7p123

lib/bundle.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))

lib/bundle/brew_checker.rb

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

lib/bundle/brew_dumper.rb

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

lib/bundle/brew_installer.rb

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

lib/bundle/brew_service_checker.rb

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

lib/bundle/brew_services.rb

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

lib/bundle/brewfile.rb

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

lib/bundle/brewfile.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module Brewfile
+    include Kernel
+  end
+end

lib/bundle/bundle.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "English"
@@ -8,7 +9,7 @@ def system(cmd, *args, verbose: false)
       return super cmd, *args if verbose
 
       logs = []
-      success = nil
+      success = T.let(nil, T.nilable(T::Boolean))
       IO.popen([cmd, *args], err: [:child, :out]) do |pipe|
         while (buf = pipe.gets)
           logs << buf
@@ -66,7 +67,8 @@ def exchange_uid_if_needed!(&block)
         Process::Sys.seteuid(uid)
       end
 
-      return_value = with_env("HOME" => Etc.getpwuid(Process.uid).dir, &block)
+      home = T.must(Etc.getpwuid(Process.uid)).dir
+      return_value = with_env("HOME" => home, &block)
 
       if process_reexchangeable
         Process::UID.re_exchange

lib/bundle/cask_checker.rb

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

lib/bundle/cask_dumper.rb

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

lib/bundle/cask_dumper.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module CaskDumper
+    include Kernel
+  end
+end

lib/bundle/cask_installer.rb

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

lib/bundle/cask_installer.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module CaskInstaller
+    include Kernel
+  end
+end

lib/bundle/checker.rb

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

lib/bundle/commands/check.rb

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

lib/bundle/commands/cleanup.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "utils/formatter"
@@ -125,7 +126,7 @@ def kept_casks(global: false, file: nil)
 
       def recursive_dependencies(current_formulae, formulae_names, top_level: true)
         @checked_formulae_names = [] if top_level
-        dependencies = []
+        dependencies = T.let([], T::Array[Formula])
 
         formulae_names.each do |name|
           next if @checked_formulae_names.include?(name)

lib/bundle/commands/commands.rbi

@@ -0,0 +1,29 @@
+# typed: true
+
+module Bundle
+  module Commands
+    module Check
+      include Kernel
+    end
+
+    module Cleanup
+      include Kernel
+    end
+
+    module Dump
+      include Kernel
+    end
+
+    module Exec
+      include Kernel
+    end
+
+    module Install
+      include Kernel
+    end
+
+    module List
+      include Kernel
+    end
+  end
+end

lib/bundle/commands/dump.rb

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

lib/bundle/commands/exec.rb

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

lib/bundle/commands/install.rb

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

lib/bundle/commands/list.rb

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

lib/bundle/dsl.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Bundle
@@ -102,7 +103,7 @@ def self.sanitize_brew_name(name)
         Regexp.last_match(1)
       elsif name =~ HOMEBREW_TAP_FORMULA_REGEX
         user = Regexp.last_match(1)
-        repo = Regexp.last_match(2)
+        repo = T.must(Regexp.last_match(2))
         name = Regexp.last_match(3)
         "#{user}/#{repo.sub("homebrew-", "")}/#{name}"
       else

lib/bundle/dumper.rb

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

lib/bundle/dumper.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module Dumper
+    include Kernel
+  end
+end

lib/bundle/extend/os/bundle.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "bundle/extend/os/linux/bundle" if OS.linux?

lib/bundle/extend/os/linux/bundle.rb

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

lib/bundle/extend/os/linux/skipper.rb

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

lib/bundle/extend/os/skipper.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "bundle/extend/os/linux/skipper" if OS.linux?

lib/bundle/installer.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Bundle
@@ -37,6 +38,7 @@ def install(entries, global: false, file: nil, no_lock: false, no_upgrade: false
           Bundle::TapInstaller
         end
 
+        next if cls.nil?
         next if Bundle::Skipper.skip? entry
 
         preinstall = if cls.preinstall(*args, **options, no_upgrade:, verbose:)

lib/bundle/installer.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module Installer
+    include Kernel
+  end
+end

lib/bundle/lister.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Bundle
@@ -10,7 +11,7 @@ def list(entries, brews:, casks:, taps:, mas:, whalebrew:, vscode:)
       end
     end
 
-    def self.show?(type, brews:, casks:, taps:, mas:, whalebrew:, vscode:)
+    def show?(type, brews:, casks:, taps:, mas:, whalebrew:, vscode:)
       return true if brews && type == :brew
       return true if casks && type == :cask
       return true if taps && type == :tap

lib/bundle/lister.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module Lister
+    include Kernel
+  end
+end

lib/bundle/mac_app_store_checker.rb

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

lib/bundle/mac_app_store_dumper.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "json"
@@ -17,7 +18,10 @@ def apps
 
           # Only add the application details should we have a valid match.
           # Strip unprintable characters
-          [app_details[:id], app_details[:name].gsub(/[[:cntrl:]]|[\p{C}]/, "")] if app_details
+          if app_details
+            name = T.must(app_details[:name])
+            [app_details[:id], name.gsub(/[[:cntrl:]]|[\p{C}]/, "")]
+          end
         end
       else
         []

lib/bundle/mac_app_store_dumper.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module MacAppStoreDumper
+    include Kernel
+  end
+end

lib/bundle/mac_app_store_installer.rb

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

lib/bundle/mac_app_store_installer.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module MacAppStoreInstaller
+    include Kernel
+  end
+end

lib/bundle/skipper.rb

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

lib/bundle/tap_checker.rb

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

lib/bundle/tap_dumper.rb

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

lib/bundle/tap_dumper.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module TapDumper
+    include Kernel
+  end
+end

lib/bundle/tap_installer.rb

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

lib/bundle/tap_installer.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module TapInstaller
+    include Kernel
+  end
+end

lib/bundle/vscode_extension_checker.rb

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

lib/bundle/vscode_extension_dumper.rb

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

lib/bundle/vscode_extension_dumper.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module VscodeExtensionDumper
+    include Kernel
+  end
+end

lib/bundle/vscode_extension_installer.rb

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

lib/bundle/vscode_extension_installer.rbi

@@ -0,0 +1,7 @@
+# typed: true
+
+module Bundle
+  module VscodeExtensionInstaller
+    include Kernel
+  end
+end

lib/bundle/whalebrew_dumper.rb

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