.editorconfig

@@ -16,6 +16,11 @@ trim_trailing_whitespace = true
 # trailing whitespace is crucial for patches
 trim_trailing_whitespace = false
 
+[**.drawio.svg]
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+
 [**.md]
 trim_trailing_whitespace = true
 x-soft-wrap-text = true

.github/workflows/tests.yml

@@ -45,11 +45,10 @@ jobs:
     - name: Set up Homebrew official command taps
       run: |
         # Setup taps needed for 'brew tests' and 'brew man'
-        brew tap homebrew/bundle
         cd "$(brew --repo)"
 
         if [ "$RUNNER_OS" = "macOS" ]; then
-          brew update-reset Library/Taps/homebrew/homebrew-cask Library/Taps/homebrew/homebrew-services
+          brew update-reset Library/Taps/homebrew/homebrew-bundle Library/Taps/homebrew/homebrew-cask Library/Taps/homebrew/homebrew-services
         else
           brew update-reset Library/Taps/homebrew/homebrew-services
         fi
@@ -60,6 +59,14 @@ jobs:
     - name: Run brew man
       run: brew man --fail-if-changed
 
+    - name: Install brew tests dependencies
+      if: matrix.os == 'macOS-latest'
+      run: |
+        brew install subversion
+        Library/Homebrew/shims/scm/svn --homebrew=print-path
+        which svn
+        which svnadmin
+
     - name: Run brew tests
       run: |
         # brew tests doesn't like world writable directories

Library/Homebrew/.simplecov

@@ -45,8 +45,9 @@ SimpleCov.start do
   else
     command_name "#{command_name} (#{$PROCESS_ID})"
 
+    excludes = ["test", "vendor"]
     subdirs = Dir.chdir(SimpleCov.root) { Dir.glob("*") }
-                 .reject { |d| d.end_with?(".rb") || ["test", "vendor"].include?(d) }
+                 .reject { |d| d.end_with?(".rb") || excludes.include?(d) }
                  .map { |d| "#{d}/**/*.rb" }.join(",")
 
     # Not using this during integration tests makes the tests 4x times faster

Library/Homebrew/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -109,8 +109,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.3.0)
       parser (>= 2.7.1.4)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
+    rubocop-performance (1.8.0)
+      rubocop (>= 0.87.0)
     rubocop-rspec (1.43.2)
       rubocop (~> 0.87)
     ruby-macho (2.2.0)
@@ -119,16 +119,16 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
-    sorbet (0.5.5891)
-      sorbet-static (= 0.5.5891)
-    sorbet-runtime (0.5.5891)
-    sorbet-static (0.5.5891-universal-darwin-14)
+    sorbet (0.5.5909)
+      sorbet-static (= 0.5.5909)
+    sorbet-runtime (0.5.5909)
+    sorbet-static (0.5.5909-universal-darwin-14)
     spoom (1.0.4)
       colorize
       sorbet (~> 0.5.5)
       sorbet-runtime
       thor (>= 0.19.2)
-    tapioca (0.4.4)
+    tapioca (0.4.5)
       parlour (>= 2.1.0)
       pry (>= 0.12.2)
       sorbet-runtime

Library/Homebrew/bintray.rb

@@ -37,8 +37,8 @@ def open_api(url, *extra_curl_args, auth: true)
     end
 
     curl(*args, url,
-         show_output: verbose?,
-         secrets:     key)
+         print_stdout: false,
+         secrets:      key)
   end
 
   def upload(local_file, repo:, package:, version:, remote_file:, sha256: nil)

Library/Homebrew/brew.rb

@@ -139,10 +139,12 @@ class MissingEnvironmentVariables < RuntimeError; end
         brew_uid = HOMEBREW_BREW_FILE.stat.uid
         tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero?
       end
-      tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap.name}]
+      quiet_arg = args.quiet? ? "--quiet" : nil
+      tap_commands += [HOMEBREW_BREW_FILE, "tap", *quiet_arg, possible_tap.name]
       safe_system(*tap_commands)
     end
 
+    ARGV << "--help" if help_flag
     exec HOMEBREW_BREW_FILE, cmd, *ARGV
   end
 rescue UsageError => e

Library/Homebrew/brew.sh

