Merge pull request #17707 from Homebrew/optimise_requires

Library/Homebrew/PATH.rb

@@ -1,6 +1,8 @@
 # typed: true
 # frozen_string_literal: true
 
+require "forwardable"
+
 # Representation of a `*PATH` environment variable.
 class PATH
   include Enumerable

Library/Homebrew/abstract_command.rb

@@ -24,7 +24,13 @@ class << self
       attr_reader :args_class
 
       sig { returns(String) }
-      def command_name = Utils.underscore(T.must(name).split("::").fetch(-1)).tr("_", "-").delete_suffix("-cmd")
+      def command_name
+        require "utils"
+
+        Utils.underscore(T.must(name).split("::").fetch(-1))
+             .tr("_", "-")
+             .delete_suffix("-cmd")
+      end
 
       # @return the AbstractCommand subclass associated with the brew CLI command name.
       sig { params(name: String).returns(T.nilable(T.class_of(AbstractCommand))) }

Library/Homebrew/api.rb

@@ -8,7 +8,6 @@
 Warnings.ignore :default_gems do
   require "base64" # TODO: Add this to the Gemfile or remove it before moving to Ruby 3.4.
 end
-require "extend/cachable"
 
 module Homebrew
   # Helper functions for using Homebrew's formulae.brew.sh API.

Library/Homebrew/brew.rb

@@ -39,6 +39,7 @@
       help_flag = true
       help_cmd_index = i
     elsif !cmd && help_flag_list.exclude?(arg)
+      require "commands"
       cmd = ARGV.delete_at(i)
       cmd = Commands::HOMEBREW_INTERNAL_COMMAND_ALIASES.fetch(cmd, cmd)
     end
@@ -59,13 +60,13 @@
 
   ENV["PATH"] = path.to_s
 
-  require "abstract_command"
   require "commands"
-  require "settings"
 
   internal_cmd = Commands.valid_internal_cmd?(cmd) || Commands.valid_internal_dev_cmd?(cmd) if cmd
 
   unless internal_cmd
+    require "tap"
+
     # Add contributed commands to PATH before checking.
     homebrew_path.append(Tap.cmd_directories)
 
@@ -88,6 +89,8 @@
     cmd_class = Homebrew::AbstractCommand.command(cmd)
     if cmd_class
       command_instance = cmd_class.new
+
+      require "utils/analytics"
       Utils::Analytics.report_command_run(command_instance)
       command_instance.run
     else
@@ -102,6 +105,8 @@
     end
     exec "brew-#{cmd}", *ARGV
   else
+    require "tap"
+
     possible_tap = OFFICIAL_CMD_TAPS.find { |_, cmds| cmds.include?(cmd) }
     possible_tap = Tap.fetch(possible_tap.first) if possible_tap
 
@@ -142,6 +147,7 @@
   Homebrew::Help.help cmd, remaining_args: args&.remaining, usage_error: e.message
 rescue SystemExit => e
   onoe "Kernel.exit" if args&.debug? && !e.success?
+  require "utils/backtrace"
   $stderr.puts Utils::Backtrace.clean(e) if args&.debug? || ARGV.include?("--debug")
   raise
 rescue Interrupt
@@ -179,13 +185,15 @@
   raise if e.message.empty?
 
   onoe e
+  require "utils/backtrace"
   $stderr.puts Utils::Backtrace.clean(e) if args&.debug? || ARGV.include?("--debug")
 
   exit 1
 rescue Exception => e # rubocop:disable Lint/RescueException
   onoe e
 
   method_deprecated_error = e.is_a?(MethodDeprecatedError)
+  require "utils/backtrace"
   $stderr.puts Utils::Backtrace.clean(e) if args&.debug? || ARGV.include?("--debug") || !method_deprecated_error
 
   if OS.unsupported_configuration?

Library/Homebrew/build.rb

@@ -15,6 +15,7 @@
 require "fcntl"
 require "socket"
 require "cmd/install"
+require "json/add/exception"
 
 # A formula build.
 class Build

Library/Homebrew/cask/audit.rb

@@ -8,6 +8,7 @@
 require "livecheck/livecheck"
 require "source_location"
 require "system_command"
+require "utils/backtrace"
 require "utils/curl"
 require "utils/git"
 require "utils/shared_audits"

Library/Homebrew/cask/info.rb

@@ -27,6 +27,8 @@ def self.get_info(cask)
 
     def self.info(cask)
       puts get_info(cask)