@@ -106,14 +106,6 @@ numeric() {
   printf "%01d%02d%02d%03d" ${1//[.rc]/ } 2>/dev/null
 }
 
-HOMEBREW_VERSION="$(git -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbrev=7 2>/dev/null)"
-HOMEBREW_USER_AGENT_VERSION="$HOMEBREW_VERSION"
-if [[ -z "$HOMEBREW_VERSION" ]]
-then
-  HOMEBREW_VERSION=">=2.2.0 (shallow or no git repository)"
-  HOMEBREW_USER_AGENT_VERSION="2.X.Y"
-fi
-
 if [[ "$HOMEBREW_PREFIX" = "/" || "$HOMEBREW_PREFIX" = "/usr" ]]
 then
   # it may work, but I only see pain this route and don't want to support it
@@ -144,6 +136,14 @@ else
   HOMEBREW_GIT="git"
 fi
 
+HOMEBREW_VERSION="$("$HOMEBREW_GIT" -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbrev=7 2>/dev/null)"
+HOMEBREW_USER_AGENT_VERSION="$HOMEBREW_VERSION"
+if [[ -z "$HOMEBREW_VERSION" ]]
+then
+  HOMEBREW_VERSION=">=2.5.0 (shallow or no git repository)"
+  HOMEBREW_USER_AGENT_VERSION="2.X.Y"
+fi
+
 if [[ -n "$HOMEBREW_MACOS" ]]
 then
   HOMEBREW_PRODUCT="Homebrew"

Library/Homebrew/cache_store.rb

@@ -13,14 +13,33 @@ class CacheStoreDatabase
   # @param  [Symbol] type
   # @yield  [CacheStoreDatabase] self
   def self.use(type)
-    database = CacheStoreDatabase.new(type)
-    return_value = yield(database)
-    database.close_if_open!
+    @db_type_reference_hash ||= {}
+    @db_type_reference_hash[type] ||= {}
+    type_ref = @db_type_reference_hash[type]
+
+    type_ref[:count] ||= 0
+    type_ref[:count]  += 1
+
+    type_ref[:db] ||= CacheStoreDatabase.new(type)
+
+    return_value = yield(type_ref[:db])
+    if type_ref[:count].positive?
+      type_ref[:count] -= 1
+    else
+      type_ref[:count] = 0
+    end
+
+    if type_ref[:count].zero?
+      type_ref[:db].write_if_dirty!
+      type_ref.delete(:db)
+    end
+
     return_value
   end
 
   # Sets a value in the underlying database (and creates it if necessary).
   def set(key, value)
+    dirty!
     db[key] = value
   end
 
@@ -35,12 +54,13 @@ def get(key)
   def delete(key)
     return unless created?
 
+    dirty!
     db.delete(key)
   end
 
   # Closes the underlying database (if it is created and open).
-  def close_if_open!
-    return unless @db
+  def write_if_dirty!
+    return unless dirty?
 
     cache_path.dirname.mkpath
     cache_path.atomic_write(JSON.dump(@db))
@@ -76,6 +96,13 @@ def empty?
     db.empty?
   end
 
+  # Performs a `each_key` on the underlying database.
+  #
+  # @return [Array]
+  def each_key(&block)
+    db.each_key(&block)
+  end
+
   private
 
   # Lazily loaded database in read/write mode. If this method is called, a
@@ -98,6 +125,7 @@ def db
   # @return [nil]
   def initialize(type)
     @type = type
+    @dirty = false
   end
 
   # The path where the database resides in the `HOMEBREW_CACHE` for the given
@@ -107,6 +135,18 @@ def initialize(type)
   def cache_path
     HOMEBREW_CACHE/"#{@type}.json"
   end
+
+  # Sets that the cache needs written to disk.
+  def dirty!
+    @dirty = true
+  end
+
+  # Returns `true` if the cache needs written to disk.
+  #
+  # @return [Boolean]
+  def dirty?
+    @dirty
+  end
 end
 
 #

Library/Homebrew/cask/artifact/abstract_uninstall.rb

@@ -85,9 +85,10 @@ def uninstall_early_script(directives, **options)
 
       # :launchctl must come before :quit/:signal for cases where app would instantly re-launch
       def uninstall_launchctl(*services, command: nil, **_)
+        booleans = [false, true]
         services.each do |service|
           ohai "Removing launchctl service #{service}"
-          [false, true].each do |with_sudo|
+          booleans.each do |with_sudo|
             plist_status = command.run(
               "/bin/launchctl",
               args: ["list", service],

Library/Homebrew/cask/audit.rb

@@ -204,7 +204,8 @@ def check_required_stanzas
       end
       add_error "at least one name stanza is required" if cask.name.empty?
       # TODO: specific DSL knowledge should not be spread around in various files like this
-      installable_artifacts = cask.artifacts.reject { |k| [:uninstall, :zap].include?(k) }
+      rejected_artifacts = [:uninstall, :zap]
+      installable_artifacts = cask.artifacts.reject { |k| rejected_artifacts.include?(k) }
       add_error "at least one activatable artifact stanza is required" if installable_artifacts.empty?
     end
 
@@ -468,8 +469,9 @@ def check_github_prerelease_version
       user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if @online
       return if user.nil?
 
-      # TODO: Detect tag from URL instead of using `cask.version`.
-      error = SharedAudits.github_release(user, repo, cask.version, cask: cask)
+      tag = SharedAudits.github_tag_from_url(cask.url)
+      tag ||= cask.version
+      error = SharedAudits.github_release(user, repo, tag, cask: cask)
       add_error error if error
     end
 
@@ -481,7 +483,9 @@ def check_gitlab_prerelease_version
 
       odebug "Auditing GitLab prerelease"
 
-      error = SharedAudits.gitlab_release(user, repo, cask.version)
+      tag = SharedAudits.gitlab_tag_from_url(cask.url)
+      tag ||= cask.version
+      error = SharedAudits.gitlab_release(user, repo, tag)
       add_error error if error
     end
 

Library/Homebrew/cask/cmd/audit.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "utils/github/actions"
+
 module Cask
   class Cmd
     # Implementation of the `brew cask audit` command.
@@ -57,7 +59,19 @@ def run
           odebug "Auditing Cask #{cask}"
           result = Auditor.audit(cask, **options)
 
-          result[:warnings].empty? && result[:errors].empty?
+          next true if result[:warnings].empty? && result[:errors].empty?
+
+          if ENV["GITHUB_ACTIONS"]
+            cask_path = cask.sourcefile_path
+            annotations = (result[:warnings].map { |w| [:warning, w] } + result[:errors].map { |e| [:error, e] })
+                          .map { |type, message| GitHub::Actions::Annotation.new(type, message, file: cask_path) }
+
+            annotations.each do |annotation|
+              puts annotation if annotation.relevant?
+            end
+          end
+
+          false
         end
 
         return if failed_casks.empty?

Library/Homebrew/cleanup.rb

@@ -180,15 +180,15 @@ def periodic_clean!
     def clean!(quiet: false, periodic: false)
       if args.empty?
         Formula.installed.sort_by(&:name).each do |formula|
-          cleanup_formula(formula, quiet: quiet, ds_store: false)
+          cleanup_formula(formula, quiet: quiet, ds_store: false, cache_db: false)
         end
         cleanup_cache
         cleanup_logs
         cleanup_lockfiles
         prune_prefix_symlinks_and_directories
 
         unless dry_run?
-          cleanup_old_cache_db
+          cleanup_cache_db
           rm_ds_store
           HOMEBREW_CACHE.mkpath
           FileUtils.touch PERIODIC_CLEAN_FILE
@@ -225,11 +225,12 @@ def unremovable_kegs
       @unremovable_kegs ||= []
     end
 
-    def cleanup_formula(formula, quiet: false, ds_store: true)
+    def cleanup_formula(formula, quiet: false, ds_store: true, cache_db: true)
       formula.eligible_kegs_for_cleanup(quiet: quiet)
              .each(&method(:cleanup_keg))
       cleanup_cache(Pathname.glob(cache/"#{formula.name}--*"))
       rm_ds_store([formula.rack]) if ds_store
+      cleanup_cache_db(formula.rack) if cache_db
       cleanup_lockfiles(FormulaLock.new(formula.name).path)
     end
 
@@ -387,12 +388,23 @@ def cleanup_portable_ruby
       FileUtils.rm_rf portable_rubies_to_remove
     end
 
-    def cleanup_old_cache_db
+    def cleanup_cache_db(rack = nil)
       FileUtils.rm_rf [
         cache/"desc_cache.json",
         cache/"linkage.db",
         cache/"linkage.db.db",
       ]
+
+      CacheStoreDatabase.use(:linkage) do |db|
+        break unless db.created?
+
+        db.each_key do |keg|
+          next if rack.present? && !keg.start_with?("#{rack}/")
+          next if File.directory?(keg)
+
+          LinkageCacheStore.new(keg, db).delete!
+        end
+      end
     end
 
     def rm_ds_store(dirs = nil)