+
+      require "utils/analytics"
       ::Utils::Analytics.cask_output(cask, args: Homebrew::CLI::Args.new)
     end
 

Library/Homebrew/cli/named_args.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "delegate"
-require "api"
 require "cli/args"
 
 module Homebrew
@@ -29,12 +28,6 @@ def initialize(
         cask_options: false,
         without_api: false
       )
-        require "cask/cask"
-        require "cask/cask_loader"
-        require "formulary"
-        require "keg"
-        require "missing_formula"
-
         @args = args
         @override_spec = override_spec
         @force_bottle = force_bottle

Library/Homebrew/cli/parser.rb

@@ -5,8 +5,10 @@
 require "env_config"
 require "cask/config"
 require "cli/args"
+require "commands"
 require "optparse"
 require "utils/tty"
+require "utils/formatter"
 
 module Homebrew
   module CLI

Library/Homebrew/cmd/tap-info.rb

@@ -23,6 +23,8 @@ class TapInfo < AbstractCommand
 
       sig { override.void }
       def run
+        require "tap"
+
         taps = if args.installed?
           Tap
         else

Library/Homebrew/commands.rb

@@ -1,8 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "completions"
-
 # Helper functions for commands.
 module Commands
   HOMEBREW_CMD_PATH = (HOMEBREW_LIBRARY_PATH/"cmd").freeze
@@ -72,16 +70,22 @@ def self.internal_dev_cmd_path(cmd)
 
   # Ruby commands which can be `require`d without being run.
   def self.external_ruby_v2_cmd_path(cmd)
+    require "tap"
+
     path = which("#{cmd}.rb", Tap.cmd_directories)
     path if require?(path)
   end
 
   # Ruby commands which are run by being `require`d.
   def self.external_ruby_cmd_path(cmd)
+    require "tap"
+
     which("brew-#{cmd}.rb", PATH.new(ENV.fetch("PATH")).append(Tap.cmd_directories))
   end
 
   def self.external_cmd_path(cmd)
+    require "tap"
+
     which("brew-#{cmd}", PATH.new(ENV.fetch("PATH")).append(Tap.cmd_directories))
   end
 
@@ -112,6 +116,8 @@ def self.internal_developer_commands_paths
   end
 
   def self.official_external_commands_paths(quiet:)
+    require "tap"
+
     OFFICIAL_CMD_TAPS.flat_map do |tap_name, cmds|
       tap = Tap.fetch(tap_name)
       tap.install(quiet:) unless tap.installed?
@@ -137,6 +143,8 @@ def self.find_internal_commands(path)
   end
 
   def self.external_commands
+    require "tap"
+
     Tap.cmd_directories.flat_map do |path|
       find_commands(path).select(&:executable?)
                          .map { basename_without_extension(_1) }
@@ -156,6 +164,8 @@ def self.find_commands(path)
   end
 
   def self.rebuild_internal_commands_completion_list
+    require "completions"
+
     cmds = internal_commands + internal_developer_commands + internal_commands_aliases
     cmds.reject! { |cmd| Homebrew::Completions::COMPLETIONS_EXCLUSION_LIST.include? cmd }
 
@@ -164,6 +174,8 @@ def self.rebuild_internal_commands_completion_list
   end
 
   def self.rebuild_commands_completion_list
+    require "completions"
+
     # Ensure that the cache exists so we can build the commands list
     HOMEBREW_CACHE.mkpath
 

Library/Homebrew/dependency_collector.rb

@@ -87,6 +87,7 @@ def gcc_dep_if_needed(related_formula_names); end
   def glibc_dep_if_needed(related_formula_names); end
 
   def git_dep_if_needed(tags)
+    require "utils/git"
     return if Utils::Git.available?
 
     Dependency.new("git", [*tags, :implicit])
@@ -97,6 +98,7 @@ def curl_dep_if_needed(tags)
   end
 
   def subversion_dep_if_needed(tags)
+    require "utils/svn"
     return if Utils::Svn.available?
 
     Dependency.new("subversion", [*tags, :implicit])

Library/Homebrew/dev-cmd/test.rb

@@ -35,6 +35,7 @@ def run
 
         require "formula_assertions"
         require "formula_free_port"
+        require "utils/fork"
 
         args.named.to_resolved_formulae.each do |f|
           # Cannot test uninstalled formulae
@@ -100,6 +101,8 @@ def run
             end
           rescue Exception => e # rubocop:disable Lint/RescueException
             retry if retry_test?(f)
+
+            require "utils/backtrace"
             ofail "#{f.full_name}: failed"
             $stderr.puts e, Utils::Backtrace.clean(e)
           ensure

Library/Homebrew/download_strategy.rb

@@ -737,6 +737,8 @@ def fetch(timeout: nil)
   # @api public
   sig { returns(Time) }
   def source_modified_time
+    require "utils/svn"
+
     time = if Version.new(T.must(Utils::Svn.version)) >= Version.new("1.9")
       out, = silent_command("svn", args: ["info", "--show-item", "last-changed-date"], chdir: cached_location)
       out
@@ -789,6 +791,7 @@ def fetch_repo(target, url, revision = nil, ignore_externals: false, timeout: ni
 
     args << "--ignore-externals" if ignore_externals
 
+    require "utils/svn"
     args.concat Utils::Svn.invalid_cert_flags if meta[:trust_cert] == true
 
     if target.directory?
@@ -921,6 +924,7 @@ def submodules?
   def partial_clone_sparse_checkout?
     return false if @only_path.blank?
 
+    require "utils/git"
     Utils::Git.supports_partial_clone_sparse_checkout?
   end
 

Library/Homebrew/exceptions.rb

@@ -1,9 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "shellwords"
-require "utils"
-
 # Raised when a command is used wrong.
 #
 # @api internal
@@ -554,6 +551,8 @@ def dump(verbose: false)
 # installed in a situation where a bottle is required.
 class UnbottledError < RuntimeError
   def initialize(formulae)
+    require "utils"
+
     msg = +<<~EOS
       The following #{Utils.pluralize("formula", formulae.count, plural: "e")} cannot be installed from #{Utils.pluralize("bottle", formulae.count)} and must be
       built from source.

Library/Homebrew/extend/kernel.rb

@@ -3,6 +3,7 @@
 
 # Contains shorthand Homebrew utility methods like `ohai`, `opoo`, `odisabled`.
 # TODO: move these out of `Kernel`.
+
 module Kernel
   def require?(path)
     return false if path.nil?
@@ -74,6 +75,9 @@ def opoo(message)
   # @api public
   sig { params(message: T.any(String, Exception)).void }
   def onoe(message)
+    require "utils/formatter"
+    require "utils/github/actions"
+
     Tty.with($stderr) do |stderr|
       stderr.puts Formatter.error(message, label: "Error")
       GitHub::Actions.puts_annotation_if_env_set(:error, message.to_s)
@@ -150,6 +154,8 @@ def odeprecated(method, replacement = nil,
     backtrace.each do |line|
       next unless (match = line.match(HOMEBREW_TAP_PATH_REGEX))
 
+      require "tap"
+
       tap = Tap.fetch(match[:user], match[:repo])
       tap_message = +"\nPlease report this issue to the #{tap.full_name} tap"
       tap_message += " (not Homebrew/brew or Homebrew/homebrew-core)" unless tap.official?

Library/Homebrew/extend/pathname.rb

@@ -1,12 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "context"
-require "resource"
-require "metafiles"
-require "extend/file/atomic"
-require "system_command"
-
 module DiskUsageExtension
   sig { returns(Integer) }
   def disk_usage
@@ -75,6 +69,8 @@ def compute_disk_usage
   end
 end
 
+require "system_command"
+
 # Homebrew extends Ruby's `Pathname` to make our code more readable.
 # @see https://ruby-doc.org/stdlib-2.6.3/libdoc/pathname/rdoc/Pathname.html Ruby's Pathname API
 class Pathname
@@ -186,6 +182,8 @@ def append_lines(content, **open_args)
   # @api public
   sig { params(content: String).void }
   def atomic_write(content)
+    require "extend/file/atomic"
+
     old_stat = stat if exist?
     File.atomic_write(self) do |file|
       file.write(content)
@@ -433,6 +431,8 @@ def write_jar_script(target_jar, script_name, java_opts = "", java_version: nil)
   end
 
   def install_metafiles(from = Pathname.pwd)
+    require "metafiles"
+
     Pathname(from).children.each do |p|
       next if p.directory?
       next if File.empty?(p)
@@ -514,9 +514,10 @@ def rmtree(noop: nil, verbose: nil, secure: nil)
     nil
   end
 end
-
 require "extend/os/pathname"
 
+require "context"
+
 module ObserverPathnameExtension
   class << self
     include Context

Library/Homebrew/formula.rb

@@ -8,6 +8,7 @@
 require "lock_file"
 require "formula_pin"
 require "hardware"
+require "utils"
 require "utils/bottles"
 require "utils/shebang"
 require "utils/shell"