From 5052f49f40bf6235fe458a21cf50ded08aca3958 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Mon, 27 Apr 2020 22:37:35 -0700
Subject: [PATCH 001/134] Build Docker images for Ubuntu 18.04 and 20.04

---
 .dockerignore                |  2 ++
 .github/workflows/docker.yml | 31 ++++++++++++++++++++++++++++++
 .github/workflows/tests.yml  |  4 ++--
 .gitignore                   |  1 +
 Dockerfile                   | 37 +++++++++++++++---------------------
 5 files changed, 51 insertions(+), 24 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 .github/workflows/docker.yml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..03929c08f5
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+Library/Homebrew/vendor/portable-ruby
+Library/Taps
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000000..2fc53dfb7e
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,31 @@
+name: Docker
+on:
+  pull_request:
+    paths:
+      - .github/workflows/docker.yml
+      - Dockerfile
+  release:
+    types:
+      - published
+jobs:
+  ubuntu:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: ["18.04", "20.04"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 0
+      - name: Build Docker image
+        run: docker build -t brew --build-arg=version=${{matrix.version}} .
+      - name: Run brew test-bot
+        run: docker run --rm brew brew test-bot
+      - name: Deploy the tagged Docker image to GitHub
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
+          v=${GITHUB_REF:10}
+          docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$v"
+          docker push "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$v"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d145771145..27c6346584 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -187,14 +187,14 @@ jobs:
           brew test-bot
         fi
 
-    - name: Deploy the latest Docker image
+    - name: Deploy the latest Docker image to GitHub
       if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
       run: |
         docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
         docker tag brew docker.pkg.github.com/homebrew/brew/brew
         docker push docker.pkg.github.com/homebrew/brew/brew
 
-    - name: Deploy the tagged Docker image
+    - name: Deploy the tagged Docker image to GitHub
       if: matrix.os == 'ubuntu-latest' && startsWith(github.ref, 'refs/tags/')
       run: |
         docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
diff --git a/.gitignore b/.gitignore
index 94bfb9b2c9..61ca266f05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,6 +151,7 @@
 /docs/vendor
 
 # Unignore our root-level metadata files.
+!/.dockerignore
 !/.editorconfig
 !/.gitignore
 !/.yardopts
diff --git a/Dockerfile b/Dockerfile
index 5fdf78e43c..27fb1b60c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,9 @@
-FROM ubuntu:xenial
-LABEL maintainer="Shaun Jackman <sjackman@gmail.com>"
+ARG version=16.04
+FROM ubuntu:$version
+ARG DEBIAN_FRONTEND=noninteractive
 
 # hadolint ignore=DL3008
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends software-properties-common \
-  && add-apt-repository -y ppa:git-core/ppa \
-  && apt-get update \
   && apt-get install -y --no-install-recommends \
     bzip2 \
     ca-certificates \
@@ -14,6 +12,7 @@ RUN apt-get update \
     fonts-dejavu-core \
     g++ \
     git \
+    less \
     libz-dev \
     locales \
     make \
@@ -23,29 +22,23 @@ RUN apt-get update \
     sudo \
     uuid-runtime \
     tzdata \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN localedef -i en_US -f UTF-8 en_US.UTF-8 \
+  && rm -rf /var/lib/apt/lists/* \
+  && localedef -i en_US -f UTF-8 en_US.UTF-8 \
   && useradd -m -s /bin/bash linuxbrew \
   && echo 'linuxbrew ALL=(ALL) NOPASSWD:ALL' >>/etc/sudoers
+
 COPY . /home/linuxbrew/.linuxbrew/Homebrew
-ARG FORCE_REBUILD
+ENV PATH=/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH
+WORKDIR /home/linuxbrew
 
 # hadolint ignore=DL3003
 RUN cd /home/linuxbrew/.linuxbrew \
   && mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar \
   && ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin/ \
-  && cd /home/linuxbrew/.linuxbrew/Homebrew \
-  && git remote set-url origin https://github.com/Homebrew/brew
-
-WORKDIR /home/linuxbrew
-ENV PATH=/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH \
-  SHELL=/bin/bash
-
-# Install portable-ruby, tap homebrew/core, install audit gems, and cleanup
-RUN HOMEBREW_NO_ANALYTICS=1 HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/core \
-  && chown -R linuxbrew: /home/linuxbrew/.linuxbrew \
-  && chmod -R g+w,o-w /home/linuxbrew/.linuxbrew \
-  && rm -rf ~/.cache \
+  && git -C /home/linuxbrew/.linuxbrew/Homebrew remote set-url origin https://github.com/Homebrew/brew \
+  && HOMEBREW_NO_ANALYTICS=1 HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/core \
   && brew install-bundler-gems \
-  && brew cleanup
+  && brew cleanup \
+  && rm -rf ~/.cache \
+  && chown -R linuxbrew: /home/linuxbrew/.linuxbrew \
+  && chmod -R g+w,o-w /home/linuxbrew/.linuxbrew

From c5267f1c755d861649e8f304872856bf848d9c5a Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 3 May 2020 13:59:08 +0100
Subject: [PATCH 002/134] formula_cellar_checks: check plist.

Check plists so https://github.com/Homebrew/homebrew-services/issues/219 does not occur.
---
 Library/Homebrew/formula_cellar_checks.rb | 36 +++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb
index 1dd08c9cb1..d81f6d70e7 100644
--- a/Library/Homebrew/formula_cellar_checks.rb
+++ b/Library/Homebrew/formula_cellar_checks.rb
@@ -224,6 +224,41 @@ module FormulaCellarChecks
     EOS
   end
 
+  def check_plist(prefix, plist)
+    return unless prefix.directory?
+
+    plist = begin
+      Plist.parse_xml(plist)
+    rescue
+      nil
+    end
+    return if plist.blank?
+
+    program_location = plist["ProgramArguments"]&.first
+    key = "first ProgramArguments value"
+    if program_location.blank?
+      program_location = plist["Program"]
+      key = "Program"
+    end
+    return if program_location.blank?
+
+    Dir.chdir("/") do
+      unless File.exist?(program_location)
+        return <<~EOS
+          The plist #{key} does not exist:
+            #{program_location}
+        EOS
+      end
+
+      return if File.executable?(program_location)
+    end
+
+    <<~EOS
+      The plist #{key} is not executable:
+        #{program_location}
+    EOS
+  end
+
   def audit_installed
     @new_formula ||= false
 
@@ -240,6 +275,7 @@ module FormulaCellarChecks
     problem_if_output(check_elisp_root(formula.share, formula.name))
     problem_if_output(check_python_packages(formula.lib, formula.deps))
     problem_if_output(check_shim_references(formula.prefix))
+    problem_if_output(check_plist(formula.prefix, formula.plist))
   end
   alias generic_audit_installed audit_installed
 

From 5935da6c6c01419255b4bbff7342e559addca9bb Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Sun, 3 May 2020 14:29:09 +0100
Subject: [PATCH 003/134] Dockerfile: restore git-core PPA

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 27fb1b60c7..94012220e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # hadolint ignore=DL3008
 RUN apt-get update \
+  && apt-get install -y --no-install-recommends software-properties-common \
+  && add-apt-repository -y ppa:git-core/ppa \
+  && apt-get update \
   && apt-get install -y --no-install-recommends \
     bzip2 \
     ca-certificates \

From 35869b917d63cb410d871efc43f65f04dce4f7ea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 4 May 2020 05:58:51 +0000
Subject: [PATCH 004/134] build(deps): bump rspec-support from 3.9.2 to 3.9.3
 in /Library/Homebrew

Bumps [rspec-support](https://github.com/rspec/rspec-support) from 3.9.2 to 3.9.3.
- [Release notes](https://github.com/rspec/rspec-support/releases)
- [Changelog](https://github.com/rspec/rspec-support/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-support/compare/v3.9.2...v3.9.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index af02152058..dd095e6d8f 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
     rubocop (0.82.0)

From 417bdca22d1b763592bbc2fb30f17e317e2a89b6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 4 May 2020 05:59:23 +0000
Subject: [PATCH 005/134] build(deps): bump rspec-core from 3.9.1 to 3.9.2 in
 /Library/Homebrew

Bumps [rspec-core](https://github.com/rspec/rspec-core) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/rspec/rspec-core/releases)
- [Changelog](https://github.com/rspec/rspec-core/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-core/compare/v3.9.1...v3.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index af02152058..59bf7c9fb3 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -65,8 +65,8 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
     rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
@@ -78,7 +78,7 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
     rubocop (0.82.0)

From fe45f680008e6f8c43c3193cd6f9b9defd45be7c Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 4 May 2020 03:16:51 -0500
Subject: [PATCH 006/134] brew.sh: check versions of proper cURL and Git

User may specify which cURL and Git to use via
HOMEBREW_CURL_PATH and HOMEBREW_GIT_PATH.
So, let's use these to determine whether we need to use
their vendored alternatives.
---
 Library/Homebrew/brew.sh | 59 ++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 3a43c7a1b4..f50d17a327 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -93,6 +93,31 @@ case "$HOMEBREW_SYSTEM" in
   Linux)  HOMEBREW_LINUX="1" ;;
 esac
 
+if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
+      -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] &&
+         "$HOMEBREW_PREFIX/opt/curl/bin/curl" --version >/dev/null
+then
+  HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
+elif [[ -n "$HOMEBREW_DEVELOPER" && -x "$HOMEBREW_CURL_PATH" ]]
+then
+  HOMEBREW_CURL="$HOMEBREW_CURL_PATH"
+else
+  HOMEBREW_CURL="curl"
+fi
+
+if [[ -n "$HOMEBREW_FORCE_BREWED_GIT" &&
+      -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]] &&
+         "$HOMEBREW_PREFIX/opt/git/bin/git" --version >/dev/null
+then
+  HOMEBREW_GIT="$HOMEBREW_PREFIX/opt/git/bin/git"
+elif [[ -n "$HOMEBREW_DEVELOPER" && -x "$HOMEBREW_GIT_PATH" ]]
+then
+  HOMEBREW_GIT="$HOMEBREW_GIT_PATH"
+else
+  HOMEBREW_GIT="git"
+fi
+
+
 if [[ -n "$HOMEBREW_MACOS" ]]
 then
   HOMEBREW_PROCESSOR="$(uname -p)"
@@ -159,9 +184,9 @@ else
 
   # Ensure the system Curl is a version that supports modern HTTPS certificates.
   HOMEBREW_MINIMUM_CURL_VERSION="7.41.0"
-  system_curl_version_output="$($(command -v curl) --version 2>/dev/null)"
-  system_curl_name_and_version="${system_curl_version_output%% (*}"
-  if [[ $(numeric "${system_curl_name_and_version##* }") -lt $(numeric "$HOMEBREW_MINIMUM_CURL_VERSION") ]]
+  curl_version_output="$($HOMEBREW_CURL --version 2>/dev/null)"
+  curl_name_and_version="${curl_version_output%% (*}"
+  if [[ $(numeric "${curl_name_and_version##* }") -lt $(numeric "$HOMEBREW_MINIMUM_CURL_VERSION") ]]
   then
     HOMEBREW_SYSTEM_CURL_TOO_OLD="1"
     HOMEBREW_FORCE_BREWED_CURL="1"
@@ -170,10 +195,10 @@ else
   # Ensure the system Git is at or newer than the minimum required version.
   # Git 2.7.4 is the version of git on Ubuntu 16.04 LTS (Xenial Xerus).
   HOMEBREW_MINIMUM_GIT_VERSION="2.7.0"
-  system_git_version_output="$($(command -v git) --version 2>/dev/null)"
+  git_version_output="$($HOMEBREW_GIT --version 2>/dev/null)"
   # $extra is intentionally discarded.
   # shellcheck disable=SC2034
-  IFS=. read -r major minor micro build extra <<< "${system_git_version_output##* }"
+  IFS=. read -r major minor micro build extra <<< "${git_version_output##* }"
   if [[ $(numeric "$major.$minor.$micro.$build") -lt $(numeric "$HOMEBREW_MINIMUM_GIT_VERSION") ]]
   then
     HOMEBREW_FORCE_BREWED_GIT="1"
@@ -198,30 +223,6 @@ HOMEBREW_CACHE="${HOMEBREW_CACHE:-${HOMEBREW_DEFAULT_CACHE}}"
 HOMEBREW_LOGS="${HOMEBREW_LOGS:-${HOMEBREW_DEFAULT_LOGS}}"
 HOMEBREW_TEMP="${HOMEBREW_TEMP:-${HOMEBREW_DEFAULT_TEMP}}"
 
-if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
-      -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] &&
-         "$HOMEBREW_PREFIX/opt/curl/bin/curl" --version >/dev/null
-then
-  HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl"
-elif [[ -n "$HOMEBREW_DEVELOPER" && -x "$HOMEBREW_CURL_PATH" ]]
-then
-  HOMEBREW_CURL="$HOMEBREW_CURL_PATH"
-else
-  HOMEBREW_CURL="curl"
-fi
-
-if [[ -n "$HOMEBREW_FORCE_BREWED_GIT" &&
-      -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]] &&
-         "$HOMEBREW_PREFIX/opt/git/bin/git" --version >/dev/null
-then
-  HOMEBREW_GIT="$HOMEBREW_PREFIX/opt/git/bin/git"
-elif [[ -n "$HOMEBREW_DEVELOPER" && -x "$HOMEBREW_GIT_PATH" ]]
-then
-  HOMEBREW_GIT="$HOMEBREW_GIT_PATH"
-else
-  HOMEBREW_GIT="git"
-fi
-
 HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)"
 curl_version_output="$("$HOMEBREW_CURL" --version 2>/dev/null)"
 curl_name_and_version="${curl_version_output%% (*}"

From ae353ff42e6b5da042d82a51683f1e1ee6d8c8fe Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 4 May 2020 11:12:25 +0100
Subject: [PATCH 007/134] Revert "ARGV: Deprecate ARGV.flags_only and replace
 with Homebrew.args.flags_only"

---
 Library/Homebrew/extend/ARGV.rb        | 4 ++++
 Library/Homebrew/software_spec.rb      | 3 +--
 Library/Homebrew/test/ARGV_spec.rb     | 8 ++++++++
 Library/Homebrew/test/messages_spec.rb | 3 +--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index c75c81b67c..27f21a228f 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 module HomebrewArgvExtension
+  def flags_only
+    select { |arg| arg.start_with?("--") }
+  end
+
   def value(name)
     arg_prefix = "--#{name}="
     flag_with_value = find { |arg| arg.start_with?(arg_prefix) }
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index d3e6410cba..6258a18091 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -11,7 +11,6 @@ require "patch"
 require "compilers"
 require "global"
 require "os/mac/version"
-require "cli/parser"
 
 class SoftwareSpec
   extend Forwardable
@@ -42,7 +41,7 @@ class SoftwareSpec
     @bottle_specification = BottleSpecification.new
     @patches = []
     @options = Options.new
-    @flags = Homebrew.args.flags_only
+    @flags = ARGV.flags_only
     @deprecated_flags = []
     @deprecated_options = []
     @build = BuildOptions.new(Options.create(@flags), options)
diff --git a/Library/Homebrew/test/ARGV_spec.rb b/Library/Homebrew/test/ARGV_spec.rb
index dd1699af31..5b32127930 100644
--- a/Library/Homebrew/test/ARGV_spec.rb
+++ b/Library/Homebrew/test/ARGV_spec.rb
@@ -31,6 +31,14 @@ describe HomebrewArgvExtension do
     end
   end
 
+  describe "#flags_only" do
+    let(:argv) { ["--foo", "-vds", "a", "b", "cdefg"] }
+
+    it "returns an array of flags" do
+      expect(subject.flags_only).to eq ["--foo"]
+    end
+  end
+
   describe "#empty?" do
     let(:argv) { [] }
 
diff --git a/Library/Homebrew/test/messages_spec.rb b/Library/Homebrew/test/messages_spec.rb
index c34dfbe141..8b743b7bdf 100644
--- a/Library/Homebrew/test/messages_spec.rb
+++ b/Library/Homebrew/test/messages_spec.rb
@@ -76,8 +76,7 @@ describe Messages do
     # rubocop:disable RSpec/VerifiedDoubles
     context "when the --display-times argument is present" do
       before do
-        allow(Homebrew).to receive(:args)
-          .and_return(double(display_times?: true, flags_only: ["--display-times"]))
+        allow(Homebrew).to receive(:args).and_return(double(display_times?: true))
       end
 
       context "when install_times is empty" do

From 9324a85955d4713973b1288a30ca6d0cc7bc3894 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 4 May 2020 12:39:31 +0100
Subject: [PATCH 008/134] cli: readability improvements.

- Rename `cmdline_args` to `argv` to make it more obvious where they
  come from.
- Make the `if args_parsed` early return into `unless args_parsed` to
  (hopefully) make it clearer that this is not the "normal" case and
  to not check `argv` unless arguments haven't been parsed.
---
 Library/Homebrew/cli/args.rb   | 28 ++++++++++++++--------------
 Library/Homebrew/cli/parser.rb |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index a60d6b23e7..09b3c14ff0 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -13,7 +13,7 @@ module Homebrew
         super
 
         self[:remaining] = []
-        self[:cmdline_args] = ARGV.dup.freeze
+        self[:argv] = ARGV.dup.freeze
 
         @args_parsed = false
         @processed_options = []
@@ -174,21 +174,21 @@ module Homebrew
       end
 
       def build_from_source
-        return true if args_parsed && (build_from_source? || s?)
+        return argv.include?("--build-from-source") || argv.include?("-s") unless args_parsed
 
-        cmdline_args.include?("--build-from-source") || cmdline_args.include?("-s")
+        build_from_source? || s?
       end
 
       def build_bottle
-        return true if args_parsed && build_bottle?
+        return argv.include?("--build-bottle") unless args_parsed
 
-        cmdline_args.include?("--build-bottle")
+        build_bottle?
       end
 
       def force_bottle
-        return true if args_parsed && force_bottle?
+        return argv.include?("--force-bottle") unless args_parsed
 
-        cmdline_args.include?("--force-bottle")
+        force_bottle?
       end
 
       private
@@ -198,7 +198,7 @@ module Homebrew
         arguments = if args_parsed
           named
         else
-          cmdline_args.reject { |arg| arg.start_with?("-") }
+          argv.reject { |arg| arg.start_with?("-") }
         end
         arguments.map do |arg|
           if arg.include?("/") || arg.end_with?(".tar.gz") || File.exist?(arg)
@@ -210,21 +210,21 @@ module Homebrew
       end
 
       def head
-        return true if args_parsed && HEAD?
+        return argv.include?("--HEAD") unless args_parsed
 
-        cmdline_args.include?("--HEAD")
+        HEAD?
       end
 
       def devel
-        return true if args_parsed && devel?
+        return argv.include?("--devel") unless args_parsed
 
-        cmdline_args.include?("--devel")
+        devel?
       end
 
       def build_universal
-        return true if args_parsed && universal?
+        return argv.include?("--universal") unless args_parsed
 
-        cmdline_args.include?("--universal")
+        universal?
       end
 
       def spec(default = :stable)
diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb
index b5d6941d30..b17c915af6 100644
--- a/Library/Homebrew/cli/parser.rb
+++ b/Library/Homebrew/cli/parser.rb
@@ -152,11 +152,11 @@ module Homebrew
         @parser.to_s
       end
 
-      def parse(cmdline_args = ARGV, allow_no_named_args: false)
+      def parse(argv = ARGV, allow_no_named_args: false)
         raise "Arguments were already parsed!" if @args_parsed
 
         begin
-          named_args = @parser.parse(cmdline_args)
+          named_args = @parser.parse(argv)
         rescue OptionParser::InvalidOption => e
           $stderr.puts generate_help_text
           raise e
@@ -166,7 +166,7 @@ module Homebrew
         @args[:remaining] = named_args
         @args.freeze_processed_options!(@processed_options)
         Homebrew.args = @args
-        cmdline_args.freeze
+        argv.freeze
         @args_parsed = true
         @parser
       end

From f567302ebf04b51aefd56c6600d7c02f2c0b5be9 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 4 May 2020 12:59:56 +0100
Subject: [PATCH 009/134] deps_spec: check args.

---
 Library/Homebrew/test/.rubocop_todo.yml | 1 +
 Library/Homebrew/test/cmd/deps_spec.rb  | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Library/Homebrew/test/.rubocop_todo.yml b/Library/Homebrew/test/.rubocop_todo.yml
index e3fca6d865..d3da7961bc 100644
--- a/Library/Homebrew/test/.rubocop_todo.yml
+++ b/Library/Homebrew/test/.rubocop_todo.yml
@@ -83,6 +83,7 @@ RSpec/MultipleDescribes:
     - 'cmd/cleanup_spec.rb'
     - 'cmd/commands_spec.rb'
     - 'cmd/config_spec.rb'
+    - 'cmd/deps_spec.rb'
     - 'cmd/desc_spec.rb'
     - 'cmd/doctor_spec.rb'
     - 'cmd/fetch_spec.rb'
diff --git a/Library/Homebrew/test/cmd/deps_spec.rb b/Library/Homebrew/test/cmd/deps_spec.rb
index 8ec40bffbd..f63454712a 100644
--- a/Library/Homebrew/test/cmd/deps_spec.rb
+++ b/Library/Homebrew/test/cmd/deps_spec.rb
@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+require "cmd/shared_examples/args_parse"
+
+describe "Homebrew.deps_args" do
+  it_behaves_like "parseable arguments"
+end
+
 describe "brew deps", :integration_test do
   it "outputs all of a Formula's dependencies and their dependencies on separate lines" do
     setup_test_formula "foo"

From 16141e7effe453cfe94ae274dadaf4b3ecf6767a Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Mon, 4 May 2020 17:16:39 +0100
Subject: [PATCH 010/134] os/mac/software_spec: fix argument error in valid 
 use case

---
 .../Homebrew/extend/os/mac/software_spec.rb   |  2 +-
 Library/Homebrew/test/os/mac/formula_spec.rb  | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/extend/os/mac/software_spec.rb b/Library/Homebrew/extend/os/mac/software_spec.rb
index d4f98d208e..e3c1de519f 100644
--- a/Library/Homebrew/extend/os/mac/software_spec.rb
+++ b/Library/Homebrew/extend/os/mac/software_spec.rb
@@ -11,7 +11,7 @@ class SoftwareSpec
       deps = Hash[*bounds.shift]
     end
 
-    bounds.transform_values! { |v| MacOS::Version.from_symbol(v) }
+    bounds = bounds.transform_values { |v| MacOS::Version.from_symbol(v) }
     if MacOS.version >= bounds[:since]
       @uses_from_macos_elements << deps
     else
diff --git a/Library/Homebrew/test/os/mac/formula_spec.rb b/Library/Homebrew/test/os/mac/formula_spec.rb
index 289703cfdd..c966aef3d0 100644
--- a/Library/Homebrew/test/os/mac/formula_spec.rb
+++ b/Library/Homebrew/test/os/mac/formula_spec.rb
@@ -3,6 +3,43 @@
 require "formula"
 
 describe Formula do
+  describe "#uses_from_macos" do
+    before do
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(OS::Mac).to receive(:version).and_return(OS::Mac::Version.from_symbol(:sierra))
+    end
+
+    it "adds a macOS dependency to all specs if the OS version meets requirements" do
+      f = formula "foo" do
+        url "foo-1.0"
+
+        uses_from_macos("foo", since: :el_capitan)
+      end
+
+      expect(f.class.stable.deps).to be_empty
+      expect(f.class.devel.deps).to be_empty
+      expect(f.class.head.deps).to be_empty
+      expect(f.class.stable.uses_from_macos_elements.first).to eq("foo")
+      expect(f.class.devel.uses_from_macos_elements.first).to eq("foo")
+      expect(f.class.head.uses_from_macos_elements.first).to eq("foo")
+    end
+
+    it "doesn't add a macOS dependency to any spec if the OS version doesn't meet requirements" do
+      f = formula "foo" do
+        url "foo-1.0"
+
+        uses_from_macos("foo", since: :high_sierra)
+      end
+
+      expect(f.class.stable.deps.first.name).to eq("foo")
+      expect(f.class.devel.deps.first.name).to eq("foo")
+      expect(f.class.head.deps.first.name).to eq("foo")
+      expect(f.class.stable.uses_from_macos_elements).to be_empty
+      expect(f.class.devel.uses_from_macos_elements).to be_empty
+      expect(f.class.head.uses_from_macos_elements).to be_empty
+    end
+  end
+
   describe "#on_macos" do
     it "defines an url on macos only" do
       f = formula do

From 305ecfd66e850297026e58f1e09eb93ba0b759b5 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Sun, 3 May 2020 09:45:24 -0700
Subject: [PATCH 011/134] docker.yml: Deploy tagged image to Docker Hub

---
 .github/workflows/docker.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2fc53dfb7e..ee8e470758 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,6 +18,10 @@ jobs:
         uses: actions/checkout@master
         with:
           fetch-depth: 0
+      - name: Configure Git
+        run: |
+          git config --unset "http.https://github.com/.extraheader"
+          git fetch origin master
       - name: Build Docker image
         run: docker build -t brew --build-arg=version=${{matrix.version}} .
       - name: Run brew test-bot
@@ -25,7 +29,15 @@ jobs:
       - name: Deploy the tagged Docker image to GitHub
         if: startsWith(github.ref, 'refs/tags/')
         run: |
+          brew_version=${GITHUB_REF:10}
+          echo "::set-env brew_version=$brew_version"
+          echo "::set-env name=brew_version::$brew_version"
           docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-          v=${GITHUB_REF:10}
-          docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$v"
-          docker push "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$v"
+          docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$brew_version"
+          docker push "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$brew_version"
+      - name: Deploy the tagged Docker image to Docker Hub
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          docker login docker.com -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
+          docker tag brew "homebrew/ubuntu${{matrix.version}}:$brew_version"
+          docker push "homebrew/ubuntu${{matrix.version}}:$brew_version"

From 3a9e12efac47882309de4698c58a57e630d84cb0 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Mon, 4 May 2020 15:00:36 -0700
Subject: [PATCH 012/134] docker.yml: Fix a typo

---
 .github/workflows/docker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ee8e470758..c103211bcc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,7 +30,6 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           brew_version=${GITHUB_REF:10}
-          echo "::set-env brew_version=$brew_version"
           echo "::set-env name=brew_version::$brew_version"
           docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
           docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$brew_version"

From f4e32ebcb1d0ccde9274410dca3d15c6dce2205d Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Mon, 4 May 2020 16:16:18 -0700
Subject: [PATCH 013/134] docker.yml: Set persist-credentials: false

---
 .github/workflows/docker.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c103211bcc..ad0b722061 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,10 +18,9 @@ jobs:
         uses: actions/checkout@master
         with:
           fetch-depth: 0
-      - name: Configure Git
-        run: |
-          git config --unset "http.https://github.com/.extraheader"
-          git fetch origin master
+          persist-credentials: false
+      - name: Fetch origin/master from Git
+        run: git fetch origin master
       - name: Build Docker image
         run: docker build -t brew --build-arg=version=${{matrix.version}} .
       - name: Run brew test-bot

From f8516885417157ad6a26da74f07a561811bb3f7a Mon Sep 17 00:00:00 2001
From: vidusheeamoli <vidushee.amoli@gmail.com>
Date: Tue, 28 Apr 2020 22:35:47 +0530
Subject: [PATCH 014/134] audit: Port audit_keg_only to rubocop and add tests

audit: add test

audit: fixed test

audit: added another test case

audit: fix test

audit: fix test

audit: fix keg only
---
 Library/Homebrew/dev-cmd/audit.rb             | 34 ---------
 Library/Homebrew/rubocops.rb                  |  1 +
 Library/Homebrew/rubocops/keg_only.rb         | 41 ++++++++++
 Library/Homebrew/test/.rubocop_todo.yml       |  1 +
 Library/Homebrew/test/dev-cmd/audit_spec.rb   | 63 ----------------
 .../Homebrew/test/rubocops/keg_only_spec.rb   | 74 +++++++++++++++++++
 6 files changed, 117 insertions(+), 97 deletions(-)
 create mode 100644 Library/Homebrew/rubocops/keg_only.rb
 create mode 100644 Library/Homebrew/test/rubocops/keg_only_spec.rb

diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 08cb33977a..87faf0b725 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -435,40 +435,6 @@ module Homebrew
       end
     end
 
-    def audit_keg_only
-      return unless formula.keg_only?
-
-      whitelist = %w[
-        Apple
-        macOS
-        OS
-        Homebrew
-        Xcode
-        GPG
-        GNOME
-        BSD
-        Firefox
-      ].freeze
-
-      reason = formula.keg_only_reason.to_s
-      # Formulae names can legitimately be uppercase/lowercase/both.
-      name = Regexp.new(formula.name, Regexp::IGNORECASE)
-      reason.sub!(name, "")
-      first_word = reason.split.first
-
-      if reason =~ /\A[A-Z]/ && !reason.start_with?(*whitelist)
-        # TODO: check could be in RuboCop
-        problem <<~EOS
-          '#{first_word}' from the keg_only reason should be '#{first_word.downcase}'.
-        EOS
-      end
-
-      return unless reason.end_with?(".")
-
-      # TODO: check could be in RuboCop
-      problem "keg_only reason should not end with a period."
-    end
-
     def audit_postgresql
       return unless formula.name == "postgresql"
       return unless @core_tap
diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb
index 6252f64b58..6b43b6f937 100644
--- a/Library/Homebrew/rubocops.rb
+++ b/Library/Homebrew/rubocops.rb
@@ -20,5 +20,6 @@ require "rubocops/lines"
 require "rubocops/class"
 require "rubocops/uses_from_macos"
 require "rubocops/files"
+require "rubocops/keg_only"
 
 require "rubocops/rubocop-cask"
diff --git a/Library/Homebrew/rubocops/keg_only.rb b/Library/Homebrew/rubocops/keg_only.rb
new file mode 100644
index 0000000000..e2969f2df1
--- /dev/null
+++ b/Library/Homebrew/rubocops/keg_only.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "rubocops/extend/formula"
+
+module RuboCop
+  module Cop
+    module FormulaAudit
+      class KegOnly < FormulaCop
+        def audit_formula(_node, _class_node, _parent_class_node, body_node)
+          keg_only_node = find_node_method_by_name(body_node, :keg_only)
+          return unless keg_only_node
+
+          whitelist = %w[
+            Apple
+            macOS
+            OS
+            Homebrew
+            Xcode
+            GPG
+            GNOME
+            BSD
+            Firefox
+          ].freeze
+
+          reason = string_content(parameters(keg_only_node).first)
+          name = Regexp.new(@formula_name, Regexp::IGNORECASE)
+          reason = reason.sub(name, "")
+          first_word = reason.split.first
+
+          if reason =~ /\A[A-Z]/ && !reason.start_with?(*whitelist)
+            problem "'#{first_word}' from the keg_only reason should be '#{first_word.downcase}'."
+          end
+
+          return unless reason.end_with?(".")
+
+          problem "keg_only reason should not end with a period."
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/.rubocop_todo.yml b/Library/Homebrew/test/.rubocop_todo.yml
index d3da7961bc..a5a6d80cc5 100644
--- a/Library/Homebrew/test/.rubocop_todo.yml
+++ b/Library/Homebrew/test/.rubocop_todo.yml
@@ -46,6 +46,7 @@ RSpec/FilePath:
     - 'rubocops/conflicts_spec.rb'
     - 'rubocops/dependency_order_spec.rb'
     - 'rubocops/files_spec.rb'
+    - 'rubocops/keg_only_spec.rb'
     - 'rubocops/homepage_spec.rb'
     - 'rubocops/options_spec.rb'
     - 'rubocops/patches_spec.rb'
diff --git a/Library/Homebrew/test/dev-cmd/audit_spec.rb b/Library/Homebrew/test/dev-cmd/audit_spec.rb
index 895d339aef..132d70bf40 100644
--- a/Library/Homebrew/test/dev-cmd/audit_spec.rb
+++ b/Library/Homebrew/test/dev-cmd/audit_spec.rb
@@ -300,69 +300,6 @@ module Homebrew
       end
     end
 
-    describe "#audit_keg_only" do
-      specify "keg_only_needs_downcasing" do
-        fa = formula_auditor "foo", <<~RUBY, strict: true
-          class Foo < Formula
-            url "https://brew.sh/foo-1.0.tgz"
-
-            keg_only "Because why not"
-          end
-        RUBY
-
-        fa.audit_keg_only
-        expect(fa.problems)
-          .to eq(["'Because' from the keg_only reason should be 'because'.\n"])
-      end
-
-      specify "keg_only_redundant_period" do
-        fa = formula_auditor "foo", <<~RUBY, strict: true
-          class Foo < Formula
-            url "https://brew.sh/foo-1.0.tgz"
-
-            keg_only "because this line ends in a period."
-          end
-        RUBY
-
-        fa.audit_keg_only
-        expect(fa.problems)
-          .to eq(["keg_only reason should not end with a period."])
-      end
-
-      specify "keg_only_handles_block_correctly" do
-        fa = formula_auditor "foo", <<~RUBY, strict: true
-          class Foo < Formula
-            url "https://brew.sh/foo-1.0.tgz"
-
-            keg_only <<~EOF
-              this line starts with a lowercase word.
-
-              This line does not but that shouldn't be a
-              problem
-            EOF
-          end
-        RUBY
-
-        fa.audit_keg_only
-        expect(fa.problems)
-          .to eq([])
-      end
-
-      specify "keg_only_handles_whitelist_correctly" do
-        fa = formula_auditor "foo", <<~RUBY, strict: true
-          class Foo < Formula
-            url "https://brew.sh/foo-1.0.tgz"
-
-            keg_only "Apple ships foo in the CLT package"
-          end
-        RUBY
-
-        fa.audit_keg_only
-        expect(fa.problems)
-          .to eq([])
-      end
-    end
-
     describe "#audit_revision_and_version_scheme" do
       subject {
         fa = described_class.new(Formulary.factory(formula_path))
diff --git a/Library/Homebrew/test/rubocops/keg_only_spec.rb b/Library/Homebrew/test/rubocops/keg_only_spec.rb
new file mode 100644
index 0000000000..81112da206
--- /dev/null
+++ b/Library/Homebrew/test/rubocops/keg_only_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require "rubocops/keg_only"
+
+describe RuboCop::Cop::FormulaAudit::KegOnly do
+  subject(:cop) { described_class.new }
+
+  specify "keg_only_needs_downcasing" do
+    expect_offense(<<~RUBY)
+      class Foo < Formula
+
+        url "https://brew.sh/foo-1.0.tgz"
+        homepage "https://brew.sh"
+
+        keg_only "Because why not"
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^ 'Because' from the keg_only reason should be 'because'.
+      end
+    RUBY
+  end
+
+  specify "keg_only_redundant_period" do
+    expect_offense(<<~RUBY)
+      class Foo < Formula
+        url "https://brew.sh/foo-1.0.tgz"
+        homepage "https://brew.sh"
+
+        keg_only "ending with a period."
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ keg_only reason should not end with a period.
+      end
+    RUBY
+  end
+
+  specify "keg_only_handles_block_correctly" do
+    expect_no_offenses(<<~RUBY)
+      class Foo < Formula
+        url "https://brew.sh/foo-1.0.tgz"
+        homepage "https://brew.sh"
+
+        keg_only <<~EOF
+          this line starts with a lowercase word.
+
+          This line does not but that shouldn't be a
+          problem
+        EOF
+      end
+    RUBY
+  end
+
+  specify "keg_only_handles_whitelist_correctly" do
+    expect_no_offenses(<<~RUBY)
+      class Foo < Formula
+        url "https://brew.sh/foo-1.0.tgz"
+        homepage "https://brew.sh"
+
+        keg_only "Apple ships foo in the CLT package"
+      end
+    RUBY
+  end
+
+  specify "keg_only does not need downcasing of formula name in reason" do
+    filename = Formulary.core_path("foo")
+    File.open(filename, "w") do |file|
+      FileUtils.chmod "-rwx", filename
+
+      expect_no_offenses(<<~RUBY, file)
+        class Foo < Formula
+          url "https://brew.sh/foo-1.0.tgz"
+
+          keg_only "Foo is the formula name hence downcasing is not required"
+        end
+      RUBY
+    end
+  end
+end

From 8e318d81bcbf88d1829cdfba8c390f553c8787a1 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 5 May 2020 08:34:07 +0100
Subject: [PATCH 015/134] formula: add pkgetc method.

This should provide a more "type-safe" way of referring to the `etc`
directories of other formulae e.g.
https://github.com/Homebrew/homebrew-core/pull/54257 so that the output
will change if the formula name changes.
---
 Library/Homebrew/formula.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 4e46d328b3..8c9f47f1e7 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -790,6 +790,14 @@ class Formula
     (HOMEBREW_PREFIX/"etc").extend(InstallRenamed)
   end
 
+  # A subdirectory of `etc` with the formula name suffixed.
+  # e.g. `$HOMEBREW_PREFIX/etc/openssl@1.1`
+  # Anything using `pkgetc.install` will not overwrite other files on
+  # e.g. upgrades but will write a new file named `*.default`.
+  def pkgetc
+    (HOMEBREW_PREFIX/"etc"/name).extend(InstallRenamed)
+  end
+
   # The directory where the formula's variable files should be installed.
   # This directory is not inside the `HOMEBREW_CELLAR` so it persists
   # across upgrades.
@@ -1080,7 +1088,7 @@ class Formula
     # keg's formula is deleted.
     begin
       keg = Keg.for(path)
-    rescue NotAKegError, Errno::ENOENT # rubocop:disable Lint/SuppressedException
+    rescue NotAKegError, Errno::ENOENT
       # file doesn't belong to any keg.
     else
       tab_tap = Tab.for_keg(keg).tap
@@ -1089,7 +1097,7 @@ class Formula
 
       begin
         Formulary.factory(keg.name)
-      rescue FormulaUnavailableError # rubocop:disable Lint/SuppressedException
+      rescue FormulaUnavailableError
         # formula for this keg is deleted, so defer to whitelist
       rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
         return false # this keg belongs to another formula

From 60c9472b14f24e720f2be3aeb25644bde8df6e55 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 5 May 2020 15:50:10 +0100
Subject: [PATCH 016/134] rubocop_rspec: disable RSpec/FilePath.

We keep adding to the list of exceptions and this fails if it isn't run
in the right directory.
---
 Library/.rubocop_rspec.yml              |  6 ++--
 Library/Homebrew/test/.rubocop_todo.yml | 48 -------------------------
 2 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/Library/.rubocop_rspec.yml b/Library/.rubocop_rspec.yml
index e855cce1cc..cb607442c2 100644
--- a/Library/.rubocop_rspec.yml
+++ b/Library/.rubocop_rspec.yml
@@ -15,12 +15,14 @@ Style/DisableCopsWithinSourceCodeDirective:
 # Intentionally disabled as it doesn't fit with our code style.
 RSpec/AnyInstance:
   Enabled: false
+RSpec/FilePath:
+  Enabled: false
 RSpec/ImplicitBlockExpectation:
   Enabled: false
 RSpec/SubjectStub:
   Enabled: false
 
-# TODO: try to enable these (also requires fixing Homebrew/bundle)
+# TODO: try to enable these
 RSpec/ContextWording:
   Enabled: false
 RSpec/DescribeClass:
@@ -34,7 +36,7 @@ RSpec/RepeatedDescription:
 RSpec/RepeatedExampleGroupDescription:
   Enabled: false
 
-# TODO: try to reduce these (also requires fixing Homebrew/bundle)
+# TODO: try to reduce these
 RSpec/ExampleLength:
   Max: 75
 RSpec/MultipleExpectations:
diff --git a/Library/Homebrew/test/.rubocop_todo.yml b/Library/Homebrew/test/.rubocop_todo.yml
index a5a6d80cc5..18986235db 100644
--- a/Library/Homebrew/test/.rubocop_todo.yml
+++ b/Library/Homebrew/test/.rubocop_todo.yml
@@ -12,54 +12,6 @@ RSpec/ExampleLength:
   Exclude:
     - 'rubocops/patches_spec.rb'
 
-# Offense count: 41
-# Configuration parameters: CustomTransform, IgnoreMethods.
-RSpec/FilePath:
-  Exclude:
-    - 'ARGV_spec.rb'
-    - 'PATH_spec.rb'
-    - 'bottle_filename_spec.rb'
-    - 'cache_store_spec.rb'
-    - 'cask/artifact/alt_target_spec.rb'
-    - 'cask/artifact/generic_artifact_spec.rb'
-    - 'cask/artifact/two_apps_correct_spec.rb'
-    - 'cask/artifact/uninstall_no_zap_spec.rb'
-    - 'cask/cask_loader/from__path_loader_spec.rb'
-    - 'cask/macos_spec.rb'
-    - 'cli/parser_spec.rb'
-    - 'checksum_verification_spec.rb'
-    - 'cxxstdlib_spec.rb'
-    - 'diagnostic_checks_spec.rb'
-    - 'env_config_spec.rb'
-    - 'missing_formula_spec.rb'
-    - 'os/linux/diagnostic_spec.rb'
-    - 'os/mac/diagnostic_spec.rb'
-    - 'requirements/macos_requirement_spec.rb'
-    - 'rubocops/cask/homepage_matches_url_spec.rb'
-    - 'rubocops/cask/homepage_url_trailing_slash_spec.rb'
-    - 'rubocops/cask/no_dsl_version_spec.rb'
-    - 'rubocops/cask/stanza_grouping_spec.rb'
-    - 'rubocops/cask/stanza_order_spec.rb'
-    - 'rubocops/caveats_spec.rb'
-    - 'rubocops/components_order_spec.rb'
-    - 'rubocops/components_redundancy_spec.rb'
-    - 'rubocops/conflicts_spec.rb'
-    - 'rubocops/dependency_order_spec.rb'
-    - 'rubocops/files_spec.rb'
-    - 'rubocops/keg_only_spec.rb'
-    - 'rubocops/homepage_spec.rb'
-    - 'rubocops/options_spec.rb'
-    - 'rubocops/patches_spec.rb'
-    - 'rubocops/text_spec.rb'
-    - 'rubocops/uses_from_macos_spec.rb'
-    - 'rubocops/formula_desc_spec.rb'
-    - 'search_spec.rb'
-    - 'string_spec.rb'
-    - 'style_spec.rb'
-    - 'system_command_result_spec.rb'
-    - 'unpack_strategy/p7zip_spec.rb'
-    - 'utils/github_spec.rb'
-
 # Offense count: 6
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:

From 20a1199375417ba49cf435dccb0104c0ad8fe8d0 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 5 May 2020 12:50:41 +0100
Subject: [PATCH 017/134] Refactor CLI to remove `unless args_parsed`

Refactor the CLI::Args module so it doesn't have different paths to
check arguments depending on whether the arguments have been parsed or
not. Instead, set the values we need from the global ARGV at
first, global initialisation time where they will be thrown away when
the actual arguments are parsed.

To do this some other general refactoring was needed:
- more methods made private when possible
- e.g. `HEAD?` used consistently instead of `head` before arguments
  are parsed.
- formula options are only parsed after named arguments are extracted
---
 Library/Homebrew/cli/args.rb          | 146 +++++++++++---------------
 Library/Homebrew/cli/parser.rb        |  53 ++++++----
 Library/Homebrew/cmd/install.rb       |   2 +-
 Library/Homebrew/dev-cmd/irb.rb       |   6 +-
 Library/Homebrew/extend/ENV/shared.rb |   2 +-
 Library/Homebrew/fetch.rb             |   2 +-
 Library/Homebrew/formula_installer.rb |   4 +-
 Library/Homebrew/global.rb            |   2 +-
 Library/Homebrew/reinstall.rb         |   2 +-
 Library/Homebrew/software_spec.rb     |   2 +-
 10 files changed, 104 insertions(+), 117 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index 09b3c14ff0..350767fd5c 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -5,56 +5,44 @@ require "ostruct"
 module Homebrew
   module CLI
     class Args < OpenStruct
-      attr_reader :processed_options, :args_parsed
       # undefine tap to allow --tap argument
       undef tap
 
-      def initialize
-        super
+      def initialize(argv = ARGV.dup.freeze, set_default_args: false)
+        super()
 
-        self[:remaining] = []
-        self[:argv] = ARGV.dup.freeze
-
-        @args_parsed = false
         @processed_options = []
+
+        # Set values needed before Parser#parse has been run.
+        return unless set_default_args
+
+        self[:build_from_source?] = argv.include?("--build-from-source") || argv.include?("-s")
+        self[:build_bottle?] = argv.include?("--build-bottle")
+        self[:force_bottle?] = argv.include?("--force-bottle")
+        self[:HEAD?] = argv.include?("--HEAD")
+        self[:devel?] = argv.include?("--devel")
+        self[:universal?] = argv.include?("--universal")
+        self[:named_args] = argv.reject { |arg| arg.start_with?("-") }
+      end
+
+      def freeze_named_args!(named_args)
+        self[:named_args] = named_args
+        self[:named_args].freeze
       end
 
       def freeze_processed_options!(processed_options)
         @processed_options += processed_options
         @processed_options.freeze
-        @args_parsed = true
-      end
-
-      def option_to_name(option)
-        option.sub(/\A--?/, "")
-              .tr("-", "_")
-      end
-
-      def cli_args
-        return @cli_args if @cli_args
-
-        @cli_args = []
-        processed_options.each do |short, long|
-          option = long || short
-          switch = "#{option_to_name(option)}?".to_sym
-          flag = option_to_name(option).to_sym
-          if @table[switch] == true || @table[flag] == true
-            @cli_args << option
-          elsif @table[flag].instance_of? String
-            @cli_args << option + "=" + @table[flag]
-          elsif @table[flag].instance_of? Array
-            @cli_args << option + "=" + @table[flag].join(",")
-          end
-        end
-        @cli_args
       end
 
       def options_only
         @options_only ||= cli_args.select { |arg| arg.start_with?("-") }
+                                  .freeze
       end
 
       def flags_only
         @flags_only ||= cli_args.select { |arg| arg.start_with?("--") }
+                                .freeze
       end
 
       def passthrough
@@ -62,7 +50,7 @@ module Homebrew
       end
 
       def named
-        remaining
+        named_args || []
       end
 
       def no_named?
@@ -74,16 +62,17 @@ module Homebrew
       def collect_build_args
         build_flags = []
 
-        build_flags << "--HEAD" if head
-        build_flags << "--universal" if build_universal
-        build_flags << "--build-bottle" if build_bottle
-        build_flags << "--build-from-source" if build_from_source
+        build_flags << "--HEAD" if HEAD?
+        build_flags << "--universal" if build_universal?
+        build_flags << "--build-bottle" if build_bottle?
+        build_flags << "--build-from-source" if build_from_source?
 
         build_flags
       end
 
       def formulae
         require "formula"
+
         @formulae ||= (downcased_unique_named - casks).map do |name|
           if name.include?("/") || File.exist?(name)
             Formulary.factory(name, spec)
@@ -91,29 +80,35 @@ module Homebrew
             Formulary.find_with_priority(name, spec)
           end
         end.uniq(&:name)
+                                                      .freeze
       end
 
       def resolved_formulae
         require "formula"
+
         @resolved_formulae ||= (downcased_unique_named - casks).map do |name|
           Formulary.resolve(name, spec: spec(nil))
         end.uniq(&:name)
+                                                               .freeze
       end
 
       def formulae_paths
         @formulae_paths ||= (downcased_unique_named - casks).map do |name|
           Formulary.path(name)
         end.uniq
+                                                            .freeze
       end
 
       def casks
-        @casks ||= downcased_unique_named.grep HOMEBREW_CASK_TAP_CASK_REGEX
+        @casks ||= downcased_unique_named.grep(HOMEBREW_CASK_TAP_CASK_REGEX)
+                                         .freeze
       end
 
       def kegs
         require "keg"
         require "formula"
         require "missing_formula"
+
         @kegs ||= downcased_unique_named.map do |name|
           raise UsageError if name.empty?
 
@@ -158,7 +153,7 @@ module Homebrew
               Please delete (with rm -rf!) all but one and then try again.
             EOS
           end
-        end
+        end.freeze
       end
 
       def build_stable?
@@ -168,39 +163,40 @@ module Homebrew
       # Whether a given formula should be built from source during the current
       # installation run.
       def build_formula_from_source?(f)
-        return false if !build_from_source && !build_bottle
+        return false if !build_from_source? && !build_bottle?
 
         formulae.any? { |args_f| args_f.full_name == f.full_name }
       end
 
-      def build_from_source
-        return argv.include?("--build-from-source") || argv.include?("-s") unless args_parsed
-
-        build_from_source? || s?
-      end
-
-      def build_bottle
-        return argv.include?("--build-bottle") unless args_parsed
-
-        build_bottle?
-      end
-
-      def force_bottle
-        return argv.include?("--force-bottle") unless args_parsed
-
-        force_bottle?
-      end
-
       private
 
+      def option_to_name(option)
+        option.sub(/\A--?/, "")
+              .tr("-", "_")
+      end
+
+      def cli_args
+        return @cli_args if @cli_args
+
+        @cli_args = []
+        @processed_options.each do |short, long|
+          option = long || short
+          switch = "#{option_to_name(option)}?".to_sym
+          flag = option_to_name(option).to_sym
+          if @table[switch] == true || @table[flag] == true
+            @cli_args << option
+          elsif @table[flag].instance_of? String
+            @cli_args << option + "=" + @table[flag]
+          elsif @table[flag].instance_of? Array
+            @cli_args << option + "=" + @table[flag].join(",")
+          end
+        end
+        @cli_args.freeze
+      end
+
       def downcased_unique_named
         # Only lowercase names, not paths, bottle filenames or URLs
-        arguments = if args_parsed
-          named
-        else
-          argv.reject { |arg| arg.start_with?("-") }
-        end
-        arguments.map do |arg|
+        named.map do |arg|
           if arg.include?("/") || arg.end_with?(".tar.gz") || File.exist?(arg)
             arg
           else
@@ -209,28 +205,10 @@ module Homebrew
         end.uniq
       end
 
-      def head
-        return argv.include?("--HEAD") unless args_parsed
-
-        HEAD?
-      end
-
-      def devel
-        return argv.include?("--devel") unless args_parsed
-
-        devel?
-      end
-
-      def build_universal
-        return argv.include?("--universal") unless args_parsed
-
-        universal?
-      end
-
       def spec(default = :stable)
-        if head
+        if HEAD?
           :head
-        elsif devel
+        elsif devel?
           :devel
         else
           default
diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb
index b17c915af6..7cf3889edd 100644
--- a/Library/Homebrew/cli/parser.rb
+++ b/Library/Homebrew/cli/parser.rb
@@ -12,8 +12,8 @@ module Homebrew
     class Parser
       attr_reader :processed_options, :hide_from_man_page
 
-      def self.parse(args = ARGV, allow_no_named_args: false, &block)
-        new(args, &block).parse(args, allow_no_named_args: allow_no_named_args)
+      def self.parse(argv = ARGV.dup.freeze, allow_no_named_args: false, &block)
+        new(argv, &block).parse(allow_no_named_args: allow_no_named_args)
       end
 
       def self.from_cmd_path(cmd_path)
@@ -37,9 +37,10 @@ module Homebrew
         }
       end
 
-      def initialize(&block)
+      def initialize(argv = ARGV.dup.freeze, &block)
         @parser = OptionParser.new
-        @args = Homebrew::CLI::Args.new
+        @argv = argv
+        @args = Homebrew::CLI::Args.new(@argv)
 
         @constraints = []
         @conflicts = []
@@ -152,7 +153,7 @@ module Homebrew
         @parser.to_s
       end
 
-      def parse(argv = ARGV, allow_no_named_args: false)
+      def parse(argv = @argv, allow_no_named_args: false)
         raise "Arguments were already parsed!" if @args_parsed
 
         begin
@@ -161,12 +162,14 @@ module Homebrew
           $stderr.puts generate_help_text
           raise e
         end
+
         check_constraint_violations
         check_named_args(named_args, allow_no_named_args: allow_no_named_args)
-        @args[:remaining] = named_args
+        @args.freeze_named_args!(named_args)
+        parse_formula_options
         @args.freeze_processed_options!(@processed_options)
         Homebrew.args = @args
-        argv.freeze
+
         @args_parsed = true
         @parser
       end
@@ -186,21 +189,7 @@ module Homebrew
       end
 
       def formula_options
-        @args.formulae.each do |f|
-          next if f.options.empty?
-
-          f.options.each do |o|
-            name = o.flag
-            description = "`#{f.name}`: #{o.description}"
-            if name.end_with? "="
-              flag   name, description: description
-            else
-              switch name, description: description
-            end
-          end
-        end
-      rescue FormulaUnavailableError
-        []
+        @parse_formula_options = true
       end
 
       def max_named(count)
@@ -239,6 +228,26 @@ module Homebrew
 
       private
 
+      def parse_formula_options
+        return unless @parse_formula_options
+
+        @args.formulae.each do |f|
+          next if f.options.empty?
+
+          f.options.each do |o|
+            name = o.flag
+            description = "`#{f.name}`: #{o.description}"
+            if name.end_with? "="
+              flag   name, description: description
+            else
+              switch name, description: description
+            end
+          end
+        end
+      rescue FormulaUnavailableError
+        []
+      end
+
       def enable_switch(*names, from:)
         names.each do |name|
           @switch_sources[option_to_name(name)] = from
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 644dd6039e..7d60894b9b 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -152,7 +152,7 @@ module Homebrew
       end
 
       # --HEAD, fail with no head defined
-      raise "No head is defined for #{f.full_name}" if args.head? && f.head.nil?
+      raise "No head is defined for #{f.full_name}" if args.HEAD? && f.head.nil?
 
       # --devel, fail with no devel defined
       raise "No devel block is defined for #{f.full_name}" if args.devel? && f.devel.nil?
diff --git a/Library/Homebrew/dev-cmd/irb.rb b/Library/Homebrew/dev-cmd/irb.rb
index de6f6d6376..e319acd972 100644
--- a/Library/Homebrew/dev-cmd/irb.rb
+++ b/Library/Homebrew/dev-cmd/irb.rb
@@ -18,7 +18,8 @@ module Homebrew
   module_function
 
   def irb_args
-    Homebrew::CLI::Parser.new do
+    # work around IRB modifying ARGV.
+    Homebrew::CLI::Parser.new(ARGV.dup) do
       usage_banner <<~EOS
         `irb` [<options>]
 
@@ -33,8 +34,7 @@ module Homebrew
   end
 
   def irb
-    # work around IRB modifying ARGV.
-    irb_args.parse(ARGV.dup)
+    irb_args.parse
 
     if args.examples?
       puts "'v8'.f # => instance of the v8 formula"
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index 0f6fda16e4..fc422fa352 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -268,7 +268,7 @@ module SharedEnvExtension
 
   # @private
   def effective_arch
-    if Homebrew.args.build_bottle && ARGV.bottle_arch
+    if Homebrew.args.build_bottle? && ARGV.bottle_arch
       ARGV.bottle_arch
     else
       Hardware.oldest_cpu
diff --git a/Library/Homebrew/fetch.rb b/Library/Homebrew/fetch.rb
index b2e04554b0..6564aaf955 100644
--- a/Library/Homebrew/fetch.rb
+++ b/Library/Homebrew/fetch.rb
@@ -5,7 +5,7 @@ module Homebrew
     module_function
 
     def fetch_bottle?(f)
-      return true if Homebrew.args.force_bottle && f.bottle
+      return true if Homebrew.args.force_bottle? && f.bottle
       return false unless f.bottle && f.pour_bottle?
       return false if Homebrew.args.build_formula_from_source?(f)
       return false unless f.bottle.compatible_cellar?
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index da9135767d..cd757386cb 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -49,9 +49,9 @@ class FormulaInstaller
     @show_header = false
     @ignore_deps = false
     @only_deps = false
-    @build_from_source = Homebrew.args.build_from_source
+    @build_from_source = Homebrew.args.build_from_source?
     @build_bottle = false
-    @force_bottle = Homebrew.args.force_bottle
+    @force_bottle = Homebrew.args.force_bottle?
     @include_test = ARGV.include?("--include-test")
     @interactive = false
     @git = false
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 6e9aefb675..b7067e7717 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -85,7 +85,7 @@ module Homebrew
     end
 
     def args
-      @args ||= CLI::Args.new
+      @args ||= CLI::Args.new(set_default_args: true)
     end
 
     def messages
diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb
index 4a53a2a757..8fc5ed649d 100644
--- a/Library/Homebrew/reinstall.rb
+++ b/Library/Homebrew/reinstall.rb
@@ -25,7 +25,7 @@ module Homebrew
 
     fi = FormulaInstaller.new(f)
     fi.options              = options
-    fi.build_bottle         = Homebrew.args.build_bottle
+    fi.build_bottle         = Homebrew.args.build_bottle?
     fi.interactive          = Homebrew.args.interactive?
     fi.git                  = Homebrew.args.git?
     fi.link_keg           ||= keg_was_linked if keg_had_linked_opt
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 6258a18091..676e7e524f 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -95,7 +95,7 @@ class SoftwareSpec
 
   def bottled?
     bottle_specification.tag?(Utils::Bottles.tag) && \
-      (bottle_specification.compatible_cellar? || Homebrew.args.force_bottle)
+      (bottle_specification.compatible_cellar? || Homebrew.args.force_bottle?)
   end
 
   def bottle(disable_type = nil, disable_reason = nil, &block)

From 4b68c7a08c56f819b11d308878e437a9aaba3194 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Mon, 4 May 2020 15:26:38 -0700
Subject: [PATCH 018/134] tests.yml: Deploy the Docker image to Docker Hub

---
 .github/workflows/tests.yml | 27 ++++++++++++---------------
 Dockerfile.yml              | 17 -----------------
 2 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 Dockerfile.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 27c6346584..7948132c62 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -174,30 +174,27 @@ jobs:
 
     - name: Build Docker image
       if: matrix.os == 'ubuntu-latest'
-      run: |
-        docker pull homebrew/brew
-        docker-compose -f Dockerfile.yml build sut
+      run: docker build -t brew .
 
     - name: Run brew test-bot
       run: |
         if [ "$RUNNER_OS" = "Linux" ]; then
-          docker-compose -f Dockerfile.yml run --rm -v $GITHUB_WORKSPACE:/tmp/test-bot sut
-          docker tag homebrew_sut brew
+          docker run --rm brew brew test-bot
         else
           brew test-bot
         fi
 
-    - name: Deploy the latest Docker image to GitHub
-      if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
+    - name: Deploy the Docker image to GitHub and Docker Hub
+      if: matrix.os == 'ubuntu-latest' && (github.ref == 'refs/heads/master' || github.event_name == 'release')
       run: |
+        case $GITHUB_REF in
+          refs/heads/master) v=latest ;;
+          refs/tags/*) v=${GITHUB_REF:10} ;;
+          *) echo Error: unexpected GITHUB_REF: $GITHUB_REF; exit 1 ;;
+        esac
         docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-        docker tag brew docker.pkg.github.com/homebrew/brew/brew
-        docker push docker.pkg.github.com/homebrew/brew/brew
-
-    - name: Deploy the tagged Docker image to GitHub
-      if: matrix.os == 'ubuntu-latest' && startsWith(github.ref, 'refs/tags/')
-      run: |
-        docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-        v=${GITHUB_REF:10}
         docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$v"
         docker push "docker.pkg.github.com/homebrew/brew/brew:$v"
+        docker login docker.com -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
+        docker tag "brew homebrew/brew:$v"
+        docker push "homebrew/brew:$v"
diff --git a/Dockerfile.yml b/Dockerfile.yml
deleted file mode 100644
index ac02ce9147..0000000000
--- a/Dockerfile.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3.7'
-
-services:
-  sut:
-    build:
-      context: .
-      cache_from:
-        - homebrew/brew
-      args:
-        - FORCE_REBUILD=1
-    command:
-      - sh
-      - -xc
-      - |
-        /home/linuxbrew/.linuxbrew/bin/brew test-bot
-        status=$$?
-        exit $$status

From 63e6632aa9f616c60d120761bba94a3cacc3b0e7 Mon Sep 17 00:00:00 2001
From: Bob Wombat Hogg <wombat@rwhogg.site>
Date: Wed, 6 May 2020 08:45:07 -0400
Subject: [PATCH 019/134] docs: Update tap-pin and tap-unpin disable
 explanations

I interpreted the existing message as meaning "you don't pin
a tap any more, rather you pin a specific formula from that
tap". I.e. the command still worked, but it had to be done
on a per-formula basis (eg. `brew tap-pin linuxbrew/xorg/mesa` instead
of just `brew tap-pin linuxbrew/xorg`)

IMO, this makes it clearer that the command itself is no longer
supported.
---
 Library/Homebrew/cmd/tap-pin.rb   | 4 ++--
 Library/Homebrew/cmd/tap-unpin.rb | 4 ++--
 Library/Homebrew/formulary.rb     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/cmd/tap-pin.rb b/Library/Homebrew/cmd/tap-pin.rb
index 97397a7ef5..b8e7a87365 100644
--- a/Library/Homebrew/cmd/tap-pin.rb
+++ b/Library/Homebrew/cmd/tap-pin.rb
@@ -12,7 +12,7 @@ module Homebrew
   end
 
   def tap_pin
-    odisabled "brew tap-pin user/tap",
-              "fully-scoped user/tap/formula naming"
+    odisabled "the brew tap-pin command",
+              "fully-scoped user/tap/formula naming when installing and in dependency references"
   end
 end
diff --git a/Library/Homebrew/cmd/tap-unpin.rb b/Library/Homebrew/cmd/tap-unpin.rb
index 07132ec629..2ec6e681a9 100644
--- a/Library/Homebrew/cmd/tap-unpin.rb
+++ b/Library/Homebrew/cmd/tap-unpin.rb
@@ -12,7 +12,7 @@ module Homebrew
   end
 
   def tap_unpin
-    odisabled "brew tap-pin user/tap",
-              "fully-scoped user/tap/formula naming"
+    odisabled "the brew tap-unpin command",
+              "fully-scoped user/tap/formula naming when installing and in dependency references"
   end
 end
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 83565d1a49..b01973fab6 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -491,8 +491,8 @@ module Formulary
     if possible_pinned_tap_formulae.size == 1
       selected_formula = factory(possible_pinned_tap_formulae.first, spec)
       if core_path(ref).file?
-        odisabled "brew tap-pin user/tap",
-                  "fully-scoped user/tap/formula naming"
+        odisabled "the brew tap-pin command",
+                  "fully-scoped user/tap/formula naming when installing and in dependency references"
       end
       selected_formula
     else

From 6fa09ab0eef3239e107e75ce1b5f6a39b7b3cf38 Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Wed, 6 May 2020 16:53:39 +0200
Subject: [PATCH 020/134] pr-automerge: match only approved PRs by default

Also remove default `--with-label` value and add `--without-approval`
option.

Reviews could be automatically dismissed on new commits pushed (there is
an option for that in repository settings on Github). That is not the
case for labels. They remain attached to a PR, even when new commits are
pushed. This is undesirable and creates security concerns, because
someone could introduce untested code just before the automerge happens.

Co-authored-by: Eric Knibbe <enk3@outlook.com>
---
 Library/Homebrew/dev-cmd/pr-automerge.rb | 11 +++++++----
 docs/Manpage.md                          |  4 +++-
 manpages/brew-cask.1                     |  2 +-
 manpages/brew.1                          |  8 ++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb
index 471cfc2c7e..c7aadd8ea1 100644
--- a/Library/Homebrew/dev-cmd/pr-automerge.rb
+++ b/Library/Homebrew/dev-cmd/pr-automerge.rb
@@ -16,9 +16,11 @@ module Homebrew
       flag   "--tap=",
              description: "Target tap repository (default: `homebrew/core`)."
       flag   "--with-label=",
-             description: "Pull requests must have this label (default: `ready to merge`)."
+             description: "Pull requests must have this label."
       comma_array "--without-labels=",
                   description: "Pull requests must not have these labels (default: `do not merge`, `new formula`)."
+      switch "--without-approval",
+             description: "Pull requests do not require approval to be merged."
       switch "--publish",
              description: "Run `brew pr-publish` on matching pull requests."
       switch "--ignore-failures",
@@ -33,12 +35,13 @@ module Homebrew
     pr_automerge_args.parse
 
     ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] = "1" unless OS.mac?
-    with_label = Homebrew.args.with_label || "ready to merge"
     without_labels = Homebrew.args.without_labels || ["do not merge", "new formula"]
     tap = Tap.fetch(Homebrew.args.tap || CoreTap.instance.name)
 
-    query = "is:pr is:open repo:#{tap.full_name} label:\"#{with_label}\""
-    query += args.ignore_failures? ? " -status:pending" : " status:success"
+    query = "is:pr is:open repo:#{tap.full_name}"
+    query += Homebrew.args.ignore_failures? ? " -status:pending" : " status:success"
+    query += " review:approved" unless Homebrew.args.without_approval?
+    query += " label:\"#{with_label}\"" if Homebrew.args.with_label
     without_labels&.each { |label| query += " -label:\"#{label}\"" }
     odebug "Searching: #{query}"
 
diff --git a/docs/Manpage.md b/docs/Manpage.md
index a6eccb4505..aaae77fd29 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -858,9 +858,11 @@ Find pull requests that can be automatically merged using `brew pr-publish`.
 * `--tap`:
   Target tap repository (default: `homebrew/core`).
 * `--with-label`:
-  Pull requests must have this label (default: `ready to merge`).
+  Pull requests must have this label.
 * `--without-labels`:
   Pull requests must not have these labels (default: `do not merge`, `new formula`).
+* `--without-approval`:
+  Pull requests do not require approval to be merged.
 * `--publish`:
   Run `brew pr-publish` on matching pull requests.
 * `--ignore-failures`:
diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1
index f9487b6347..1e989ae15e 100644
--- a/manpages/brew-cask.1
+++ b/manpages/brew-cask.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BREW\-CASK" "1" "April 2020" "Homebrew" "brew-cask"
+.TH "BREW\-CASK" "1" "May 2020" "Homebrew" "brew-cask"
 .
 .SH "NAME"
 \fBbrew\-cask\fR \- a friendly binary installer for macOS
diff --git a/manpages/brew.1 b/manpages/brew.1
index 39b4c97fdd..0cd099327f 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BREW" "1" "April 2020" "Homebrew" "brew"
+.TH "BREW" "1" "May 2020" "Homebrew" "brew"
 .
 .SH "NAME"
 \fBbrew\fR \- The Missing Package Manager for macOS
@@ -1103,13 +1103,17 @@ Target tap repository (default: \fBhomebrew/core\fR)\.
 .
 .TP
 \fB\-\-with\-label\fR
-Pull requests must have this label (default: \fBready to merge\fR)\.
+Pull requests must have this label\.
 .
 .TP
 \fB\-\-without\-labels\fR
 Pull requests must not have these labels (default: \fBdo not merge\fR, \fBnew formula\fR)\.
 .
 .TP
+\fB\-\-without\-approval\fR
+Pull requests do not require approval to be merged\.
+.
+.TP
 \fB\-\-publish\fR
 Run \fBbrew pr\-publish\fR on matching pull requests\.
 .

From f3e373cf6f54e65ff571c0c2913314cedccc8288 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 6 May 2020 18:06:36 +0000
Subject: [PATCH 021/134] build(deps): bump activesupport from 6.0.2.2 to 6.0.3
 in /docs

Bumps [activesupport](https://github.com/rails/rails) from 6.0.2.2 to 6.0.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v6.0.3/activesupport/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v6.0.2.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 docs/Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index d3d28d8299..58956ed770 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     coffee-script (2.4.1)

From 5e4e0401b0d30f8896c54ff542247def9991e044 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 7 May 2020 08:19:29 +0000
Subject: [PATCH 022/134] build(deps): bump activesupport in /Library/Homebrew

Bumps [activesupport](https://github.com/rails/rails) from 6.0.2.2 to 6.0.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v6.0.3/activesupport/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v6.0.2.2...v6.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 59bf7c9fb3..83792a8ee8 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)

From 85a9fc4abe9f46372c3f34fd241953deb1a44ca2 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 7 May 2020 10:02:34 +0100
Subject: [PATCH 023/134] cli/args: cleanup weird style.

This got autofixed by RuboCop but looks weird.
---
 Library/Homebrew/cli/args.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index 350767fd5c..b5734d43c0 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -79,8 +79,7 @@ module Homebrew
           else
             Formulary.find_with_priority(name, spec)
           end
-        end.uniq(&:name)
-                                                      .freeze
+        end.uniq(&:name).freeze
       end
 
       def resolved_formulae
@@ -88,15 +87,13 @@ module Homebrew
 
         @resolved_formulae ||= (downcased_unique_named - casks).map do |name|
           Formulary.resolve(name, spec: spec(nil))
-        end.uniq(&:name)
-                                                               .freeze
+        end.uniq(&:name).freeze
       end
 
       def formulae_paths
         @formulae_paths ||= (downcased_unique_named - casks).map do |name|
           Formulary.path(name)
-        end.uniq
-                                                            .freeze
+        end.uniq.freeze
       end
 
       def casks

From c91f39760508495ed4230667f5a5e8179f6b05fb Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 7 May 2020 10:33:02 +0100
Subject: [PATCH 024/134] cli: fix options handling.

Fix breaking options on taps again (second time in two weeks, sob).

To avoid doing this again: also add a test for this case (that I've
verified would have caught these cases).
---
 Library/Homebrew/cli/args.rb              | 15 ++++++++-
 Library/Homebrew/cli/parser.rb            | 37 +++++++++--------------
 Library/Homebrew/test/cmd/install_spec.rb | 13 ++++++++
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index 350767fd5c..5f44d753a5 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -13,6 +13,10 @@ module Homebrew
 
         @processed_options = []
 
+        # Can set these because they will be overwritten by freeze_named_args!
+        # (whereas other values below will only be overwritten if passed).
+        self[:named_args] = argv.reject { |arg| arg.start_with?("-") }
+
         # Set values needed before Parser#parse has been run.
         return unless set_default_args
 
@@ -22,15 +26,24 @@ module Homebrew
         self[:HEAD?] = argv.include?("--HEAD")
         self[:devel?] = argv.include?("--devel")
         self[:universal?] = argv.include?("--universal")
-        self[:named_args] = argv.reject { |arg| arg.start_with?("-") }
       end
 
       def freeze_named_args!(named_args)
+        # Reset cache values reliant on named_args
+        @formulae = nil
+        @resolved_formulae = nil
+        @formulae_paths = nil
+        @casks = nil
+        @kegs = nil
+
         self[:named_args] = named_args
         self[:named_args].freeze
       end
 
       def freeze_processed_options!(processed_options)
+        # Reset cache values reliant on processed_options
+        @cli_args = nil
+
         @processed_options += processed_options
         @processed_options.freeze
       end
diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb
index 7cf3889edd..4a7d2ca681 100644
--- a/Library/Homebrew/cli/parser.rb
+++ b/Library/Homebrew/cli/parser.rb
@@ -166,7 +166,6 @@ module Homebrew
         check_constraint_violations
         check_named_args(named_args, allow_no_named_args: allow_no_named_args)
         @args.freeze_named_args!(named_args)
-        parse_formula_options
         @args.freeze_processed_options!(@processed_options)
         Homebrew.args = @args
 
@@ -189,7 +188,21 @@ module Homebrew
       end
 
       def formula_options
-        @parse_formula_options = true
+        @args.formulae.each do |f|
+          next if f.options.empty?
+
+          f.options.each do |o|
+            name = o.flag
+            description = "`#{f.name}`: #{o.description}"
+            if name.end_with? "="
+              flag   name, description: description
+            else
+              switch name, description: description
+            end
+          end
+        end
+      rescue FormulaUnavailableError
+        []
       end
 
       def max_named(count)
@@ -228,26 +241,6 @@ module Homebrew
 
       private
 
-      def parse_formula_options
-        return unless @parse_formula_options
-
-        @args.formulae.each do |f|
-          next if f.options.empty?
-
-          f.options.each do |o|
-            name = o.flag
-            description = "`#{f.name}`: #{o.description}"
-            if name.end_with? "="
-              flag   name, description: description
-            else
-              switch name, description: description
-            end
-          end
-        end
-      rescue FormulaUnavailableError
-        []
-      end
-
       def enable_switch(*names, from:)
         names.each do |name|
           @switch_sources[option_to_name(name)] = from
diff --git a/Library/Homebrew/test/cmd/install_spec.rb b/Library/Homebrew/test/cmd/install_spec.rb
index 0bc91c86c5..b0623567a3 100644
--- a/Library/Homebrew/test/cmd/install_spec.rb
+++ b/Library/Homebrew/test/cmd/install_spec.rb
@@ -14,6 +14,17 @@ describe "brew install", :integration_test do
       .to output(%r{#{HOMEBREW_CELLAR}/testball1/0\.1}).to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
+    expect(HOMEBREW_CELLAR/"testball1/0.1/foo/test").not_to be_a_file
+  end
+
+  it "installs formulae with options" do
+    setup_test_formula "testball1"
+
+    expect { brew "install", "testball1", "--with-foo" }
+      .to output(%r{#{HOMEBREW_CELLAR}/testball1/0\.1}).to_stdout
+      .and not_to_output.to_stderr
+      .and be_a_success
+    expect(HOMEBREW_CELLAR/"testball1/0.1/foo/test").to be_a_file
   end
 
   it "can install keg-only Formulae" do
@@ -27,6 +38,7 @@ describe "brew install", :integration_test do
       .to output(%r{#{HOMEBREW_CELLAR}/testball1/1\.0}).to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
+    expect(HOMEBREW_CELLAR/"testball1/1.0/foo/test").not_to be_a_file
   end
 
   it "can install HEAD Formulae" do
@@ -59,5 +71,6 @@ describe "brew install", :integration_test do
       .to output(%r{#{HOMEBREW_CELLAR}/testball1/HEAD\-d5eb689}).to_stdout
       .and output(/Cloning into/).to_stderr
       .and be_a_success
+    expect(HOMEBREW_CELLAR/"testball1/HEAD-d5eb689/foo/test").not_to be_a_file
   end
 end

From c05b3a755fd643a007558372f1e47f43abc694a9 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 7 May 2020 10:34:59 +0100
Subject: [PATCH 025/134] shellenv: recommend .bash_profile

Fixes #7516
---
 Library/Homebrew/cmd/shellenv.sh | 2 +-
 docs/Manpage.md                  | 2 +-
 manpages/brew-cask.1             | 2 +-
 manpages/brew.1                  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/cmd/shellenv.sh b/Library/Homebrew/cmd/shellenv.sh
index b478b6fcf4..b96ddb6a60 100644
--- a/Library/Homebrew/cmd/shellenv.sh
+++ b/Library/Homebrew/cmd/shellenv.sh
@@ -3,7 +3,7 @@
 #:  Print export statements. When run in a shell, this installation of Homebrew will be added to your `PATH`, `MANPATH`, and `INFOPATH`.
 #:
 #:  The variables `HOMEBREW_PREFIX`, `HOMEBREW_CELLAR` and `HOMEBREW_REPOSITORY` are also exported to avoid querying them multiple times.
-#:  Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.profile` or `~/.zprofile`) with: `eval $(brew shellenv)`
+#:  Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.bash_profile` or `~/.zprofile`) with: `eval $(brew shellenv)`
 
 homebrew-shellenv() {
   case "$SHELL" in
diff --git a/docs/Manpage.md b/docs/Manpage.md
index a6eccb4505..84ea7ad024 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -435,7 +435,7 @@ ones). No online search is performed.
 Print export statements. When run in a shell, this installation of Homebrew will be added to your `PATH`, `MANPATH`, and `INFOPATH`.
 
 The variables `HOMEBREW_PREFIX`, `HOMEBREW_CELLAR` and `HOMEBREW_REPOSITORY` are also exported to avoid querying them multiple times.
-Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.profile` or `~/.zprofile`) with: `eval $(brew shellenv)`
+Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.bash_profile` or `~/.zprofile`) with: `eval $(brew shellenv)`
 
 ### `switch` *`formula`* *`version`*
 
diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1
index f9487b6347..1e989ae15e 100644
--- a/manpages/brew-cask.1
+++ b/manpages/brew-cask.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BREW\-CASK" "1" "April 2020" "Homebrew" "brew-cask"
+.TH "BREW\-CASK" "1" "May 2020" "Homebrew" "brew-cask"
 .
 .SH "NAME"
 \fBbrew\-cask\fR \- a friendly binary installer for macOS
diff --git a/manpages/brew.1 b/manpages/brew.1
index 39b4c97fdd..813451a8d9 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BREW" "1" "April 2020" "Homebrew" "brew"
+.TH "BREW" "1" "May 2020" "Homebrew" "brew"
 .
 .SH "NAME"
 \fBbrew\fR \- The Missing Package Manager for macOS
@@ -576,7 +576,7 @@ Search for \fItext\fR in the given package manager\'s list\.
 Print export statements\. When run in a shell, this installation of Homebrew will be added to your \fBPATH\fR, \fBMANPATH\fR, and \fBINFOPATH\fR\.
 .
 .P
-The variables \fBHOMEBREW_PREFIX\fR, \fBHOMEBREW_CELLAR\fR and \fBHOMEBREW_REPOSITORY\fR are also exported to avoid querying them multiple times\. Consider adding evaluation of this command\'s output to your dotfiles (e\.g\. \fB~/\.profile\fR or \fB~/\.zprofile\fR) with: \fBeval $(brew shellenv)\fR
+The variables \fBHOMEBREW_PREFIX\fR, \fBHOMEBREW_CELLAR\fR and \fBHOMEBREW_REPOSITORY\fR are also exported to avoid querying them multiple times\. Consider adding evaluation of this command\'s output to your dotfiles (e\.g\. \fB~/\.bash_profile\fR or \fB~/\.zprofile\fR) with: \fBeval $(brew shellenv)\fR
 .
 .SS "\fBswitch\fR \fIformula\fR \fIversion\fR"
 Symlink all of the specified \fIversion\fR of \fIformula\fR\'s installation into Homebrew\'s prefix\.

From 426c0ceb187704293c83dc488beb3a553981fc65 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 7 May 2020 10:37:19 +0100
Subject: [PATCH 026/134] brew vendor-gems: commit updates.

---
 .../Homebrew/vendor/bundle/bundler/setup.rb   |  6 +--
 .../lib/active_support/option_merger.rb       | 27 -----------
 .../lib/active_support/actionable_error.rb    |  0
 .../lib/active_support/array_inquirer.rb      |  0
 .../lib/active_support/backtrace_cleaner.rb   |  1 -
 .../lib/active_support/benchmarkable.rb       |  0
 .../lib/active_support/builder.rb             |  0
 .../lib/active_support/callbacks.rb           |  3 --
 .../lib/active_support/concern.rb             |  0
 .../lib/active_support/configurable.rb        |  0
 .../lib/active_support/core_ext.rb            |  0
 .../lib/active_support/core_ext/array.rb      |  0
 .../active_support/core_ext/array/access.rb   |  0
 .../core_ext/array/conversions.rb             | 10 ++---
 .../active_support/core_ext/array/extract.rb  |  0
 .../core_ext/array/extract_options.rb         |  0
 .../active_support/core_ext/array/grouping.rb |  0
 .../active_support/core_ext/array/inquiry.rb  |  0
 .../core_ext/array/prepend_and_append.rb      |  0
 .../lib/active_support/core_ext/array/wrap.rb |  0
 .../lib/active_support/core_ext/benchmark.rb  |  0
 .../active_support/core_ext/big_decimal.rb    |  0
 .../core_ext/big_decimal/conversions.rb       |  0
 .../lib/active_support/core_ext/class.rb      |  0
 .../core_ext/class/attribute.rb               |  0
 .../core_ext/class/attribute_accessors.rb     |  0
 .../core_ext/class/subclasses.rb              |  0
 .../lib/active_support/core_ext/date.rb       |  0
 .../active_support/core_ext/date/acts_like.rb |  0
 .../lib/active_support/core_ext/date/blank.rb |  0
 .../core_ext/date/calculations.rb             |  0
 .../core_ext/date/conversions.rb              |  0
 .../lib/active_support/core_ext/date/zones.rb |  0
 .../core_ext/date_and_time/calculations.rb    |  0
 .../core_ext/date_and_time/compatibility.rb   |  0
 .../core_ext/date_and_time/zones.rb           |  1 -
 .../lib/active_support/core_ext/date_time.rb  |  0
 .../core_ext/date_time/acts_like.rb           |  0
 .../core_ext/date_time/blank.rb               |  0
 .../core_ext/date_time/calculations.rb        |  0
 .../core_ext/date_time/compatibility.rb       |  0
 .../core_ext/date_time/conversions.rb         |  1 -
 .../lib/active_support/core_ext/digest.rb     |  0
 .../active_support/core_ext/digest/uuid.rb    |  0
 .../lib/active_support/core_ext/enumerable.rb |  0
 .../lib/active_support/core_ext/file.rb       |  0
 .../active_support/core_ext/file/atomic.rb    |  0
 .../lib/active_support/core_ext/hash.rb       |  0
 .../active_support/core_ext/hash/compact.rb   |  0
 .../core_ext/hash/conversions.rb              |  2 +-
 .../core_ext/hash/deep_merge.rb               |  0
 .../core_ext/hash/deep_transform_values.rb    |  0
 .../active_support/core_ext/hash/except.rb    |  0
 .../core_ext/hash/indifferent_access.rb       |  0
 .../lib/active_support/core_ext/hash/keys.rb  |  0
 .../core_ext/hash/reverse_merge.rb            |  0
 .../lib/active_support/core_ext/hash/slice.rb |  0
 .../core_ext/hash/transform_values.rb         |  0
 .../lib/active_support/core_ext/integer.rb    |  0
 .../core_ext/integer/inflections.rb           |  0
 .../core_ext/integer/multiple.rb              |  0
 .../active_support/core_ext/integer/time.rb   |  0
 .../lib/active_support/core_ext/kernel.rb     |  0
 .../active_support/core_ext/kernel/concern.rb |  0
 .../core_ext/kernel/reporting.rb              |  0
 .../core_ext/kernel/singleton_class.rb        |  0
 .../lib/active_support/core_ext/load_error.rb |  0
 .../lib/active_support/core_ext/marshal.rb    |  0
 .../lib/active_support/core_ext/module.rb     |  0
 .../core_ext/module/aliasing.rb               |  0
 .../core_ext/module/anonymous.rb              |  0
 .../core_ext/module/attr_internal.rb          |  0
 .../core_ext/module/attribute_accessors.rb    |  0
 .../module/attribute_accessors_per_thread.rb  |  0
 .../core_ext/module/concerning.rb             |  0
 .../core_ext/module/delegation.rb             |  9 +++-
 .../core_ext/module/deprecation.rb            |  0
 .../core_ext/module/introspection.rb          |  1 +
 .../core_ext/module/reachable.rb              |  0
 .../core_ext/module/redefine_method.rb        |  0
 .../core_ext/module/remove_method.rb          |  0
 .../lib/active_support/core_ext/name_error.rb |  0
 .../lib/active_support/core_ext/numeric.rb    |  0
 .../active_support/core_ext/numeric/bytes.rb  |  0
 .../core_ext/numeric/conversions.rb           |  0
 .../core_ext/numeric/inquiry.rb               |  0
 .../active_support/core_ext/numeric/time.rb   |  0
 .../lib/active_support/core_ext/object.rb     |  0
 .../core_ext/object/acts_like.rb              |  0
 .../active_support/core_ext/object/blank.rb   |  0
 .../core_ext/object/conversions.rb            |  0
 .../core_ext/object/deep_dup.rb               |  0
 .../core_ext/object/duplicable.rb             |  0
 .../core_ext/object/inclusion.rb              |  0
 .../core_ext/object/instance_variables.rb     |  0
 .../active_support/core_ext/object/json.rb    |  0
 .../core_ext/object/to_param.rb               |  0
 .../core_ext/object/to_query.rb               |  0
 .../lib/active_support/core_ext/object/try.rb |  2 +
 .../core_ext/object/with_options.rb           |  0
 .../lib/active_support/core_ext/range.rb      |  0
 .../core_ext/range/compare_range.rb           |  0
 .../core_ext/range/conversions.rb             |  0
 .../lib/active_support/core_ext/range/each.rb |  1 -
 .../core_ext/range/include_range.rb           |  0
 .../core_ext/range/include_time_with_zone.rb  |  0
 .../active_support/core_ext/range/overlaps.rb |  0
 .../lib/active_support/core_ext/regexp.rb     |  0
 .../active_support/core_ext/securerandom.rb   |  0
 .../lib/active_support/core_ext/string.rb     |  0
 .../active_support/core_ext/string/access.rb  |  0
 .../core_ext/string/behavior.rb               |  0
 .../core_ext/string/conversions.rb            |  0
 .../active_support/core_ext/string/exclude.rb |  0
 .../active_support/core_ext/string/filters.rb |  0
 .../active_support/core_ext/string/indent.rb  |  0
 .../core_ext/string/inflections.rb            |  0
 .../active_support/core_ext/string/inquiry.rb |  0
 .../core_ext/string/multibyte.rb              |  0
 .../core_ext/string/output_safety.rb          |  1 -
 .../core_ext/string/starts_ends_with.rb       |  0
 .../active_support/core_ext/string/strip.rb   |  0
 .../active_support/core_ext/string/zones.rb   |  0
 .../lib/active_support/core_ext/time.rb       |  0
 .../active_support/core_ext/time/acts_like.rb |  0
 .../core_ext/time/calculations.rb             |  0
 .../core_ext/time/compatibility.rb            |  0
 .../core_ext/time/conversions.rb              |  0
 .../lib/active_support/core_ext/time/zones.rb |  0
 .../lib/active_support/core_ext/uri.rb        |  0
 .../lib/active_support/current_attributes.rb  |  0
 .../lib/active_support/deprecation.rb         |  0
 .../active_support/deprecation/behaviors.rb   |  0
 .../deprecation/constant_accessor.rb          |  0
 .../deprecation/instance_delegator.rb         |  0
 .../deprecation/method_wrappers.rb            | 18 +++++---
 .../deprecation/proxy_wrappers.rb             |  6 ++-
 .../active_support/deprecation/reporting.rb   |  0
 .../lib/active_support/descendants_tracker.rb |  1 -
 .../lib/active_support/digest.rb              |  0
 .../lib/active_support/duration.rb            | 24 +++++-----
 .../active_support/encrypted_configuration.rb |  0
 .../lib/active_support/encrypted_file.rb      |  2 +-
 .../evented_file_update_checker.rb            |  1 -
 .../lib/active_support/execution_wrapper.rb   |  0
 .../lib/active_support/executor.rb            |  0
 .../lib/active_support/file_update_checker.rb |  1 -
 .../lib/active_support/gem_version.rb         |  4 +-
 .../lib/active_support/gzip.rb                |  0
 .../hash_with_indifferent_access.rb           |  0
 .../lib/active_support/i18n.rb                |  0
 .../lib/active_support/i18n_railtie.rb        |  0
 .../lib/active_support/inflections.rb         |  0
 .../lib/active_support/inflector.rb           |  0
 .../active_support/inflector/inflections.rb   |  1 -
 .../lib/active_support/inflector/methods.rb   |  3 +-
 .../active_support/inflector/transliterate.rb |  0
 .../lib/active_support/key_generator.rb       |  0
 .../lib/active_support/lazy_load_hooks.rb     |  1 -
 .../lib/active_support/locale/en.rb           |  6 ++-
 .../lib/active_support/locale/en.yml          |  0
 .../lib/active_support/logger.rb              |  2 +-
 .../lib/active_support/logger_silence.rb      |  0
 .../logger_thread_safe_level.rb               |  0
 .../lib/active_support/message_encryptor.rb   |  2 +-
 .../lib/active_support/message_verifier.rb    |  4 +-
 .../lib/active_support/multibyte.rb           |  0
 .../lib/active_support/notifications.rb       |  0
 .../active_support/notifications/fanout.rb    |  0
 .../notifications/instrumenter.rb             |  1 -
 .../lib/active_support/option_merger.rb       | 45 +++++++++++++++++++
 .../lib/active_support/ordered_hash.rb        |  0
 .../lib/active_support/ordered_options.rb     |  4 ++
 .../lib/active_support/parameter_filter.rb    |  3 +-
 .../lib/active_support/per_thread_registry.rb |  0
 .../lib/active_support/proxy_object.rb        |  0
 .../lib/active_support/rails.rb               |  0
 .../lib/active_support/railtie.rb             |  0
 .../lib/active_support/reloader.rb            |  0
 .../lib/active_support/rescuable.rb           |  0
 .../lib/active_support/security_utils.rb      |  0
 .../lib/active_support/string_inquirer.rb     |  1 -
 .../lib/active_support/subscriber.rb          |  0
 .../lib/active_support/tagged_logging.rb      |  0
 .../lib/active_support/test_case.rb           |  0
 .../lib/active_support/time.rb                |  0
 .../lib/active_support/time_with_zone.rb      |  0
 .../lib/active_support/values/time_zone.rb    |  0
 .../lib/active_support/version.rb             |  0
 .../lib/active_support/xml_mini.rb            |  1 -
 .../lib/active_support/xml_mini/jdom.rb       |  1 -
 .../lib/active_support/xml_mini/libxml.rb     |  0
 .../lib/active_support/xml_mini/libxmlsax.rb  |  0
 .../lib/active_support/xml_mini/nokogiri.rb   |  0
 .../active_support/xml_mini/nokogirisax.rb    |  0
 .../lib/active_support/xml_mini/rexml.rb      |  0
 196 files changed, 112 insertions(+), 85 deletions(-)
 delete mode 100644 Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/option_merger.rb
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/actionable_error.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/array_inquirer.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/backtrace_cleaner.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/benchmarkable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/builder.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/callbacks.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/concern.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/configurable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/conversions.rb (96%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/extract.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/extract_options.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/grouping.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/inquiry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/prepend_and_append.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/array/wrap.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/benchmark.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/big_decimal.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/big_decimal/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/class.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/class/attribute.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/class/attribute_accessors.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/class/subclasses.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date/blank.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date/zones.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_and_time/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_and_time/compatibility.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_and_time/zones.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_time/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_time/blank.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_time/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_time/compatibility.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/date_time/conversions.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/digest.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/digest/uuid.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/enumerable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/file.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/file/atomic.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/compact.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/conversions.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/deep_merge.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/deep_transform_values.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/except.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/indifferent_access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/keys.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/reverse_merge.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/slice.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/hash/transform_values.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/integer.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/integer/inflections.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/integer/multiple.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/integer/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/kernel.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/kernel/concern.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/kernel/reporting.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/kernel/singleton_class.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/load_error.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/marshal.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/aliasing.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/anonymous.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/attr_internal.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/attribute_accessors.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/concerning.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/delegation.rb (97%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/deprecation.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/introspection.rb (97%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/reachable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/redefine_method.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/module/remove_method.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/name_error.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/numeric.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/numeric/bytes.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/numeric/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/numeric/inquiry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/numeric/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/blank.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/deep_dup.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/duplicable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/inclusion.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/instance_variables.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/json.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/to_param.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/to_query.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/try.rb (96%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/object/with_options.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/range.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/range/compare_range.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/range/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/range/each.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/range/include_range.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/range/include_time_with_zone.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/range/overlaps.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/regexp.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/securerandom.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/behavior.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/exclude.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/filters.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/indent.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/inflections.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/inquiry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/multibyte.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/output_safety.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/starts_ends_with.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/strip.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/string/zones.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/time/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/time/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/time/compatibility.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/time/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/time/zones.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/core_ext/uri.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/current_attributes.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/deprecation.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/deprecation/behaviors.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/deprecation/constant_accessor.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/deprecation/instance_delegator.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/deprecation/method_wrappers.rb (80%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/deprecation/proxy_wrappers.rb (96%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/deprecation/reporting.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/descendants_tracker.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/digest.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/duration.rb (96%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/encrypted_configuration.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/encrypted_file.rb (96%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/evented_file_update_checker.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/execution_wrapper.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/executor.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/file_update_checker.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/gem_version.rb (91%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/gzip.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/hash_with_indifferent_access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/i18n.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/i18n_railtie.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/inflections.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/inflector.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/inflector/inflections.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/inflector/methods.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/inflector/transliterate.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/key_generator.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/lazy_load_hooks.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/locale/en.rb (78%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/locale/en.yml (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/logger.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/logger_silence.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/logger_thread_safe_level.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/message_encryptor.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/message_verifier.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/multibyte.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/notifications.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/notifications/fanout.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/notifications/instrumenter.rb (99%)
 create mode 100644 Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/option_merger.rb
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/ordered_hash.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/ordered_options.rb (97%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/parameter_filter.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/per_thread_registry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/proxy_object.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/rails.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/railtie.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/reloader.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/rescuable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/security_utils.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/string_inquirer.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/subscriber.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/tagged_logging.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/test_case.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/time_with_zone.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/values/time_zone.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/version.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/xml_mini.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/xml_mini/jdom.rb (99%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/xml_mini/libxml.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/xml_mini/libxmlsax.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/xml_mini/nokogiri.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/xml_mini/nokogirisax.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.2 => activesupport-6.0.3}/lib/active_support/xml_mini/rexml.rb (100%)

diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
index bb5b6581f2..efc95978a1 100644
--- a/Library/Homebrew/vendor/bundle/bundler/setup.rb
+++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -9,7 +9,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.14.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.7/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.3.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.0.2.2/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.0.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib"
 $:.unshift "#{path}/"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.2/lib"
@@ -53,8 +53,8 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-1
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rexml-3.2.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ronn-0.7.3/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.9.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-core-3.9.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.9.3/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-core-3.9.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.9.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-mocks-3.9.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.9.0/lib"
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/option_merger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/option_merger.rb
deleted file mode 100644
index ab9ca727f6..0000000000
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/option_merger.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/core_ext/hash/deep_merge"
-
-module ActiveSupport
-  class OptionMerger #:nodoc:
-    instance_methods.each do |method|
-      undef_method(method) if method !~ /^(__|instance_eval|class|object_id)/
-    end
-
-    def initialize(context, options)
-      @context, @options = context, options
-    end
-
-    private
-      def method_missing(method, *arguments, &block)
-        if arguments.first.is_a?(Proc)
-          proc = arguments.pop
-          arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) }
-        else
-          arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup)
-        end
-
-        @context.__send__(method, *arguments, &block)
-      end
-  end
-end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/actionable_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/actionable_error.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/actionable_error.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/actionable_error.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/array_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/array_inquirer.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/array_inquirer.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/array_inquirer.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/backtrace_cleaner.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/backtrace_cleaner.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/backtrace_cleaner.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/backtrace_cleaner.rb
index 02cbfbaee6..f55e821e10 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/backtrace_cleaner.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/backtrace_cleaner.rb
@@ -85,7 +85,6 @@ module ActiveSupport
     end
 
     private
-
       FORMATTED_GEMS_PATTERN = /\A[^\/]+ \([\w.]+\) /
 
       def add_gem_filter
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/benchmarkable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/benchmarkable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/benchmarkable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/benchmarkable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/builder.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/builder.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/builder.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/builder.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/callbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/callbacks.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/callbacks.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/callbacks.rb
index d0644a0f7e..11746e0537 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/callbacks.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/callbacks.rb
@@ -142,7 +142,6 @@ module ActiveSupport
     end
 
     private
-
       # A hook invoked every time a before callback is halted.
       # This can be overridden in ActiveSupport::Callbacks implementors in order
       # to provide better debugging/logging.
@@ -582,7 +581,6 @@ module ActiveSupport
           attr_reader :chain
 
         private
-
           def append_one(callback)
             @callbacks = nil
             remove_duplicates(callback)
@@ -843,7 +841,6 @@ module ActiveSupport
         end
 
         protected
-
           def get_callbacks(name) # :nodoc:
             __callbacks[name.to_sym]
           end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/concern.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/concern.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/concern.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/configurable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/configurable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/configurable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/configurable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/conversions.rb
similarity index 96%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/conversions.rb
index ea688ed2ea..0780c4ed8a 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/conversions.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/conversions.rb
@@ -74,13 +74,13 @@ class Array
 
     case length
     when 0
-      ""
+      +""
     when 1
-      "#{self[0]}"
+      +"#{self[0]}"
     when 2
-      "#{self[0]}#{options[:two_words_connector]}#{self[1]}"
+      +"#{self[0]}#{options[:two_words_connector]}#{self[1]}"
     else
-      "#{self[0...-1].join(options[:words_connector])}#{options[:last_word_connector]}#{self[-1]}"
+      +"#{self[0...-1].join(options[:words_connector])}#{options[:last_word_connector]}#{self[-1]}"
     end
   end
 
@@ -181,7 +181,7 @@ class Array
   #   </messages>
   #
   def to_xml(options = {})
-    require "active_support/builder" unless defined?(Builder)
+    require "active_support/builder" unless defined?(Builder::XmlMarkup)
 
     options = options.dup
     options[:indent]  ||= 2
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/extract.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/extract.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/extract_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract_options.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/extract_options.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract_options.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/grouping.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/grouping.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/grouping.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/grouping.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/inquiry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/inquiry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/inquiry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/prepend_and_append.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/prepend_and_append.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/prepend_and_append.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/prepend_and_append.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/wrap.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/wrap.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/wrap.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/wrap.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/benchmark.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/benchmark.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/benchmark.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/benchmark.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/big_decimal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/big_decimal.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/big_decimal/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/big_decimal/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/attribute.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/attribute.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute_accessors.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/attribute_accessors.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute_accessors.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/subclasses.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/subclasses.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/subclasses.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/subclasses.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/blank.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/blank.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/blank.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/zones.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/zones.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_and_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_and_time/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_and_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/compatibility.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_and_time/compatibility.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/compatibility.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_and_time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/zones.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_and_time/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/zones.rb
index 894fd9b76d..fb6a27cb27 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_and_time/zones.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/zones.rb
@@ -29,7 +29,6 @@ module DateAndTime
     end
 
     private
-
       def time_with_zone(time, zone)
         if time
           ActiveSupport::TimeWithZone.new(time.utc? ? time : time.getutc, zone)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/blank.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/blank.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/blank.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/compatibility.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/compatibility.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/compatibility.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/conversions.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/conversions.rb
index 29725c89f7..231bf870a2 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/conversions.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/conversions.rb
@@ -96,7 +96,6 @@ class DateTime
   end
 
   private
-
     def offset_in_seconds
       (offset * 86400).to_i
     end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/digest.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/digest/uuid.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest/uuid.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/digest/uuid.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest/uuid.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/enumerable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/enumerable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/enumerable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/enumerable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/file.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/file/atomic.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file/atomic.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/file/atomic.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file/atomic.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/compact.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/compact.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/compact.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/compact.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/conversions.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/conversions.rb
index 5b48254646..61cbcaff27 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/conversions.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/conversions.rb
@@ -73,7 +73,7 @@ class Hash
   # configure your own builder with the <tt>:builder</tt> option. The method also accepts
   # options like <tt>:dasherize</tt> and friends, they are forwarded to the builder.
   def to_xml(options = {})
-    require "active_support/builder" unless defined?(Builder)
+    require "active_support/builder" unless defined?(Builder::XmlMarkup)
 
     options = options.dup
     options[:indent]  ||= 2
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/deep_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_merge.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/deep_merge.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_merge.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/deep_transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_transform_values.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/deep_transform_values.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_transform_values.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/except.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/except.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/except.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/except.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/indifferent_access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/indifferent_access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/indifferent_access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/keys.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/keys.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/keys.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/keys.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/reverse_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/reverse_merge.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/reverse_merge.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/reverse_merge.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/slice.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/slice.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/slice.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/slice.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/transform_values.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/transform_values.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/transform_values.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/inflections.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/inflections.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/multiple.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/multiple.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/multiple.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/multiple.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/concern.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/concern.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/concern.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/reporting.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/reporting.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/reporting.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/singleton_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/singleton_class.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/singleton_class.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/singleton_class.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/load_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/load_error.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/load_error.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/load_error.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/marshal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/marshal.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/marshal.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/marshal.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/aliasing.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/aliasing.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/aliasing.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/aliasing.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/anonymous.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/anonymous.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/anonymous.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/anonymous.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attr_internal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attr_internal.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attr_internal.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attr_internal.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attribute_accessors.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/concerning.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/concerning.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/concerning.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/concerning.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/delegation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/delegation.rb
similarity index 97%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/delegation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/delegation.rb
index ccdb6f0a7f..893e3aff54 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/delegation.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/delegation.rb
@@ -193,7 +193,13 @@ class Module
     method_names = methods.map do |method|
       # Attribute writer methods only accept one argument. Makes sure []=
       # methods still accept two arguments.
-      definition = /[^\]]=$/.match?(method) ? "arg" : "*args, &block"
+      definition = if /[^\]]=$/.match?(method)
+        "arg"
+      elsif RUBY_VERSION >= "2.7"
+        "..."
+      else
+        "*args, &block"
+      end
 
       # The following generated method calls the target exactly once, storing
       # the returned value in a dummy variable.
@@ -308,6 +314,7 @@ class Module
           end
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     RUBY
   end
 end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/deprecation.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/deprecation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/deprecation.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/introspection.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/introspection.rb
similarity index 97%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/introspection.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/introspection.rb
index 9b6df40596..aff8c2f3ce 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/introspection.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/introspection.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/filters"
 require "active_support/inflector"
 
 class Module
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/reachable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/reachable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/reachable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/reachable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/redefine_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/redefine_method.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/redefine_method.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/redefine_method.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/remove_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/remove_method.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/remove_method.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/remove_method.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/name_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/name_error.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/name_error.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/name_error.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/bytes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/bytes.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/bytes.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/bytes.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/inquiry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/inquiry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/inquiry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/blank.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/blank.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/blank.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/deep_dup.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/deep_dup.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/deep_dup.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/deep_dup.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/duplicable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/duplicable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/duplicable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/duplicable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/inclusion.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/inclusion.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/inclusion.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/inclusion.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/instance_variables.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/instance_variables.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/instance_variables.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/instance_variables.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/json.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/json.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/json.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/json.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/to_param.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_param.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/to_param.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_param.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/to_query.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_query.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/to_query.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_query.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/try.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/try.rb
similarity index 96%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/try.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/try.rb
index ef8a1f476d..d4b13fa413 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/try.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/try.rb
@@ -15,6 +15,7 @@ module ActiveSupport
         public_send(method_name, *args, &b)
       end
     end
+    ruby2_keywords(:try) if respond_to?(:ruby2_keywords, true)
 
     def try!(method_name = nil, *args, &b)
       if method_name.nil? && block_given?
@@ -27,6 +28,7 @@ module ActiveSupport
         public_send(method_name, *args, &b)
       end
     end
+    ruby2_keywords(:try!) if respond_to?(:ruby2_keywords, true)
   end
 end
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/with_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/with_options.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/with_options.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/with_options.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/compare_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/compare_range.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/compare_range.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/compare_range.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/each.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/each.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/each.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/each.rb
index 2f22cd0e92..2d86997edf 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/each.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/each.rb
@@ -15,7 +15,6 @@ module ActiveSupport
     end
 
     private
-
       def ensure_iteration_allowed
         raise TypeError, "can't iterate from #{first.class}" if first.is_a?(TimeWithZone)
       end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/include_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_range.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/include_range.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_range.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/include_time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_time_with_zone.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/include_time_with_zone.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_time_with_zone.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/overlaps.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/overlaps.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/overlaps.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/overlaps.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/regexp.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/regexp.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/regexp.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/regexp.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/securerandom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/securerandom.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/securerandom.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/securerandom.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/behavior.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/behavior.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/behavior.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/behavior.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/exclude.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/exclude.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/exclude.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/exclude.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/filters.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/filters.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/filters.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/filters.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/indent.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/indent.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/indent.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/indent.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inflections.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inflections.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inquiry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/inquiry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inquiry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/multibyte.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/multibyte.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/multibyte.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/output_safety.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/output_safety.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/output_safety.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/output_safety.rb
index 62c628e23f..e226779422 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/output_safety.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/output_safety.rb
@@ -291,7 +291,6 @@ module ActiveSupport #:nodoc:
     end
 
     private
-
       def html_escape_interpolated_argument(arg)
         (!html_safe? || arg.html_safe?) ? arg : CGI.escapeHTML(arg.to_s)
       end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/starts_ends_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/starts_ends_with.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/starts_ends_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/starts_ends_with.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/strip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/strip.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/strip.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/strip.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/zones.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/zones.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/compatibility.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/compatibility.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/compatibility.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/zones.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/zones.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/uri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/uri.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/uri.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/uri.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/current_attributes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/current_attributes.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/current_attributes.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/current_attributes.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/behaviors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/behaviors.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/behaviors.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/behaviors.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/constant_accessor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/constant_accessor.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/constant_accessor.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/constant_accessor.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/instance_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/instance_delegator.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/instance_delegator.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/instance_delegator.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/method_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/method_wrappers.rb
similarity index 80%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/method_wrappers.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/method_wrappers.rb
index 7c0a54a1d0..bc202ff2e4 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/method_wrappers.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/method_wrappers.rb
@@ -58,15 +58,21 @@ module ActiveSupport
         method_names.each do |method_name|
           if target_module.method_defined?(method_name) || target_module.private_method_defined?(method_name)
             method = target_module.instance_method(method_name)
-            target_module.redefine_method(method_name) do |*args, &block|
-              deprecator.deprecation_warning(method_name, options[method_name])
-              method.bind(self).call(*args, &block)
+            target_module.module_eval do
+              redefine_method(method_name) do |*args, &block|
+                deprecator.deprecation_warning(method_name, options[method_name])
+                method.bind(self).call(*args, &block)
+              end
+              ruby2_keywords(method_name) if respond_to?(:ruby2_keywords, true)
             end
           else
             mod ||= Module.new
-            mod.define_method(method_name) do |*args, &block|
-              deprecator.deprecation_warning(method_name, options[method_name])
-              super(*args, &block)
+            mod.module_eval do
+              define_method(method_name) do |*args, &block|
+                deprecator.deprecation_warning(method_name, options[method_name])
+                super(*args, &block)
+              end
+              ruby2_keywords(method_name) if respond_to?(:ruby2_keywords, true)
             end
           end
         end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/proxy_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/proxy_wrappers.rb
similarity index 96%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/proxy_wrappers.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/proxy_wrappers.rb
index 24c75b5661..b6b32e2025 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/proxy_wrappers.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/proxy_wrappers.rb
@@ -121,7 +121,7 @@ module ActiveSupport
     #        (Backtrace information…)
     #        ["Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune"]
     class DeprecatedConstantProxy < Module
-      def self.new(*args, &block)
+      def self.new(*args, **kwargs, &block)
         object = args.first
 
         return object unless object
@@ -145,6 +145,10 @@ module ActiveSupport
         target.inspect
       end
 
+      # Don't give a deprecation warning on methods that IRB may invoke
+      # during tab-completion.
+      delegate :hash, :instance_methods, :name, to: :target
+
       # Returns the class of the new constant.
       #
       #   PLANETS_POST_2006 = %w(mercury venus earth mars jupiter saturn uranus neptune)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/reporting.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/reporting.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/reporting.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/descendants_tracker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/descendants_tracker.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/descendants_tracker.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/descendants_tracker.rb
index 21565138a7..1dad4f923e 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/descendants_tracker.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/descendants_tracker.rb
@@ -41,7 +41,6 @@ module ActiveSupport
       end
 
       private
-
         def accumulate_descendants(klass, acc)
           if direct_descendants = @@direct_descendants[klass]
             direct_descendants.each do |direct_descendant|
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/digest.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/digest.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/digest.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/duration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/duration.rb
similarity index 96%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/duration.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/duration.rb
index 4ab7b827bb..f1f5253115 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/duration.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/duration.rb
@@ -182,15 +182,15 @@ module ActiveSupport
       #
       def build(value)
         parts = {}
-        remainder = value.to_f
+        remainder = value.round(9)
 
         PARTS.each do |part|
           unless part == :seconds
             part_in_seconds = PARTS_IN_SECONDS[part]
             parts[part] = remainder.div(part_in_seconds)
-            remainder = (remainder % part_in_seconds).round(9)
+            remainder %= part_in_seconds
           end
-        end
+        end unless value == 0
 
         parts[:seconds] = remainder
 
@@ -198,7 +198,6 @@ module ActiveSupport
       end
 
       private
-
         def calculate_total_seconds(parts)
           parts.inject(0) do |total, (part, value)|
             total + value * PARTS_IN_SECONDS[part]
@@ -209,7 +208,7 @@ module ActiveSupport
     def initialize(value, parts) #:nodoc:
       @value, @parts = value, parts.to_h
       @parts.default = 0
-      @parts.reject! { |k, v| v.zero? }
+      @parts.reject! { |k, v| v.zero? } unless value == 0
     end
 
     def coerce(other) #:nodoc:
@@ -372,7 +371,7 @@ module ActiveSupport
     alias :before :ago
 
     def inspect #:nodoc:
-      return "0 seconds" if parts.empty?
+      return "#{value} seconds" if parts.empty?
 
       parts.
         sort_by { |unit,  _ | PARTS.index(unit) }.
@@ -399,10 +398,15 @@ module ActiveSupport
     end
 
     private
-
       def sum(sign, time = ::Time.current)
-        parts.inject(time) do |t, (type, number)|
-          if t.acts_like?(:time) || t.acts_like?(:date)
+        unless time.acts_like?(:time) || time.acts_like?(:date)
+          raise ::ArgumentError, "expected a time or date, got #{time.inspect}"
+        end
+
+        if parts.empty?
+          time.since(sign * value)
+        else
+          parts.inject(time) do |t, (type, number)|
             if type == :seconds
               t.since(sign * number)
             elsif type == :minutes
@@ -412,8 +416,6 @@ module ActiveSupport
             else
               t.advance(type => sign * number)
             end
-          else
-            raise ::ArgumentError, "expected a time or date, got #{time.inspect}"
           end
         end
       end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_configuration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_configuration.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_configuration.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_configuration.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_file.rb
similarity index 96%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_file.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_file.rb
index 2b7db568a5..544dacb7e5 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_file.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_file.rb
@@ -94,7 +94,7 @@ module ActiveSupport
       end
 
       def handle_missing_key
-        raise MissingKeyError, key_path: key_path, env_key: env_key if raise_if_missing_key
+        raise MissingKeyError.new(key_path: key_path, env_key: env_key) if raise_if_missing_key
       end
   end
 end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/evented_file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/evented_file_update_checker.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/evented_file_update_checker.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/evented_file_update_checker.rb
index 98f9508071..9cbe1ed973 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/evented_file_update_checker.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/evented_file_update_checker.rb
@@ -224,7 +224,6 @@ module ActiveSupport
         end
 
         private
-
           def ascendant_of?(base, other)
             base != other && other.ascend do |ascendant|
               break true if base == ascendant
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/execution_wrapper.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/execution_wrapper.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/execution_wrapper.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/execution_wrapper.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/executor.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/executor.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/executor.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/file_update_checker.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/file_update_checker.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/file_update_checker.rb
index 1a0bb10815..9b665e7f19 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/file_update_checker.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/file_update_checker.rb
@@ -98,7 +98,6 @@ module ActiveSupport
     end
 
     private
-
       def watched
         @watched || begin
           all = @files.select { |f| File.exist?(f) }
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gem_version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gem_version.rb
similarity index 91%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gem_version.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gem_version.rb
index e75f204995..c279bb1169 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gem_version.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gem_version.rb
@@ -9,8 +9,8 @@ module ActiveSupport
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 2
-    PRE   = "2"
+    TINY  = 3
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gzip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gzip.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gzip.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gzip.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/hash_with_indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/hash_with_indifferent_access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/hash_with_indifferent_access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/hash_with_indifferent_access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n_railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n_railtie.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n_railtie.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n_railtie.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflections.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflections.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/inflections.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/inflections.rb
index 88cdd99dbd..5b29a13894 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/inflections.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/inflections.rb
@@ -230,7 +230,6 @@ module ActiveSupport
       end
 
       private
-
         def define_acronym_regex_patterns
           @acronym_regex             = @acronyms.empty? ? /(?=a)b/ : /#{@acronyms.values.join("|")}/
           @acronyms_camelize_regex   = /^(?:#{@acronym_regex}(?=\b|[A-Z_])|\w)/
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/methods.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/methods.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/methods.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/methods.rb
index ee193add6f..cb8ac62682 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/methods.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/methods.rb
@@ -196,7 +196,7 @@ module ActiveSupport
     #
     # Singular names are not handled correctly:
     #
-    #   classify('calculus')     # => "Calculus"
+    #   classify('calculus')     # => "Calculu"
     def classify(table_name)
       # strip out any leading schema name
       camelize(singularize(table_name.to_s.sub(/.*\./, "")))
@@ -359,7 +359,6 @@ module ActiveSupport
     end
 
     private
-
       # Mounts a regular expression, returned as a string to ease interpolation,
       # that will match part by part the given constant.
       #
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/transliterate.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/transliterate.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/transliterate.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/transliterate.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/key_generator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/key_generator.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/key_generator.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/key_generator.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/lazy_load_hooks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/lazy_load_hooks.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/lazy_load_hooks.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/lazy_load_hooks.rb
index a6b096a973..c6f7ccf0a2 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/lazy_load_hooks.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/lazy_load_hooks.rb
@@ -54,7 +54,6 @@ module ActiveSupport
     end
 
     private
-
       def with_execution_control(name, block, once)
         unless @run_once[name].include?(block)
           @run_once[name] << block if once
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.rb
similarity index 78%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.rb
index a2a7ea7ae1..29eb9dec0c 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.rb
@@ -4,7 +4,8 @@
   en: {
     number: {
       nth: {
-        ordinals: lambda do |_key, number:, **_options|
+        ordinals: lambda do |_key, options|
+          number = options[:number]
           case number
           when 1; "st"
           when 2; "nd"
@@ -22,7 +23,8 @@
           end
         end,
 
-        ordinalized: lambda do |_key, number:, **_options|
+        ordinalized: lambda do |_key, options|
+          number = options[:number]
           "#{number}#{ActiveSupport::Inflector.ordinal(number)}"
         end
       }
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.yml b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.yml
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.yml
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.yml
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger.rb
index b8555c887b..d8f537c64d 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger.rb
@@ -77,7 +77,7 @@ module ActiveSupport
       end
     end
 
-    def initialize(*args)
+    def initialize(*args, **kwargs)
       super
       @formatter = SimpleFormatter.new
     end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger_silence.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_silence.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger_silence.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_silence.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger_thread_safe_level.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_thread_safe_level.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger_thread_safe_level.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_thread_safe_level.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_encryptor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_encryptor.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_encryptor.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_encryptor.rb
index 7d6f8937f0..00548cb381 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_encryptor.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_encryptor.rb
@@ -172,7 +172,7 @@ module ActiveSupport
         iv = cipher.random_iv
         cipher.auth_data = "" if aead_mode?
 
-        encrypted_data = cipher.update(Messages::Metadata.wrap(@serializer.dump(value), metadata_options))
+        encrypted_data = cipher.update(Messages::Metadata.wrap(@serializer.dump(value), **metadata_options))
         encrypted_data << cipher.final
 
         blob = "#{::Base64.strict_encode64 encrypted_data}--#{::Base64.strict_encode64 iv}"
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_verifier.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_verifier.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_verifier.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_verifier.rb
index c4a4afe95f..82865c779b 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_verifier.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_verifier.rb
@@ -172,8 +172,8 @@ module ActiveSupport
     #
     #   other_verifier = ActiveSupport::MessageVerifier.new 'd1ff3r3nt-s3Krit'
     #   other_verifier.verify(signed_message) # => ActiveSupport::MessageVerifier::InvalidSignature
-    def verify(*args)
-      verified(*args) || raise(InvalidSignature)
+    def verify(*args, **options)
+      verified(*args, **options) || raise(InvalidSignature)
     end
 
     # Generates a signed message for the provided value.
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/multibyte.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/multibyte.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/multibyte.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/fanout.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/fanout.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/fanout.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/fanout.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/instrumenter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/instrumenter.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/instrumenter.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/instrumenter.rb
index cd3845dd60..927c382e5d 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/instrumenter.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/instrumenter.rb
@@ -46,7 +46,6 @@ module ActiveSupport
       end
 
       private
-
         def unique_id
           SecureRandom.hex(10)
         end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/option_merger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/option_merger.rb
new file mode 100644
index 0000000000..a4f40b02a4
--- /dev/null
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/option_merger.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/hash/deep_merge"
+
+module ActiveSupport
+  class OptionMerger #:nodoc:
+    instance_methods.each do |method|
+      undef_method(method) if !/^(__|instance_eval|class|object_id)/.match?(method)
+    end
+
+    def initialize(context, options)
+      @context, @options = context, options
+    end
+
+    private
+      def method_missing(method, *arguments, &block)
+        options = nil
+        if arguments.first.is_a?(Proc)
+          proc = arguments.pop
+          arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) }
+        elsif arguments.last.respond_to?(:to_hash)
+          options = @options.deep_merge(arguments.pop)
+        else
+          options = @options
+        end
+
+        invoke_method(method, arguments, options, &block)
+      end
+
+      if RUBY_VERSION >= "2.7"
+        def invoke_method(method, arguments, options, &block)
+          if options
+            @context.__send__(method, *arguments, **options, &block)
+          else
+            @context.__send__(method, *arguments, &block)
+          end
+        end
+      else
+        def invoke_method(method, arguments, options, &block)
+          arguments << options if options
+          @context.__send__(method, *arguments, &block)
+        end
+      end
+  end
+end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_hash.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_hash.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_hash.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_options.rb
similarity index 97%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_options.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_options.rb
index ea822706e8..55c850dbce 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_options.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_options.rb
@@ -56,6 +56,10 @@ module ActiveSupport
     def respond_to_missing?(name, include_private)
       true
     end
+
+    def extractable_options?
+      true
+    end
   end
 
   # +InheritableOptions+ provides a constructor to build an +OrderedOptions+
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/parameter_filter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/parameter_filter.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/parameter_filter.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/parameter_filter.rb
index 7114cc8efb..f700dbbea5 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/parameter_filter.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/parameter_filter.rb
@@ -51,7 +51,6 @@ module ActiveSupport
     end
 
   private
-
     def compiled_filter
       @compiled_filter ||= CompiledFilter.compile(@filters, mask: @mask)
     end
@@ -103,7 +102,7 @@ module ActiveSupport
 
       def value_for_key(key, value, parents = [], original_params = nil)
         parents.push(key) if deep_regexps
-        if regexps.any? { |r| r.match?(key) }
+        if regexps.any? { |r| r.match?(key.to_s) }
           value = @mask
         elsif deep_regexps && (joined = parents.join(".")) && deep_regexps.any? { |r| r.match?(joined) }
           value = @mask
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/per_thread_registry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/per_thread_registry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/per_thread_registry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/per_thread_registry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/proxy_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/proxy_object.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/proxy_object.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/proxy_object.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rails.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rails.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rails.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rails.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/railtie.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/railtie.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/railtie.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/reloader.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/reloader.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/reloader.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/reloader.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rescuable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rescuable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rescuable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rescuable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/security_utils.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/security_utils.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/security_utils.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/security_utils.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/string_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/string_inquirer.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/string_inquirer.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/string_inquirer.rb
index a3af36720e..e5091e127a 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/string_inquirer.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/string_inquirer.rb
@@ -18,7 +18,6 @@ module ActiveSupport
   #   vehicle.bike?  # => false
   class StringInquirer < String
     private
-
       def respond_to_missing?(method_name, include_private = false)
         (method_name[-1] == "?") || super
       end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/subscriber.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/subscriber.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/subscriber.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/subscriber.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/tagged_logging.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/tagged_logging.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/tagged_logging.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/tagged_logging.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/test_case.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/test_case.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/test_case.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/test_case.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time_with_zone.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time_with_zone.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time_with_zone.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/values/time_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/values/time_zone.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/values/time_zone.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/values/time_zone.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/version.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/version.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/version.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini.rb
index 075cd4ed8b..f6ae08bb5d 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini.rb
@@ -155,7 +155,6 @@ module ActiveSupport
     end
 
     private
-
       def _dasherize(key)
         # $2 must be a non-greedy regex for this to work
         left, middle, right = /\A(_*)(.*?)(_*)\Z/.match(key.strip)[1, 3]
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/jdom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/jdom.rb
similarity index 99%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/jdom.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/jdom.rb
index 32fe6ade28..12ca19a76f 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/jdom.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/jdom.rb
@@ -53,7 +53,6 @@ module ActiveSupport
     end
 
     private
-
       # Convert an XML element and merge into the hash
       #
       # hash::
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxml.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxml.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxml.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxmlsax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxmlsax.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxmlsax.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxmlsax.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogiri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogiri.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogiri.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogiri.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogirisax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogirisax.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogirisax.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogirisax.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/rexml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/rexml.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/rexml.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/rexml.rb

From 4da5c09c256accf5eb25101764310acc365172ce Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 7 May 2020 09:58:27 +0100
Subject: [PATCH 027/134] cleanup: tweak missing clean file behaviour.

Instead of cleaning every time if the file is missing: don't clean this
time, touch the file and clean when it's next needed.

Now that this feature has been around for longer this makes more sense
for existing installations and stops the first `brew install` run on a
new/test installation without this file always running a `brew cleanup`.

Also, fix up the use of a compat/deprecated method hit by tests by
this change.
---
 Library/Homebrew/cleanup.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb
index cc12be3886..480a9c9ca1 100644
--- a/Library/Homebrew/cleanup.rb
+++ b/Library/Homebrew/cleanup.rb
@@ -142,14 +142,18 @@ module Homebrew
       cleanup = Cleanup.new
       if cleanup.periodic_clean_due?
         cleanup.periodic_clean!
-      elsif f.installed?
+      elsif f.latest_version_installed?
         cleanup.cleanup_formula(f)
       end
     end
 
     def periodic_clean_due?
       return false if Homebrew::EnvConfig.no_install_cleanup?
-      return true unless PERIODIC_CLEAN_FILE.exist?
+
+      unless PERIODIC_CLEAN_FILE.exist?
+        FileUtils.touch PERIODIC_CLEAN_FILE
+        return false
+      end
 
       PERIODIC_CLEAN_FILE.mtime < CLEANUP_DEFAULT_DAYS.days.ago
     end

From 2b224a66a5a56ec374b293b3665a7171b35ca7db Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 8 May 2020 09:18:55 +0100
Subject: [PATCH 028/134] os/mac/diagnostic: check for deprecated cask taps.

We keep seeing users popping up with these (#7449) so advise an untap.
---
 Library/Homebrew/extend/os/mac/diagnostic.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index e6ebdeceed..6e18a917bd 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -345,6 +345,17 @@ module Homebrew
           directory on the same volume as your Cellar.
         EOS
       end
+
+      def check_deprecated_caskroom_taps
+        tapped_caskroom_taps = Tap.select { |t| t.user == "caskroom" }.map(&:repo)
+        return if tapped_caskroom_taps.empty?
+
+        <<~EOS
+          You have the following deprecated, cask taps tapped:
+            Caskroom/homebrew-#{tapped_caskroom_taps.join("\n  Caskroom/homebrew-")}
+          Untap them with `brew untap`.
+        EOS
+      end
     end
   end
 end

From 04ae589d5cb6871bb0f0a20655a1055aa917935c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 8 May 2020 10:37:51 +0100
Subject: [PATCH 029/134] cmd/uninstall: note etc files that stay around.

We don't remove `etc` files on uninstall. Now we have `pkgetc`, though,
we have a pretty decent guess at what files in `etc` may belong to a
given package and can warn about them being left around on uninstall.

Thoughts: should we do the same thing for `var`? I don't see it being
used nearly as consistently.
---
 Library/Homebrew/cmd/uninstall.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index 9d4e77a699..c5fa22ea17 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -80,6 +80,27 @@ module Homebrew
               puts "#{keg.name} #{versions.to_sentence} #{"is".pluralize(versions.count)} still installed."
               puts "Run `brew uninstall --force #{keg.name}` to remove all versions."
             end
+
+            paths = f.pkgetc.find.map(&:to_s) if f.pkgetc.exist?
+            if paths.present?
+              puts
+              opoo <<~EOS
+                The following #{f.name} configuration files have not been removed!
+                If desired, remove them manually with `rm -rf`:
+                  #{paths.sort.uniq.join("\n  ")}
+              EOS
+            end
+
+            unversioned_name = f.name.gsub(/@.+$/, "")
+            maybe_paths = Dir.glob("#{f.etc}/*#{unversioned_name}*") - paths
+            if maybe_paths.present?
+              puts
+              opoo <<~EOS
+                The following may be #{f.name} configuration files and have not been removed!
+                If desired, remove them manually with `rm -rf`:
+                  #{maybe_paths.sort.uniq.join("\n  ")}
+              EOS
+            end
           end
         end
       end

From 055f7fcc235187895e542a38811e0e62aa86856c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 12:20:27 +0000
Subject: [PATCH 030/134] build(deps): bump typhoeus from 1.3.1 to 1.4.0 in
 /docs

Bumps [typhoeus](https://github.com/typhoeus/typhoeus) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/typhoeus/typhoeus/releases)
- [Changelog](https://github.com/typhoeus/typhoeus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/typhoeus/typhoeus/compare/v1.3.1...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 docs/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 58956ed770..8fa96a4180 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)

From 4bca7f0cba9b7dc5f22ced1c04cc2c392ee22b69 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Sat, 9 May 2020 11:06:02 +0100
Subject: [PATCH 031/134] compilers: support GCC 10 as a formula

---
 Library/Homebrew/compilers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb
index 7f95f25b83..25a9a42147 100644
--- a/Library/Homebrew/compilers.rb
+++ b/Library/Homebrew/compilers.rb
@@ -106,7 +106,7 @@ class CompilerSelector
 
   def gnu_gcc_versions
     # prioritize gcc version provided by gcc formula.
-    v = Formulary.factory("gcc").version.to_s.slice(/\d/)
+    v = Formulary.factory("gcc").version.to_s.slice(/\d+/)
     GNU_GCC_VERSIONS - [v] + [v] # move the version to the end of the list
   rescue FormulaUnavailableError
     GNU_GCC_VERSIONS

From 9f4dbd40089be747cfd971cb510faf1b4cacd6eb Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Sat, 9 May 2020 14:31:34 +0100
Subject: [PATCH 032/134] development_tools: fix GCC 10 version detection

---
 Library/Homebrew/development_tools.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/development_tools.rb b/Library/Homebrew/development_tools.rb
index 456a156871..bec90038b1 100644
--- a/Library/Homebrew/development_tools.rb
+++ b/Library/Homebrew/development_tools.rb
@@ -78,7 +78,7 @@ class DevelopmentTools
         path = HOMEBREW_PREFIX/"opt/gcc/bin"/cc
         path = locate(cc) unless path.exist?
         version = if path &&
-                     build_version = `#{path} --version`[/gcc(?:(?:-\d(?:\.\d)?)? \(.+\))? (\d+\.\d\.\d)/, 1]
+                     build_version = `#{path} --version`[/gcc(?:(?:-\d+(?:\.\d)?)? \(.+\))? (\d+\.\d\.\d)/, 1]
           Version.new build_version
         else
           Version::NULL

From 9cf43a181c18a3f3cec3e8565887a0e0ebb5169c Mon Sep 17 00:00:00 2001
From: Takashi Idobe <idobetakashi@gmail.com>
Date: Sat, 9 May 2020 09:55:09 -0500
Subject: [PATCH 033/134] grammar fix for How-To-Create-and-Maintain-a-Tap

changing `with you github username` to `with your github username`.
---
 docs/How-to-Create-and-Maintain-a-Tap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/How-to-Create-and-Maintain-a-Tap.md b/docs/How-to-Create-and-Maintain-a-Tap.md
index 29e69abe6b..8c3e02e233 100644
--- a/docs/How-to-Create-and-Maintain-a-Tap.md
+++ b/docs/How-to-Create-and-Maintain-a-Tap.md
@@ -72,7 +72,7 @@ See [homebrew/cask](https://github.com/Homebrew/homebrew-cask) for an example of
 ### Naming
 
 Unlike formulae, casks must have globally unique names to avoid clashes.
-This can be achieved by e.g. prepending the cask name with you github username: `username-formula-name`.
+This can be achieved by e.g. prepending the cask name with your github username: `username-formula-name`.
 
 ## External commands
 

From 65d7036c19ca360b4679c9af20952df9c066dd43 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Sun, 10 May 2020 00:30:32 +0100
Subject: [PATCH 034/134] bintray: url encode where needed

---
 Library/Homebrew/bintray.rb        | 6 +++---
 Library/Homebrew/dev-cmd/mirror.rb | 7 ++++---
 Library/Homebrew/software_spec.rb  | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Library/Homebrew/bintray.rb b/Library/Homebrew/bintray.rb
index 68c7e2d1cd..8d4a0ea154 100644
--- a/Library/Homebrew/bintray.rb
+++ b/Library/Homebrew/bintray.rb
@@ -106,12 +106,12 @@ class Bintray
     formula_packaged = {}
 
     bottles_hash.each do |formula_name, bottle_hash|
-      version = bottle_hash["formula"]["pkg_version"]
+      version = ERB::Util.url_encode(bottle_hash["formula"]["pkg_version"])
       bintray_package = bottle_hash["bintray"]["package"]
       bintray_repo = bottle_hash["bintray"]["repository"]
 
       bottle_hash["bottle"]["tags"].each do |_tag, tag_hash|
-        filename = tag_hash["filename"]
+        filename = tag_hash["filename"] # URL encoded in Bottle::Filename#bintray
         sha256 = tag_hash["sha256"]
 
         odebug "Checking remote file #{@bintray_org}/#{bintray_repo}/#{filename}"
@@ -132,7 +132,7 @@ class Bintray
           formula_packaged[formula_name] = true
         end
 
-        odebug "Uploading #{@bintray_org}/#{bintray_repo}/#{bintray_package}/#{version}/#{tag_hash["local_filename"]}"
+        odebug "Uploading #{@bintray_org}/#{bintray_repo}/#{bintray_package}/#{version}/#{filename}"
         upload(tag_hash["local_filename"],
                repo:        bintray_repo,
                package:     bintray_package,
diff --git a/Library/Homebrew/dev-cmd/mirror.rb b/Library/Homebrew/dev-cmd/mirror.rb
index 9637a5a45d..9abb83302b 100644
--- a/Library/Homebrew/dev-cmd/mirror.rb
+++ b/Library/Homebrew/dev-cmd/mirror.rb
@@ -41,20 +41,21 @@ module Homebrew
 
       downloader.fetch
 
-      filename = downloader.basename
+      filename = ERB::Util.url_encode(downloader.basename)
 
       destination_url = "https://dl.bintray.com/#{bintray_org}/#{bintray_repo}/#{filename}"
       ohai "Uploading to #{destination_url}"
 
+      version = ERB::Util.url_encode(f.pkg_version)
       bintray.upload(
         downloader.cached_location,
         repo:        bintray_repo,
         package:     bintray_package,
-        version:     f.pkg_version,
+        version:     version,
         sha256:      f.stable.checksum,
         remote_file: filename,
       )
-      bintray.publish(repo: bintray_repo, package: bintray_package, version: f.pkg_version)
+      bintray.publish(repo: bintray_repo, package: bintray_package, version: version)
       ohai "Mirrored #{filename}!"
     end
   end
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 676e7e524f..200d38b3f1 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -274,7 +274,7 @@ class Bottle
     end
 
     def bintray
-      "#{name}-#{version}#{extname}"
+      ERB::Util.url_encode("#{name}-#{version}#{extname}")
     end
 
     def extname

From 5685f379ef2bea2dda041dfacd993c6b8c34cdfa Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 10 May 2020 13:42:55 +0100
Subject: [PATCH 035/134] Formula#outdated_kegs: check versions aren't
 identical.

Even if the `version_scheme` does not match: we should never try to
`upgrade` (or show `outdated`) for two identical `pkg_version`s.

If this is ever needed: a `revision` bump should be done instead.

Fixes #7507
---
 Library/Homebrew/formula.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 8c9f47f1e7..8260d9af28 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1211,7 +1211,7 @@ class Formula
         next if version.head?
 
         tab = Tab.for_keg(keg)
-        next if version_scheme > tab.version_scheme
+        next if version_scheme > tab.version_scheme && pkg_version != version
         next if version_scheme == tab.version_scheme && pkg_version > version
 
         # don't consider this keg current if there's a newer formula available

From 4cdc2a5c81417d050980661acfb389ffb938eed8 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 10 May 2020 14:15:27 +0100
Subject: [PATCH 036/134] docs/How-to-Create-and-Maintain-a-Tap: official
 vendor taps.

Explain our policies around "Official Vendor Taps" and clarify the
formulae naming section.

Inspired by discussion in
https://discourse.brew.sh/t/maintenance-of-formulas-by-vendor/7649/.
---
 docs/How-to-Create-and-Maintain-a-Tap.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/How-to-Create-and-Maintain-a-Tap.md b/docs/How-to-Create-and-Maintain-a-Tap.md
index 8c3e02e233..63a08a87c2 100644
--- a/docs/How-to-Create-and-Maintain-a-Tap.md
+++ b/docs/How-to-Create-and-Maintain-a-Tap.md
@@ -26,7 +26,7 @@ a tap with a `Formula` subdirectory.
 
 ## Naming your formulae to avoid clashes
 
-If your formulae have the same name as Homebrew/homebrew-core formulae they cannot be installed side-by-side. If you wish to create a different version of a formula that's in Homebrew/homebrew-core (e.g. with `option`s) consider giving it a different name e.g. `nginx-full` for more fully-featured `nginx` formula. This will allow both `nginx` and `nginx-full` to be installed at the same time (but not linked if there are conflicts and one of them is not declared to be `keg_only`).
+If your formulae have the same name as Homebrew/homebrew-core formulae they cannot be installed side-by-side. If you wish to create a different version of a formula that's in Homebrew/homebrew-core (e.g. with `option`s) consider giving it a different name e.g. `nginx-full` for more fully-featured `nginx` formula. This will allow both `nginx` and `nginx-full` to be installed at the same time (assuming one is `keg_only` or the linked files do not clash).
 
 ### Installing
 
@@ -81,3 +81,11 @@ You can provide your tap users with custom `brew` commands by adding them in a
 
 See [homebrew/aliases](https://github.com/Homebrew/homebrew-aliases) for an
 example of a tap with external commands.
+
+## Official Vendor Taps
+
+Some upstream software providers like to package their software in their own Homebrew tap. When their software is [eligible for Homebrew/homebrew-core](Acceptable-Formulae.md) we prefer to maintain software there for ease of updates, improved discoverability and use of tools such as [formulae.brew.sh](https://formulae.brew.sh).
+
+We are not willing to remove software packaged in Homebrew/homebrew-core in favour of an upstream tap. We are not willing to instruct users in our formulae to use your formulae instead. If upstream projects have issues with how Homebrew packages your software: please file issues (or, ideally, pull requests) to address these problems.
+
+There’s an increasing desire in commercial open source about “maintaining control” e.g. defining exactly what binaries are shipping to users. Not supporting users (or even software distributions) to build-from-source is antithetical to the values of open source. If you think Homebrew's perspective is annoying on this: try and see how Debian responds to requests to ship your binaries.

From af278b15de03ea410b5d057518747446bbf8b8c4 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 10 May 2020 15:10:36 +0100
Subject: [PATCH 037/134] cli/parser: add formulae method.

This removes the coupling on args.formulae before it has been parsed.
---
 Library/Homebrew/cli/parser.rb | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb
index 4a7d2ca681..53efc00584 100644
--- a/Library/Homebrew/cli/parser.rb
+++ b/Library/Homebrew/cli/parser.rb
@@ -3,6 +3,7 @@
 require "cli/args"
 require "optparse"
 require "set"
+require "formula"
 
 COMMAND_DESC_WIDTH = 80
 OPTION_DESC_WIDTH = 43
@@ -188,7 +189,7 @@ module Homebrew
       end
 
       def formula_options
-        @args.formulae.each do |f|
+        formulae.each do |f|
           next if f.options.empty?
 
           f.options.each do |o|
@@ -343,6 +344,28 @@ module Homebrew
         option, = @parser.make_switch(args)
         @processed_options << [option.short.first, option.long.first, option.arg, option.desc.first]
       end
+
+      def formulae
+        named_args = @argv.reject { |arg| arg.start_with?("-") }
+        spec = if @argv.include?("--HEAD")
+          :head
+        elsif @argv.include?("--devel")
+          :devel
+        else
+          :stable
+        end
+
+        # Only lowercase names, not paths, bottle filenames or URLs
+        named_args.map do |arg|
+          next if arg.match?(HOMEBREW_CASK_TAP_CASK_REGEX)
+
+          if arg.include?("/") || arg.end_with?(".tar.gz") || File.exist?(arg)
+            Formulary.factory(arg, spec)
+          else
+            Formulary.find_with_priority(arg.downcase, spec)
+          end
+        end.compact.uniq(&:name)
+      end
     end
 
     class OptionConstraintError < RuntimeError

From fa0d45481737b1c85b76fdc32ee816777f371d7c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 10 May 2020 15:12:25 +0100
Subject: [PATCH 038/134] Replace ARGV#flags_only with Homebrew.args.flags_only

Take two on https://github.com/Homebrew/brew/pull/7490
---
 Library/Homebrew/cli/args.rb           | 25 ++++++++++++++++---------
 Library/Homebrew/extend/ARGV.rb        |  4 ----
 Library/Homebrew/software_spec.rb      |  2 +-
 Library/Homebrew/test/ARGV_spec.rb     |  8 --------
 Library/Homebrew/test/messages_spec.rb |  3 ++-
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index 801d2e7041..202b5557db 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -5,6 +5,8 @@ require "ostruct"
 module Homebrew
   module CLI
     class Args < OpenStruct
+      attr_reader :options_only, :flags_only
+
       # undefine tap to allow --tap argument
       undef tap
 
@@ -12,6 +14,8 @@ module Homebrew
         super()
 
         @processed_options = []
+        @options_only = args_options_only(argv)
+        @flags_only = args_flags_only(argv)
 
         # Can set these because they will be overwritten by freeze_named_args!
         # (whereas other values below will only be overwritten if passed).
@@ -46,16 +50,9 @@ module Homebrew
 
         @processed_options += processed_options
         @processed_options.freeze
-      end
 
-      def options_only
-        @options_only ||= cli_args.select { |arg| arg.start_with?("-") }
-                                  .freeze
-      end
-
-      def flags_only
-        @flags_only ||= cli_args.select { |arg| arg.start_with?("--") }
-                                .freeze
+        @options_only = args_options_only(cli_args)
+        @flags_only = args_flags_only(cli_args)
       end
 
       def passthrough
@@ -204,6 +201,16 @@ module Homebrew
         @cli_args.freeze
       end
 
+      def args_options_only(args)
+        args.select { |arg| arg.start_with?("-") }
+            .freeze
+      end
+
+      def args_flags_only(args)
+        args.select { |arg| arg.start_with?("--") }
+            .freeze
+      end
+
       def downcased_unique_named
         # Only lowercase names, not paths, bottle filenames or URLs
         named.map do |arg|
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 27f21a228f..c75c81b67c 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 module HomebrewArgvExtension
-  def flags_only
-    select { |arg| arg.start_with?("--") }
-  end
-
   def value(name)
     arg_prefix = "--#{name}="
     flag_with_value = find { |arg| arg.start_with?(arg_prefix) }
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 676e7e524f..4202711a8a 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -41,7 +41,7 @@ class SoftwareSpec
     @bottle_specification = BottleSpecification.new
     @patches = []
     @options = Options.new
-    @flags = ARGV.flags_only
+    @flags = Homebrew.args.flags_only
     @deprecated_flags = []
     @deprecated_options = []
     @build = BuildOptions.new(Options.create(@flags), options)
diff --git a/Library/Homebrew/test/ARGV_spec.rb b/Library/Homebrew/test/ARGV_spec.rb
index 5b32127930..dd1699af31 100644
--- a/Library/Homebrew/test/ARGV_spec.rb
+++ b/Library/Homebrew/test/ARGV_spec.rb
@@ -31,14 +31,6 @@ describe HomebrewArgvExtension do
     end
   end
 
-  describe "#flags_only" do
-    let(:argv) { ["--foo", "-vds", "a", "b", "cdefg"] }
-
-    it "returns an array of flags" do
-      expect(subject.flags_only).to eq ["--foo"]
-    end
-  end
-
   describe "#empty?" do
     let(:argv) { [] }
 
diff --git a/Library/Homebrew/test/messages_spec.rb b/Library/Homebrew/test/messages_spec.rb
index 8b743b7bdf..9bf48c58aa 100644
--- a/Library/Homebrew/test/messages_spec.rb
+++ b/Library/Homebrew/test/messages_spec.rb
@@ -76,7 +76,8 @@ describe Messages do
     # rubocop:disable RSpec/VerifiedDoubles
     context "when the --display-times argument is present" do
       before do
-        allow(Homebrew).to receive(:args).and_return(double(display_times?: true))
+        allow(Homebrew).to receive(:args).and_return \
+          double(display_times?: true, flags_only: ["--display-times"])
       end
 
       context "when install_times is empty" do

From 07b19cba09ec39a4c879718f96bad308541ed10e Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 10 May 2020 15:15:41 +0100
Subject: [PATCH 039/134] Replace ARGV#bottle_arch with
 Homebrew.args.bottle_arch

Part of https://github.com/Homebrew/brew/issues/5730
---
 Library/Homebrew/extend/ARGV.rb                       | 5 -----
 Library/Homebrew/extend/ENV/shared.rb                 | 4 ++--
 Library/Homebrew/extend/os/linux/extend/ENV/shared.rb | 2 +-
 Library/Homebrew/formula_installer.rb                 | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 27f21a228f..67ca1b264c 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -15,11 +15,6 @@ module HomebrewArgvExtension
     flag?("--debug") || !ENV["HOMEBREW_DEBUG"].nil?
   end
 
-  def bottle_arch
-    arch = value "bottle-arch"
-    arch&.to_sym
-  end
-
   def cc
     value "cc"
   end
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index fc422fa352..cfc48b2b82 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -268,8 +268,8 @@ module SharedEnvExtension
 
   # @private
   def effective_arch
-    if Homebrew.args.build_bottle? && ARGV.bottle_arch
-      ARGV.bottle_arch
+    if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch
+      Homebrew.args.bottle_arch
     else
       Hardware.oldest_cpu
     end
diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
index cd48e4f366..0ebba4f6bc 100644
--- a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
@@ -4,7 +4,7 @@ module SharedEnvExtension
   # @private
   def effective_arch
     if Homebrew.args.build_bottle?
-      ARGV.bottle_arch || Hardware.oldest_cpu
+      Homebrew.args.bottle_arch || Hardware.oldest_cpu
     else
       :native
     end
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index cd757386cb..e7ba8847bd 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -267,7 +267,7 @@ class FormulaInstaller
 
     return if only_deps?
 
-    if build_bottle? && (arch = ARGV.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch)
+    if build_bottle? && (arch = Homebrew.args.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch)
       raise "Unrecognized architecture for --bottle-arch: #{arch}"
     end
 
@@ -699,7 +699,7 @@ class FormulaInstaller
 
     if build_bottle?
       args << "--build-bottle"
-      args << "--bottle-arch=#{ARGV.bottle_arch}" if ARGV.bottle_arch
+      args << "--bottle-arch=#{Homebrew.args.bottle_arch}" if Homebrew.args.bottle_arch
     end
 
     args << "--git" if git?

From 5f721c6986b60b2e574563e09e77cb0d4b435dc8 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 10 May 2020 15:21:31 +0100
Subject: [PATCH 040/134] Cleanup ARGV.include? usage

Remove usage where `Homebrew.args` could be used instead or, due to the
`Homebrew.args` parsing, there was dead code that was never executed
(and no-one complained about not working).
---
 Library/Homebrew/dependencies.rb      |  2 +-
 Library/Homebrew/extend/ENV/shared.rb | 14 --------------
 Library/Homebrew/formula_installer.rb |  3 +--
 Library/Homebrew/style.rb             |  2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb
index 1431ec2507..3ef90b2ed1 100644
--- a/Library/Homebrew/dependencies.rb
+++ b/Library/Homebrew/dependencies.rb
@@ -81,7 +81,7 @@ module Homebrew
       ignores << "optional?"
     end
 
-    ignores << "recommended?" if ARGV.include? "--skip-recommended"
+    ignores << "recommended?" if Homebrew.args.skip_recommended?
 
     [includes, ignores]
   end
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index fc422fa352..ac087c55c0 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -235,20 +235,6 @@ module SharedEnvExtension
       ohai "Building with an alternative Fortran compiler"
       puts "This is unsupported."
       self["F77"] ||= fc
-
-      if ARGV.include? "--default-fortran-flags"
-        flags = FC_FLAG_VARS.reject { |key| self[key] }
-      elsif values_at(*FC_FLAG_VARS).compact.empty?
-        opoo <<~EOS
-          No Fortran optimization information was provided.  You may want to consider
-          setting FCFLAGS and FFLAGS or pass the `--default-fortran-flags` option to
-          `brew install` if your compiler is compatible with GCC.
-
-          If you like the default optimization level of your compiler, ignore this
-          warning.
-        EOS
-      end
-
     else
       if (gfortran = which("gfortran", (HOMEBREW_PREFIX/"bin").to_s))
         ohai "Using Homebrew-provided Fortran compiler."
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index cd757386cb..ae14f768b7 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -52,7 +52,7 @@ class FormulaInstaller
     @build_from_source = Homebrew.args.build_from_source?
     @build_bottle = false
     @force_bottle = Homebrew.args.force_bottle?
-    @include_test = ARGV.include?("--include-test")
+    @include_test = Homebrew.args.include_test?
     @interactive = false
     @git = false
     @verbose = Homebrew.args.verbose?
@@ -707,7 +707,6 @@ class FormulaInstaller
     args << "--verbose" if verbose?
     args << "--debug" if debug?
     args << "--cc=#{ARGV.cc}" if ARGV.cc
-    args << "--default-fortran-flags" if ARGV.include? "--default-fortran-flags"
     args << "--keep-tmp" if Homebrew.args.keep_tmp?
 
     if ARGV.env
diff --git a/Library/Homebrew/style.rb b/Library/Homebrew/style.rb
index 7285de1926..4c2c57d0ec 100644
--- a/Library/Homebrew/style.rb
+++ b/Library/Homebrew/style.rb
@@ -78,7 +78,7 @@ module Homebrew
       case output_type
       when :print
         args << "--debug" if ARGV.debug?
-        args << "--display-cop-names" if ARGV.include? "--display-cop-names"
+        args << "--display-cop-names" if Homebrew.args.display_cop_names?
         args << "--format" << "simple" if files
         system(cache_env, "rubocop", *args)
         rubocop_success = $CHILD_STATUS.success?

From e4823ea6fe4fa7a89c2dd6da59e091e29ba5a6f0 Mon Sep 17 00:00:00 2001
From: Mike Fiedler <miketheman@gmail.com>
Date: Sun, 10 May 2020 11:25:49 -0400
Subject: [PATCH 041/134] cmd/uninstall: fix Array comparison

In #7526 a comparison for `paths` was introduced, but if `paths` is ever
`nil`, this triggers an error.

Coercing the variable to an Array should alleviate this problem, as
`nil.to_a` produces an empty and comparable Array.

Fixes #7540

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
---
 Library/Homebrew/cmd/uninstall.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index c5fa22ea17..e679377d40 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -92,7 +92,7 @@ module Homebrew
             end
 
             unversioned_name = f.name.gsub(/@.+$/, "")
-            maybe_paths = Dir.glob("#{f.etc}/*#{unversioned_name}*") - paths
+            maybe_paths = Dir.glob("#{f.etc}/*#{unversioned_name}*") - paths.to_a
             if maybe_paths.present?
               puts
               opoo <<~EOS

From a3474e8361c01910b9b05d6c2abc7ae25d6da52f Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 10 May 2020 19:22:54 +0100
Subject: [PATCH 042/134] uninstall: tweak paths array logic.

---
 Library/Homebrew/cmd/uninstall.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index e679377d40..a27c45eaf5 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -92,7 +92,8 @@ module Homebrew
             end
 
             unversioned_name = f.name.gsub(/@.+$/, "")
-            maybe_paths = Dir.glob("#{f.etc}/*#{unversioned_name}*") - paths.to_a
+            maybe_paths = Dir.glob("#{f.etc}/*#{unversioned_name}*")
+            maybe_paths -= paths if paths.present?
             if maybe_paths.present?
               puts
               opoo <<~EOS

From 77e74e7e699854664e844fcc5a0447538d16934b Mon Sep 17 00:00:00 2001
From: nandahkrishna <nanda.harishankar@gmail.com>
Date: Mon, 16 Mar 2020 01:37:49 +0530
Subject: [PATCH 043/134] Adding livecheck Formula DSL

---
 Library/Homebrew/.rubocop.yml           |  2 +
 Library/Homebrew/formula.rb             | 38 ++++++++++++++++
 Library/Homebrew/livecheck.rb           | 59 +++++++++++++++++++++++++
 Library/Homebrew/test/formula_spec.rb   | 37 ++++++++++++++++
 Library/Homebrew/test/livecheck_spec.rb | 57 ++++++++++++++++++++++++
 5 files changed, 193 insertions(+)
 create mode 100644 Library/Homebrew/livecheck.rb
 create mode 100644 Library/Homebrew/test/livecheck_spec.rb

diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml
index 223f857a05..bdb40a9b91 100644
--- a/Library/Homebrew/.rubocop.yml
+++ b/Library/Homebrew/.rubocop.yml
@@ -46,6 +46,8 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Enabled: true
   Max: 1100
+  Exclude:
+    - 'test/formula_spec.rb'
 Metrics/BlockNesting:
   Enabled: true
   Max: 5
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 8260d9af28..f431b19dfa 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -12,6 +12,7 @@ require "build_environment"
 require "build_options"
 require "formulary"
 require "software_spec"
+require "livecheck"
 require "install_renamed"
 require "pkg_version"
 require "keg"
@@ -353,6 +354,16 @@ class Formula
   # @see .homepage=
   delegate homepage: :"self.class"
 
+  # The livecheck specification for the software.
+  # @method livecheck
+  # @see .livecheck=
+  delegate livecheck: :"self.class"
+
+  # Is a livecheck specification defined for the software?
+  # @method livecheckable?
+  # @see .livecheckable?
+  delegate livecheckable?: :"self.class"
+
   # The version for the currently active {SoftwareSpec}.
   # The version is autodetected from the URL and/or tag so only needs to be
   # declared if it cannot be autodetected correctly.
@@ -2186,6 +2197,13 @@ class Formula
     # <pre>homepage "https://www.example.com"</pre>
     attr_rw :homepage
 
+    # Whether a livecheck specification is defined or not.
+    # It returns true when a livecheck block is present in the {Formula} and
+    # false otherwise, and is used by livecheck.
+    def livecheckable?
+      @livecheckable == true
+    end
+
     # The `:startup` attribute set by {.plist_options}.
     # @private
     attr_reader :plist_startup
@@ -2628,6 +2646,26 @@ class Formula
       define_method(:test, &block)
     end
 
+    # @!attribute [w] livecheck
+    # Livecheck can be used to check for newer versions of the software.
+    # This method evaluates the DSL specified in the livecheck block of the
+    # {Formula} (if it exists) and sets the instance variables of a Livecheck
+    # object accordingly. This is used by brew livecheck to check for newer
+    # versions of the software.
+    #
+    # <pre>livecheck do
+    #   skip "Not maintained"
+    #   url "https://example.com/foo/releases"
+    #   regex /foo-(\d+(?:\.\d+)+)\.tar/
+    # end</pre>
+    def livecheck(&block)
+      @livecheck ||= Livecheck.new
+      return @livecheck unless block_given?
+
+      @livecheckable = true
+      @livecheck.instance_eval(&block)
+    end
+
     # Defines whether the {Formula}'s bottle can be used on the given Homebrew
     # installation.
     #
diff --git a/Library/Homebrew/livecheck.rb b/Library/Homebrew/livecheck.rb
new file mode 100644
index 0000000000..f2bf621f1e
--- /dev/null
+++ b/Library/Homebrew/livecheck.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# Livecheck can be used to check for newer versions of the software.
+# The livecheck DSL specified in the formula is evaluated the methods
+# of this class, which set the instance variables accordingly. The
+# information is used by brew livecheck when checking for newer versions
+# of the software.
+class Livecheck
+  # The reason for skipping livecheck for the formula.
+  # e.g. `Not maintained`
+  attr_reader :skip_msg
+
+  def initialize
+    @regex = nil
+    @skip = false
+    @skip_msg = nil
+    @url = nil
+  end
+
+  # Sets the regex instance variable to the argument given, returns the
+  # regex instance variable when no argument is given.
+  def regex(pattern = nil)
+    return @regex if pattern.nil?
+
+    @regex = pattern
+  end
+
+  # Sets the skip instance variable to true, indicating that livecheck
+  # must be skipped for the formula. If an argument is given and present,
+  # its value is assigned to the skip_msg instance variable, else nil is
+  # assigned.
+  def skip(skip_msg = nil)
+    @skip = true
+    @skip_msg = skip_msg.presence
+  end
+
+  # Should livecheck be skipped for the formula?
+  def skip?
+    @skip
+  end
+
+  # Sets the url instance variable to the argument given, returns the url
+  # instance variable when no argument is given.
+  def url(val = nil)
+    return @url if val.nil?
+
+    @url = val
+  end
+
+  # Returns a Hash of all instance variable values.
+  def to_hash
+    {
+      "regex"    => @regex,
+      "skip"     => @skip,
+      "skip_msg" => @skip_msg,
+      "url"      => @url,
+    }
+  end
+end
diff --git a/Library/Homebrew/test/formula_spec.rb b/Library/Homebrew/test/formula_spec.rb
index 43b0c4b2e5..6daf45f1ab 100644
--- a/Library/Homebrew/test/formula_spec.rb
+++ b/Library/Homebrew/test/formula_spec.rb
@@ -698,6 +698,43 @@ describe Formula do
     expect(f1.test_fixtures("foo")).to eq(Pathname.new("#{HOMEBREW_LIBRARY_PATH}/test/support/fixtures/foo"))
   end
 
+  specify "#livecheck" do
+    f = formula do
+      url "https://brew.sh/test-1.0.tbz"
+      livecheck do
+        skip "foo"
+        url "https://brew.sh/test/releases"
+        regex(/test-(\d+(?:\.\d+)+)\.tbz/)
+      end
+    end
+
+    expect(f.livecheck.skip?).to be true
+    expect(f.livecheck.skip_msg).to eq("foo")
+    expect(f.livecheck.url).to eq("https://brew.sh/test/releases")
+    expect(f.livecheck.regex).to eq(/test-(\d+(?:\.\d+)+)\.tbz/)
+  end
+
+  describe "#livecheckable?" do
+    specify "no livecheck block defined" do
+      f = formula do
+        url "https://brew.sh/test-1.0.tbz"
+      end
+
+      expect(f.livecheckable?).to be false
+    end
+
+    specify "livecheck block defined" do
+      f = formula do
+        url "https://brew.sh/test-1.0.tbz"
+        livecheck do
+          regex(/test-(\d+(?:.\d+)+).tbz/)
+        end
+      end
+
+      expect(f.livecheckable?).to be true
+    end
+  end
+
   specify "dependencies" do
     f1 = formula "f1" do
       url "f1-1.0"
diff --git a/Library/Homebrew/test/livecheck_spec.rb b/Library/Homebrew/test/livecheck_spec.rb
new file mode 100644
index 0000000000..f975548cda
--- /dev/null
+++ b/Library/Homebrew/test/livecheck_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "livecheck"
+
+describe Livecheck do
+  subject(:livecheckable) { described_class.new }
+
+  describe "#regex" do
+    it "returns nil if unset" do
+      expect(livecheckable.regex).to be nil
+    end
+
+    it "returns the Regex if set" do
+      livecheckable.regex(/foo/)
+      expect(livecheckable.regex).to eq(/foo/)
+    end
+  end
+
+  describe "#skip" do
+    it "sets the instance variable skip to true and skip_msg to nil when the argument is not present" do
+      livecheckable.skip
+      expect(livecheckable.instance_variable_get(:@skip)).to be true
+      expect(livecheckable.instance_variable_get(:@skip_msg)).to be nil
+    end
+
+    it "sets the instance variable skip to true and skip_msg to the argument when present" do
+      livecheckable.skip("foo")
+      expect(livecheckable.instance_variable_get(:@skip)).to be true
+      expect(livecheckable.instance_variable_get(:@skip_msg)).to eq("foo")
+    end
+  end
+
+  describe "#skip?" do
+    it "returns the value of the instance variable skip" do
+      expect(livecheckable.skip?).to be false
+      livecheckable.skip
+      expect(livecheckable.skip?).to be true
+    end
+  end
+
+  describe "#url" do
+    it "returns nil if unset" do
+      expect(livecheckable.url).to be nil
+    end
+
+    it "returns the URL if set" do
+      livecheckable.url("foo")
+      expect(livecheckable.url).to eq("foo")
+    end
+  end
+
+  describe "#to_hash" do
+    it "returns a Hash of all instance variables" do
+      expect(livecheckable.to_hash).to eq({ "regex"=>nil, "skip"=>false, "skip_msg"=>nil, "url"=>nil })
+    end
+  end
+end

From 21a3e306edd82faf36298d863bed34392fa91b0b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 05:57:30 +0000
Subject: [PATCH 044/134] build(deps): bump rspec-expectations in
 /Library/Homebrew

Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.9.1 to 3.9.2.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.9.1...v3.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 83792a8ee8..b3095762a1 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -67,7 +67,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.1)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)

From 9ecc04fbe4c65806ef704309e48563a951226755 Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Mon, 11 May 2020 10:21:08 +0200
Subject: [PATCH 045/134] workflows: fix docker tag

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7948132c62..fb68ba6abc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -196,5 +196,5 @@ jobs:
         docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$v"
         docker push "docker.pkg.github.com/homebrew/brew/brew:$v"
         docker login docker.com -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
-        docker tag "brew homebrew/brew:$v"
+        docker tag brew "homebrew/brew:$v"
         docker push "homebrew/brew:$v"

From 2264c08cee95f0c829a6826d23c6285762e2d515 Mon Sep 17 00:00:00 2001
From: Michelle Nguyen <michelle.b.nguy@gmail.com>
Date: Wed, 4 Mar 2020 17:48:17 -0500
Subject: [PATCH 046/134] Fetch formula resources before unlinking during
 upgrade.

Fixes #6374.
---
 Library/Homebrew/cask/installer.rb            |  1 +
 Library/Homebrew/cmd/install.rb               |  1 +
 Library/Homebrew/cmd/upgrade.rb               |  2 ++
 Library/Homebrew/formula.rb                   |  1 +
 Library/Homebrew/formula_installer.rb         | 36 +++++++++++++++----
 Library/Homebrew/reinstall.rb                 |  1 +
 Library/Homebrew/resource.rb                  |  2 +-
 .../test/formula_installer_bottle_spec.rb     |  5 ++-
 .../Homebrew/test/formula_installer_spec.rb   |  2 ++
 Library/Homebrew/test/formulary_spec.rb       |  2 ++
 .../spec/shared_context/integration_test.rb   |  1 +
 11 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb
index 212e40720a..369b05f1d0 100644
--- a/Library/Homebrew/cask/installer.rb
+++ b/Library/Homebrew/cask/installer.rb
@@ -369,6 +369,7 @@ module Cask
             fi.show_header = true
             fi.verbose = verbose?
             fi.prelude
+            fi.fetch
             fi.install
             fi.finish
           end
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 7d60894b9b..ef95b00c76 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -326,6 +326,7 @@ module Homebrew
     fi.interactive          = args.interactive?
     fi.git                  = args.git?
     fi.prelude
+    fi.fetch
     fi.install
     fi.finish
   rescue FormulaInstallationAlreadyAttemptedError
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 80841542a2..f417c7c54f 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -192,6 +192,8 @@ module Homebrew
     end
     oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{upgrade_version} #{fi.options.to_a.join(" ")}"
 
+    fi.fetch
+
     # first we unlink the currently active keg for this formula otherwise it is
     # possible for the existing build to interfere with the build we are about to
     # do! Seriously, it happens!
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index f431b19dfa..499937efd3 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1160,6 +1160,7 @@ class Formula
   # @private
   def brew
     @prefix_returns_versioned_prefix = true
+    active_spec.fetch
     stage do |staging|
       staging.retain! if Homebrew.args.keep_tmp?
       prepare_patches
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index dcce9bbb84..7c5e82cba9 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -600,6 +600,7 @@ class FormulaInstaller
     fi.installed_as_dependency = true
     fi.installed_on_request    = df.any_version_installed? && tab.installed_on_request
     fi.prelude
+    fi.fetch
     oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}"
     fi.install
     fi.finish
@@ -946,14 +947,35 @@ class FormulaInstaller
     @show_summary_heading = true
   end
 
-  def pour
-    if (bottle_path = formula.local_bottle_path)
-      downloader = LocalBottleDownloadStrategy.new(bottle_path)
-    else
-      downloader = formula.bottle
-      downloader.fetch
-    end
+  def fetch_dependencies
+    deps = compute_dependencies
 
+    return if deps.empty? || ignore_deps?
+
+    deps.each do |dep, _|
+      dep.to_formula.resources.each(&:fetch)
+    end
+  end
+
+  def fetch
+    fetch_dependencies
+
+    return if only_deps?
+
+    downloader.fetch
+  end
+
+  def downloader
+    if (bottle_path = formula.local_bottle_path)
+      LocalBottleDownloadStrategy.new(bottle_path)
+    elsif pour_bottle?
+      formula.bottle
+    else
+      formula.downloader
+    end
+  end
+
+  def pour
     HOMEBREW_CELLAR.cd do
       downloader.stage
     end
diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb
index 8fc5ed649d..be7f9c847e 100644
--- a/Library/Homebrew/reinstall.rb
+++ b/Library/Homebrew/reinstall.rb
@@ -36,6 +36,7 @@ module Homebrew
       fi.installed_on_request    = tab.installed_on_request
     end
     fi.prelude
+    fi.fetch
 
     oh1 "Reinstalling #{Formatter.identifier(f.full_name)} #{options.to_a.join " "}"
 
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index 920a787c3f..2d7d6f6d03 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -70,8 +70,8 @@ class Resource
   def stage(target = nil, &block)
     raise ArgumentError, "target directory or block is required" unless target || block
 
-    fetch
     prepare_patches
+
     unpack(target, &block)
   end
 
diff --git a/Library/Homebrew/test/formula_installer_bottle_spec.rb b/Library/Homebrew/test/formula_installer_bottle_spec.rb
index d1a86b59c2..b5e715260f 100644
--- a/Library/Homebrew/test/formula_installer_bottle_spec.rb
+++ b/Library/Homebrew/test/formula_installer_bottle_spec.rb
@@ -23,7 +23,10 @@ describe FormulaInstaller do
     stub_formula_loader formula("gcc") { url "gcc-1.0" }
     stub_formula_loader formula("patchelf") { url "patchelf-1.0" }
     allow(Formula["patchelf"]).to receive(:latest_version_installed?).and_return(true)
-    described_class.new(formula).install
+
+    fi = FormulaInstaller.new(formula)
+    fi.fetch
+    fi.install
 
     keg = Keg.new(formula.prefix)
 
diff --git a/Library/Homebrew/test/formula_installer_spec.rb b/Library/Homebrew/test/formula_installer_spec.rb
index d7dcd713c1..cd5856a0bf 100644
--- a/Library/Homebrew/test/formula_installer_spec.rb
+++ b/Library/Homebrew/test/formula_installer_spec.rb
@@ -21,6 +21,7 @@ describe FormulaInstaller do
 
     installer = described_class.new(formula)
 
+    installer.fetch
     installer.install
 
     keg = Keg.new(formula.prefix)
@@ -158,6 +159,7 @@ describe FormulaInstaller do
 
     it "shows audit problems if HOMEBREW_DEVELOPER is set" do
       ENV["HOMEBREW_DEVELOPER"] = "1"
+      formula_installer.fetch
       formula_installer.install
       expect(formula_installer).to receive(:audit_installed).and_call_original
       formula_installer.caveats
diff --git a/Library/Homebrew/test/formulary_spec.rb b/Library/Homebrew/test/formulary_spec.rb
index 3170b71cb2..157b608050 100644
--- a/Library/Homebrew/test/formulary_spec.rb
+++ b/Library/Homebrew/test/formulary_spec.rb
@@ -149,6 +149,7 @@ describe Formulary do
       let(:installer) { FormulaInstaller.new(installed_formula) }
 
       it "returns a Formula when given a rack" do
+        installer.fetch
         installer.install
 
         f = described_class.from_rack(installed_formula.rack)
@@ -156,6 +157,7 @@ describe Formulary do
       end
 
       it "returns a Formula when given a Keg" do
+        installer.fetch
         installer.install
 
         keg = Keg.new(installed_formula.prefix)
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
index 0a28b8b558..cbc933817d 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
@@ -177,6 +177,7 @@ RSpec.shared_context "integration test" do
     fi = FormulaInstaller.new(Formula[name])
     fi.build_bottle = build_bottle
     fi.prelude
+    fi.fetch
     fi.install
     fi.finish
   end

From 48918bb5e33440d97c7ce12186b97fb0026e4bbf Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 3 May 2020 14:53:50 +0100
Subject: [PATCH 047/134] formula_installer: add fetch_dependency method.

This uses `FormulaInstaller#fetch` to recursively fetch dependencies
through the dependency tree and allows `install_dependency` to not
do any fetching.
---
 Library/Homebrew/formula_installer.rb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 7c5e82cba9..9dbb75674e 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -561,6 +561,18 @@ class FormulaInstaller
     @show_header = true unless deps.empty?
   end
 
+  def fetch_dependency(dep)
+    df = dep.to_formula
+    fi = FormulaInstaller.new(df)
+
+    fi.build_from_source       = Homebrew.args.build_formula_from_source?(df)
+    fi.force_bottle            = false
+    fi.verbose                 = verbose?
+    fi.quiet                   = quiet?
+    fi.debug                   = debug?
+    fi.fetch
+  end
+
   def install_dependency(dep, inherited_options)
     df = dep.to_formula
     tab = Tab.for_formula(df)
@@ -600,7 +612,6 @@ class FormulaInstaller
     fi.installed_as_dependency = true
     fi.installed_on_request    = df.any_version_installed? && tab.installed_on_request
     fi.prelude
-    fi.fetch
     oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}"
     fi.install
     fi.finish
@@ -952,9 +963,7 @@ class FormulaInstaller
 
     return if deps.empty? || ignore_deps?
 
-    deps.each do |dep, _|
-      dep.to_formula.resources.each(&:fetch)
-    end
+    deps.each { |dep, _options| fetch_dependency(dep) }
   end
 
   def fetch

From 08a9f0e1c093a8de3acb31c5bc12664cfeecd102 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 3 May 2020 14:54:31 +0100
Subject: [PATCH 048/134] Use FormulaInstaller#fetch before #prelude.

---
 Library/Homebrew/cask/installer.rb                              | 2 +-
 Library/Homebrew/cmd/install.rb                                 | 2 +-
 Library/Homebrew/cmd/upgrade.rb                                 | 2 +-
 Library/Homebrew/reinstall.rb                                   | 2 +-
 .../test/support/helper/spec/shared_context/integration_test.rb | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb
index 369b05f1d0..503962e308 100644
--- a/Library/Homebrew/cask/installer.rb
+++ b/Library/Homebrew/cask/installer.rb
@@ -368,8 +368,8 @@ module Cask
             fi.installed_on_request = false
             fi.show_header = true
             fi.verbose = verbose?
-            fi.prelude
             fi.fetch
+            fi.prelude
             fi.install
             fi.finish
           end
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index ef95b00c76..03f373447d 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -325,8 +325,8 @@ module Homebrew
     fi.build_bottle         = args.build_bottle?
     fi.interactive          = args.interactive?
     fi.git                  = args.git?
-    fi.prelude
     fi.fetch
+    fi.prelude
     fi.install
     fi.finish
   rescue FormulaInstallationAlreadyAttemptedError
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index f417c7c54f..df2481fb10 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -183,7 +183,6 @@ module Homebrew
       fi.installed_as_dependency = tab.installed_as_dependency
       fi.installed_on_request  ||= tab.installed_on_request
     end
-    fi.prelude
 
     upgrade_version = if f.optlinked?
       "#{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}"
@@ -193,6 +192,7 @@ module Homebrew
     oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{upgrade_version} #{fi.options.to_a.join(" ")}"
 
     fi.fetch
+    fi.prelude
 
     # first we unlink the currently active keg for this formula otherwise it is
     # possible for the existing build to interfere with the build we are about to
diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb
index be7f9c847e..ff3c5707f2 100644
--- a/Library/Homebrew/reinstall.rb
+++ b/Library/Homebrew/reinstall.rb
@@ -35,8 +35,8 @@ module Homebrew
       fi.installed_as_dependency = tab.installed_as_dependency
       fi.installed_on_request    = tab.installed_on_request
     end
-    fi.prelude
     fi.fetch
+    fi.prelude
 
     oh1 "Reinstalling #{Formatter.identifier(f.full_name)} #{options.to_a.join " "}"
 
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
index cbc933817d..3f4468a3a7 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
@@ -176,8 +176,8 @@ RSpec.shared_context "integration test" do
     setup_test_formula(name, content)
     fi = FormulaInstaller.new(Formula[name])
     fi.build_bottle = build_bottle
-    fi.prelude
     fi.fetch
+    fi.prelude
     fi.install
     fi.finish
   end

From 95c6d3797d60e0fe0d225092294c644ad3f2ad7d Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Mon, 11 May 2020 10:38:38 +0200
Subject: [PATCH 049/134] workflows: login without specifying registry

---
 .github/workflows/docker.yml | 2 +-
 .github/workflows/tests.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ad0b722061..b11413c5db 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,6 +36,6 @@ jobs:
       - name: Deploy the tagged Docker image to Docker Hub
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          docker login docker.com -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
+          docker login -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
           docker tag brew "homebrew/ubuntu${{matrix.version}}:$brew_version"
           docker push "homebrew/ubuntu${{matrix.version}}:$brew_version"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fb68ba6abc..e71e23aff0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -195,6 +195,6 @@ jobs:
         docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
         docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$v"
         docker push "docker.pkg.github.com/homebrew/brew/brew:$v"
-        docker login docker.com -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
+        docker login -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
         docker tag brew "homebrew/brew:$v"
         docker push "homebrew/brew:$v"

From 6ff307c45620003f2a1eece707787d9bddc12527 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 11 May 2020 05:18:04 -0500
Subject: [PATCH 050/134] brew.sh: remove unnecessary empty line

Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Homebrew/brew.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index f50d17a327..08e8cf20eb 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -116,8 +116,6 @@ then
 else
   HOMEBREW_GIT="git"
 fi
-
-
 if [[ -n "$HOMEBREW_MACOS" ]]
 then
   HOMEBREW_PROCESSOR="$(uname -p)"

From 6ba7ace66a3aaacbc6491ea64c643c163dfab83f Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 11 May 2020 07:17:26 -0500
Subject: [PATCH 051/134] brew.sh: stop if HOMEBREW_CURL_PATH is too old

---
 Library/Homebrew/brew.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 08e8cf20eb..73e4c1312b 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -186,8 +186,18 @@ else
   curl_name_and_version="${curl_version_output%% (*}"
   if [[ $(numeric "${curl_name_and_version##* }") -lt $(numeric "$HOMEBREW_MINIMUM_CURL_VERSION") ]]
   then
-    HOMEBREW_SYSTEM_CURL_TOO_OLD="1"
-    HOMEBREW_FORCE_BREWED_CURL="1"
+    if [[ -z $HOMEBREW_CURL_PATH ]]; then
+      HOMEBREW_SYSTEM_CURL_TOO_OLD=1
+      HOMEBREW_FORCE_BREWED_CURL=1
+    else
+      odie <<EOS
+The version of cURL that you provided to Homebrew using HOMEBREW_CURL_PATH is too old.
+Minimum required version: ${HOMEBREW_MINIMUM_CURL_VERSION}.
+Your cURL version: ${curl_name_and_version##* }.
+Please point Homebrew to cURL version ${HOMEBREW_MINIMUM_CURL_VERSION} or newer
+or unset HOMEBREW_CURL_PATH variable.
+EOS
+    fi
   fi
 
   # Ensure the system Git is at or newer than the minimum required version.

From 6455264716eac611bfbd9caf71a7bf5dc21498f9 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 11 May 2020 07:20:16 -0500
Subject: [PATCH 052/134] brew.sh: stop if HOMEBREW_GIT_PATH is too old

---
 Library/Homebrew/brew.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 73e4c1312b..73f59ffbff 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -194,7 +194,7 @@ else
 The version of cURL that you provided to Homebrew using HOMEBREW_CURL_PATH is too old.
 Minimum required version: ${HOMEBREW_MINIMUM_CURL_VERSION}.
 Your cURL version: ${curl_name_and_version##* }.
-Please point Homebrew to cURL version ${HOMEBREW_MINIMUM_CURL_VERSION} or newer
+Please point Homebrew to cURL ${HOMEBREW_MINIMUM_CURL_VERSION} or newer
 or unset HOMEBREW_CURL_PATH variable.
 EOS
     fi
@@ -209,7 +209,17 @@ EOS
   IFS=. read -r major minor micro build extra <<< "${git_version_output##* }"
   if [[ $(numeric "$major.$minor.$micro.$build") -lt $(numeric "$HOMEBREW_MINIMUM_GIT_VERSION") ]]
   then
-    HOMEBREW_FORCE_BREWED_GIT="1"
+    if [[ -z $HOMEBREW_GIT_PATH ]]; then
+      HOMEBREW_FORCE_BREWED_GIT="1"
+    else
+      odie <<EOS
+The version of Git that you provided to Homebrew using HOMEBREW_GIT_PATH is too old.
+Minimum required version: ${HOMEBREW_MINIMUM_GIT_VERSION}.
+Your Git version: $major.$minor.$micro.$build.
+Please point Homebrew to Git ${HOMEBREW_MINIMUM_CURL_VERSION} or newer
+or unset HOMEBREW_GIT_PATH variable.
+EOS
+    fi
   fi
 
   CACHE_HOME="${XDG_CACHE_HOME:-${HOME}/.cache}"

From 5be4682ecb4a476f69329c66af92a655338e7e28 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Mon, 11 May 2020 07:30:25 -0500
Subject: [PATCH 053/134] brew.sh: add an empty line for code readability

Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Homebrew/brew.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 73f59ffbff..092b68a802 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -116,6 +116,7 @@ then
 else
   HOMEBREW_GIT="git"
 fi
+
 if [[ -n "$HOMEBREW_MACOS" ]]
 then
   HOMEBREW_PROCESSOR="$(uname -p)"

From 58cecf38cf66117dddb09af0020d3426f1e90da2 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 12 May 2020 03:02:07 +0100
Subject: [PATCH 054/134] resource: restore fetch in stage

Fixes #7546.
---
 Library/Homebrew/formula.rb  | 1 -
 Library/Homebrew/resource.rb | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 499937efd3..f431b19dfa 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1160,7 +1160,6 @@ class Formula
   # @private
   def brew
     @prefix_returns_versioned_prefix = true
-    active_spec.fetch
     stage do |staging|
       staging.retain! if Homebrew.args.keep_tmp?
       prepare_patches
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index 2d7d6f6d03..1f245fd719 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -70,6 +70,7 @@ class Resource
   def stage(target = nil, &block)
     raise ArgumentError, "target directory or block is required" unless target || block
 
+    fetch
     prepare_patches
 
     unpack(target, &block)

From b157b3aaf9f70cd4ba49ac35fafe8ced33f6a699 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 12 May 2020 05:36:44 +0000
Subject: [PATCH 055/134] build(deps): bump rubocop from 0.82.0 to 0.83.0 in
 /Library/Homebrew

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.82.0 to 0.83.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.82.0...v0.83.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index b3095762a1..689f0f6322 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -25,7 +25,6 @@ GEM
       domain_name (~> 0.5)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (2.3.0)
     mechanize (2.7.6)
       domain_name (~> 0.5, >= 0.5.1)
@@ -81,8 +80,7 @@ GEM
     rspec-support (3.9.3)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)

From 67ff3c53fec123bd4def2d0ab735efbe022c0229 Mon Sep 17 00:00:00 2001
From: dfabulich <dan@fabulich.com>
Date: Mon, 11 May 2020 19:16:20 -0700
Subject: [PATCH 056/134] Document how to use test fixtures

---
 docs/Formula-Cookbook.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index 21784fcf79..d18f91c6f8 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -278,6 +278,20 @@ Some advice for specific cases:
 A good example is [`tinyxml2`](https://github.com/Homebrew/homebrew-core/blob/master/Formula/tinyxml2.rb), which writes a small C++ source file into the test directory, compiles and links it against the tinyxml2 library and finally checks that the resulting program runs successfully.
 * If the formula is for a GUI program, try to find some function that runs as command-line only, like a format conversion, reading or displaying a config file, etc.
 * If the software cannot function without credentials or requires a virtual machine, docker instance, etc. to run, a test could be to try to connect with invalid credentials (or without credentials) and confirm that it fails as expected.
+* Homebrew comes with a number of [standard test fixtures](https://github.com/Homebrew/brew/tree/master/Library/Homebrew/test/support/fixtures), including numerous sample images, sounds, and documents in various formats. You can get the file path to a test fixture with `test_fixtures("test.svg")`.
+* If your test requires a test file that isn't a standard test fixture, you can install it from a source repository during the `test` phase with a resource block, like this:
+```ruby
+resource("testdata") do
+  url "https://example.com/input.foo"
+  sha256 "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+end
+
+test do
+  resource("testdata").stage do
+    assert_match "OK", shell_output("#{bin}/foo build-foo input.foo")
+  end
+end
+```
 
 ### Manuals
 

From 12bdb3866376c96e87a7f4458888ff2d72377ba6 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 12 May 2020 08:32:27 +0100
Subject: [PATCH 057/134] rubocop: brew style --fix autocorrections.

---
 Library/Homebrew/cask/cmd.rb                               | 2 +-
 Library/Homebrew/cask/cmd/abstract_command.rb              | 1 +
 Library/Homebrew/cask/cmd/internal_stanza.rb               | 2 ++
 Library/Homebrew/download_strategy.rb                      | 1 +
 Library/Homebrew/extend/os/linux/hardware/cpu.rb           | 2 +-
 Library/Homebrew/formula.rb                                | 2 ++
 Library/Homebrew/formula_installer.rb                      | 2 ++
 Library/Homebrew/keg.rb                                    | 1 +
 Library/Homebrew/requirement.rb                            | 1 +
 Library/Homebrew/rubocops/cask/homepage_matches_url.rb     | 5 +++--
 Library/Homebrew/rubocops/cask/mixin/on_homepage_stanza.rb | 1 +
 Library/Homebrew/rubocops/cask/stanza_grouping.rb          | 1 +
 Library/Homebrew/rubocops/cask/stanza_order.rb             | 1 +
 Library/Homebrew/rubocops/extend/formula.rb                | 1 +
 14 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/cask/cmd.rb b/Library/Homebrew/cask/cmd.rb
index f81026ffa9..a65cee3949 100644
--- a/Library/Homebrew/cask/cmd.rb
+++ b/Library/Homebrew/cask/cmd.rb
@@ -228,7 +228,7 @@ module Cask
       end
 
       def run(*)
-        exec @path, *ARGV[1..-1]
+        exec @path, *ARGV[1..]
       end
     end
 
diff --git a/Library/Homebrew/cask/cmd/abstract_command.rb b/Library/Homebrew/cask/cmd/abstract_command.rb
index c6b988eb4d..1646ddb943 100644
--- a/Library/Homebrew/cask/cmd/abstract_command.rb
+++ b/Library/Homebrew/cask/cmd/abstract_command.rb
@@ -37,6 +37,7 @@ module Cask
       end
 
       attr_accessor :args
+
       private :args=
 
       def initialize(*args)
diff --git a/Library/Homebrew/cask/cmd/internal_stanza.rb b/Library/Homebrew/cask/cmd/internal_stanza.rb
index 578e5f06f4..20235e13af 100644
--- a/Library/Homebrew/cask/cmd/internal_stanza.rb
+++ b/Library/Homebrew/cask/cmd/internal_stanza.rb
@@ -33,9 +33,11 @@ module Cask
       option "--inspect", :inspect, false
 
       attr_accessor :format
+
       private :format, :format=
 
       attr_accessor :stanza
+
       private :stanza, :stanza=
 
       def initialize(*)
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index ed3c11c4bb..3d8ca97571 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -23,6 +23,7 @@ class AbstractDownloadStrategy
 
   attr_reader :cache, :cached_location, :url
   attr_reader :meta, :name, :version, :shutup
+
   private :meta, :name, :version, :shutup
 
   def initialize(url, name, version, **meta)
diff --git a/Library/Homebrew/extend/os/linux/hardware/cpu.rb b/Library/Homebrew/extend/os/linux/hardware/cpu.rb
index 67dd402a1c..4f37ac614b 100644
--- a/Library/Homebrew/extend/os/linux/hardware/cpu.rb
+++ b/Library/Homebrew/extend/os/linux/hardware/cpu.rb
@@ -80,7 +80,7 @@ module Hardware
       # Compatibility with Mac method, which returns lowercase symbols
       # instead of strings
       def features
-        @features ||= flags[1..-1].map(&:intern)
+        @features ||= flags[1..].map(&:intern)
       end
 
       %w[aes altivec avx avx2 lm ssse3 sse4_2].each do |flag|
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index f431b19dfa..faa86fceec 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -126,6 +126,7 @@ class Formula
   # The currently active {SoftwareSpec}.
   # @see #determine_active_spec
   attr_reader :active_spec
+
   protected :active_spec
 
   # A symbol to indicate currently active {SoftwareSpec}.
@@ -176,6 +177,7 @@ class Formula
   # Defaults to true.
   # @return [Boolean]
   attr_accessor :follow_installed_alias
+
   alias follow_installed_alias? follow_installed_alias
 
   # @private
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 9dbb75674e..3e281a7588 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -25,6 +25,7 @@ class FormulaInstaller
 
   def self.mode_attr_accessor(*names)
     attr_accessor(*names)
+
     private(*names)
     names.each do |name|
       predicate = "#{name}?"
@@ -38,6 +39,7 @@ class FormulaInstaller
   attr_reader :formula
   attr_accessor :options, :build_bottle
   attr_accessor :installed_as_dependency, :installed_on_request, :link_keg
+
   mode_attr_accessor :show_summary_heading, :show_header
   mode_attr_accessor :build_from_source, :force_bottle, :include_test
   mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index d40cf4457b..16818f0ce2 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -184,6 +184,7 @@ class Keg
   end
 
   attr_reader :path, :name, :linked_keg_record, :opt_record
+
   protected :path
 
   extend Forwardable
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index ebd2179a24..f593ca5753 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -151,6 +151,7 @@ class Requirement
     include BuildEnvironment::DSL
 
     attr_reader :env_proc, :build
+
     attr_rw :fatal, :cask, :download
 
     def satisfy(options = nil, &block)
diff --git a/Library/Homebrew/rubocops/cask/homepage_matches_url.rb b/Library/Homebrew/rubocops/cask/homepage_matches_url.rb
index 34c5261698..b260d5c730 100644
--- a/Library/Homebrew/rubocops/cask/homepage_matches_url.rb
+++ b/Library/Homebrew/rubocops/cask/homepage_matches_url.rb
@@ -40,6 +40,7 @@ module RuboCop
         private
 
         attr_reader :cask_block
+
         def_delegators :cask_block, :cask_node, :toplevel_stanzas,
                        :sorted_toplevel_stanzas
 
@@ -141,10 +142,10 @@ module RuboCop
           end
           home = homepage.downcase
           if (split_host = host.split(".")).length >= 3
-            host = split_host[-2..-1].join(".")
+            host = split_host[-2..].join(".")
           end
           if (split_home = homepage.split(".")).length >= 3
-            home = split_home[-2..-1].join(".")
+            home = split_home[-2..].join(".")
           end
           host == home
         end
diff --git a/Library/Homebrew/rubocops/cask/mixin/on_homepage_stanza.rb b/Library/Homebrew/rubocops/cask/mixin/on_homepage_stanza.rb
index 24d65737c3..f76d258faa 100644
--- a/Library/Homebrew/rubocops/cask/mixin/on_homepage_stanza.rb
+++ b/Library/Homebrew/rubocops/cask/mixin/on_homepage_stanza.rb
@@ -19,6 +19,7 @@ module RuboCop
         private
 
         attr_reader :cask_block
+
         def_delegators :cask_block,
                        :toplevel_stanzas
       end
diff --git a/Library/Homebrew/rubocops/cask/stanza_grouping.rb b/Library/Homebrew/rubocops/cask/stanza_grouping.rb
index 631d2c7e2a..aec43875c7 100644
--- a/Library/Homebrew/rubocops/cask/stanza_grouping.rb
+++ b/Library/Homebrew/rubocops/cask/stanza_grouping.rb
@@ -39,6 +39,7 @@ module RuboCop
         private
 
         attr_reader :cask_block, :line_ops
+
         def_delegators :cask_block, :cask_node, :toplevel_stanzas
 
         def add_offenses
diff --git a/Library/Homebrew/rubocops/cask/stanza_order.rb b/Library/Homebrew/rubocops/cask/stanza_order.rb
index bb8c153ba7..2a81bdb113 100644
--- a/Library/Homebrew/rubocops/cask/stanza_order.rb
+++ b/Library/Homebrew/rubocops/cask/stanza_order.rb
@@ -31,6 +31,7 @@ module RuboCop
         private
 
         attr_reader :cask_block
+
         def_delegators :cask_block, :cask_node, :toplevel_stanzas,
                        :sorted_toplevel_stanzas
 
diff --git a/Library/Homebrew/rubocops/extend/formula.rb b/Library/Homebrew/rubocops/extend/formula.rb
index 74eef626ee..81281cd63a 100644
--- a/Library/Homebrew/rubocops/extend/formula.rb
+++ b/Library/Homebrew/rubocops/extend/formula.rb
@@ -17,6 +17,7 @@ module RuboCop
       include RangeHelp
 
       attr_accessor :file_path
+
       @registry = Cop.registry
 
       # This method is called by RuboCop and is the main entry point

From fe6cca354039ad5f511864642e85136aff9d1ead Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 12 May 2020 09:09:59 +0100
Subject: [PATCH 058/134] cask/cmd/list: remove deprecated -l.

This crashes `brew style`.
---
 Library/Homebrew/cask/cmd/list.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Library/Homebrew/cask/cmd/list.rb b/Library/Homebrew/cask/cmd/list.rb
index 83a17eed74..563f2a59d9 100644
--- a/Library/Homebrew/cask/cmd/list.rb
+++ b/Library/Homebrew/cask/cmd/list.rb
@@ -7,11 +7,6 @@ module Cask
       option "--versions", :versions, false
       option "--full-name", :full_name, false
 
-      option "-l", (lambda do |*|
-        one = true # rubocop:disable Lint/UselessAssignment
-        opoo "Option -l is obsolete! Implying option -1."
-      end)
-
       def run
         args.any? ? list : list_installed
       end

From 84a110744aeda5b3c269a70fde534ed7718e2c44 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 12 May 2020 10:26:09 +0100
Subject: [PATCH 059/134] utils/fork: check for inner exception command.

If it's not present then `ErrorDuringExecution` and `BuildError` don't
work correctly so better to fall back to a default `RuntimeError`.
---
 Library/Homebrew/utils/fork.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/utils/fork.rb b/Library/Homebrew/utils/fork.rb
index bd8066b3fc..6427193ce8 100644
--- a/Library/Homebrew/utils/fork.rb
+++ b/Library/Homebrew/utils/fork.rb
@@ -5,11 +5,13 @@ require "socket"
 
 module Utils
   def self.rewrite_child_error(child_error)
-    error = if child_error.inner_class == ErrorDuringExecution
+    error = if child_error.inner["cmd"] &&
+               child_error.inner_class == ErrorDuringExecution
       ErrorDuringExecution.new(child_error.inner["cmd"],
                                status: child_error.inner["status"],
                                output: child_error.inner["output"])
-    elsif child_error.inner_class == BuildError
+    elsif child_error.inner["cmd"] &&
+          child_error.inner_class == BuildError
       # We fill `BuildError#formula` and `BuildError#options` in later,
       # when we rescue this in `FormulaInstaller#build`.
       BuildError.new(nil, child_error.inner["cmd"],

From a333014c55c1edc2555cd2dfbd8dc07463cc9b76 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 12 May 2020 10:43:54 +0100
Subject: [PATCH 060/134] formula_installer: ignore dependencies when fetching.

Whenever you are fetching a dependency you only care about fetching that
specific dependency and not all the dependencies of that dependency.

Unlike installing, dependencies can be fetched in any order and have no
"chains" between them.
---
 Library/Homebrew/formula_installer.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 3e281a7588..d51ad3780b 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -572,6 +572,10 @@ class FormulaInstaller
     fi.verbose                 = verbose?
     fi.quiet                   = quiet?
     fi.debug                   = debug?
+    # When fetching we don't need to recurse the dependency tree as it's already
+    # been done for us in `compute_dependencies` and there's no requirement to
+    # fetch in a particular order.
+    fi.ignore_deps             = true
     fi.fetch
   end
 

From 6ed1ccd8e88fdabab04b2f1c077665f142b7e093 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 12 May 2020 12:37:54 +0100
Subject: [PATCH 061/134] Fetch (all) resources when building from source

Also:
- when `brew test` or `brew postinstall` is run allow `Resource#stage`
  to fetch the resource.
- make `Formula#fetch` and `Resource#fetch` fetch external patches too.

Follow-up from #7549 and #7546.
---
 Library/Homebrew/build.rb             |  4 +++-
 Library/Homebrew/formula.rb           | 29 ++++++++++++++-------------
 Library/Homebrew/formula_installer.rb |  7 ++++++-
 Library/Homebrew/patch.rb             |  4 ++--
 Library/Homebrew/resource.rb          | 18 ++++++++++++-----
 5 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 98ad387ce2..c63f45f97e 100644
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -114,7 +114,9 @@ class Build
     with_env(new_env) do
       formula.extend(Debrew::Formula) if ARGV.debug?
 
-      formula.brew do |_formula, staging|
+      formula.update_head_version
+
+      formula.brew(fetch: false) do |_formula, staging|
         # For head builds, HOMEBREW_FORMULA_PREFIX should include the commit,
         # which is not known until after the formula has been staged.
         ENV["HOMEBREW_FORMULA_PREFIX"] = formula.prefix
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index faa86fceec..c33d151c9c 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1012,11 +1012,11 @@ class Formula
     self.build = Tab.for_formula(self)
 
     new_env = {
-      "TMPDIR"        => HOMEBREW_TEMP,
-      "TEMP"          => HOMEBREW_TEMP,
-      "TMP"           => HOMEBREW_TEMP,
-      "HOMEBREW_PATH" => nil,
-      "PATH"          => ENV["HOMEBREW_PATH"],
+      TMPDIR:        HOMEBREW_TEMP,
+      TEMP:          HOMEBREW_TEMP,
+      TMP:           HOMEBREW_TEMP,
+      HOMEBREW_PATH: nil,
+      PATH:          ENV["HOMEBREW_PATH"],
     }
 
     with_env(new_env) do
@@ -1160,11 +1160,12 @@ class Formula
   # yields |self,staging| with current working directory set to the uncompressed tarball
   # where staging is a Mktemp staging context
   # @private
-  def brew
+  def brew(fetch: true)
     @prefix_returns_versioned_prefix = true
+    active_spec.fetch if fetch
     stage do |staging|
       staging.retain! if Homebrew.args.keep_tmp?
-      prepare_patches
+      fetch_patches if fetch
 
       begin
         yield self, staging
@@ -2078,6 +2079,13 @@ class Formula
     ENV.update(removed)
   end
 
+  def fetch_patches
+    active_spec.add_legacy_patches(patches) if respond_to?(:patches)
+
+    patchlist.grep(DATAPatch) { |p| p.path = path }
+    patchlist.select(&:external?).each(&:fetch)
+  end
+
   private
 
   # Returns the prefix for a given formula version number.
@@ -2147,13 +2155,6 @@ class Formula
     end
   end
 
-  def prepare_patches
-    active_spec.add_legacy_patches(patches) if respond_to?(:patches)
-
-    patchlist.grep(DATAPatch) { |p| p.path = path }
-    patchlist.select(&:external?).each(&:fetch)
-  end
-
   # The methods below define the formula DSL.
   class << self
     include BuildEnvironment::DSL
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 3e281a7588..dcea932f38 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -973,6 +973,11 @@ class FormulaInstaller
 
     return if only_deps?
 
+    unless pour_bottle?
+      formula.fetch_patches
+      formula.resources.each(&:fetch)
+    end
+
     downloader.fetch
   end
 
@@ -982,7 +987,7 @@ class FormulaInstaller
     elsif pour_bottle?
       formula.bottle
     else
-      formula.downloader
+      formula
     end
   end
 
diff --git a/Library/Homebrew/patch.rb b/Library/Homebrew/patch.rb
index db49f65e79..1050e5bdf4 100644
--- a/Library/Homebrew/patch.rb
+++ b/Library/Homebrew/patch.rb
@@ -117,8 +117,8 @@ class ExternalPatch
   attr_reader :resource, :strip
 
   def_delegators :resource,
-                 :url, :fetch, :patch_files, :verify_download_integrity, :cached_download,
-                 :clear_cache
+                 :url, :fetch, :patch_files, :verify_download_integrity,
+                 :cached_download, :downloaded?, :clear_cache
 
   def initialize(strip, &block)
     @strip    = strip
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index 1f245fd719..dec25c6de1 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -55,6 +55,10 @@ class Resource
     "#{owner.name}--#{escaped_name}"
   end
 
+  def downloaded?
+    cached_download.exist?
+  end
+
   def cached_download
     downloader.cached_location
   end
@@ -68,17 +72,19 @@ class Resource
   # directory. Subclasses that override stage should implement the tmp
   # dir using {Mktemp} so that works with all subtypes.
   def stage(target = nil, &block)
-    raise ArgumentError, "target directory or block is required" unless target || block
+    raise ArgumentError, "target directory or block is required" if target.blank? && block.blank?
 
-    fetch
-    prepare_patches
+    fetch_patches(skip_downloaded: true)
+    fetch unless downloaded?
 
     unpack(target, &block)
   end
 
-  def prepare_patches
+  def fetch_patches(skip_downloaded: false)
     patches.grep(DATAPatch) { |p| p.path = owner.owner.path }
-    patches.select(&:external?).each(&:fetch)
+    patches.select!(&:external?)
+    patches.reject!(&:downloaded?) if skip_downloaded
+    patches.each(&:fetch)
   end
 
   def apply_patches
@@ -115,6 +121,8 @@ class Resource
   def fetch(verify_download_integrity: true)
     HOMEBREW_CACHE.mkpath
 
+    fetch_patches
+
     begin
       downloader.fetch
     rescue ErrorDuringExecution, CurlDownloadStrategyError => e

From d9ad24f5af1d70162305b68f712a972e893627ae Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 12 May 2020 17:44:03 +0100
Subject: [PATCH 062/134] workflows/tests: fix for pre-installed Linuxbrew

---
 .github/workflows/tests.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e71e23aff0..4f6cf50084 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,7 +18,8 @@ jobs:
       id: set-up-homebrew
       run: |
         if which brew &>/dev/null; then
-          HOMEBREW_REPOSITORY="$(brew --repo)"
+          HOMEBREW_PREFIX="$(brew --prefix)"
+          HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew"
         else
           HOMEBREW_PREFIX=/home/linuxbrew/.linuxbrew
           HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew"
@@ -30,11 +31,11 @@ jobs:
           sudo mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar
           sudo ln -sf ../Homebrew/bin/brew "$HOMEBREW_PREFIX/bin/"
           cd -
-
-          export PATH="$HOMEBREW_PREFIX/bin:$PATH"
-          echo "::add-path::$HOMEBREW_PREFIX/bin"
         fi
 
+        export PATH="$HOMEBREW_PREFIX/bin:$PATH"
+        echo "::add-path::$HOMEBREW_PREFIX/bin"
+
         cd "$HOMEBREW_REPOSITORY"
         rm -rf "$GITHUB_WORKSPACE"
         ln -s "$HOMEBREW_REPOSITORY" "$GITHUB_WORKSPACE"

From 8762fc2d7e6b72c185c2f087bb8d04a79b896675 Mon Sep 17 00:00:00 2001
From: Dan Fabulich <dan.fabulich@redfin.com>
Date: Tue, 12 May 2020 10:14:23 -0700
Subject: [PATCH 063/134] Fix formatting issue in Formula Cookbook

---
 docs/Formula-Cookbook.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index d18f91c6f8..c141675db5 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -280,6 +280,7 @@ A good example is [`tinyxml2`](https://github.com/Homebrew/homebrew-core/blob/ma
 * If the software cannot function without credentials or requires a virtual machine, docker instance, etc. to run, a test could be to try to connect with invalid credentials (or without credentials) and confirm that it fails as expected.
 * Homebrew comes with a number of [standard test fixtures](https://github.com/Homebrew/brew/tree/master/Library/Homebrew/test/support/fixtures), including numerous sample images, sounds, and documents in various formats. You can get the file path to a test fixture with `test_fixtures("test.svg")`.
 * If your test requires a test file that isn't a standard test fixture, you can install it from a source repository during the `test` phase with a resource block, like this:
+
 ```ruby
 resource("testdata") do
   url "https://example.com/input.foo"

From 580ccab75db1e9f3496dba7ab88dfe1c94b9d67d Mon Sep 17 00:00:00 2001
From: EricFromCanada <enk3@outlook.com>
Date: Wed, 13 May 2020 00:37:37 -0400
Subject: [PATCH 064/134] formula JSON: include URLs for non-bottled formulae

---
 Library/Homebrew/formula.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index c33d151c9c..5cb9d94e27 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1716,6 +1716,13 @@ class Formula
 
     %w[stable devel].each do |spec_sym|
       next unless spec = send(spec_sym)
+
+      hsh["urls"][spec_sym] = {
+        "url"      => spec.url,
+        "tag"      => spec.specs[:tag],
+        "revision" => spec.specs[:revision],
+      }
+
       next unless spec.bottle_defined?
 
       bottle_spec = spec.bottle_specification
@@ -1735,11 +1742,6 @@ class Formula
         }
       end
       hsh["bottle"][spec_sym] = bottle_info
-      hsh["urls"][spec_sym] = {
-        "url"      => spec.url,
-        "tag"      => spec.specs[:tag],
-        "revision" => spec.specs[:revision],
-      }
     end
 
     hsh["options"] = options.map do |opt|

From 5e5e0345f577670532252b1f5dde4d2f5552aadc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 13 May 2020 05:44:42 +0000
Subject: [PATCH 065/134] build(deps): bump mime-types-data in
 /Library/Homebrew

Bumps [mime-types-data](https://github.com/mime-types/mime-types-data) from 3.2020.0425 to 3.2020.0512.
- [Release notes](https://github.com/mime-types/mime-types-data/releases)
- [Changelog](https://github.com/mime-types/mime-types-data/blob/master/History.md)
- [Commits](https://github.com/mime-types/mime-types-data/compare/v3.2020.0425...v3.2020.0512)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 689f0f6322..ea14570654 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -37,7 +37,7 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0425)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     mustache (1.1.1)

From cb0a9e79d897cb88a7e2b7c60b4f82b586f3f135 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 13 May 2020 11:24:06 +0100
Subject: [PATCH 066/134] docs/New-Maintainer-Checklist: clarify ops can get
 owner.

This is needed for Bo98 to get access to GitHub Actions shared runners.
---
 docs/New-Maintainer-Checklist.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/New-Maintainer-Checklist.md b/docs/New-Maintainer-Checklist.md
index b9961fa05a..7a27dd3ec8 100644
--- a/docs/New-Maintainer-Checklist.md
+++ b/docs/New-Maintainer-Checklist.md
@@ -66,10 +66,11 @@ If they accept, follow a few steps to get them set up:
 - Add them to Homebrew/brew's README, run `brew man` and commit the changes.
 - Start the process to [add them as Homebrew members](#members), for formal voting rights and the ability to hold office for Homebrew.
 
-If they are interested in doing system administration work or Homebrew/brew releases:
+If they are interested in doing system administration work:
 
 - Invite them to the [`homebrew-ops` private operations mailing list](https://lists.sfconservancy.org/mailman/admin/homebrew-ops/members/add).
 - Invite them to the [`homebrew` private 1Password](https://homebrew.1password.com/people).
+- Optionally: make them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people) if they need to access organisation-wide settings (like GitHub Actions organisation shared runners).
 
 If they are elected to the Homebrew's [Project Leadership Committee](https://docs.brew.sh/Homebrew-Governance#4-project-leadership-committee):
 

From a7475a2946cc6a10d3901d2cc225cce9994b694d Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 13 May 2020 11:49:17 +0100
Subject: [PATCH 067/134] Split out prepare_patches and fetch_patches methods.

The new `fetch_patches` method wasn't exclusively fetching so shouldn't
have been skipped when it was.

Fixes #7558.
---
 Library/Homebrew/formula.rb  | 10 +++++++---
 Library/Homebrew/resource.rb |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 5cb9d94e27..ab90329020 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1165,6 +1165,8 @@ class Formula
     active_spec.fetch if fetch
     stage do |staging|
       staging.retain! if Homebrew.args.keep_tmp?
+
+      prepare_patches
       fetch_patches if fetch
 
       begin
@@ -2082,14 +2084,16 @@ class Formula
   end
 
   def fetch_patches
-    active_spec.add_legacy_patches(patches) if respond_to?(:patches)
-
-    patchlist.grep(DATAPatch) { |p| p.path = path }
     patchlist.select(&:external?).each(&:fetch)
   end
 
   private
 
+  def prepare_patches
+    active_spec.add_legacy_patches(patches) if respond_to?(:patches)
+    patchlist.grep(DATAPatch) { |p| p.path = path }
+  end
+
   # Returns the prefix for a given formula version number.
   # @private
   def versioned_prefix(v)
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index dec25c6de1..a02d197f0a 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -74,14 +74,18 @@ class Resource
   def stage(target = nil, &block)
     raise ArgumentError, "target directory or block is required" if target.blank? && block.blank?
 
+    prepare_patches
     fetch_patches(skip_downloaded: true)
     fetch unless downloaded?
 
     unpack(target, &block)
   end
 
-  def fetch_patches(skip_downloaded: false)
+  def prepare_patches
     patches.grep(DATAPatch) { |p| p.path = owner.owner.path }
+  end
+
+  def fetch_patches(skip_downloaded: false)
     patches.select!(&:external?)
     patches.reject!(&:downloaded?) if skip_downloaded
     patches.each(&:fetch)

From 133ee7966dbebd965f8d306bdaa78706399e67f3 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Mon, 11 May 2020 21:26:45 -0700
Subject: [PATCH 068/134] shell: Use .profile unless .bash_profile exists

---
 Library/Homebrew/cmd/shellenv.sh          |  2 +-
 Library/Homebrew/manpages/brew-cask.1.md  |  3 ++-
 Library/Homebrew/test/utils/shell_spec.rb | 12 ++++++------
 Library/Homebrew/utils/shell.rb           | 14 ++++++++++----
 docs/Gems,-Eggs-and-Perl-Modules.md       |  2 +-
 docs/Manpage.md                           |  2 +-
 docs/Shell-Completion.md                  |  2 +-
 manpages/brew-cask.1                      |  2 +-
 manpages/brew.1                           |  2 +-
 9 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Library/Homebrew/cmd/shellenv.sh b/Library/Homebrew/cmd/shellenv.sh
index b96ddb6a60..193924f27c 100644
--- a/Library/Homebrew/cmd/shellenv.sh
+++ b/Library/Homebrew/cmd/shellenv.sh
@@ -3,7 +3,7 @@
 #:  Print export statements. When run in a shell, this installation of Homebrew will be added to your `PATH`, `MANPATH`, and `INFOPATH`.
 #:
 #:  The variables `HOMEBREW_PREFIX`, `HOMEBREW_CELLAR` and `HOMEBREW_REPOSITORY` are also exported to avoid querying them multiple times.
-#:  Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.bash_profile` or `~/.zprofile`) with: `eval $(brew shellenv)`
+#:  Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.profile`, `~/.bash_profile`, or `~/.zprofile`) with: `eval $(brew shellenv)`
 
 homebrew-shellenv() {
   case "$SHELL" in
diff --git a/Library/Homebrew/manpages/brew-cask.1.md b/Library/Homebrew/manpages/brew-cask.1.md
index cec5db30ad..32da99944a 100644
--- a/Library/Homebrew/manpages/brew-cask.1.md
+++ b/Library/Homebrew/manpages/brew-cask.1.md
@@ -243,7 +243,8 @@ Environment variables specific to Homebrew Cask:
   * `HOMEBREW_CASK_OPTS`:
     This variable may contain any arguments normally used as options on
     the command-line. This is particularly useful to make options persistent.
-    For example, you might add to your .bash_profile or .zshenv something like:
+    For example, you might add to your ~/.profile, ~/.bash_profile, or ~/.zshenv
+    something like:
 
                export HOMEBREW_CASK_OPTS='--appdir=~/Applications --fontdir=/Library/Fonts'
 
diff --git a/Library/Homebrew/test/utils/shell_spec.rb b/Library/Homebrew/test/utils/shell_spec.rb
index c0d4e33e6f..d4844080bd 100644
--- a/Library/Homebrew/test/utils/shell_spec.rb
+++ b/Library/Homebrew/test/utils/shell_spec.rb
@@ -4,19 +4,19 @@ require "utils/shell"
 
 describe Utils::Shell do
   describe "::profile" do
-    it "returns ~/.bash_profile by default" do
+    it "returns ~/.profile by default" do
       ENV["SHELL"] = "/bin/another_shell"
-      expect(subject.profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.profile")
     end
 
-    it "returns ~/.bash_profile for sh" do
+    it "returns ~/.profile for sh" do
       ENV["SHELL"] = "/bin/sh"
-      expect(subject.profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.profile")
     end
 
-    it "returns ~/.bash_profile for Bash" do
+    it "returns ~/.profile for Bash" do
       ENV["SHELL"] = "/bin/bash"
-      expect(subject.profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.profile")
     end
 
     it "returns /tmp/.zshrc for Zsh if ZDOTDIR is /tmp" do
diff --git a/Library/Homebrew/utils/shell.rb b/Library/Homebrew/utils/shell.rb
index a6f233a259..32f187afca 100644
--- a/Library/Homebrew/utils/shell.rb
+++ b/Library/Homebrew/utils/shell.rb
@@ -39,9 +39,15 @@ module Utils
 
     # return the shell profile file based on user's preferred shell
     def profile
-      return "#{ENV["ZDOTDIR"]}/.zshrc" if preferred == :zsh && ENV["ZDOTDIR"].present?
+      case preferred
+      when :bash
+        bash_profile = "#{ENV["HOME"]}/.bash_profile"
+        return bash_profile if File.exist? bash_profile
+      when :zsh
+        return "#{ENV["ZDOTDIR"]}/.zshrc" if ENV["ZDOTDIR"].present?
+      end
 
-      SHELL_PROFILE_MAP.fetch(preferred, "~/.bash_profile")
+      SHELL_PROFILE_MAP.fetch(preferred, "~/.profile")
     end
 
     def set_variable_in_profile(variable, value)
@@ -67,12 +73,12 @@ module Utils
     end
 
     SHELL_PROFILE_MAP = {
-      bash: "~/.bash_profile",
+      bash: "~/.profile",
       csh:  "~/.cshrc",
       fish: "~/.config/fish/config.fish",
       ksh:  "~/.kshrc",
       mksh: "~/.kshrc",
-      sh:   "~/.bash_profile",
+      sh:   "~/.profile",
       tcsh: "~/.tcshrc",
       zsh:  "~/.zshrc",
     }.freeze
diff --git a/docs/Gems,-Eggs-and-Perl-Modules.md b/docs/Gems,-Eggs-and-Perl-Modules.md
index 1323981730..d7793fb63b 100644
--- a/docs/Gems,-Eggs-and-Perl-Modules.md
+++ b/docs/Gems,-Eggs-and-Perl-Modules.md
@@ -114,7 +114,7 @@ sudo cpan local::lib
 
 Note that this will install some other dependencies like `Module::Install`.
 Then put the appropriate incantation in your shell’s startup, e.g. for
-`.bash_profile` you insert the below, for others see the
+`.profile` you insert the below, for others see the
 [`local::lib`](https://metacpan.org/pod/local::lib) docs.
 
 ```sh
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 4cae34f275..4b509a8bdc 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -435,7 +435,7 @@ ones). No online search is performed.
 Print export statements. When run in a shell, this installation of Homebrew will be added to your `PATH`, `MANPATH`, and `INFOPATH`.
 
 The variables `HOMEBREW_PREFIX`, `HOMEBREW_CELLAR` and `HOMEBREW_REPOSITORY` are also exported to avoid querying them multiple times.
-Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.bash_profile` or `~/.zprofile`) with: `eval $(brew shellenv)`
+Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.profile`, `~/.bash_profile`, or `~/.zprofile`) with: `eval $(brew shellenv)`
 
 ### `switch` *`formula`* *`version`*
 
diff --git a/docs/Shell-Completion.md b/docs/Shell-Completion.md
index d56cfd1c93..34a4c64f59 100644
--- a/docs/Shell-Completion.md
+++ b/docs/Shell-Completion.md
@@ -8,7 +8,7 @@ You must configure your shell to enable its completion support. This is because
 
 ## Configuring Completions in `bash`
 
-To make Homebrew's completions available in `bash`, you must source the definitions as part of your shell's startup. Add the following to your `~/.bash_profile` file:
+To make Homebrew's completions available in `bash`, you must source the definitions as part of your shell's startup. Add the following to your `~/.profile` file:
 
 ```sh
 if type brew &>/dev/null; then
diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1
index 1e989ae15e..6dcccee77b 100644
--- a/manpages/brew-cask.1
+++ b/manpages/brew-cask.1
@@ -274,7 +274,7 @@ Environment variables specific to Homebrew Cask:
 .
 .TP
 \fBHOMEBREW_CASK_OPTS\fR
-This variable may contain any arguments normally used as options on the command\-line\. This is particularly useful to make options persistent\. For example, you might add to your \.bash_profile or \.zshenv something like:
+This variable may contain any arguments normally used as options on the command\-line\. This is particularly useful to make options persistent\. For example, you might add to your ~/\.profile, ~/\.bash_profile, or ~/\.zshenv something like:
 .
 .IP "" 4
 .
diff --git a/manpages/brew.1 b/manpages/brew.1
index 6cc7715b35..cc751d43b9 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -576,7 +576,7 @@ Search for \fItext\fR in the given package manager\'s list\.
 Print export statements\. When run in a shell, this installation of Homebrew will be added to your \fBPATH\fR, \fBMANPATH\fR, and \fBINFOPATH\fR\.
 .
 .P
-The variables \fBHOMEBREW_PREFIX\fR, \fBHOMEBREW_CELLAR\fR and \fBHOMEBREW_REPOSITORY\fR are also exported to avoid querying them multiple times\. Consider adding evaluation of this command\'s output to your dotfiles (e\.g\. \fB~/\.bash_profile\fR or \fB~/\.zprofile\fR) with: \fBeval $(brew shellenv)\fR
+The variables \fBHOMEBREW_PREFIX\fR, \fBHOMEBREW_CELLAR\fR and \fBHOMEBREW_REPOSITORY\fR are also exported to avoid querying them multiple times\. Consider adding evaluation of this command\'s output to your dotfiles (e\.g\. \fB~/\.profile\fR, \fB~/\.bash_profile\fR, or \fB~/\.zprofile\fR) with: \fBeval $(brew shellenv)\fR
 .
 .SS "\fBswitch\fR \fIformula\fR \fIversion\fR"
 Symlink all of the specified \fIversion\fR of \fIformula\fR\'s installation into Homebrew\'s prefix\.

From bb27478de053eb7061cdd22218fc86efc41436d0 Mon Sep 17 00:00:00 2001
From: skim <skim@swainslane.co>
Date: Wed, 13 May 2020 17:35:59 -0700
Subject: [PATCH 069/134] fixes uninstall if formula is unavailable

---
 Library/Homebrew/cmd/uninstall.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index a27c45eaf5..af66c9ac1e 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -81,6 +81,8 @@ module Homebrew
               puts "Run `brew uninstall --force #{keg.name}` to remove all versions."
             end
 
+            next unless f
+
             paths = f.pkgetc.find.map(&:to_s) if f.pkgetc.exist?
             if paths.present?
               puts

From e877a52fa6c0dc9dd91998305037f588e7394246 Mon Sep 17 00:00:00 2001
From: Zach Auten <zachauten@gmail.com>
Date: Thu, 14 May 2020 00:31:14 -0400
Subject: [PATCH 070/134] Fix exception when calling "brew cask" with --help
 and no subcommand

---
 Library/Homebrew/cask/cmd.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Library/Homebrew/cask/cmd.rb b/Library/Homebrew/cask/cmd.rb
index a65cee3949..af03b04385 100644
--- a/Library/Homebrew/cask/cmd.rb
+++ b/Library/Homebrew/cask/cmd.rb
@@ -243,6 +243,10 @@ module Cask
         $stderr.puts
         $stderr.puts Help.usage
       end
+
+      def help
+        run
+      end
     end
   end
 end

From e79c7e7bf5261467324674fb5f0dc803d5427886 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 05:37:53 +0000
Subject: [PATCH 071/134] build(deps): bump tins from 1.24.1 to 1.25.0 in
 /Library/Homebrew

Bumps [tins](https://github.com/flori/tins) from 1.24.1 to 1.25.0.
- [Release notes](https://github.com/flori/tins/releases)
- [Commits](https://github.com/flori/tins/compare/v1.24.1...v1.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index ea14570654..7b462d04ef 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
       tins (~> 1.0)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tins (1.24.1)
+    tins (1.25.0)
       sync
     tzinfo (1.2.7)
       thread_safe (~> 0.1)

From 2ffb87cb0312c28db8c04afa89736b1fed6a805c Mon Sep 17 00:00:00 2001
From: Jonathan Chang <jchang641@gmail.com>
Date: Thu, 14 May 2020 20:08:01 +1000
Subject: [PATCH 072/134] resource: fix patching when patch already fetched

This inappropriately modified the shared `patches` variable, meaning an
already fetched patch would be removed and therefore not be applied when
the resource was staged.
---
 Library/Homebrew/resource.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index a02d197f0a..ab7018e035 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -86,9 +86,12 @@ class Resource
   end
 
   def fetch_patches(skip_downloaded: false)
-    patches.select!(&:external?)
-    patches.reject!(&:downloaded?) if skip_downloaded
-    patches.each(&:fetch)
+    patches.each do |p|
+      next unless p.external?
+      next if p.downloaded? && skip_downloaded
+
+      p.fetch
+    end
   end
 
   def apply_patches

From 8e2718c74e2febd02348c5e5fcf0374c6a6e0df8 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 14 May 2020 09:20:58 +0100
Subject: [PATCH 073/134] resource: tweak fetch_patches logic.

---
 Library/Homebrew/resource.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index ab7018e035..082dd1a7a8 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -86,12 +86,9 @@ class Resource
   end
 
   def fetch_patches(skip_downloaded: false)
-    patches.each do |p|
-      next unless p.external?
-      next if p.downloaded? && skip_downloaded
-
-      p.fetch
-    end
+    external_patches = patches.select(&:external?)
+    external_patches.reject!(&:downloaded?) if skip_downloaded
+    external_patches.each(&:fetch)
   end
 
   def apply_patches

From 69e1673a81d75da6d2213075c9427d0afd7b1813 Mon Sep 17 00:00:00 2001
From: rmnull <rmnull@users.noreply.github.com>
Date: Fri, 15 May 2020 04:36:15 +0530
Subject: [PATCH 074/134] skip needed_libraries check when patchelf is the
 bottle being installed.

---
 Library/Homebrew/os/linux/elf.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Library/Homebrew/os/linux/elf.rb b/Library/Homebrew/os/linux/elf.rb
index 244a22e114..11603dee71 100644
--- a/Library/Homebrew/os/linux/elf.rb
+++ b/Library/Homebrew/os/linux/elf.rb
@@ -132,6 +132,8 @@ module ELFShim
       elsif DevelopmentTools.locate "patchelf"
         needed_libraries_using_patchelf path
       else
+        return [nil, []] if path.basename.to_s == "patchelf"
+
         raise "patchelf must be installed: brew install patchelf"
       end
     end

From a4f9a664068eb93a6822f2b409457912685fa668 Mon Sep 17 00:00:00 2001
From: nandahkrishna <nanda.harishankar@gmail.com>
Date: Fri, 15 May 2020 18:28:47 +0530
Subject: [PATCH 075/134] livecheck: add component order rubocop

---
 Library/Homebrew/rubocops/components_order.rb | 33 ++++++++++---------
 .../test/rubocops/components_order_spec.rb    | 17 ++++++++++
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Library/Homebrew/rubocops/components_order.rb b/Library/Homebrew/rubocops/components_order.rb
index a9d4d577b8..5049598b4b 100644
--- a/Library/Homebrew/rubocops/components_order.rb
+++ b/Library/Homebrew/rubocops/components_order.rb
@@ -12,24 +12,25 @@ module RuboCop
       class ComponentsOrder < FormulaCop
         def audit_formula(_node, _class_node, _parent_class_node, body_node)
           component_precedence_list = [
-            [{ name: :include,  type: :method_call }],
-            [{ name: :desc,     type: :method_call }],
-            [{ name: :homepage, type: :method_call }],
-            [{ name: :url,      type: :method_call }],
-            [{ name: :mirror,   type: :method_call }],
-            [{ name: :version,  type: :method_call }],
-            [{ name: :sha256,   type: :method_call }],
-            [{ name: :revision, type: :method_call }],
+            [{ name: :include,   type: :method_call }],
+            [{ name: :desc,      type: :method_call }],
+            [{ name: :homepage,  type: :method_call }],
+            [{ name: :url,       type: :method_call }],
+            [{ name: :mirror,    type: :method_call }],
+            [{ name: :version,   type: :method_call }],
+            [{ name: :sha256,    type: :method_call }],
+            [{ name: :revision,  type: :method_call }],
             [{ name: :version_scheme, type: :method_call }],
-            [{ name: :head,     type: :method_call }],
-            [{ name: :stable,   type: :block_call }],
-            [{ name: :bottle,   type: :block_call }],
+            [{ name: :head,      type: :method_call }],
+            [{ name: :stable,    type: :block_call }],
+            [{ name: :livecheck, type: :block_call }],
+            [{ name: :bottle,    type: :block_call }],
             [{ name: :pour_bottle?, type: :block_call }],
-            [{ name: :devel,    type: :block_call }],
-            [{ name: :head,     type: :block_call }],
-            [{ name: :bottle,   type: :method_call }],
-            [{ name: :keg_only, type: :method_call }],
-            [{ name: :option,   type: :method_call }],
+            [{ name: :devel,     type: :block_call }],
+            [{ name: :head,      type: :block_call }],
+            [{ name: :bottle,    type: :method_call }],
+            [{ name: :keg_only,  type: :method_call }],
+            [{ name: :option,    type: :method_call }],
             [{ name: :deprecated_option, type: :method_call }],
             [{ name: :depends_on, type: :method_call }],
             [{ name: :uses_from_macos, type: :method_call }],
diff --git a/Library/Homebrew/test/rubocops/components_order_spec.rb b/Library/Homebrew/test/rubocops/components_order_spec.rb
index 1edc7fd499..821cbd64a1 100644
--- a/Library/Homebrew/test/rubocops/components_order_spec.rb
+++ b/Library/Homebrew/test/rubocops/components_order_spec.rb
@@ -19,6 +19,23 @@ describe RuboCop::Cop::FormulaAudit::ComponentsOrder do
       RUBY
     end
 
+    it "When `bottle` precedes `livecheck`" do
+      expect_offense(<<~RUBY)
+        class Foo < Formula
+          homepage "https://brew.sh"
+          url "https://brew.sh/foo-1.0.tgz"
+
+          bottle :unneeded
+
+          livecheck do
+          ^^^^^^^^^^^^ `livecheck` (line 7) should be put before `bottle` (line 5)
+            url "https://brew.sh/foo/versions/"
+            regex(/href=.+?foo-(\d+(?:\.\d+)+)\.t/)
+          end
+        end
+      RUBY
+    end
+
     it "When url precedes homepage" do
       expect_offense(<<~RUBY)
         class Foo < Formula

From c70bb474e3d8ae447042e2d24ed1d67e6071dc48 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Sat, 16 May 2020 12:30:29 +0100
Subject: [PATCH 076/134] os/mac: move legacy functions to compat

---
 Library/Homebrew/compat.rb        |  1 +
 Library/Homebrew/compat/os/mac.rb | 30 ++++++++++++++++++++++++++++++
 Library/Homebrew/os/mac.rb        | 16 ----------------
 3 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 Library/Homebrew/compat/os/mac.rb

diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb
index 9a2cf29459..a73aa184ef 100644
--- a/Library/Homebrew/compat.rb
+++ b/Library/Homebrew/compat.rb
@@ -4,3 +4,4 @@ require "compat/cask/dsl/version"
 require "compat/language/python"
 require "compat/requirements/macos_requirement"
 require "compat/formula"
+require "compat/os/mac" if OS.mac?
diff --git a/Library/Homebrew/compat/os/mac.rb b/Library/Homebrew/compat/os/mac.rb
new file mode 100644
index 0000000000..af3863c86a
--- /dev/null
+++ b/Library/Homebrew/compat/os/mac.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OS
+  module Mac
+    class << self
+      module Compat
+        def preferred_arch
+          # odeprecated "MacOS.preferred_arch", "Hardware::CPU.arch (or ideally let the compiler handle it)"
+          if Hardware::CPU.is_64_bit?
+            Hardware::CPU.arch_64_bit
+          else
+            Hardware::CPU.arch_32_bit
+          end
+        end
+
+        def tcc_db
+          # odeprecated "MacOS.tcc_db"
+          @tcc_db ||= Pathname.new("/Library/Application Support/com.apple.TCC/TCC.db")
+        end
+
+        def pre_mavericks_accessibility_dotfile
+          # odeprecated "MacOS.pre_mavericks_accessibility_dotfile"
+          @pre_mavericks_accessibility_dotfile ||= Pathname.new("/private/var/db/.AccessibilityAPIEnabled")
+        end
+      end
+
+      prepend Compat
+    end
+  end
+end
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 5343d7def4..3118edf50f 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -166,14 +166,6 @@ module OS
       paths.uniq
     end
 
-    def preferred_arch
-      if Hardware::CPU.is_64_bit?
-        Hardware::CPU.arch_64_bit
-      else
-        Hardware::CPU.arch_32_bit
-      end
-    end
-
     def app_with_bundle_id(*ids)
       path = mdfind(*ids)
              .reject { |p| p.include?("/Backups.backupdb/") }
@@ -196,13 +188,5 @@ module OS
     def mdfind_query(*ids)
       ids.map! { |id| "kMDItemCFBundleIdentifier == #{id}" }.join(" || ")
     end
-
-    def tcc_db
-      @tcc_db ||= Pathname.new("/Library/Application Support/com.apple.TCC/TCC.db")
-    end
-
-    def pre_mavericks_accessibility_dotfile
-      @pre_mavericks_accessibility_dotfile ||= Pathname.new("/private/var/db/.AccessibilityAPIEnabled")
-    end
   end
 end

From e03846720ca8b8b8218d399b2bcedf2ecf10bb52 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Sat, 16 May 2020 12:05:03 +0100
Subject: [PATCH 077/134] language/haskell: move to compat

---
 Library/Homebrew/compat/language/haskell.rb | 114 ++++++++++++++++++++
 Library/Homebrew/language/haskell.rb        |  95 +---------------
 2 files changed, 115 insertions(+), 94 deletions(-)
 create mode 100644 Library/Homebrew/compat/language/haskell.rb

diff --git a/Library/Homebrew/compat/language/haskell.rb b/Library/Homebrew/compat/language/haskell.rb
new file mode 100644
index 0000000000..0f961b1c34
--- /dev/null
+++ b/Library/Homebrew/compat/language/haskell.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module Language
+  module Haskell
+    module Cabal
+      module Compat
+        def cabal_sandbox(options = {})
+          # odeprecated "Language::Haskell::Cabal.cabal_sandbox"
+
+          pwd = Pathname.pwd
+          home = options[:home] || pwd
+
+          # pretend HOME is elsewhere, so that ~/.cabal is kept as untouched
+          # as possible (except for ~/.cabal/setup-exe-cache)
+          # https://github.com/haskell/cabal/issues/1234
+          saved_home = ENV["HOME"]
+          ENV["HOME"] = home
+
+          system "cabal", "v1-sandbox", "init"
+          cabal_sandbox_bin = pwd/".cabal-sandbox/bin"
+          mkdir_p cabal_sandbox_bin
+
+          # make available any tools that will be installed in the sandbox
+          saved_path = ENV["PATH"]
+          ENV.prepend_path "PATH", cabal_sandbox_bin
+
+          # avoid updating the cabal package database more than once
+          system "cabal", "v1-update" unless (home/".cabal/packages").exist?
+
+          yield
+
+          # remove the sandbox and all build products
+          rm_rf [".cabal-sandbox", "cabal.sandbox.config", "dist"]
+
+          # avoid installing any Haskell libraries, as a matter of policy
+          rm_rf lib unless options[:keep_lib]
+
+          # restore the environment
+          ENV["HOME"] = saved_home
+          ENV["PATH"] = saved_path
+        end
+
+        def cabal_sandbox_add_source(*args)
+          # odeprecated "Language::Haskell::Cabal.cabal_sandbox_add_source"
+
+          system "cabal", "v1-sandbox", "add-source", *args
+        end
+
+        def cabal_install(*args)
+          # odeprecated "Language::Haskell::Cabal.cabal_install",
+          #             "cabal v2-install directly with std_cabal_v2_args"
+
+          # cabal hardcodes 64 as the maximum number of parallel jobs
+          # https://github.com/Homebrew/legacy-homebrew/issues/49509
+          make_jobs = (ENV.make_jobs > 64) ? 64 : ENV.make_jobs
+
+          # cabal-install's dependency-resolution backtracking strategy can easily
+          # need more than the default 2,000 maximum number of "backjumps," since
+          # Hackage is a fast-moving, rolling-release target. The highest known
+          # needed value by a formula at this time (February 2016) was 43,478 for
+          # git-annex, so 100,000 should be enough to avoid most gratuitous
+          # backjumps build failures.
+          system "cabal", "v1-install", "--jobs=#{make_jobs}", "--max-backjumps=100000", *args
+        end
+
+        def cabal_configure(flags)
+          # odeprecated "Language::Haskell::Cabal.cabal_configure"
+
+          system "cabal", "v1-configure", flags
+        end
+
+        def cabal_install_tools(*tools)
+          # odeprecated "Language::Haskell::Cabal.cabal_install_tools"
+
+          # install tools sequentially, as some tools can depend on other tools
+          tools.each { |tool| cabal_install tool }
+
+          # unregister packages installed as dependencies for the tools, so
+          # that they can't cause dependency conflicts for the main package
+          rm_rf Dir[".cabal-sandbox/*packages.conf.d/"]
+        end
+
+        def install_cabal_package(*args, **options)
+          # odeprecated "Language::Haskell::Cabal.install_cabal_package",
+          #             "cabal v2-update directly followed by v2-install with std_cabal_v2_args"
+
+          cabal_sandbox do
+            cabal_install_tools(*options[:using]) if options[:using]
+
+            # if we have build flags, we have to pass them to cabal install to resolve the necessary
+            # dependencies, and call cabal configure afterwards to set the flags again for compile
+            flags = "--flags=#{options[:flags].join(" ")}" if options[:flags]
+
+            args_and_flags = args
+            args_and_flags << flags unless flags.nil?
+
+            # install dependencies in the sandbox
+            cabal_install "--only-dependencies", *args_and_flags
+
+            # call configure if build flags are set
+            cabal_configure flags unless flags.nil?
+
+            # install the main package in the destination dir
+            cabal_install "--prefix=#{prefix}", *args
+
+            yield if block_given?
+          end
+        end
+      end
+
+      prepend Compat
+    end
+  end
+end
diff --git a/Library/Homebrew/language/haskell.rb b/Library/Homebrew/language/haskell.rb
index e4b11e3071..964fa4f773 100644
--- a/Library/Homebrew/language/haskell.rb
+++ b/Library/Homebrew/language/haskell.rb
@@ -1,96 +1,3 @@
 # frozen_string_literal: true
 
-module Language
-  module Haskell
-    module Cabal
-      def cabal_sandbox(options = {})
-        pwd = Pathname.pwd
-        home = options[:home] || pwd
-
-        # pretend HOME is elsewhere, so that ~/.cabal is kept as untouched
-        # as possible (except for ~/.cabal/setup-exe-cache)
-        # https://github.com/haskell/cabal/issues/1234
-        saved_home = ENV["HOME"]
-        ENV["HOME"] = home
-
-        system "cabal", "v1-sandbox", "init"
-        cabal_sandbox_bin = pwd/".cabal-sandbox/bin"
-        mkdir_p cabal_sandbox_bin
-
-        # make available any tools that will be installed in the sandbox
-        saved_path = ENV["PATH"]
-        ENV.prepend_path "PATH", cabal_sandbox_bin
-
-        # avoid updating the cabal package database more than once
-        system "cabal", "v1-update" unless (home/".cabal/packages").exist?
-
-        yield
-
-        # remove the sandbox and all build products
-        rm_rf [".cabal-sandbox", "cabal.sandbox.config", "dist"]
-
-        # avoid installing any Haskell libraries, as a matter of policy
-        rm_rf lib unless options[:keep_lib]
-
-        # restore the environment
-        ENV["HOME"] = saved_home
-        ENV["PATH"] = saved_path
-      end
-
-      def cabal_sandbox_add_source(*args)
-        system "cabal", "v1-sandbox", "add-source", *args
-      end
-
-      def cabal_install(*args)
-        # cabal hardcodes 64 as the maximum number of parallel jobs
-        # https://github.com/Homebrew/legacy-homebrew/issues/49509
-        make_jobs = (ENV.make_jobs > 64) ? 64 : ENV.make_jobs
-
-        # cabal-install's dependency-resolution backtracking strategy can easily
-        # need more than the default 2,000 maximum number of "backjumps," since
-        # Hackage is a fast-moving, rolling-release target. The highest known
-        # needed value by a formula at this time (February 2016) was 43,478 for
-        # git-annex, so 100,000 should be enough to avoid most gratuitous
-        # backjumps build failures.
-        system "cabal", "v1-install", "--jobs=#{make_jobs}", "--max-backjumps=100000", *args
-      end
-
-      def cabal_configure(flags)
-        system "cabal", "v1-configure", flags
-      end
-
-      def cabal_install_tools(*tools)
-        # install tools sequentially, as some tools can depend on other tools
-        tools.each { |tool| cabal_install tool }
-
-        # unregister packages installed as dependencies for the tools, so
-        # that they can't cause dependency conflicts for the main package
-        rm_rf Dir[".cabal-sandbox/*packages.conf.d/"]
-      end
-
-      def install_cabal_package(*args, **options)
-        cabal_sandbox do
-          cabal_install_tools(*options[:using]) if options[:using]
-
-          # if we have build flags, we have to pass them to cabal install to resolve the necessary
-          # dependencies, and call cabal configure afterwards to set the flags again for compile
-          flags = "--flags=#{options[:flags].join(" ")}" if options[:flags]
-
-          args_and_flags = args
-          args_and_flags << flags unless flags.nil?
-
-          # install dependencies in the sandbox
-          cabal_install "--only-dependencies", *args_and_flags
-
-          # call configure if build flags are set
-          cabal_configure flags unless flags.nil?
-
-          # install the main package in the destination dir
-          cabal_install "--prefix=#{prefix}", *args
-
-          yield if block_given?
-        end
-      end
-    end
-  end
-end
+require "compat/language/haskell"

From 139ca1d3749520d7c43fd1f3f24f4c63b3f539d7 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Sun, 17 May 2020 00:31:12 +0530
Subject: [PATCH 078/134] Updated analytics method name for cask info

---
 Library/Homebrew/cask/cmd/abstract_command.rb | 2 ++
 Library/Homebrew/cask/cmd/info.rb             | 1 +
 Library/Homebrew/utils/analytics.rb           | 1 +
 3 files changed, 4 insertions(+)

diff --git a/Library/Homebrew/cask/cmd/abstract_command.rb b/Library/Homebrew/cask/cmd/abstract_command.rb
index 1646ddb943..605bea5e4d 100644
--- a/Library/Homebrew/cask/cmd/abstract_command.rb
+++ b/Library/Homebrew/cask/cmd/abstract_command.rb
@@ -2,12 +2,14 @@
 
 require_relative "options"
 require "search"
+require "utils"
 
 module Cask
   class Cmd
     class AbstractCommand
       include Options
       include Homebrew::Search
+      include Utils
 
       option "--[no-]binaries",   :binaries,      true
       option "--debug",           :debug,         false
diff --git a/Library/Homebrew/cask/cmd/info.rb b/Library/Homebrew/cask/cmd/info.rb
index a09291bce0..1f4fd7e90b 100644
--- a/Library/Homebrew/cask/cmd/info.rb
+++ b/Library/Homebrew/cask/cmd/info.rb
@@ -46,6 +46,7 @@ module Cask
 
       def self.info(cask)
         puts get_info(cask)
+        Analytics.cask_output(cask)
       end
 
       def self.title_info(cask)
diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index eea5d8fe18..40896e5aec 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -178,6 +178,7 @@ module Utils
           puts "#{category}: #{analytics.join(", ")}" unless full_analytics
         end
       end
+      alias cask_output formula_output
 
       def custom_prefix_label
         "custom-prefix"

From 2a62be087580762f1589c984f64dd729ed70f036 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Sun, 17 May 2020 01:38:11 +0530
Subject: [PATCH 079/134] Refractored analytics to support analytics for cask

---
 Library/Homebrew/utils/analytics.rb | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index 40896e5aec..54052d6e1a 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -147,10 +147,7 @@ module Utils
         table_output(category, days, results, os_version: os_version, cask_install: cask_install)
       end
 
-      def formula_output(f)
-        json = formulae_api_json("#{formula_path}/#{f}.json")
-        return if json.blank? || json["analytics"].blank?
-
+      def get_analytics(json)
         full_analytics = Homebrew.args.analytics? || Homebrew.args.verbose?
 
         ohai "Analytics"
@@ -178,7 +175,20 @@ module Utils
           puts "#{category}: #{analytics.join(", ")}" unless full_analytics
         end
       end
-      alias cask_output formula_output
+
+      def formula_output(f)
+        json = formulae_api_json("#{formula_path}/#{f}.json")
+        return if json.blank? || json["analytics"].blank?
+
+        get_analytics(json)
+      end
+
+      def cask_output(cask)
+        json = formulae_api_json("#{cask_path}/#{cask}.json")
+        return if json.blank? || json["analytics"].blank?
+
+        get_analytics(json)
+      end
 
       def custom_prefix_label
         "custom-prefix"
@@ -337,6 +347,10 @@ module Utils
         "analytics"
       end
       alias generic_analytics_path analytics_path
+
+      def cask_path
+        "cask"
+      end
     end
   end
 end

From 4aba04556eef11391e4ba9e8613c30b8095022a9 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Sun, 17 May 2020 02:51:57 +0530
Subject: [PATCH 080/134] Updated tests

---
 Library/Homebrew/test/cask/cmd/info_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
index 01fd90d27a..160a6efbd9 100644
--- a/Library/Homebrew/test/cask/cmd/info_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -155,6 +155,8 @@ describe Cask::Cmd::Info, :cask do
       Docker CE
       ==> Artifacts
       Docker.app (App)
+      ==> Analytics
+      install: 16,997 (30 days), 54,056 (90 days), 239,482 (365 days)
       ==> Downloading https://raw.githubusercontent.com/Homebrew/homebrew-cask/d0b2c58652ae5eff20a7a4ac93292a08b250912b/Casks/docker.rb.
       docker: 2.0.0.2-ce-mac81,30215 (auto_updates)
       https://www.docker.com/community-edition
@@ -164,6 +166,8 @@ describe Cask::Cmd::Info, :cask do
       Docker CE
       ==> Artifacts
       Docker.app (App)
+      ==> Analytics
+      install: 16,997 (30 days), 54,056 (90 days), 239,482 (365 days)
     EOS
   end
 end

From a0d069b30946a1a48051482f41a92299df82eeb5 Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Sun, 17 May 2020 17:23:23 +0900
Subject: [PATCH 081/134] brew doctor shows deleted formulae

---
 Library/Homebrew/diagnostic.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index cdf37ee2fe..f7a50e4d50 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -832,6 +832,25 @@ module Homebrew
         EOS
       end
 
+      def check_deleted_formula
+        formulae = Dir.children(HOMEBREW_CELLAR)
+        formulae.delete(".keepme")
+        deleted_formulae = []
+        formulae.each do |f|
+          Formula[f]
+        rescue
+          deleted_formulae << f
+        end
+        return if deleted_formulae.blank?
+
+        message = <<~EOS
+          Some installed formulae are deleted.
+          You should find replacements for the following formulae:
+            #{deleted_formulae.*"\n  "}
+        EOS
+        message
+      end
+
       def all
         methods.map(&:to_s).grep(/^check_/)
       end

From 7b08e2252e42bc3f19998c3954253e2ac951ab6e Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Sun, 17 May 2020 20:14:05 -0500
Subject: [PATCH 082/134] os/linux/glibc.rb: up minimum glibc version to 2.13

---
 Library/Homebrew/os/linux/glibc.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/os/linux/glibc.rb b/Library/Homebrew/os/linux/glibc.rb
index 8a7fa52506..c7073b39f3 100644
--- a/Library/Homebrew/os/linux/glibc.rb
+++ b/Library/Homebrew/os/linux/glibc.rb
@@ -15,7 +15,7 @@ module OS
       end
 
       def minimum_version
-        Version.new "2.12"
+        Version.new "2.13"
       end
 
       def below_minimum_version?

From 13c311aab4757e73ffaeb9d94c75df762b230ea4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 May 2020 05:41:15 +0000
Subject: [PATCH 083/134] build(deps): bump minitest from 5.14.0 to 5.14.1 in
 /docs

Bumps [minitest](https://github.com/seattlerb/minitest) from 5.14.0 to 5.14.1.
- [Release notes](https://github.com/seattlerb/minitest/releases)
- [Changelog](https://github.com/seattlerb/minitest/blob/master/History.rdoc)
- [Commits](https://github.com/seattlerb/minitest/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 docs/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 8fa96a4180..8803b2cc5a 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -210,7 +210,7 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)

From b53c97ae80b6676ddea3d1535955bd9703c3dee9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 May 2020 05:52:18 +0000
Subject: [PATCH 084/134] build(deps): bump minitest from 5.14.0 to 5.14.1 in
 /Library/Homebrew

Bumps [minitest](https://github.com/seattlerb/minitest) from 5.14.0 to 5.14.1.
- [Release notes](https://github.com/seattlerb/minitest/releases)
- [Changelog](https://github.com/seattlerb/minitest/blob/master/History.rdoc)
- [Commits](https://github.com/seattlerb/minitest/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 7b462d04ef..94e9ba9808 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     mustache (1.1.1)
     net-http-digest_auth (1.4.1)
     net-http-persistent (4.0.0)

From f5b6a90fd0f5610f581834cfee6569688992d623 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 18 May 2020 08:50:51 +0100
Subject: [PATCH 085/134] utils/analytics: fix options reporting.

Check we have a non-empty `options` and convert them all to human
readable strings.
---
 Library/Homebrew/utils/analytics.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index eea5d8fe18..f2163355bf 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -67,8 +67,8 @@ module Utils
         return if exception.formula.tap.private?
 
         action = exception.formula.full_name
-        if (options = exception.options&.to_a&.join(" "))
-          action = "#{action} #{options}".strip
+        if (options = exception.options.to_a.presence)
+          action = "#{action} #{options.map(&:to_s).join(" ")}".strip
         end
         report_event("BuildError", action)
       end

From 4f1e9f44a17ae023120ae88d22f939b85ac2ea1b Mon Sep 17 00:00:00 2001
From: vidusheeamoli <vidushee.amoli@gmail.com>
Date: Mon, 18 May 2020 16:28:43 +0530
Subject: [PATCH 086/134] set up byebug debugger

---
 .gitignore                                      | 2 ++
 Library/Homebrew/Gemfile                        | 1 +
 Library/Homebrew/Gemfile.lock                   | 2 ++
 Library/Homebrew/dev-cmd/tests.rb               | 4 ++++
 Library/Homebrew/test/spec_helper.rb            | 3 ++-
 Library/Homebrew/vendor/bundle/bundler/setup.rb | 1 +
 docs/Manpage.md                                 | 2 ++
 manpages/brew.1                                 | 4 ++++
 8 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 61ca266f05..eb9f76b6c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 /Library/Homebrew/vendor/portable-ruby
 /Library/Taps
 /Library/PinnedTaps
+/Library/Homebrew/.byebug_history
 
 # Ignore Bundler files
 **/.bundle/bin
@@ -77,6 +78,7 @@
 **/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/u*
 **/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/x*
 **/vendor/bundle/ruby/*/gems/thread_safe-*/lib/thread_safe/util
+**/vendor/bundle/ruby/*/gems/byebug-*/
 
 # Ignore dependencies we don't wish to vendor
 **/vendor/bundle/ruby/*/gems/ast-*/
diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile
index 065dd6c83e..2c28f3de29 100644
--- a/Library/Homebrew/Gemfile
+++ b/Library/Homebrew/Gemfile
@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 # installed gems
+gem "byebug"
 gem "coveralls", "~> 0.8", require: false
 gem "parallel_tests"
 gem "ronn", require: false
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 94e9ba9808..bdc2db070a 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -8,6 +8,7 @@ GEM
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
+    byebug (11.1.3)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
     coveralls (0.8.23)
@@ -119,6 +120,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
+  byebug
   concurrent-ruby
   coveralls (~> 0.8)
   mechanize
diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index 18bff0c88b..e2facbfa5b 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -22,6 +22,8 @@ module Homebrew
       switch "--online",
              description: "Include tests that use the GitHub API and tests that use any of the taps for "\
                           "official external commands."
+      switch "--byebug",
+             description: "Enable debugging using byebug."
       flag   "--only=",
              description: "Run only <test_script>`_spec.rb`. Appending `:`<line_number> will start at a "\
                           "specific line."
@@ -39,6 +41,8 @@ module Homebrew
     Homebrew.install_bundler_gems!
     gem_user_dir = Gem.user_dir
 
+    require "byebug" if args.byebug?
+
     HOMEBREW_LIBRARY_PATH.cd do
       ENV.delete("HOMEBREW_COLOR")
       ENV.delete("HOMEBREW_NO_COLOR")
diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index 65490fddfa..f40e98cb25 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -39,6 +39,7 @@ require "rspec/retry"
 require "rubocop"
 require "rubocop/rspec/support"
 require "find"
+require "byebug"
 
 $LOAD_PATH.push(File.expand_path("#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/test/support/lib"))
 
@@ -177,7 +178,7 @@ RSpec.configure do |config|
       @__stdout = $stdout.clone
       @__stderr = $stderr.clone
 
-      unless example.metadata.key?(:focus) || ENV.key?("VERBOSE_TESTS")
+      if (example.metadata.keys & [:focus, :byebug]).empty? && !ENV.key?("VERBOSE_TESTS")
         $stdout.reopen(File::NULL)
         $stderr.reopen(File::NULL)
       end
diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
index efc95978a1..ee533a1b8f 100644
--- a/Library/Homebrew/vendor/bundle/bundler/setup.rb
+++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -67,3 +67,4 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.82.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.39.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/byebug-11.1.3/lib"
diff --git a/docs/Manpage.md b/docs/Manpage.md
index 4b509a8bdc..36c45bea58 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -1015,6 +1015,8 @@ Run Homebrew's unit and integration tests.
   Do not load the compatibility layer when running tests.
 * `--online`:
   Include tests that use the GitHub API and tests that use any of the taps for official external commands.
+* `--byebug`:
+  Enable debugging using byebug.
 * `--only`:
   Run only *`test_script`*`_spec.rb`. Appending `:`*`line_number`* will start at a specific line.
 * `--seed`:
diff --git a/manpages/brew.1 b/manpages/brew.1
index cc751d43b9..d69f8f770a 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1307,6 +1307,10 @@ Do not load the compatibility layer when running tests\.
 Include tests that use the GitHub API and tests that use any of the taps for official external commands\.
 .
 .TP
+\fB\-\-byebug\fR
+Enable debugging using byebug\.
+.
+.TP
 \fB\-\-only\fR
 Run only \fItest_script\fR\fB_spec\.rb\fR\. Appending \fB:\fR\fIline_number\fR will start at a specific line\.
 .

From 7ac337181a3abbecc99c36d3702e7a0662117584 Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Mon, 18 May 2020 20:41:55 +0900
Subject: [PATCH 087/134] use helper methods

---
 Library/Homebrew/diagnostic.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index f7a50e4d50..d16172e291 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -833,20 +833,19 @@ module Homebrew
       end
 
       def check_deleted_formula
-        formulae = Dir.children(HOMEBREW_CELLAR)
-        formulae.delete(".keepme")
+        kegs = Keg.all
         deleted_formulae = []
-        formulae.each do |f|
-          Formula[f]
+        kegs.each do |keg|
+          keg.to_formula
         rescue
-          deleted_formulae << f
+          deleted_formulae << keg.name
         end
         return if deleted_formulae.blank?
 
         message = <<~EOS
-          Some installed formulae are deleted.
+          Some installed formulae were deleted!
           You should find replacements for the following formulae:
-            #{deleted_formulae.*"\n  "}
+            #{deleted_formulae.join("\n  ")}
         EOS
         message
       end

From b9f493a7f694cbe92af6d3e823db0961105246c2 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 18 May 2020 12:46:23 +0100
Subject: [PATCH 088/134] Pass FormulaInstaller#display_options to BuildError.

This should improve the output in analytics.
---
 Library/Homebrew/formula_installer.rb | 17 ++++++++---------
 Library/Homebrew/utils/analytics.rb   |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index dcf57c4d66..18ed7cb437 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -279,7 +279,7 @@ class FormulaInstaller
       opoo "#{formula.full_name}: #{old_flag} was deprecated; using #{new_flag} instead!"
     end
 
-    options = display_options(formula)
+    options = display_options(formula).join(" ")
     oh1 "Installing #{Formatter.identifier(formula.full_name)} #{options}".strip if show_header?
 
     unless formula.tap&.private?
@@ -529,16 +529,15 @@ class FormulaInstaller
   end
 
   def display_options(formula)
-    options = []
-    if formula.head?
-      options << "--HEAD"
+    options = if formula.head?
+      ["--HEAD"]
     elsif formula.devel?
-      options << "--devel"
+      ["--devel"]
+    else
+      []
     end
     options += effective_build_options_for(formula).used_options.to_a
-    return if options.empty?
-
-    options.join(" ")
+    options
   end
 
   def inherited_options_for(dep)
@@ -793,7 +792,7 @@ class FormulaInstaller
   rescue Exception => e # rubocop:disable Lint/RescueException
     if e.is_a? BuildError
       e.formula = formula
-      e.options = options
+      e.options = display_options(formula)
     end
 
     ignore_interrupts do
diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index f2163355bf..c3a8bc03c9 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -67,8 +67,8 @@ module Utils
         return if exception.formula.tap.private?
 
         action = exception.formula.full_name
-        if (options = exception.options.to_a.presence)
-          action = "#{action} #{options.map(&:to_s).join(" ")}".strip
+        if (options = exception.options.to_a.map(&:to_s).join(" ").presence)
+          action = "#{action} #{options}".strip
         end
         report_event("BuildError", action)
       end

From 82ba0475addddbc03e42b6711a8ecc7c65413ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matha=CC=88us=20Zingerle?= <mat.zingerle@gmail.com>
Date: Sun, 17 May 2020 12:52:39 -0500
Subject: [PATCH 089/134] audit: Port version checks that do not rely on
 `Formula` state to RuboCop and add tests

---
 Library/Homebrew/dev-cmd/audit.rb             | 11 ------
 Library/Homebrew/rubocops.rb                  |  1 +
 Library/Homebrew/rubocops/version.rb          | 26 +++++++++++++
 .../Homebrew/test/rubocops/version_spec.rb    | 39 +++++++++++++++++++
 4 files changed, 66 insertions(+), 11 deletions(-)
 create mode 100644 Library/Homebrew/rubocops/version.rb
 create mode 100644 Library/Homebrew/test/rubocops/version_spec.rb

diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 87faf0b725..33c157f6ee 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -1042,9 +1042,6 @@ module Homebrew
     def audit_version
       if version.nil?
         problem "missing version"
-      elsif version.blank?
-        # TODO: check could be in RuboCop
-        problem "version is set to an empty string"
       elsif !version.detected_from_url?
         version_text = version
         version_url = Version.detect(url, specs)
@@ -1052,14 +1049,6 @@ module Homebrew
           problem "version #{version_text} is redundant with version scanned from URL"
         end
       end
-
-      # TODO: check could be in RuboCop
-      problem "version #{version} should not have a leading 'v'" if version.to_s.start_with?("v")
-
-      return unless version.to_s.match?(/_\d+$/)
-
-      # TODO: check could be in RuboCop
-      problem "version #{version} should not end with an underline and a number"
     end
 
     def audit_download_strategy
diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb
index 6b43b6f937..7a0f2c70e8 100644
--- a/Library/Homebrew/rubocops.rb
+++ b/Library/Homebrew/rubocops.rb
@@ -21,5 +21,6 @@ require "rubocops/class"
 require "rubocops/uses_from_macos"
 require "rubocops/files"
 require "rubocops/keg_only"
+require "rubocops/version"
 
 require "rubocops/rubocop-cask"
diff --git a/Library/Homebrew/rubocops/version.rb b/Library/Homebrew/rubocops/version.rb
new file mode 100644
index 0000000000..f4ed91c18d
--- /dev/null
+++ b/Library/Homebrew/rubocops/version.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "rubocops/extend/formula"
+
+module RuboCop
+  module Cop
+    module FormulaAudit
+      class Version < FormulaCop
+        def audit_formula(_node, _class_node, _parent_class_node, body_node)
+          version_node = find_node_method_by_name(body_node, :version)
+          return unless version_node
+
+          version = string_content(parameters(version_node).first)
+
+          problem "version is set to an empty string" if version.empty?
+
+          problem "version #{version} should not have a leading 'v'" if version.start_with?("v")
+
+          return unless version.match?(/_\d+$/)
+
+          problem "version #{version} should not end with an underline and a number"
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/rubocops/version_spec.rb b/Library/Homebrew/test/rubocops/version_spec.rb
new file mode 100644
index 0000000000..45ac7ecf1e
--- /dev/null
+++ b/Library/Homebrew/test/rubocops/version_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "rubocops/version"
+
+describe RuboCop::Cop::FormulaAudit::Version do
+  subject(:cop) { described_class.new }
+
+  context "When auditing version" do
+    it "version should not be an empty string" do
+      expect_offense(<<~RUBY)
+        class Foo < Formula
+          url 'https://brew.sh/foo-1.0.tgz'
+          version ""
+          ^^^^^^^^^^ version is set to an empty string
+        end
+      RUBY
+    end
+
+    it "version should not have a leading 'v'" do
+      expect_offense(<<~RUBY)
+        class Foo < Formula
+          url 'https://brew.sh/foo-1.0.tgz'
+          version "v1.0"
+          ^^^^^^^^^^^^^^ version v1.0 should not have a leading 'v'
+        end
+      RUBY
+    end
+
+    it "version should not end with underline and number" do
+      expect_offense(<<~RUBY)
+        class Foo < Formula
+          url 'https://brew.sh/foo-1.0.tgz'
+          version "1_0"
+          ^^^^^^^^^^^^^ version 1_0 should not end with an underline and a number
+        end
+      RUBY
+    end
+  end
+end

From 6e543f7289636a83feb4976c6359a88ace267b85 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Mon, 18 May 2020 20:46:43 +0530
Subject: [PATCH 090/134] Updated test with stubing cask analytics call

---
 Library/Homebrew/test/cask/cmd/info_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
index 160a6efbd9..32f990110e 100644
--- a/Library/Homebrew/test/cask/cmd/info_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -2,6 +2,7 @@
 
 require_relative "shared_examples/requires_cask_token"
 require_relative "shared_examples/invalid_option"
+require_relative "../../../utils"
 
 describe Cask::Cmd::Info, :cask do
   it_behaves_like "a command that requires a Cask token"
@@ -141,6 +142,24 @@ describe Cask::Cmd::Info, :cask do
 
   it "can run be run with a url twice", :needs_network do
     expect {
+      Utils::Analytics.formulae_api_json
+    .should_receive(:endpoint)
+    .with("test")
+    .and_return("{
+      analytics: {
+        install: {
+          30d: {
+            docker: 1000
+          },
+          90d: {
+            docker: 2000
+          },
+          365d: {
+            docker: 3000
+          }
+        }
+      }
+    }")
       described_class.run("https://raw.githubusercontent.com/Homebrew/homebrew-cask" \
                           "/d0b2c58652ae5eff20a7a4ac93292a08b250912b/Casks/docker.rb")
       described_class.run("https://raw.githubusercontent.com/Homebrew/homebrew-cask" \

From bb3985d446e8db1f0a702e52301b59d447f82ea6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 May 2020 15:50:36 +0000
Subject: [PATCH 091/134] build(deps): bump activesupport in /Library/Homebrew

Bumps [activesupport](https://github.com/rails/rails) from 6.0.3 to 6.0.3.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v6.0.3.1/activesupport/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v6.0.3...v6.0.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 94e9ba9808..c062cbbd31 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)

From 957f318f2cfb9e83f440572b12fd8b45a39e0776 Mon Sep 17 00:00:00 2001
From: Sean Molenaar <SMillerDev@users.noreply.github.com>
Date: Mon, 18 May 2020 18:28:40 +0200
Subject: [PATCH 092/134] Specify the stance on mocks in test blocks

---
 docs/Formula-Cookbook.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index c141675db5..9930dd7e94 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -277,7 +277,7 @@ Some advice for specific cases:
 * If the formula is a library, compile and run some simple code that links against it. It could be taken from upstream's documentation / source examples.
 A good example is [`tinyxml2`](https://github.com/Homebrew/homebrew-core/blob/master/Formula/tinyxml2.rb), which writes a small C++ source file into the test directory, compiles and links it against the tinyxml2 library and finally checks that the resulting program runs successfully.
 * If the formula is for a GUI program, try to find some function that runs as command-line only, like a format conversion, reading or displaying a config file, etc.
-* If the software cannot function without credentials or requires a virtual machine, docker instance, etc. to run, a test could be to try to connect with invalid credentials (or without credentials) and confirm that it fails as expected.
+* If the software cannot function without credentials or requires a virtual machine, docker instance, etc. to run, a test could be to try to connect with invalid credentials (or without credentials) and confirm that it fails as expected. This is prefered over mocking a dependency.
 * Homebrew comes with a number of [standard test fixtures](https://github.com/Homebrew/brew/tree/master/Library/Homebrew/test/support/fixtures), including numerous sample images, sounds, and documents in various formats. You can get the file path to a test fixture with `test_fixtures("test.svg")`.
 * If your test requires a test file that isn't a standard test fixture, you can install it from a source repository during the `test` phase with a resource block, like this:
 

From afb29035bd637ce98aea1018816897bdcfb46e5c Mon Sep 17 00:00:00 2001
From: vidusheeamoli <vidushee.amoli@gmail.com>
Date: Mon, 18 May 2020 23:49:44 +0530
Subject: [PATCH 093/134] update gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index eb9f76b6c3..0c3bf37367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,7 +78,6 @@
 **/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/u*
 **/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/x*
 **/vendor/bundle/ruby/*/gems/thread_safe-*/lib/thread_safe/util
-**/vendor/bundle/ruby/*/gems/byebug-*/
 
 # Ignore dependencies we don't wish to vendor
 **/vendor/bundle/ruby/*/gems/ast-*/
@@ -133,6 +132,7 @@
 **/vendor/bundle/ruby/*/gems/unf-*/
 **/vendor/bundle/ruby/*/gems/unicode-display_width-*/
 **/vendor/bundle/ruby/*/gems/webrobots-*/
+**/vendor/bundle/ruby/*/gems/byebug-*/
 
 # Ignore `bin` contents (again).
 /bin

From f9050faf8e29b6a59f33b19a01066657c7f2780b Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 18 May 2020 19:32:35 +0100
Subject: [PATCH 094/134] brew vendor-gems: commit updates.

---
 .../Homebrew/vendor/bundle/bundler/setup.rb   | 26 +++++++++----------
 .../lib/active_support/actionable_error.rb    |  0
 .../lib/active_support/array_inquirer.rb      |  0
 .../lib/active_support/backtrace_cleaner.rb   |  0
 .../lib/active_support/benchmarkable.rb       |  0
 .../lib/active_support/builder.rb             |  0
 .../lib/active_support/callbacks.rb           |  0
 .../lib/active_support/concern.rb             |  0
 .../lib/active_support/configurable.rb        |  0
 .../lib/active_support/core_ext.rb            |  0
 .../lib/active_support/core_ext/array.rb      |  0
 .../active_support/core_ext/array/access.rb   |  0
 .../core_ext/array/conversions.rb             |  0
 .../active_support/core_ext/array/extract.rb  |  0
 .../core_ext/array/extract_options.rb         |  0
 .../active_support/core_ext/array/grouping.rb |  0
 .../active_support/core_ext/array/inquiry.rb  |  0
 .../core_ext/array/prepend_and_append.rb      |  0
 .../lib/active_support/core_ext/array/wrap.rb |  0
 .../lib/active_support/core_ext/benchmark.rb  |  0
 .../active_support/core_ext/big_decimal.rb    |  0
 .../core_ext/big_decimal/conversions.rb       |  0
 .../lib/active_support/core_ext/class.rb      |  0
 .../core_ext/class/attribute.rb               |  0
 .../core_ext/class/attribute_accessors.rb     |  0
 .../core_ext/class/subclasses.rb              |  0
 .../lib/active_support/core_ext/date.rb       |  0
 .../active_support/core_ext/date/acts_like.rb |  0
 .../lib/active_support/core_ext/date/blank.rb |  0
 .../core_ext/date/calculations.rb             |  0
 .../core_ext/date/conversions.rb              |  0
 .../lib/active_support/core_ext/date/zones.rb |  0
 .../core_ext/date_and_time/calculations.rb    |  0
 .../core_ext/date_and_time/compatibility.rb   |  0
 .../core_ext/date_and_time/zones.rb           |  0
 .../lib/active_support/core_ext/date_time.rb  |  0
 .../core_ext/date_time/acts_like.rb           |  0
 .../core_ext/date_time/blank.rb               |  0
 .../core_ext/date_time/calculations.rb        |  0
 .../core_ext/date_time/compatibility.rb       |  0
 .../core_ext/date_time/conversions.rb         |  0
 .../lib/active_support/core_ext/digest.rb     |  0
 .../active_support/core_ext/digest/uuid.rb    |  0
 .../lib/active_support/core_ext/enumerable.rb |  0
 .../lib/active_support/core_ext/file.rb       |  0
 .../active_support/core_ext/file/atomic.rb    |  0
 .../lib/active_support/core_ext/hash.rb       |  0
 .../active_support/core_ext/hash/compact.rb   |  0
 .../core_ext/hash/conversions.rb              |  0
 .../core_ext/hash/deep_merge.rb               |  0
 .../core_ext/hash/deep_transform_values.rb    |  0
 .../active_support/core_ext/hash/except.rb    |  0
 .../core_ext/hash/indifferent_access.rb       |  0
 .../lib/active_support/core_ext/hash/keys.rb  |  0
 .../core_ext/hash/reverse_merge.rb            |  0
 .../lib/active_support/core_ext/hash/slice.rb |  0
 .../core_ext/hash/transform_values.rb         |  0
 .../lib/active_support/core_ext/integer.rb    |  0
 .../core_ext/integer/inflections.rb           |  0
 .../core_ext/integer/multiple.rb              |  0
 .../active_support/core_ext/integer/time.rb   |  0
 .../lib/active_support/core_ext/kernel.rb     |  0
 .../active_support/core_ext/kernel/concern.rb |  0
 .../core_ext/kernel/reporting.rb              |  0
 .../core_ext/kernel/singleton_class.rb        |  0
 .../lib/active_support/core_ext/load_error.rb |  0
 .../lib/active_support/core_ext/marshal.rb    |  0
 .../lib/active_support/core_ext/module.rb     |  0
 .../core_ext/module/aliasing.rb               |  0
 .../core_ext/module/anonymous.rb              |  0
 .../core_ext/module/attr_internal.rb          |  0
 .../core_ext/module/attribute_accessors.rb    |  0
 .../module/attribute_accessors_per_thread.rb  |  0
 .../core_ext/module/concerning.rb             |  0
 .../core_ext/module/delegation.rb             |  0
 .../core_ext/module/deprecation.rb            |  0
 .../core_ext/module/introspection.rb          |  0
 .../core_ext/module/reachable.rb              |  0
 .../core_ext/module/redefine_method.rb        |  0
 .../core_ext/module/remove_method.rb          |  0
 .../lib/active_support/core_ext/name_error.rb |  0
 .../lib/active_support/core_ext/numeric.rb    |  0
 .../active_support/core_ext/numeric/bytes.rb  |  0
 .../core_ext/numeric/conversions.rb           |  0
 .../core_ext/numeric/inquiry.rb               |  0
 .../active_support/core_ext/numeric/time.rb   |  0
 .../lib/active_support/core_ext/object.rb     |  0
 .../core_ext/object/acts_like.rb              |  0
 .../active_support/core_ext/object/blank.rb   |  0
 .../core_ext/object/conversions.rb            |  0
 .../core_ext/object/deep_dup.rb               |  0
 .../core_ext/object/duplicable.rb             |  0
 .../core_ext/object/inclusion.rb              |  0
 .../core_ext/object/instance_variables.rb     |  0
 .../active_support/core_ext/object/json.rb    |  0
 .../core_ext/object/to_param.rb               |  0
 .../core_ext/object/to_query.rb               |  0
 .../lib/active_support/core_ext/object/try.rb |  0
 .../core_ext/object/with_options.rb           |  0
 .../lib/active_support/core_ext/range.rb      |  0
 .../core_ext/range/compare_range.rb           |  0
 .../core_ext/range/conversions.rb             |  0
 .../lib/active_support/core_ext/range/each.rb |  0
 .../core_ext/range/include_range.rb           |  0
 .../core_ext/range/include_time_with_zone.rb  |  0
 .../active_support/core_ext/range/overlaps.rb |  0
 .../lib/active_support/core_ext/regexp.rb     |  0
 .../active_support/core_ext/securerandom.rb   |  0
 .../lib/active_support/core_ext/string.rb     |  0
 .../active_support/core_ext/string/access.rb  |  0
 .../core_ext/string/behavior.rb               |  0
 .../core_ext/string/conversions.rb            |  0
 .../active_support/core_ext/string/exclude.rb |  0
 .../active_support/core_ext/string/filters.rb |  0
 .../active_support/core_ext/string/indent.rb  |  0
 .../core_ext/string/inflections.rb            |  0
 .../active_support/core_ext/string/inquiry.rb |  0
 .../core_ext/string/multibyte.rb              |  0
 .../core_ext/string/output_safety.rb          |  0
 .../core_ext/string/starts_ends_with.rb       |  0
 .../active_support/core_ext/string/strip.rb   |  0
 .../active_support/core_ext/string/zones.rb   |  0
 .../lib/active_support/core_ext/time.rb       |  0
 .../active_support/core_ext/time/acts_like.rb |  0
 .../core_ext/time/calculations.rb             |  0
 .../core_ext/time/compatibility.rb            |  0
 .../core_ext/time/conversions.rb              |  0
 .../lib/active_support/core_ext/time/zones.rb |  0
 .../lib/active_support/core_ext/uri.rb        |  0
 .../lib/active_support/current_attributes.rb  |  0
 .../lib/active_support/deprecation.rb         |  0
 .../active_support/deprecation/behaviors.rb   |  0
 .../deprecation/constant_accessor.rb          |  0
 .../deprecation/instance_delegator.rb         |  0
 .../deprecation/method_wrappers.rb            |  0
 .../deprecation/proxy_wrappers.rb             |  0
 .../active_support/deprecation/reporting.rb   |  0
 .../lib/active_support/descendants_tracker.rb |  0
 .../lib/active_support/digest.rb              |  0
 .../lib/active_support/duration.rb            |  0
 .../active_support/encrypted_configuration.rb |  0
 .../lib/active_support/encrypted_file.rb      |  0
 .../evented_file_update_checker.rb            |  0
 .../lib/active_support/execution_wrapper.rb   |  0
 .../lib/active_support/executor.rb            |  0
 .../lib/active_support/file_update_checker.rb |  0
 .../lib/active_support/gem_version.rb         |  2 +-
 .../lib/active_support/gzip.rb                |  0
 .../hash_with_indifferent_access.rb           |  0
 .../lib/active_support/i18n.rb                |  0
 .../lib/active_support/i18n_railtie.rb        |  0
 .../lib/active_support/inflections.rb         |  0
 .../lib/active_support/inflector.rb           |  0
 .../active_support/inflector/inflections.rb   |  0
 .../lib/active_support/inflector/methods.rb   |  0
 .../active_support/inflector/transliterate.rb |  0
 .../lib/active_support/key_generator.rb       |  0
 .../lib/active_support/lazy_load_hooks.rb     |  0
 .../lib/active_support/locale/en.rb           |  0
 .../lib/active_support/locale/en.yml          |  0
 .../lib/active_support/logger.rb              |  0
 .../lib/active_support/logger_silence.rb      |  0
 .../logger_thread_safe_level.rb               |  0
 .../lib/active_support/message_encryptor.rb   |  0
 .../lib/active_support/message_verifier.rb    |  0
 .../lib/active_support/multibyte.rb           |  0
 .../lib/active_support/notifications.rb       |  0
 .../active_support/notifications/fanout.rb    |  0
 .../notifications/instrumenter.rb             |  0
 .../lib/active_support/option_merger.rb       |  0
 .../lib/active_support/ordered_hash.rb        |  0
 .../lib/active_support/ordered_options.rb     |  0
 .../lib/active_support/parameter_filter.rb    |  0
 .../lib/active_support/per_thread_registry.rb |  0
 .../lib/active_support/proxy_object.rb        |  0
 .../lib/active_support/rails.rb               |  0
 .../lib/active_support/railtie.rb             |  0
 .../lib/active_support/reloader.rb            |  0
 .../lib/active_support/rescuable.rb           |  0
 .../lib/active_support/security_utils.rb      |  0
 .../lib/active_support/string_inquirer.rb     |  0
 .../lib/active_support/subscriber.rb          |  0
 .../lib/active_support/tagged_logging.rb      |  0
 .../lib/active_support/test_case.rb           |  0
 .../lib/active_support/time.rb                |  0
 .../lib/active_support/time_with_zone.rb      |  0
 .../lib/active_support/values/time_zone.rb    |  0
 .../lib/active_support/version.rb             |  0
 .../lib/active_support/xml_mini.rb            |  0
 .../lib/active_support/xml_mini/jdom.rb       |  0
 .../lib/active_support/xml_mini/libxml.rb     |  0
 .../lib/active_support/xml_mini/libxmlsax.rb  |  0
 .../lib/active_support/xml_mini/nokogiri.rb   |  0
 .../active_support/xml_mini/nokogirisax.rb    |  0
 .../lib/active_support/xml_mini/rexml.rb      |  0
 195 files changed, 13 insertions(+), 15 deletions(-)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/actionable_error.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/array_inquirer.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/backtrace_cleaner.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/benchmarkable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/builder.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/callbacks.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/concern.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/configurable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/extract.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/extract_options.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/grouping.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/inquiry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/prepend_and_append.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/array/wrap.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/benchmark.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/big_decimal.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/big_decimal/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/class.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/class/attribute.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/class/attribute_accessors.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/class/subclasses.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date/blank.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date/zones.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_and_time/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_and_time/compatibility.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_and_time/zones.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_time/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_time/blank.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_time/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_time/compatibility.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/date_time/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/digest.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/digest/uuid.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/enumerable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/file.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/file/atomic.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/compact.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/deep_merge.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/deep_transform_values.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/except.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/indifferent_access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/keys.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/reverse_merge.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/slice.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/hash/transform_values.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/integer.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/integer/inflections.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/integer/multiple.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/integer/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/kernel.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/kernel/concern.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/kernel/reporting.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/kernel/singleton_class.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/load_error.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/marshal.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/aliasing.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/anonymous.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/attr_internal.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/attribute_accessors.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/concerning.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/delegation.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/deprecation.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/introspection.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/reachable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/redefine_method.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/module/remove_method.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/name_error.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/numeric.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/numeric/bytes.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/numeric/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/numeric/inquiry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/numeric/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/blank.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/deep_dup.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/duplicable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/inclusion.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/instance_variables.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/json.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/to_param.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/to_query.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/try.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/object/with_options.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/range.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/range/compare_range.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/range/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/range/each.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/range/include_range.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/range/include_time_with_zone.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/range/overlaps.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/regexp.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/securerandom.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/behavior.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/exclude.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/filters.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/indent.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/inflections.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/inquiry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/multibyte.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/output_safety.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/starts_ends_with.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/strip.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/string/zones.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/time/acts_like.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/time/calculations.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/time/compatibility.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/time/conversions.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/time/zones.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/core_ext/uri.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/current_attributes.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/deprecation.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/deprecation/behaviors.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/deprecation/constant_accessor.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/deprecation/instance_delegator.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/deprecation/method_wrappers.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/deprecation/proxy_wrappers.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/deprecation/reporting.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/descendants_tracker.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/digest.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/duration.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/encrypted_configuration.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/encrypted_file.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/evented_file_update_checker.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/execution_wrapper.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/executor.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/file_update_checker.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/gem_version.rb (95%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/gzip.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/hash_with_indifferent_access.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/i18n.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/i18n_railtie.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/inflections.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/inflector.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/inflector/inflections.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/inflector/methods.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/inflector/transliterate.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/key_generator.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/lazy_load_hooks.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/locale/en.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/locale/en.yml (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/logger.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/logger_silence.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/logger_thread_safe_level.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/message_encryptor.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/message_verifier.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/multibyte.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/notifications.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/notifications/fanout.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/notifications/instrumenter.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/option_merger.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/ordered_hash.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/ordered_options.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/parameter_filter.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/per_thread_registry.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/proxy_object.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/rails.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/railtie.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/reloader.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/rescuable.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/security_utils.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/string_inquirer.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/subscriber.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/tagged_logging.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/test_case.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/time.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/time_with_zone.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/values/time_zone.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/version.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/xml_mini.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/xml_mini/jdom.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/xml_mini/libxml.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/xml_mini/libxmlsax.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/xml_mini/nokogiri.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/xml_mini/nokogirisax.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.3 => activesupport-6.0.3.1}/lib/active_support/xml_mini/rexml.rb (100%)

diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
index efc95978a1..9f57e7db48 100644
--- a/Library/Homebrew/vendor/bundle/bundler/setup.rb
+++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -5,40 +5,38 @@ ruby_version = RbConfig::CONFIG["ruby_version"]
 path = File.expand_path('..', __FILE__)
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.6/lib/concurrent-ruby"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.8.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.14.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.14.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.7/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.3.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.0.3/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.0.3.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib"
 $:.unshift "#{path}/"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-13/2.6.0-static/json-2.3.0"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/json-2.3.0"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.3.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.10.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.16.1/lib"
-$:.unshift "#{path}/../../portable-ruby/2.6.3/lib/ruby/gems/2.6.0/gems/sync-0.5.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tins-1.24.1/lib"
+$:.unshift "#{path}/../../../../../../../../Library/Ruby/Gems/2.6.0/gems/sync-0.5.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tins-1.25.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/term-ansicolor-1.7.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thor-1.0.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coveralls-0.8.23/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/diff-lcs-1.3/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-13/2.6.0-static/unf_ext-0.0.7.7"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/unf_ext-0.0.7.7"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf_ext-0.0.7.7/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf-0.1.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/domain_name-0.5.20190701/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-13/2.6.0-static/hpricot-0.8.6"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/hpricot-0.8.6"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/hpricot-0.8.6/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/http-cookie-1.0.3/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-13/2.6.0-static/jaro_winkler-1.5.4"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/jaro_winkler-1.5.4/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mime-types-data-3.2020.0425/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mime-types-data-3.2020.0512/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mime-types-3.3.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/net-http-digest_auth-1.4.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/net-http-persistent-4.0.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mini_portile2-2.4.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-13/2.6.0-static/nokogiri-1.10.9"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/nokogiri-1.10.9"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/nokogiri-1.10.9/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ntlm-http-0.1.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/webrobots-0.1.2/lib"
@@ -49,13 +47,13 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-2.32.0
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.7.1.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-13/2.6.0-static/rdiscount-2.2.0.1"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/rdiscount-2.2.0.1"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rexml-3.2.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ronn-0.7.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.9.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-core-3.9.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.9.1/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.9.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-mocks-3.9.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.9.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-its-1.3.0/lib"
@@ -63,7 +61,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-retry-0.6.2/lib
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.7.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.82.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.83.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.39.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib"
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/actionable_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/actionable_error.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/actionable_error.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/actionable_error.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/array_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/array_inquirer.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/array_inquirer.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/array_inquirer.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/backtrace_cleaner.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/backtrace_cleaner.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/backtrace_cleaner.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/backtrace_cleaner.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/benchmarkable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/benchmarkable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/benchmarkable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/benchmarkable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/builder.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/builder.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/builder.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/builder.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/callbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/callbacks.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/callbacks.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/callbacks.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/concern.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/concern.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/concern.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/configurable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/configurable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/configurable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/configurable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/extract.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/extract.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/extract_options.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/extract_options.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/extract_options.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/grouping.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/grouping.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/grouping.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/grouping.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/inquiry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/inquiry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/inquiry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/prepend_and_append.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/prepend_and_append.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/prepend_and_append.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/prepend_and_append.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/wrap.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/wrap.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/array/wrap.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/array/wrap.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/benchmark.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/benchmark.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/benchmark.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/benchmark.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/big_decimal.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/big_decimal.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/big_decimal/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/big_decimal/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/big_decimal/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class/attribute.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class/attribute.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class/attribute_accessors.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/attribute_accessors.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class/attribute_accessors.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/subclasses.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class/subclasses.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/class/subclasses.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/class/subclasses.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/blank.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/blank.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/blank.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/zones.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date/zones.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_and_time/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_and_time/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_and_time/compatibility.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/compatibility.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_and_time/compatibility.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_and_time/zones.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_and_time/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_and_time/zones.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/blank.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/blank.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/blank.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/compatibility.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/compatibility.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/compatibility.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/date_time/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/date_time/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/digest.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/digest.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest/uuid.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/digest/uuid.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/digest/uuid.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/digest/uuid.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/enumerable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/enumerable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/enumerable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/enumerable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/file.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/file.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file/atomic.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/file/atomic.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/file/atomic.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/file/atomic.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/compact.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/compact.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/compact.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/compact.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/deep_merge.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_merge.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/deep_merge.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/deep_transform_values.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/deep_transform_values.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/deep_transform_values.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/except.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/except.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/except.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/except.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/indifferent_access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/indifferent_access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/indifferent_access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/keys.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/keys.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/keys.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/keys.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/reverse_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/reverse_merge.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/reverse_merge.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/reverse_merge.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/slice.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/slice.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/slice.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/slice.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/transform_values.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/hash/transform_values.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/hash/transform_values.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer/inflections.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer/inflections.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/multiple.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer/multiple.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/multiple.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer/multiple.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/integer/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/integer/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel/concern.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/concern.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel/concern.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel/reporting.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/reporting.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel/reporting.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/singleton_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel/singleton_class.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/kernel/singleton_class.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/kernel/singleton_class.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/load_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/load_error.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/load_error.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/load_error.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/marshal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/marshal.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/marshal.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/marshal.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/aliasing.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/aliasing.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/aliasing.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/aliasing.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/anonymous.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/anonymous.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/anonymous.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/anonymous.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attr_internal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/attr_internal.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attr_internal.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/attr_internal.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/attribute_accessors.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/attribute_accessors.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/concerning.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/concerning.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/concerning.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/concerning.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/delegation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/delegation.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/delegation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/delegation.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/deprecation.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/deprecation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/deprecation.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/introspection.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/introspection.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/introspection.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/introspection.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/reachable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/reachable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/reachable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/reachable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/redefine_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/redefine_method.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/redefine_method.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/redefine_method.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/remove_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/remove_method.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/module/remove_method.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/module/remove_method.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/name_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/name_error.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/name_error.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/name_error.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/bytes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/bytes.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/bytes.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/bytes.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/inquiry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/inquiry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/inquiry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/numeric/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/numeric/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/blank.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/blank.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/blank.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/deep_dup.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/deep_dup.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/deep_dup.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/deep_dup.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/duplicable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/duplicable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/duplicable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/duplicable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/inclusion.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/inclusion.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/inclusion.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/inclusion.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/instance_variables.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/instance_variables.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/instance_variables.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/instance_variables.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/json.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/json.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/json.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/json.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_param.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/to_param.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_param.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/to_param.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_query.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/to_query.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/to_query.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/to_query.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/try.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/try.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/try.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/try.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/with_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/with_options.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/object/with_options.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/object/with_options.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/compare_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/compare_range.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/compare_range.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/compare_range.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/each.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/each.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/each.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/each.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/include_range.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_range.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/include_range.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/include_time_with_zone.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/include_time_with_zone.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/include_time_with_zone.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/overlaps.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/overlaps.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/range/overlaps.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/range/overlaps.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/regexp.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/regexp.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/regexp.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/regexp.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/securerandom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/securerandom.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/securerandom.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/securerandom.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/behavior.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/behavior.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/behavior.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/behavior.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/exclude.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/exclude.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/exclude.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/exclude.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/filters.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/filters.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/filters.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/filters.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/indent.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/indent.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/indent.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/indent.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/inflections.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/inflections.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/inquiry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/inquiry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/inquiry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/multibyte.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/multibyte.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/multibyte.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/output_safety.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/output_safety.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/output_safety.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/output_safety.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/starts_ends_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/starts_ends_with.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/starts_ends_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/starts_ends_with.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/strip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/strip.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/strip.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/strip.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/zones.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/string/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/string/zones.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/acts_like.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/acts_like.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/acts_like.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/calculations.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/calculations.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/calculations.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/compatibility.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/compatibility.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/compatibility.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/conversions.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/conversions.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/conversions.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/zones.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/time/zones.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/time/zones.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/uri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/uri.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/core_ext/uri.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/core_ext/uri.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/current_attributes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/current_attributes.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/current_attributes.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/current_attributes.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/behaviors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/behaviors.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/behaviors.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/behaviors.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/constant_accessor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/constant_accessor.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/constant_accessor.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/constant_accessor.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/instance_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/instance_delegator.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/instance_delegator.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/instance_delegator.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/method_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/method_wrappers.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/method_wrappers.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/method_wrappers.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/proxy_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/proxy_wrappers.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/proxy_wrappers.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/proxy_wrappers.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/reporting.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/deprecation/reporting.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/deprecation/reporting.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/descendants_tracker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/descendants_tracker.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/descendants_tracker.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/descendants_tracker.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/digest.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/digest.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/digest.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/duration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/duration.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/duration.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/duration.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_configuration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/encrypted_configuration.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_configuration.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/encrypted_configuration.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/encrypted_file.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/encrypted_file.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/encrypted_file.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/evented_file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/evented_file_update_checker.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/evented_file_update_checker.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/evented_file_update_checker.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/execution_wrapper.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/execution_wrapper.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/execution_wrapper.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/execution_wrapper.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/executor.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/executor.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/executor.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/file_update_checker.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/file_update_checker.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/file_update_checker.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gem_version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/gem_version.rb
similarity index 95%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gem_version.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/gem_version.rb
index c279bb1169..50375f27af 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gem_version.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/gem_version.rb
@@ -10,7 +10,7 @@ module ActiveSupport
     MAJOR = 6
     MINOR = 0
     TINY  = 3
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gzip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/gzip.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/gzip.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/gzip.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/hash_with_indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/hash_with_indifferent_access.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/hash_with_indifferent_access.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/hash_with_indifferent_access.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/i18n.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/i18n.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n_railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/i18n_railtie.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/i18n_railtie.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/i18n_railtie.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflections.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflections.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector/inflections.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/inflections.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector/inflections.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/methods.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector/methods.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/methods.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector/methods.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/transliterate.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector/transliterate.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/inflector/transliterate.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/inflector/transliterate.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/key_generator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/key_generator.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/key_generator.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/key_generator.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/lazy_load_hooks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/lazy_load_hooks.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/lazy_load_hooks.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/lazy_load_hooks.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/locale/en.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/locale/en.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.yml b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/locale/en.yml
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/locale/en.yml
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/locale/en.yml
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/logger.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/logger.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_silence.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/logger_silence.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_silence.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/logger_silence.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_thread_safe_level.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/logger_thread_safe_level.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/logger_thread_safe_level.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/logger_thread_safe_level.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_encryptor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/message_encryptor.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_encryptor.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/message_encryptor.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_verifier.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/message_verifier.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/message_verifier.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/message_verifier.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/multibyte.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/multibyte.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/multibyte.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/notifications.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/notifications.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/fanout.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/notifications/fanout.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/fanout.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/notifications/fanout.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/instrumenter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/notifications/instrumenter.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/notifications/instrumenter.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/notifications/instrumenter.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/option_merger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/option_merger.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/option_merger.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/option_merger.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/ordered_hash.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_hash.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/ordered_hash.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/ordered_options.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/ordered_options.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/ordered_options.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/parameter_filter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/parameter_filter.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/parameter_filter.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/parameter_filter.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/per_thread_registry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/per_thread_registry.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/per_thread_registry.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/per_thread_registry.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/proxy_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/proxy_object.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/proxy_object.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/proxy_object.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rails.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/rails.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rails.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/rails.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/railtie.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/railtie.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/railtie.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/reloader.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/reloader.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/reloader.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/reloader.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rescuable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/rescuable.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/rescuable.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/rescuable.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/security_utils.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/security_utils.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/security_utils.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/security_utils.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/string_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/string_inquirer.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/string_inquirer.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/string_inquirer.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/subscriber.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/subscriber.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/subscriber.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/subscriber.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/tagged_logging.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/tagged_logging.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/tagged_logging.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/tagged_logging.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/test_case.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/test_case.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/test_case.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/test_case.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/time.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/time.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/time_with_zone.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/time_with_zone.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/time_with_zone.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/values/time_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/values/time_zone.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/values/time_zone.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/values/time_zone.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/version.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/version.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/version.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/jdom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/jdom.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/jdom.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/jdom.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/libxml.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxml.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/libxml.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxmlsax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/libxmlsax.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/libxmlsax.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/libxmlsax.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogiri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/nokogiri.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogiri.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/nokogiri.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogirisax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/nokogirisax.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/nokogirisax.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/nokogirisax.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/rexml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/rexml.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3/lib/active_support/xml_mini/rexml.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.1/lib/active_support/xml_mini/rexml.rb

From 667d87ce67ceae9fffd03316e62523c6647c7121 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 18 May 2020 20:50:21 +0100
Subject: [PATCH 095/134] workflows/tests: set global environment.

We never want to auto-update and we want to globally set that we're in
GitHub Actions.
---
 .github/workflows/tests.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4f6cf50084..2737da80e7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,6 +6,9 @@ on:
   release:
     types:
       - published
+env:
+  HOMEBREW_GITHUB_ACTIONS: 1
+  HOMEBREW_NO_AUTO_UPDATE: 1
 jobs:
   tests:
     if: github.repository == 'Homebrew/brew'
@@ -66,9 +69,6 @@ jobs:
           # Cleanup some Linux `brew doctor` failures
           sudo rm -rf /usr/local/include/node/
         else
-          # Allow Xcode to be outdated
-          export HOMEBREW_GITHUB_ACTIONS=1
-
           # Link old gettext (otherwise `brew doctor` is sad)
           brew link gettext
         fi
@@ -93,7 +93,6 @@ jobs:
     - name: Install taps
       run: |
         # Install taps needed for 'brew tests' and 'brew man'
-        export HOMEBREW_NO_AUTO_UPDATE=1
         cd "$(brew --repo)"
         brew tap homebrew/bundle
         brew update-reset Library/Taps/homebrew/homebrew-bundle
@@ -137,7 +136,6 @@ jobs:
         HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
         # set variables for coverage reporting
-        HOMEBREW_GITHUB_ACTIONS: 1
         HOMEBREW_CI_NAME: github-actions
         HOMEBREW_COVERALLS_REPO_TOKEN: 3F6U6ZqctoNJwKyREremsqMgpU3qYgxFk
 

From d12e1fa16c669c737909a3cff46f849365ae376b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 May 2020 20:44:15 +0000
Subject: [PATCH 096/134] build(deps): bump activesupport from 6.0.3 to 6.0.3.1
 in /docs

Bumps [activesupport](https://github.com/rails/rails) from 6.0.3 to 6.0.3.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v6.0.3.1/activesupport/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v6.0.3...v6.0.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 docs/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 8803b2cc5a..e94a45a0b6 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)

From 1cd5d508a1f51e0672131f3dc34a5e905cc577e6 Mon Sep 17 00:00:00 2001
From: Caleb Xu <calebcenter@live.com>
Date: Tue, 19 May 2020 00:34:24 -0400
Subject: [PATCH 097/134] docs: mention that bin.install can rename file

---
 docs/Formula-Cookbook.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index c141675db5..ad2e3d6696 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -411,6 +411,12 @@ system "make", "install"
 
 You’ll see stuff like this in some formulae. This moves the file `foo` into the formula’s `bin` directory (`/usr/local/Cellar/pkg/0.1/bin`) and makes it executable (`chmod 0555 foo`).
 
+You can also rename the file during the installation process. This can be useful for adding a prefix to binaries that would otherwise cause conflicts with another formula, or for removing a file extension. For example, to install `foo.py` into the formula's `bin` directory (`/usr/local/Cellar/pkg/0.1/bin`) as just `foo` instead of `foo.py`:
+
+```ruby
+bin.install "foo.py" => "foo"
+```
+
 ### `inreplace`
 
 [`inreplace`](https://rubydoc.brew.sh/Utils/Inreplace) is a convenience function that can edit files in-place. For example:

From 3588e6a5c6e6dd55058246b3ead00be8e71d365c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 19 May 2020 08:47:59 +0100
Subject: [PATCH 098/134] bottle_arch: ensure a symbol is used when needed.

Fixes #7597.
---
 Library/Homebrew/extend/ENV/shared.rb                 | 2 +-
 Library/Homebrew/extend/os/linux/extend/ENV/shared.rb | 6 ++++--
 Library/Homebrew/formula_installer.rb                 | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index e4a15d2993..36b84cf50b 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -255,7 +255,7 @@ module SharedEnvExtension
   # @private
   def effective_arch
     if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch
-      Homebrew.args.bottle_arch
+      Homebrew.args.bottle_arch.to_sym
     else
       Hardware.oldest_cpu
     end
diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
index 0ebba4f6bc..a7eb3b9671 100644
--- a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
@@ -3,8 +3,10 @@
 module SharedEnvExtension
   # @private
   def effective_arch
-    if Homebrew.args.build_bottle?
-      Homebrew.args.bottle_arch || Hardware.oldest_cpu
+    if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch
+      Homebrew.args.bottle_arch.to_sym
+    elsif Homebrew.args.build_bottle?
+      Hardware.oldest_cpu
     else
       :native
     end
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 18ed7cb437..c2f07c73e2 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -269,7 +269,7 @@ class FormulaInstaller
 
     return if only_deps?
 
-    if build_bottle? && (arch = Homebrew.args.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch)
+    if build_bottle? && (arch = Homebrew.args.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch.to_sym)
       raise "Unrecognized architecture for --bottle-arch: #{arch}"
     end
 

From 2fc643421f4a8df1513df2345b2cc39567021828 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 19 May 2020 09:34:50 +0100
Subject: [PATCH 099/134] formula_installer: fix test dependencies.

Only prune test dependencies from the tree when they aren't also build
dependencies (and vice-versa with build dependencies) and the include
test argument hasn't been passed.
---
 Library/Homebrew/formula_installer.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index c2f07c73e2..20917292fc 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -488,9 +488,9 @@ class FormulaInstaller
 
       if dep.prune_from_option?(build)
         Dependency.prune
-      elsif include_test? && dep.test? && !dep.installed?
-        Dependency.keep_but_prune_recursive_deps
-      elsif dep.build? && install_bottle_for?(dependent, build)
+      elsif dep.test? && !dep.build? && !include_test?
+        Dependency.prune
+      elsif dep.build? && !dep.test? && install_bottle_for?(dependent, build)
         Dependency.prune
       elsif dep.prune_if_build_and_not_dependent?(dependent)
         Dependency.prune

From 9e26a451e3c4aa487bad4e6e8e64dd0de9aa79d4 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Tue, 19 May 2020 14:58:55 +0530
Subject: [PATCH 100/134] Updated mocking analytics call

---
 Library/Homebrew/test/cask/cmd/info_spec.rb | 37 ++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
index 32f990110e..fb4c634393 100644
--- a/Library/Homebrew/test/cask/cmd/info_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative "shared_examples/requires_cask_token"
 require_relative "shared_examples/invalid_option"
-require_relative "../../../utils"
+require "utils"
 
 describe Cask::Cmd::Info, :cask do
   it_behaves_like "a command that requires a Cask token"
@@ -141,25 +141,24 @@ describe Cask::Cmd::Info, :cask do
   end
 
   it "can run be run with a url twice", :needs_network do
+    expect(Utils::Analytics).to receive(:formulae_brew_sh_json).twice.with("cask/docker.json").and_return(
+      {
+        "analytics": {
+          "install": {
+            "30d":  {
+              "docker": 1000,
+            },
+            "90d":  {
+              "docker": 2000,
+            },
+            "365d": {
+              "docker": 3000,
+            },
+          },
+        },
+      },
+    )
     expect {
-      Utils::Analytics.formulae_api_json
-    .should_receive(:endpoint)
-    .with("test")
-    .and_return("{
-      analytics: {
-        install: {
-          30d: {
-            docker: 1000
-          },
-          90d: {
-            docker: 2000
-          },
-          365d: {
-            docker: 3000
-          }
-        }
-      }
-    }")
       described_class.run("https://raw.githubusercontent.com/Homebrew/homebrew-cask" \
                           "/d0b2c58652ae5eff20a7a4ac93292a08b250912b/Casks/docker.rb")
       described_class.run("https://raw.githubusercontent.com/Homebrew/homebrew-cask" \

From 7186600a5c3457b384b756269fe6d3fc6521c4b0 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Tue, 19 May 2020 14:59:43 +0530
Subject: [PATCH 101/134] renamed get_formulae_api

---
 Library/Homebrew/utils/analytics.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb
index 54052d6e1a..ca7669388d 100644
--- a/Library/Homebrew/utils/analytics.rb
+++ b/Library/Homebrew/utils/analytics.rb
@@ -119,7 +119,7 @@ module Utils
       def output(filter: nil)
         days = Homebrew.args.days || "30"
         category = Homebrew.args.category || "install"
-        json = formulae_api_json("analytics/#{category}/#{days}d.json")
+        json = formulae_brew_sh_json("analytics/#{category}/#{days}d.json")
         return if json.blank? || json["items"].blank?
 
         os_version = category == "os-version"
@@ -177,14 +177,14 @@ module Utils
       end
 
       def formula_output(f)
-        json = formulae_api_json("#{formula_path}/#{f}.json")
+        json = formulae_brew_sh_json("#{formula_path}/#{f}.json")
         return if json.blank? || json["analytics"].blank?
 
         get_analytics(json)
       end
 
       def cask_output(cask)
-        json = formulae_api_json("#{cask_path}/#{cask}.json")
+        json = formulae_brew_sh_json("#{cask_path}/#{cask}.json")
         return if json.blank? || json["analytics"].blank?
 
         get_analytics(json)
@@ -318,7 +318,7 @@ module Utils
         end
       end
 
-      def formulae_api_json(endpoint)
+      def formulae_brew_sh_json(endpoint)
         return if Homebrew::EnvConfig.no_analytics? || Homebrew::EnvConfig.no_github_api?
 
         output, = curl_output("--max-time", "5",

From 6a50f31feb8a15feaa784e3b8295eee5fb186cbb Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Tue, 19 May 2020 17:25:16 +0530
Subject: [PATCH 102/134] fixed proper parsing of mock data for analytics

---
 Library/Homebrew/test/cask/cmd/info_spec.rb | 25 +++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
index fb4c634393..bd52d7c0ae 100644
--- a/Library/Homebrew/test/cask/cmd/info_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -3,6 +3,7 @@
 require_relative "shared_examples/requires_cask_token"
 require_relative "shared_examples/invalid_option"
 require "utils"
+require "json"
 
 describe Cask::Cmd::Info, :cask do
   it_behaves_like "a command that requires a Cask token"
@@ -141,23 +142,9 @@ describe Cask::Cmd::Info, :cask do
   end
 
   it "can run be run with a url twice", :needs_network do
-    expect(Utils::Analytics).to receive(:formulae_brew_sh_json).twice.with("cask/docker.json").and_return(
-      {
-        "analytics": {
-          "install": {
-            "30d":  {
-              "docker": 1000,
-            },
-            "90d":  {
-              "docker": 2000,
-            },
-            "365d": {
-              "docker": 3000,
-            },
-          },
-        },
-      },
-    )
+    analytics = '{"analytics":{"install":{"30d":{"docker": 1000},"90d":{"docker": 2000},"365d":{"docker": 3000}}}}'
+    expect(Utils::Analytics).to receive(:formulae_brew_sh_json).twice.with("cask/docker.json")
+    .and_return(JSON.parse(analytics))
     expect {
       described_class.run("https://raw.githubusercontent.com/Homebrew/homebrew-cask" \
                           "/d0b2c58652ae5eff20a7a4ac93292a08b250912b/Casks/docker.rb")
@@ -174,7 +161,7 @@ describe Cask::Cmd::Info, :cask do
       ==> Artifacts
       Docker.app (App)
       ==> Analytics
-      install: 16,997 (30 days), 54,056 (90 days), 239,482 (365 days)
+      install: 1,000 (30 days), 2,000 (90 days), 3,000 (365 days)
       ==> Downloading https://raw.githubusercontent.com/Homebrew/homebrew-cask/d0b2c58652ae5eff20a7a4ac93292a08b250912b/Casks/docker.rb.
       docker: 2.0.0.2-ce-mac81,30215 (auto_updates)
       https://www.docker.com/community-edition
@@ -185,7 +172,7 @@ describe Cask::Cmd::Info, :cask do
       ==> Artifacts
       Docker.app (App)
       ==> Analytics
-      install: 16,997 (30 days), 54,056 (90 days), 239,482 (365 days)
+      install: 1,000 (30 days), 2,000 (90 days), 3,000 (365 days)
     EOS
   end
 end

From c263c755aabe58e3481bbb5ca237298f6015fd1a Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Tue, 19 May 2020 22:22:31 +0900
Subject: [PATCH 103/134] check tap_path size

---
 Library/Homebrew/diagnostic.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index d16172e291..7d90db0445 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -3,6 +3,7 @@
 require "keg"
 require "language/python"
 require "formula"
+require "formulary"
 require "version"
 require "development_tools"
 require "utils/shell"
@@ -836,9 +837,8 @@ module Homebrew
         kegs = Keg.all
         deleted_formulae = []
         kegs.each do |keg|
-          keg.to_formula
-        rescue
-          deleted_formulae << keg.name
+          keg_name = keg.name
+          deleted_formulae << keg_name if Formulary.tap_paths(keg_name).size != 1
         end
         return if deleted_formulae.blank?
 

From 8b98ed1f4747852d1ceafcf38fb192f8d5f9da58 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 19 May 2020 14:23:49 +0100
Subject: [PATCH 104/134] Further tweak :test dependency handling

- ensure that cases where `:build` and `:test` both apply to a
  dependency that we handle it appropriately
- fix reintroduced regression
  (https://github.com/Homebrew/brew/pull/6471#issuecomment-533414923).
  Fixes #6470.
---
 Library/Homebrew/build.rb             | 4 ++++
 Library/Homebrew/formula_installer.rb | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index c63f45f97e..f9fd51a250 100644
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -52,6 +52,8 @@ class Build
         Requirement.prune
       elsif req.prune_if_build_and_not_dependent?(dependent, formula)
         Requirement.prune
+      elsif req.test?
+        Requirement.prune
       end
     end
   end
@@ -65,6 +67,8 @@ class Build
         Dependency.prune
       elsif dep.build?
         Dependency.keep_but_prune_recursive_deps
+      elsif dep.test?
+        Dependency.prune
       end
     end
   end
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 20917292fc..affeae46ef 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -488,10 +488,11 @@ class FormulaInstaller
 
       if dep.prune_from_option?(build)
         Dependency.prune
-      elsif dep.test? && !dep.build? && !include_test?
-        Dependency.prune
-      elsif dep.build? && !dep.test? && install_bottle_for?(dependent, build)
-        Dependency.prune
+      elsif dep.test? || (dep.build? && install_bottle_for?(dependent, build))
+        keep = false
+        keep ||= dep.test? && include_test? && dependent == formula
+        keep ||= dep.build? && !install_bottle_for?(dependent, build)
+        Dependency.prune unless keep
       elsif dep.prune_if_build_and_not_dependent?(dependent)
         Dependency.prune
       elsif dep.satisfied?(inherited_options[dep.name])

From 84f2edc884153e4a3ab291e8cc0f75e003de8818 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Tue, 19 May 2020 19:35:30 +0530
Subject: [PATCH 105/134] replaced json and used dictionary

---
 Library/Homebrew/test/cask/cmd/info_spec.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
index bd52d7c0ae..9cd6e22280 100644
--- a/Library/Homebrew/test/cask/cmd/info_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -3,7 +3,6 @@
 require_relative "shared_examples/requires_cask_token"
 require_relative "shared_examples/invalid_option"
 require "utils"
-require "json"
 
 describe Cask::Cmd::Info, :cask do
   it_behaves_like "a command that requires a Cask token"
@@ -142,9 +141,15 @@ describe Cask::Cmd::Info, :cask do
   end
 
   it "can run be run with a url twice", :needs_network do
-    analytics = '{"analytics":{"install":{"30d":{"docker": 1000},"90d":{"docker": 2000},"365d":{"docker": 3000}}}}'
+    analytics = {
+      "analytics" => {
+        "install" => {
+          "30d" => { "docker" => 1000 }, "90d" => { "docker" => 2000 }, "365d" => { "docker" => 3000 }
+        },
+      },
+    }
     expect(Utils::Analytics).to receive(:formulae_brew_sh_json).twice.with("cask/docker.json")
-    .and_return(JSON.parse(analytics))
+    .and_return(analytics)
     expect {
       described_class.run("https://raw.githubusercontent.com/Homebrew/homebrew-cask" \
                           "/d0b2c58652ae5eff20a7a4ac93292a08b250912b/Casks/docker.rb")

From e1cf1b2183ff7ef845db0e9f5472796df799601f Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Tue, 19 May 2020 23:16:45 +0900
Subject: [PATCH 106/134] uninstall python2 at test

---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4f6cf50084..694132d49b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -71,6 +71,7 @@ jobs:
 
           # Link old gettext (otherwise `brew doctor` is sad)
           brew link gettext
+          brew uninstall --force python@2
         fi
         brew doctor
 

From 38e0aa8800e73bca37f86fb4abb81badb5e7970b Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Tue, 19 May 2020 23:58:33 +0900
Subject: [PATCH 107/134] change condition

---
 Library/Homebrew/diagnostic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 7d90db0445..ae7bb34fa9 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -838,7 +838,7 @@ module Homebrew
         deleted_formulae = []
         kegs.each do |keg|
           keg_name = keg.name
-          deleted_formulae << keg_name if Formulary.tap_paths(keg_name).size != 1
+          deleted_formulae << keg_name if Formulary.tap_paths(keg_name).blank?
         end
         return if deleted_formulae.blank?
 

From fbabeb446839ea1bd327d39612486293647af85b Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Tue, 19 May 2020 23:58:41 +0900
Subject: [PATCH 108/134] add a comment

---
 .github/workflows/tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 694132d49b..b82b5dafa3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -71,6 +71,8 @@ jobs:
 
           # Link old gettext (otherwise `brew doctor` is sad)
           brew link gettext
+
+          # remove deleted formula
           brew uninstall --force python@2
         fi
         brew doctor

From aeede8374f231f9bfb58dc46e67f6e65f4102777 Mon Sep 17 00:00:00 2001
From: Tharun <rajendrantharun@live.com>
Date: Tue, 19 May 2020 21:41:02 +0530
Subject: [PATCH 109/134] fixed review changes

---
 Library/Homebrew/cask/cmd/abstract_command.rb | 2 --
 Library/Homebrew/cask/cmd/info.rb             | 2 +-
 Library/Homebrew/test/cask/cmd/info_spec.rb   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/cask/cmd/abstract_command.rb b/Library/Homebrew/cask/cmd/abstract_command.rb
index 605bea5e4d..1646ddb943 100644
--- a/Library/Homebrew/cask/cmd/abstract_command.rb
+++ b/Library/Homebrew/cask/cmd/abstract_command.rb
@@ -2,14 +2,12 @@
 
 require_relative "options"
 require "search"
-require "utils"
 
 module Cask
   class Cmd
     class AbstractCommand
       include Options
       include Homebrew::Search
-      include Utils
 
       option "--[no-]binaries",   :binaries,      true
       option "--debug",           :debug,         false
diff --git a/Library/Homebrew/cask/cmd/info.rb b/Library/Homebrew/cask/cmd/info.rb
index 1f4fd7e90b..e4acbbe56d 100644
--- a/Library/Homebrew/cask/cmd/info.rb
+++ b/Library/Homebrew/cask/cmd/info.rb
@@ -46,7 +46,7 @@ module Cask
 
       def self.info(cask)
         puts get_info(cask)
-        Analytics.cask_output(cask)
+        ::Utils::Analytics.cask_output(cask)
       end
 
       def self.title_info(cask)
diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
index 9cd6e22280..7d529f7112 100644
--- a/Library/Homebrew/test/cask/cmd/info_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -140,7 +140,7 @@ describe Cask::Cmd::Info, :cask do
     EOS
   end
 
-  it "can run be run with a url twice", :needs_network do
+  it "can run be run with a url twice and returns analytics", :needs_network do
     analytics = {
       "analytics" => {
         "install" => {

From 6d9a20614aaa1fb2a01e9b1d241b686e760d0023 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Tue, 19 May 2020 19:16:17 +0200
Subject: [PATCH 110/134] Implement `brew cask help <command>`.

---
 Library/Homebrew/cask/cmd/help.rb | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/cask/cmd/help.rb b/Library/Homebrew/cask/cmd/help.rb
index 51b6ce7876..bfda5ab9a9 100644
--- a/Library/Homebrew/cask/cmd/help.rb
+++ b/Library/Homebrew/cask/cmd/help.rb
@@ -3,17 +3,23 @@
 module Cask
   class Cmd
     class Help < AbstractCommand
-      def initialize(*)
-        super
-        return if args.empty?
-
-        raise ArgumentError, "#{self.class.command_name} does not take arguments."
-      end
-
       def run
-        puts self.class.purpose
-        puts
-        puts self.class.usage
+        if args.empty?
+          puts self.class.purpose
+          puts
+          puts self.class.usage
+        elsif args.count == 1
+          command_name = args.first
+
+          if (command = self.class.commands[command_name]) && command.respond_to?(:usage)
+            puts command.usage
+            return
+          end
+
+          raise "No help information found for command '#{command_name}'."
+        else
+          raise ArgumentError, "#{self.class.command_name} only takes up to one argument."
+        end
       end
 
       def self.purpose
@@ -23,6 +29,10 @@ module Cask
         EOS
       end
 
+      def self.commands
+        Cmd.command_classes.select(&:visible?).map { |klass| [klass.command_name, klass] }.to_h
+      end
+
       def self.usage
         max_command_len = Cmd.commands.map(&:length).max
 

From 7f400d8e4e21e4f5fc00132890467734f1290055 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Tue, 19 May 2020 19:30:46 +0200
Subject: [PATCH 111/134] Fix `brew cask <command> --help`.

---
 Library/Homebrew/cask/cmd.rb      |  2 +-
 Library/Homebrew/cask/cmd/help.rb | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/cask/cmd.rb b/Library/Homebrew/cask/cmd.rb
index af03b04385..8e93128b32 100644
--- a/Library/Homebrew/cask/cmd.rb
+++ b/Library/Homebrew/cask/cmd.rb
@@ -145,7 +145,7 @@ module Cask
       command, args = detect_internal_command(*args) || detect_external_command(*args) || [NullCommand.new, args]
 
       if help?
-        puts command.help
+        Help.new(command.command_name).run
       else
         command.run(*args)
       end
diff --git a/Library/Homebrew/cask/cmd/help.rb b/Library/Homebrew/cask/cmd/help.rb
index bfda5ab9a9..28db5331b7 100644
--- a/Library/Homebrew/cask/cmd/help.rb
+++ b/Library/Homebrew/cask/cmd/help.rb
@@ -11,12 +11,15 @@ module Cask
         elsif args.count == 1
           command_name = args.first
 
-          if (command = self.class.commands[command_name]) && command.respond_to?(:usage)
-            puts command.usage
-            return
+          unless command = self.class.commands[command_name]
+            raise "No help information found for command '#{command_name}'."
           end
 
-          raise "No help information found for command '#{command_name}'."
+          if command.respond_to?(:usage)
+            puts command.usage
+          else
+            puts command.help
+          end
         else
           raise ArgumentError, "#{self.class.command_name} only takes up to one argument."
         end

From a2939be08a75842da297f20176c4b8d891277192 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 19 May 2020 19:12:47 +0100
Subject: [PATCH 112/134] formula_installer: don't propagate --include-test
 unless requested

---
 Library/Homebrew/cli/args.rb          | 6 ++++++
 Library/Homebrew/formula_installer.rb | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index 202b5557db..b4dfc2b9cb 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -175,6 +175,12 @@ module Homebrew
         formulae.any? { |args_f| args_f.full_name == f.full_name }
       end
 
+      def include_formula_test_deps?(f)
+        return false unless include_test?
+
+        formulae.any? { |args_f| args_f.full_name == f.full_name }
+      end
+
       private
 
       def option_to_name(option)
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index affeae46ef..691432ff5c 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -490,7 +490,7 @@ class FormulaInstaller
         Dependency.prune
       elsif dep.test? || (dep.build? && install_bottle_for?(dependent, build))
         keep = false
-        keep ||= dep.test? && include_test? && dependent == formula
+        keep ||= dep.test? && include_test? && Homebrew.args.include_formula_test_deps?(dependent)
         keep ||= dep.build? && !install_bottle_for?(dependent, build)
         Dependency.prune unless keep
       elsif dep.prune_if_build_and_not_dependent?(dependent)
@@ -569,6 +569,7 @@ class FormulaInstaller
 
     fi.build_from_source       = Homebrew.args.build_formula_from_source?(df)
     fi.force_bottle            = false
+    fi.include_test            = Homebrew.args.include_formula_test_deps?(df)
     fi.verbose                 = verbose?
     fi.quiet                   = quiet?
     fi.debug                   = debug?
@@ -611,6 +612,7 @@ class FormulaInstaller
     fi.options                &= df.options
     fi.build_from_source       = Homebrew.args.build_formula_from_source?(df)
     fi.force_bottle            = false
+    fi.include_test            = Homebrew.args.include_formula_test_deps?(df)
     fi.verbose                 = verbose?
     fi.quiet                   = quiet?
     fi.debug                   = debug?

From b8ba083e12d51b9689ced835e094c3f418030b95 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 19 May 2020 19:14:40 +0100
Subject: [PATCH 113/134] dependencies: fix recursive_includes not handling
 deps of test deps

---
 Library/Homebrew/dependencies.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb
index 3ef90b2ed1..512a06a09b 100644
--- a/Library/Homebrew/dependencies.rb
+++ b/Library/Homebrew/dependencies.rb
@@ -100,16 +100,11 @@ module Homebrew
         klass.prune if ignores.include?("recommended?") || dependent.build.without?(dep)
       elsif dep.optional?
         klass.prune if !includes.include?("optional?") && !dependent.build.with?(dep)
-      elsif dep.test?
-        if includes.include?("test?")
-          Dependency.keep_but_prune_recursive_deps if type == :dependencies
-        elsif dep.build?
-          klass.prune unless includes.include?("build?")
-        else
-          klass.prune
-        end
-      elsif dep.build?
-        klass.prune unless includes.include?("build?")
+      elsif dep.build? || dep.test?
+        keep = false
+        keep ||= dep.test? && includes.include?("test?") && dependent == formula
+        keep ||= dep.build? && includes.include?("build?")
+        klass.prune unless keep
       end
 
       # If a tap isn't installed, we can't find the dependencies of one of

From 5b5833c33b7681acadcf7c49c0ecdbe254b3a934 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 19 May 2020 19:17:13 +0100
Subject: [PATCH 114/134] dependency: return test deps on all levels

Filtering for this is now handled properly in places where this function is used.

In some scenarios, we _want_ test deps on more than the first level (Homebrew.args.include_formula_test_deps?).
---
 Library/Homebrew/dependency.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb
index 21b8c778e7..d97a5a22a1 100644
--- a/Library/Homebrew/dependency.rb
+++ b/Library/Homebrew/dependency.rb
@@ -89,9 +89,6 @@ class Dependency
       deps.each do |dep|
         next if dependent.name == dep.name
 
-        # we only care about one level of test dependencies.
-        next if dep.test? && @expand_stack.length > 1
-
         case action(dependent, dep, &block)
         when :prune
           next

From 633501ab089f3c18fea0406f5324a9ebbec55be2 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 20 May 2020 08:17:14 +0100
Subject: [PATCH 115/134] audit: remove incorrect TODO.

This check can't really be in RuboCop (as it relies on the URL strategy
logic).
---
 Library/Homebrew/dev-cmd/audit.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 33c157f6ee..678e50e3fe 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -1060,7 +1060,6 @@ module Homebrew
       url_strategy = DownloadStrategyDetector.detect(url)
 
       if using == :git || url_strategy == GitDownloadStrategy
-        # TODO: check could be in RuboCop
         problem "Git should specify :revision when a :tag is specified." if specs[:tag] && !specs[:revision]
       end
 

From 0ea2c5f15baebb37aeea59ce7c4d0708242bd123 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 20 May 2020 10:05:23 +0100
Subject: [PATCH 116/134] os/mac/diagnostic: suggest untapping phinze/cask.

As seen in https://github.com/Homebrew/brew/issues/7605.
---
 Library/Homebrew/extend/os/mac/diagnostic.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 6e18a917bd..fe0bf0d5be 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -347,12 +347,13 @@ module Homebrew
       end
 
       def check_deprecated_caskroom_taps
-        tapped_caskroom_taps = Tap.select { |t| t.user == "caskroom" }.map(&:repo)
+        tapped_caskroom_taps = Tap.select { |t| t.user == "caskroom" || t.name == "phinze/cask" }
+                                  .map(&:name)
         return if tapped_caskroom_taps.empty?
 
         <<~EOS
           You have the following deprecated, cask taps tapped:
-            Caskroom/homebrew-#{tapped_caskroom_taps.join("\n  Caskroom/homebrew-")}
+            #{tapped_caskroom_taps.join("\n  ")}
           Untap them with `brew untap`.
         EOS
       end

From 159a5bb2d6d3a27848d9b7eeb781a222f30e3b0c Mon Sep 17 00:00:00 2001
From: Jacob Menke <jamenk@email.wm.edu>
Date: Wed, 20 May 2020 05:12:39 -0400
Subject: [PATCH 117/134] add compsys cache for brew casks

---
 completions/zsh/_brew_cask | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/completions/zsh/_brew_cask b/completions/zsh/_brew_cask
index da49f5c462..c841b006c3 100644
--- a/completions/zsh/_brew_cask
+++ b/completions/zsh/_brew_cask
@@ -19,7 +19,13 @@ __brew_cask() {
 __brew_all_casks() {
   local -a list
   local expl
-  list=( $(brew search --casks) )
+  local comp_cachename=brew_casks
+
+  if _cache_invalid $comp_cachename || ! _retrieve_cache $comp_cachename; then
+    list=( $(brew search --casks) )
+    _store_cache $comp_cachename list
+  fi
+
   _wanted list expl 'all casks' compadd -a list
 }
 

From 89a0984d4206d5af25d2badfc3fe3a2bf0a9971f Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 20 May 2020 12:24:54 +0100
Subject: [PATCH 118/134] formula_installer: fix :test requirement expansion.

---
 Library/Homebrew/formula_installer.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 691432ff5c..c70cf2c6ab 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -457,12 +457,18 @@ class FormulaInstaller
           Requirement.prune
         elsif req.satisfied?
           Requirement.prune
-        elsif include_test? && req.test?
-          next
-        elsif !runtime_requirements.include?(req) && install_bottle_for_dependent
-          Requirement.prune
-        elsif (dep = formula_deps_map[dependent.name]) && dep.build?
-          Requirement.prune
+        elsif req.test? || req.build?
+          keep = false
+          keep ||= runtime_requirements.include?(req)
+          keep ||= req.test? && include_test? && dependent == f
+          keep ||= req.build? && !install_bottle_for_dependent
+          keep ||= (dep = formula_deps_map[dependent.name]) && !dep.build?
+
+          if keep
+            unsatisfied_reqs[dependent] << req
+          else
+            Requirement.prune
+          end
         else
           unsatisfied_reqs[dependent] << req
         end

From 6ac9d43599ed11d61eb658021a31a1e8411ed4e4 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Wed, 20 May 2020 13:13:55 +0100
Subject: [PATCH 119/134] formula_installer: fix already-satisfied test deps
 not being pruned

---
 Library/Homebrew/formula_installer.rb | 31 ++++++++++++---------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index c70cf2c6ab..0d37c452d3 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -453,22 +453,18 @@ class FormulaInstaller
         build = effective_build_options_for(dependent)
         install_bottle_for_dependent = install_bottle_for?(dependent, build)
 
+        keep_build_test = false
+        keep_build_test ||= runtime_requirements.include?(req)
+        keep_build_test ||= req.test? && include_test? && dependent == f
+        keep_build_test ||= req.build? && !install_bottle_for_dependent
+        keep_build_test ||= (dep = formula_deps_map[dependent.name]) && !dep.build?
+
         if req.prune_from_option?(build)
           Requirement.prune
         elsif req.satisfied?
           Requirement.prune
-        elsif req.test? || req.build?
-          keep = false
-          keep ||= runtime_requirements.include?(req)
-          keep ||= req.test? && include_test? && dependent == f
-          keep ||= req.build? && !install_bottle_for_dependent
-          keep ||= (dep = formula_deps_map[dependent.name]) && !dep.build?
-
-          if keep
-            unsatisfied_reqs[dependent] << req
-          else
-            Requirement.prune
-          end
+        elsif (req.build? || req.test?) && !keep_build_test
+          Requirement.prune
         else
           unsatisfied_reqs[dependent] << req
         end
@@ -492,13 +488,14 @@ class FormulaInstaller
         inherited_options.fetch(dependent.name, []),
       )
 
+      keep_build_test = false
+      keep_build_test ||= dep.test? && include_test? && Homebrew.args.include_formula_test_deps?(dependent)
+      keep_build_test ||= dep.build? && !install_bottle_for?(dependent, build)
+
       if dep.prune_from_option?(build)
         Dependency.prune
-      elsif dep.test? || (dep.build? && install_bottle_for?(dependent, build))
-        keep = false
-        keep ||= dep.test? && include_test? && Homebrew.args.include_formula_test_deps?(dependent)
-        keep ||= dep.build? && !install_bottle_for?(dependent, build)
-        Dependency.prune unless keep
+      elsif (dep.build? || dep.test?) && !keep_build_test
+        Dependency.prune
       elsif dep.prune_if_build_and_not_dependent?(dependent)
         Dependency.prune
       elsif dep.satisfied?(inherited_options[dep.name])

From a3f589801f1513cc54fcfecc8e0254ad684846ce Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Wed, 20 May 2020 23:38:09 +0100
Subject: [PATCH 120/134] formula_installer: fix build/test reqs not being
 pruned correctly

Fixes #7618.
---
 Library/Homebrew/formula_installer.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 0d37c452d3..dbb22c9d55 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -457,7 +457,6 @@ class FormulaInstaller
         keep_build_test ||= runtime_requirements.include?(req)
         keep_build_test ||= req.test? && include_test? && dependent == f
         keep_build_test ||= req.build? && !install_bottle_for_dependent
-        keep_build_test ||= (dep = formula_deps_map[dependent.name]) && !dep.build?
 
         if req.prune_from_option?(build)
           Requirement.prune
@@ -465,6 +464,8 @@ class FormulaInstaller
           Requirement.prune
         elsif (req.build? || req.test?) && !keep_build_test
           Requirement.prune
+        elsif (dep = formula_deps_map[dependent.name]) && dep.build?
+          Requirement.prune
         else
           unsatisfied_reqs[dependent] << req
         end

From bb9665ced8a853363d3cd9eee133ca70b0162bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matha=CC=88us=20Zingerle?= <mat.zingerle@gmail.com>
Date: Wed, 20 May 2020 17:22:39 -0500
Subject: [PATCH 121/134] Migrate scheme checks for cvs, bzr, hg, fossil, and
 svn+http to Rubocop

---
 Library/Homebrew/dev-cmd/audit.rb           |  5 -----
 Library/Homebrew/rubocops/urls.rb           | 10 ++++++++++
 Library/Homebrew/test/rubocops/urls_spec.rb | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index 678e50e3fe..deec12b9d6 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -1052,11 +1052,6 @@ module Homebrew
     end
 
     def audit_download_strategy
-      if url =~ %r{^(cvs|bzr|hg|fossil)://} || url =~ %r{^(svn)\+http://}
-        # TODO: check could be in RuboCop
-        problem "Use of the #{$&} scheme is deprecated, pass `:using => :#{Regexp.last_match(1)}` instead"
-      end
-
       url_strategy = DownloadStrategyDetector.detect(url)
 
       if using == :git || url_strategy == GitDownloadStrategy
diff --git a/Library/Homebrew/rubocops/urls.rb b/Library/Homebrew/rubocops/urls.rb
index 33d471a33a..429f5b8ebd 100644
--- a/Library/Homebrew/rubocops/urls.rb
+++ b/Library/Homebrew/rubocops/urls.rb
@@ -66,6 +66,16 @@ module RuboCop
             problem "#{url} should be `https://www.apache.org/dyn/closer.lua?path=#{match[1]}`"
           end
 
+          version_control_pattern = %r{^(cvs|bzr|hg|fossil)://}
+          audit_urls(urls, version_control_pattern) do |match, _|
+            problem "Use of the #{match[1]}:// scheme is deprecated, pass `:using => :#{match[1]}` instead"
+          end
+
+          svn_pattern = %r{^svn\+http://}
+          audit_urls(urls, svn_pattern) do |_, _|
+            problem "Use of the svn+http:// scheme is deprecated, pass `:using => :svn` instead"
+          end
+
           audit_urls(mirrors, /.*/) do |_, mirror|
             urls.each do |url|
               url_string = string_content(parameters(url).first)
diff --git a/Library/Homebrew/test/rubocops/urls_spec.rb b/Library/Homebrew/test/rubocops/urls_spec.rb
index c3a547f435..24c33cf60a 100644
--- a/Library/Homebrew/test/rubocops/urls_spec.rb
+++ b/Library/Homebrew/test/rubocops/urls_spec.rb
@@ -159,6 +159,26 @@ describe RuboCop::Cop::FormulaAudit::Urls do
                        "not a source archive; homebrew/core is source-only.",
       "col"         => 2,
       "formula_tap" => "homebrew-core",
+    }, {
+      "url" => "cvs://brew.sh/foo/bar",
+      "msg" => "Use of the cvs:// scheme is deprecated, pass `:using => :cvs` instead",
+      "col" => 2,
+    }, {
+      "url" => "bzr://brew.sh/foo/bar",
+      "msg" => "Use of the bzr:// scheme is deprecated, pass `:using => :bzr` instead",
+      "col" => 2,
+    }, {
+      "url" => "hg://brew.sh/foo/bar",
+      "msg" => "Use of the hg:// scheme is deprecated, pass `:using => :hg` instead",
+      "col" => 2,
+    }, {
+      "url" => "fossil://brew.sh/foo/bar",
+      "msg" => "Use of the fossil:// scheme is deprecated, pass `:using => :fossil` instead",
+      "col" => 2,
+    }, {
+      "url" => "svn+http://brew.sh/foo/bar",
+      "msg" => "Use of the svn+http:// scheme is deprecated, pass `:using => :svn` instead",
+      "col" => 2,
     }]
   }
 

From 0c8a7b0488713bacc2b6129c0e093ab663de1980 Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Wed, 20 May 2020 12:00:34 -0700
Subject: [PATCH 122/134] Base homebrew/brew Docker image on ubuntu:20.04

Add a new image homebrew/ubuntu16.04 for building Linux bottles.
Tag the most recent stable release of each image as latest.
---
 .github/workflows/docker.yml | 13 ++++++++++++-
 .github/workflows/tests.yml  | 20 ++++++--------------
 Dockerfile                   |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b11413c5db..b8db4503fd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ["18.04", "20.04"]
+        version: ["16.04", "18.04", "20.04"]
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -33,9 +33,20 @@ jobs:
           docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
           docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$brew_version"
           docker push "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:$brew_version"
+          docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:latest"
+          docker push "docker.pkg.github.com/homebrew/brew/ubuntu${{matrix.version}}:latest"
       - name: Deploy the tagged Docker image to Docker Hub
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           docker login -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
           docker tag brew "homebrew/ubuntu${{matrix.version}}:$brew_version"
           docker push "homebrew/ubuntu${{matrix.version}}:$brew_version"
+          docker tag brew "homebrew/ubuntu${{matrix.version}}:latest"
+          docker push "homebrew/ubuntu${{matrix.version}}:latest"
+      - name: Deploy the homebrew/brew Docker image to GitHub and Docker Hub
+        if: startsWith(github.ref, 'refs/tags/') && matrix.version == '20.04'
+        run: |
+            docker tag brew "docker.pkg.github.com/homebrew/brew/brew:latest"
+            docker push "docker.pkg.github.com/homebrew/brew/brew:latest"
+            docker tag brew "homebrew/brew:latest"
+            docker push "homebrew/brew:latest"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c6e43af8b2..8b273bede7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,9 +3,6 @@ on:
   push:
     branches: master
   pull_request: []
-  release:
-    types:
-      - published
 env:
   HOMEBREW_GITHUB_ACTIONS: 1
   HOMEBREW_NO_AUTO_UPDATE: 1
@@ -176,7 +173,7 @@ jobs:
 
     - name: Build Docker image
       if: matrix.os == 'ubuntu-latest'
-      run: docker build -t brew .
+      run: docker build -t brew --build-arg=version=16.04 .
 
     - name: Run brew test-bot
       run: |
@@ -187,16 +184,11 @@ jobs:
         fi
 
     - name: Deploy the Docker image to GitHub and Docker Hub
-      if: matrix.os == 'ubuntu-latest' && (github.ref == 'refs/heads/master' || github.event_name == 'release')
+      if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
       run: |
-        case $GITHUB_REF in
-          refs/heads/master) v=latest ;;
-          refs/tags/*) v=${GITHUB_REF:10} ;;
-          *) echo Error: unexpected GITHUB_REF: $GITHUB_REF; exit 1 ;;
-        esac
         docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-        docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$v"
-        docker push "docker.pkg.github.com/homebrew/brew/brew:$v"
+        docker tag brew "docker.pkg.github.com/homebrew/brew/ubuntu16.04:master"
+        docker push "docker.pkg.github.com/homebrew/brew/ubuntu16.04:master"
         docker login -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
-        docker tag brew "homebrew/brew:$v"
-        docker push "homebrew/brew:$v"
+        docker tag brew "homebrew/ubuntu16.04:master"
+        docker push "homebrew/ubuntu16.04:master"
diff --git a/Dockerfile b/Dockerfile
index 94012220e9..3027de1af0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG version=16.04
+ARG version=20.04
 FROM ubuntu:$version
 ARG DEBIAN_FRONTEND=noninteractive
 

From abd61f176e0c69b160d2f00037db74501a204289 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 21 May 2020 08:50:50 +0000
Subject: [PATCH 123/134] build(deps): bump rubocop from 0.83.0 to 0.84.0 in
 /Library/Homebrew

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.83.0 to 0.84.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.83.0...v0.84.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 58fff27589..93133be0da 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -81,13 +81,16 @@ GEM
     rspec-support (3.9.3)
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
-    rubocop (0.83.0)
+    rubocop (0.84.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
     rubocop-rspec (1.39.0)

From 223762915f1edbb86d2f79c9e5bedb9df2a2c235 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 21 May 2020 10:14:57 +0100
Subject: [PATCH 124/134] gitignore: don't vendor rubocop-ast.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0c3bf37367..51706fa962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,6 +120,7 @@
 **/vendor/bundle/ruby/*/gems/rspec-support-*/
 **/vendor/bundle/ruby/*/gems/rspec-wait-*/
 **/vendor/bundle/ruby/*/gems/rubocop-0*/
+**/vendor/bundle/ruby/*/gems/rubocop-ast-*/
 **/vendor/bundle/ruby/*/gems/ruby-prof-*/
 **/vendor/bundle/ruby/*/gems/ruby-progressbar-*/
 **/vendor/bundle/ruby/*/gems/simplecov-*/

From e33dc9e91657a537519d5ae1f88b0b35fbd1405e Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 21 May 2020 10:15:34 +0100
Subject: [PATCH 125/134] utils: brew style --fix.

---
 Library/Homebrew/utils.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index d4e8fa2536..b440a9553f 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -437,13 +437,13 @@ module Kernel
     n_back_bytes = max_bytes_in - n_front_bytes
     if n_front_bytes.zero?
       front = bytes[1..0]
-      back = bytes[-max_bytes_in..-1]
+      back = bytes[-max_bytes_in..]
     elsif n_back_bytes.zero?
       front = bytes[0..(max_bytes_in - 1)]
       back = bytes[1..0]
     else
       front = bytes[0..(n_front_bytes - 1)]
-      back = bytes[-n_back_bytes..-1]
+      back = bytes[-n_back_bytes..]
     end
     out = front + glue_bytes + back
     out.force_encoding("UTF-8")

From bab32515fa71845e3a6ae15e9a8fff683aff009d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 05:34:28 +0000
Subject: [PATCH 126/134] build(deps): bump rubocop-performance in
 /Library/Homebrew

Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.5.2 to 1.6.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.5.2...v1.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Library/Homebrew/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 93133be0da..d8f56dddaf 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -91,7 +91,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
-    rubocop-performance (1.5.2)
+    rubocop-performance (1.6.0)
       rubocop (>= 0.71.0)
     rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)

From e6c720c22cd81058a573195d19ded34a2b0ebfb4 Mon Sep 17 00:00:00 2001
From: Kien Dang <mail@kien.ai>
Date: Fri, 22 May 2020 15:21:51 +0800
Subject: [PATCH 127/134] Update zsh completion

---
 completions/zsh/_brew | 48 +++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/completions/zsh/_brew b/completions/zsh/_brew
index f216255bd3..c4f75cf6a7 100644
--- a/completions/zsh/_brew
+++ b/completions/zsh/_brew
@@ -377,17 +377,19 @@ _brew_edit() {
     '*:: :__brew_formulae_or_ruby_files'
 }
 
-# brew fetch [--force] [--retry] [-v] [--devel|--HEAD] [--deps] [--build-from-source|--force-bottle] formulae
+# brew fetch [--force] [--retry] [-v] [--devel|--HEAD] [--deps]
+#   [--build-from-source|--build-bottle|--force-bottle] formulae
 _brew_fetch() {
   _arguments \
-    '--force[remove previously cached version and re-fetch]' \
+    '(--force -f)'{--force,-f}'[remove previously cached version and re-fetch]' \
     '--retry[retry if a download fails or re-download if the checksum of a previously cached version no longer matches]' \
-    '-v[verbose VCS checkout]' \
+    '(--verbose -v)'{--verbose,-v}'[verbose VCS checkout]' \
     '(--HEAD)--devel[fetch devel version instead of stable]' \
     '(--devel)--HEAD[fetch HEAD version instead of stable]' \
     '--deps[also download dependencies for any listed formulae]' \
-    '(--force-bottle)--build-from-source[download the source rather than a bottle]' \
-    '(--build-from-source)--force-bottle[download a bottle if it exists for the current version of OS X, even if it would not be used during installation]' \
+    '(--build-from-source -s --force-bottle --build-bottle)'{--build-from-source,-s}'[download the source rather than a bottle]' \
+    '(--build-from-source -s --force-bottle)--build-bottle[download the source (for eventual bottling) rather than a bottle]' \
+    '(--build-from-source -s --build-bottle)--force-bottle[download a bottle if it exists for the current version of OS X, even if it would not be used during installation]' \
     '*:formula:__brew_formulae'
 }
 
@@ -431,9 +433,10 @@ _brew_info() {
       '(--all --installed)*: :__brew_formulae'
 }
 
-# brew install [--debug] [--env=std|super] [--ignore-dependencies]
-#   [--only-dependencies] [--cc=compiler] [--build-from-source]
-#   [--devel|--HEAD] [--keep-tmp] formulae
+# brew install [--debug] [--env=std|super]
+#   [--ignore-dependencies|--only-dependencies] [--include-test]
+#   [--cc=compiler] [--build-from-source|--build-bottle|--force-fottle]
+#   [--devel|--HEAD] [--fetch-HEAD] [--bottle-arch=architecture] [--keep-tmp] formulae
 # brew install --interactive [--git] formula
 _brew_install() {
   local state
@@ -441,11 +444,16 @@ _brew_install() {
     - normal-install \
       '--debug[if brewing fails, open an interactive debugging session]' \
       -'-env=-[use standard or super environment]:environment:(std super)' \
-      '--ignore-dependencies[skip installing any dependencies of any kind]' \
-      '--only-dependencies[install the dependencies but do not install the specified formula]' \
+      '(--only-dependencies)--ignore-dependencies[skip installing any dependencies of any kind]' \
+      '(--ignore-dependencies)--only-dependencies[install the dependencies but do not install the specified formula]' \
       '--cc=-[attempt to compile using compiler]:compiler: ' \
-      '(--build-from-source -s)'{--build-from-source,-s}'[compile the specified formula from source even if a bottle is provided]' \
+      '(--build-from-source -s --force-bottle --build-bottle)'{--build-from-source,-s}'[compile the specified formula from source even if a bottle is provided]' \
+      '(--build-from-source -s --force-bottle)--build-bottle[prepare the formula for eventual bottling during installation, skipping any post-install steps]' \
+      '(--build-from-source -s --build-bottle)--force-bottle[install from a bottle if it exists for the current version of OS X, even if it would not normally be used for installation]' \
+      '--include-test[install testing dependencies]' \
       '(--devel --HEAD)'{--devel,--HEAD}'[install the development / HEAD version]' \
+      '--fetch-HEAD[fetch the upstream repository to detect if the HEAD installation of the formula is outdated]' \
+      '--bottle-arch=-[optimise bottles for the specified architecture]:architecture: ' \
       '--keep-tmp[don''t delete temporary files created during installation]' \
       '--display-times[display installation times at end of run]' \
       '*: : __brew_formulae' \
@@ -570,7 +578,7 @@ _brew_pull() {
 }
 
 # brew pr-pull [--no-upload|--no-publish] [--dry-run] [--clean] [--branch-okay]
-#   [--resolve] [--workflow] [--artifact] [--bintray-org] [--tap] pull_request 
+#   [--resolve] [--workflow] [--artifact] [--bintray-org] [--tap] pull_request
 _brew_pr_pull() {
   _arguments \
     '(--no-upload)--no-publish[download the bottles, apply the bottle commit, and upload the bottles to Bintray, but don''t publish them]' \
@@ -592,10 +600,19 @@ _brew_readall() {
 }
 
 # brew reinstall formulae:
+# mostly copy from brew install
 _brew_reinstall() {
   _arguments \
-    '--display-times[display installation times at end of run]' \
-    '*::formula:__brew_installed_formulae'
+    - normal-install \
+      '--debug[if brewing fails, open an interactive debugging session]' \
+      '(--build-from-source -s --force-bottle)'{--build-from-source,-s}'[compile the specified formula from source even if a bottle is provided]' \
+      '(--build-from-source -s)--force-bottle[install from a bottle if it exists for the current version of OS X, even if it would not normally be used for installation]' \
+      '--keep-tmp[don''t delete temporary files created during installation]' \
+      '--display-times[display installation times at end of run]' \
+      '*::formula:__brew_installed_formulae' \
+    - interactive-install \
+      '--interactive[download and patch formula, then open a shell]' \
+      '::formula:__brew_installed_formulae'
 }
 
 # brew search, -S:
@@ -790,7 +807,8 @@ _brew_upgrade() {
     '--ignore-dependencies[skip installing any dependencies of any kind]' \
     '--only-dependencies[install the dependencies but do not install the specified formula]' \
     '--cc=-[attempt to compile using compiler]:compiler: ' \
-    '(--build-from-source -s)'{--build-from-source,-s}'[compile the specified formula from source even if a bottle is provided]' \
+    '(--build-from-source -s --force-bottle)'{--build-from-source,-s}'[compile the specified formula from source even if a bottle is provided]' \
+    '(--build-from-source -s)--force-bottle[install from a bottle if it exists for the current version of OS X, even if it would not normally be used for installation]' \
     '(--devel --HEAD)'{--devel,--HEAD}'[install the development / HEAD version]' \
     '--keep-tmp[don''t delete temporary files created during installation]' \
     '--display-times[display installation times at end of run]' \

From d02b15d31a0d719cb54081c054f4ac1dcce92d63 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 22 May 2020 08:30:19 +0100
Subject: [PATCH 128/134] brew vendor-gems: commit updates.

---
 .../Homebrew/vendor/bundle/bundler/setup.rb   |  8 +-
 .../config/default.yml                        | 22 ++++-
 .../lib/rubocop-performance.rb                |  0
 .../rubocop/cop/mixin/regexp_metacharacter.rb | 41 +++++++++
 .../lib/rubocop/cop/performance/bind_call.rb  | 87 +++++++++++++++++++
 .../lib/rubocop/cop/performance/caller.rb     |  4 +-
 .../cop/performance/case_when_splat.rb        |  0
 .../lib/rubocop/cop/performance/casecmp.rb    |  8 +-
 .../cop/performance/chain_array_allocation.rb |  2 +-
 .../cop/performance/compare_with_block.rb     |  4 +-
 .../lib/rubocop/cop/performance/count.rb      |  2 +-
 .../rubocop/cop/performance/delete_prefix.rb  | 72 +++++++++++++++
 .../rubocop/cop/performance/delete_suffix.rb  | 72 +++++++++++++++
 .../lib/rubocop/cop/performance/detect.rb     |  2 +-
 .../cop/performance/double_start_end_with.rb  |  4 +-
 .../lib/rubocop/cop/performance/end_with.rb   | 21 ++---
 .../lib/rubocop/cop/performance/fixed_size.rb |  2 +-
 .../lib/rubocop/cop/performance/flat_map.rb   |  2 +-
 .../performance/inefficient_hash_search.rb    |  2 +-
 .../rubocop/cop/performance/open_struct.rb    |  2 +-
 .../rubocop/cop/performance/range_include.rb  |  2 +-
 .../cop/performance/redundant_block_call.rb   |  6 +-
 .../cop/performance/redundant_match.rb        |  4 +-
 .../cop/performance/redundant_merge.rb        | 24 +++--
 .../rubocop/cop/performance/regexp_match.rb   | 26 +++---
 .../rubocop/cop/performance/reverse_each.rb   |  5 +-
 .../lib/rubocop/cop/performance/size.rb       |  0
 .../lib/rubocop/cop/performance/start_with.rb | 24 +++--
 .../cop/performance/string_replacement.rb     | 15 +---
 .../lib/rubocop/cop/performance/times_map.rb  |  2 +-
 .../cop/performance/unfreeze_string.rb        |  8 +-
 .../cop/performance/uri_default_parser.rb     |  2 +-
 .../lib/rubocop/cop/performance_cops.rb       |  5 ++
 .../lib/rubocop/performance.rb                |  0
 .../lib/rubocop/performance/inject.rb         |  2 +-
 .../lib/rubocop/performance/version.rb        |  2 +-
 36 files changed, 391 insertions(+), 93 deletions(-)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/config/default.yml (93%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop-performance.rb (100%)
 create mode 100644 Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/mixin/regexp_metacharacter.rb
 create mode 100644 Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/bind_call.rb
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/caller.rb (93%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/case_when_splat.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/casecmp.rb (91%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/chain_array_allocation.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/compare_with_block.rb (97%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/count.rb (98%)
 create mode 100644 Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_prefix.rb
 create mode 100644 Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_suffix.rb
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/detect.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/double_start_end_with.rb (95%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/end_with.rb (77%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/fixed_size.rb (97%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/flat_map.rb (97%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/inefficient_hash_search.rb (98%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/open_struct.rb (96%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/range_include.rb (96%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/redundant_block_call.rb (93%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/redundant_match.rb (93%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/redundant_merge.rb (89%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/regexp_match.rb (92%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/reverse_each.rb (82%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/size.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/start_with.rb (70%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/string_replacement.rb (91%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/times_map.rb (97%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/unfreeze_string.rb (87%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance/uri_default_parser.rb (95%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/cop/performance_cops.rb (86%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/performance.rb (100%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/performance/inject.rb (88%)
 rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{rubocop-performance-1.5.2 => rubocop-performance-1.6.0}/lib/rubocop/performance/version.rb (81%)

diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
index 41a0f0c253..4dd5a37499 100644
--- a/Library/Homebrew/vendor/bundle/bundler/setup.rb
+++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -12,6 +12,8 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.3.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.0.3.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib"
 $:.unshift "#{path}/"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/byebug-11.1.3"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/byebug-11.1.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/json-2.3.0"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.3.0/lib"
@@ -59,10 +61,10 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.9.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-its-1.3.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-retry-0.6.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-ast-0.0.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.7.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.83.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.5.2/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.84.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.6.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.39.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/byebug-11.1.3/lib"
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/config/default.yml b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/config/default.yml
similarity index 93%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/config/default.yml
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/config/default.yml
index 13740d9418..e6b3c65f69 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/config/default.yml
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/config/default.yml
@@ -1,5 +1,10 @@
 # This is the default configuration file.
 
+Performance/BindCall:
+  Description: 'Use `bind_call(obj, args, ...)` instead of `bind(obj).call(args, ...)`.'
+  Enabled: true
+  VersionAdded: '1.6'
+
 Performance/Caller:
   Description: >-
              Use `caller(n..n)` instead of `caller`.
@@ -21,6 +26,7 @@ Performance/Casecmp:
              Use `casecmp` rather than `downcase ==`, `upcase ==`, `== downcase`, or `== upcase`..
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#stringcasecmp-vs-stringdowncase---code'
   Enabled: true
+  Safe: false
   VersionAdded: '0.36'
 
 Performance/ChainArrayAllocation:
@@ -49,6 +55,16 @@ Performance/Count:
   VersionAdded: '0.31'
   VersionChanged: '1.5'
 
+Performance/DeletePrefix:
+  Description: 'Use `delete_prefix` instead of `gsub`.'
+  Enabled: true
+  VersionAdded: '1.6'
+
+Performance/DeleteSuffix:
+  Description: 'Use `delete_suffix` instead of `gsub`.'
+  Enabled: true
+  VersionAdded: '1.6'
+
 Performance/Detect:
   Description: >-
                   Use `detect` instead of `select.first`, `find_all.first`,
@@ -87,7 +103,7 @@ Performance/EndWith:
   VersionChanged: '0.44'
 
 Performance/FixedSize:
-  Description: 'Do not compute the size of statically sized objects except in constants'
+  Description: 'Do not compute the size of statically sized objects except in constants.'
   Enabled: true
   VersionAdded: '0.35'
 
@@ -95,7 +111,7 @@ Performance/FlatMap:
   Description: >-
                   Use `Enumerable#flat_map`
                   instead of `Enumerable#map...Array#flatten(1)`
-                  or `Enumberable#collect..Array#flatten(1)`
+                  or `Enumberable#collect..Array#flatten(1)`.
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablemaparrayflatten-vs-enumerableflat_map-code'
   Enabled: true
   VersionAdded: '0.30'
@@ -106,7 +122,7 @@ Performance/FlatMap:
   # `flatten` without any parameters can flatten multiple levels.
 
 Performance/InefficientHashSearch:
-  Description: 'Use `key?` or `value?` instead of `keys.include?` or `values.include?`'
+  Description: 'Use `key?` or `value?` instead of `keys.include?` or `values.include?`.'
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#hashkey-instead-of-hashkeysinclude-code'
   Enabled: true
   VersionAdded: '0.56'
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop-performance.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop-performance.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop-performance.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop-performance.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/mixin/regexp_metacharacter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/mixin/regexp_metacharacter.rb
new file mode 100644
index 0000000000..68c7c49840
--- /dev/null
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/mixin/regexp_metacharacter.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    # Common functionality for handling regexp metacharacters.
+    module RegexpMetacharacter
+      def literal_at_start?(regex_str)
+        # is this regexp 'literal' in the sense of only matching literal
+        # chars, rather than using metachars like `.` and `*` and so on?
+        # also, is it anchored at the start of the string?
+        # (tricky: \s, \d, and so on are metacharacters, but other characters
+        #  escaped with a slash are just literals. LITERAL_REGEX takes all
+        #  that into account.)
+        regex_str =~ /\A(\\A|\^)(?:#{Util::LITERAL_REGEX})+\z/
+      end
+
+      def literal_at_end?(regex_str)
+        # is this regexp 'literal' in the sense of only matching literal
+        # chars, rather than using metachars like . and * and so on?
+        # also, is it anchored at the end of the string?
+        regex_str =~ /\A(?:#{Util::LITERAL_REGEX})+(\\z|\$)\z/
+      end
+
+      def drop_start_metacharacter(regexp_string)
+        if regexp_string.start_with?('\\A')
+          regexp_string[2..-1] # drop `\A` anchor
+        else
+          regexp_string[1..-1] # drop `^` anchor
+        end
+      end
+
+      def drop_end_metacharacter(regexp_string)
+        if regexp_string.end_with?('\\z')
+          regexp_string.chomp('\z') # drop `\z` anchor
+        else
+          regexp_string.chop # drop `$` anchor
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/bind_call.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/bind_call.rb
new file mode 100644
index 0000000000..cf671fde25
--- /dev/null
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/bind_call.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Performance
+      # In Ruby 2.7, `UnboundMethod#bind_call` has been added.
+      #
+      # This cop identifies places where `bind(obj).call(args, ...)`
+      # can be replaced by `bind_call(obj, args, ...)`.
+      #
+      # The `bind_call(obj, args, ...)` method is faster than
+      # `bind(obj).call(args, ...)`.
+      #
+      # @example
+      #   # bad
+      #   umethod.bind(obj).call(foo, bar)
+      #   umethod.bind(obj).(foo, bar)
+      #
+      #   # good
+      #   umethod.bind_call(obj, foo, bar)
+      #
+      class BindCall < Cop
+        include RangeHelp
+        extend TargetRubyVersion
+
+        minimum_target_ruby_version 2.7
+
+        MSG = 'Use `bind_call(%<bind_arg>s%<comma>s%<call_args>s)` ' \
+              'instead of `bind(%<bind_arg>s).call(%<call_args>s)`.'
+
+        def_node_matcher :bind_with_call_method?, <<~PATTERN
+          (send
+            $(send
+              (send nil? _) :bind
+              $(...)) :call
+            $...)
+        PATTERN
+
+        def on_send(node)
+          bind_with_call_method?(node) do |receiver, bind_arg, call_args_node|
+            range = correction_range(receiver, node)
+
+            call_args = build_call_args(call_args_node)
+
+            message = message(bind_arg.source, call_args)
+
+            add_offense(node, location: range, message: message)
+          end
+        end
+
+        def autocorrect(node)
+          receiver, bind_arg, call_args_node = bind_with_call_method?(node)
+
+          range = correction_range(receiver, node)
+
+          call_args = build_call_args(call_args_node)
+          call_args = ", #{call_args}" unless call_args.empty?
+
+          replacement_method = "bind_call(#{bind_arg.source}#{call_args})"
+
+          lambda do |corrector|
+            corrector.replace(range, replacement_method)
+          end
+        end
+
+        private
+
+        def message(bind_arg, call_args)
+          comma = call_args.empty? ? '' : ', '
+
+          format(MSG, bind_arg: bind_arg, comma: comma, call_args: call_args)
+        end
+
+        def correction_range(receiver, node)
+          location_of_bind = receiver.loc.selector.begin_pos
+          location_of_call = node.loc.end.end_pos
+
+          range_between(location_of_bind, location_of_call)
+        end
+
+        def build_call_args(call_args_node)
+          call_args_node.map(&:source).join(', ')
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/caller.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/caller.rb
similarity index 93%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/caller.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/caller.rb
index 9cc82243d4..7f9d22887f 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/caller.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/caller.rb
@@ -24,14 +24,14 @@ module RuboCop
         MSG_FIRST = 'Use `%<method>s(%<n>d..%<n>d).first`' \
                     ' instead of `%<method>s.first`.'
 
-        def_node_matcher :slow_caller?, <<-PATTERN
+        def_node_matcher :slow_caller?, <<~PATTERN
           {
             (send nil? {:caller :caller_locations})
             (send nil? {:caller :caller_locations} int)
           }
         PATTERN
 
-        def_node_matcher :caller_with_scope_method?, <<-PATTERN
+        def_node_matcher :caller_with_scope_method?, <<~PATTERN
           {
             (send #slow_caller? :first)
             (send #slow_caller? :[] int)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/case_when_splat.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/case_when_splat.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/case_when_splat.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/case_when_splat.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/casecmp.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/casecmp.rb
similarity index 91%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/casecmp.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/casecmp.rb
index c411eca255..cfb0c709cb 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/casecmp.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/casecmp.rb
@@ -5,6 +5,8 @@ module RuboCop
     module Performance
       # This cop identifies places where a case-insensitive string comparison
       # can better be implemented using `casecmp`.
+      # This cop is unsafe because `String#casecmp` and `String#casecmp?` behave
+      # differently when using Non-ASCII characters.
       #
       # @example
       #   # bad
@@ -21,21 +23,21 @@ module RuboCop
         MSG = 'Use `%<good>s` instead of `%<bad>s`.'
         CASE_METHODS = %i[downcase upcase].freeze
 
-        def_node_matcher :downcase_eq, <<-PATTERN
+        def_node_matcher :downcase_eq, <<~PATTERN
           (send
             $(send _ ${:downcase :upcase})
             ${:== :eql? :!=}
             ${str (send _ {:downcase :upcase} ...) (begin str)})
         PATTERN
 
-        def_node_matcher :eq_downcase, <<-PATTERN
+        def_node_matcher :eq_downcase, <<~PATTERN
           (send
             {str (send _ {:downcase :upcase} ...) (begin str)}
             ${:== :eql? :!=}
             $(send _ ${:downcase :upcase}))
         PATTERN
 
-        def_node_matcher :downcase_downcase, <<-PATTERN
+        def_node_matcher :downcase_downcase, <<~PATTERN
           (send
             $(send _ ${:downcase :upcase})
             ${:== :eql? :!=}
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/chain_array_allocation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/chain_array_allocation.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/chain_array_allocation.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/chain_array_allocation.rb
index 49620cea8e..140dfa48ed 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/chain_array_allocation.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/chain_array_allocation.rb
@@ -51,7 +51,7 @@ module RuboCop
               '(followed by `return array` if required) instead of chaining '\
               '`%<method>s...%<second_method>s`.'
 
-        def_node_matcher :flat_map_candidate?, <<-PATTERN
+        def_node_matcher :flat_map_candidate?, <<~PATTERN
           {
             (send (send _ ${#{RETURN_NEW_ARRAY_WHEN_ARGS}} {int lvar ivar cvar gvar}) ${#{HAS_MUTATION_ALTERNATIVE}} $...)
             (send (block (send _ ${#{ALWAYS_RETURNS_NEW_ARRAY} }) ...) ${#{HAS_MUTATION_ALTERNATIVE}} $...)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/compare_with_block.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/compare_with_block.rb
similarity index 97%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/compare_with_block.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/compare_with_block.rb
index 040e6e47b2..01c1393a5d 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/compare_with_block.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/compare_with_block.rb
@@ -30,14 +30,14 @@ module RuboCop
               '`%<compare_method>s { |%<var_a>s, %<var_b>s| %<str_a>s ' \
               '<=> %<str_b>s }`.'
 
-        def_node_matcher :compare?, <<-PATTERN
+        def_node_matcher :compare?, <<~PATTERN
           (block
             $(send _ {:sort :min :max})
             (args (arg $_a) (arg $_b))
             $send)
         PATTERN
 
-        def_node_matcher :replaceable_body?, <<-PATTERN
+        def_node_matcher :replaceable_body?, <<~PATTERN
           (send
             (send (lvar %1) $_method $...)
             :<=>
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/count.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/count.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/count.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/count.rb
index 80a6e42627..4a2eb1df83 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/count.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/count.rb
@@ -42,7 +42,7 @@ module RuboCop
 
         MSG = 'Use `count` instead of `%<selector>s...%<counter>s`.'
 
-        def_node_matcher :count_candidate?, <<-PATTERN
+        def_node_matcher :count_candidate?, <<~PATTERN
           {
             (send (block $(send _ ${:select :reject}) ...) ${:count :length :size})
             (send $(send _ ${:select :reject} (:block_pass _)) ${:count :length :size})
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_prefix.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_prefix.rb
new file mode 100644
index 0000000000..f2867720dc
--- /dev/null
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_prefix.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Performance
+      # In Ruby 2.5, `String#delete_prefix` has been added.
+      #
+      # This cop identifies places where `gsub(/\Aprefix/, '')`
+      # can be replaced by `delete_prefix('prefix')`.
+      #
+      # The `delete_prefix('prefix')` method is faster than
+      # `gsub(/\Aprefix/, '')`.
+      #
+      # @example
+      #
+      #   # bad
+      #   str.gsub(/\Aprefix/, '')
+      #   str.gsub!(/\Aprefix/, '')
+      #   str.gsub(/^prefix/, '')
+      #   str.gsub!(/^prefix/, '')
+      #
+      #   # good
+      #   str.delete_prefix('prefix')
+      #   str.delete_prefix!('prefix')
+      #
+      class DeletePrefix < Cop
+        extend TargetRubyVersion
+        include RegexpMetacharacter
+
+        minimum_target_ruby_version 2.5
+
+        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
+
+        PREFERRED_METHODS = {
+          gsub: :delete_prefix,
+          gsub!: :delete_prefix!
+        }.freeze
+
+        def_node_matcher :gsub_method?, <<~PATTERN
+          (send $!nil? ${:gsub :gsub!} (regexp (str $#literal_at_start?) (regopt)) (str $_))
+        PATTERN
+
+        def on_send(node)
+          gsub_method?(node) do |_, bad_method, _, replace_string|
+            return unless replace_string.blank?
+
+            good_method = PREFERRED_METHODS[bad_method]
+
+            message = format(MSG, current: bad_method, prefer: good_method)
+
+            add_offense(node, location: :selector, message: message)
+          end
+        end
+
+        def autocorrect(node)
+          gsub_method?(node) do |receiver, bad_method, regexp_str, _|
+            lambda do |corrector|
+              good_method = PREFERRED_METHODS[bad_method]
+              regexp_str = drop_start_metacharacter(regexp_str)
+              regexp_str = interpret_string_escapes(regexp_str)
+              string_literal = to_string_literal(regexp_str)
+
+              new_code = "#{receiver.source}.#{good_method}(#{string_literal})"
+
+              corrector.replace(node, new_code)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_suffix.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_suffix.rb
new file mode 100644
index 0000000000..8d727dd57f
--- /dev/null
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/delete_suffix.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Performance
+      # In Ruby 2.5, `String#delete_suffix` has been added.
+      #
+      # This cop identifies places where `gsub(/suffix\z/, '')`
+      # can be replaced by `delete_suffix('suffix')`.
+      #
+      # The `delete_suffix('suffix')` method is faster than
+      # `gsub(/suffix\z/, '')`.
+      #
+      # @example
+      #
+      #   # bad
+      #   str.gsub(/suffix\z/, '')
+      #   str.gsub!(/suffix\z/, '')
+      #   str.gsub(/suffix$/, '')
+      #   str.gsub!(/suffix$/, '')
+      #
+      #   # good
+      #   str.delete_suffix('suffix')
+      #   str.delete_suffix!('suffix')
+      #
+      class DeleteSuffix < Cop
+        extend TargetRubyVersion
+        include RegexpMetacharacter
+
+        minimum_target_ruby_version 2.5
+
+        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
+
+        PREFERRED_METHODS = {
+          gsub: :delete_suffix,
+          gsub!: :delete_suffix!
+        }.freeze
+
+        def_node_matcher :gsub_method?, <<~PATTERN
+          (send $!nil? ${:gsub :gsub!} (regexp (str $#literal_at_end?) (regopt)) (str $_))
+        PATTERN
+
+        def on_send(node)
+          gsub_method?(node) do |_, bad_method, _, replace_string|
+            return unless replace_string.blank?
+
+            good_method = PREFERRED_METHODS[bad_method]
+
+            message = format(MSG, current: bad_method, prefer: good_method)
+
+            add_offense(node, location: :selector, message: message)
+          end
+        end
+
+        def autocorrect(node)
+          gsub_method?(node) do |receiver, bad_method, regexp_str, _|
+            lambda do |corrector|
+              good_method = PREFERRED_METHODS[bad_method]
+              regexp_str = drop_end_metacharacter(regexp_str)
+              regexp_str = interpret_string_escapes(regexp_str)
+              string_literal = to_string_literal(regexp_str)
+
+              new_code = "#{receiver.source}.#{good_method}(#{string_literal})"
+
+              corrector.replace(node, new_code)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/detect.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/detect.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/detect.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/detect.rb
index f1aa75be8d..958b4e8444 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/detect.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/detect.rb
@@ -28,7 +28,7 @@ module RuboCop
         REVERSE_MSG = 'Use `reverse.%<prefer>s` instead of ' \
                       '`%<first_method>s.%<second_method>s`.'
 
-        def_node_matcher :detect_candidate?, <<-PATTERN
+        def_node_matcher :detect_candidate?, <<~PATTERN
           {
             (send $(block (send _ {:select :find_all}) ...) ${:first :last} $...)
             (send $(send _ {:select :find_all} ...) ${:first :last} $...)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/double_start_end_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/double_start_end_with.rb
similarity index 95%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/double_start_end_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/double_start_end_with.rb
index 530c41d424..92e7e385be 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/double_start_end_with.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/double_start_end_with.rb
@@ -75,13 +75,13 @@ module RuboCop
           cop_config['IncludeActiveSupportAliases']
         end
 
-        def_node_matcher :two_start_end_with_calls, <<-PATTERN
+        def_node_matcher :two_start_end_with_calls, <<~PATTERN
           (or
             (send $_recv [{:start_with? :end_with?} $_method] $...)
             (send _recv _method $...))
         PATTERN
 
-        def_node_matcher :check_with_active_support_aliases, <<-PATTERN
+        def_node_matcher :check_with_active_support_aliases, <<~PATTERN
           (or
             (send $_recv
                     [{:start_with? :starts_with? :end_with? :ends_with?} $_method]
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/end_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/end_with.rb
similarity index 77%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/end_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/end_with.rb
index 66f43a6ce6..584d2eb6f1 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/end_with.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/end_with.rb
@@ -15,26 +15,27 @@ module RuboCop
       #   'abc'.match(/bc\Z/)
       #   /bc\Z/.match('abc')
       #
+      #   'abc'.match?(/bc$/)
+      #   /bc$/.match?('abc')
+      #   'abc' =~ /bc$/
+      #   /bc$/ =~ 'abc'
+      #   'abc'.match(/bc$/)
+      #   /bc$/.match('abc')
+      #
       #   # good
       #   'abc'.end_with?('bc')
       class EndWith < Cop
+        include RegexpMetacharacter
+
         MSG = 'Use `String#end_with?` instead of a regex match anchored to ' \
               'the end of the string.'
-        SINGLE_QUOTE = "'"
 
-        def_node_matcher :redundant_regex?, <<-PATTERN
+        def_node_matcher :redundant_regex?, <<~PATTERN
           {(send $!nil? {:match :=~ :match?} (regexp (str $#literal_at_end?) (regopt)))
            (send (regexp (str $#literal_at_end?) (regopt)) {:match :match?} $_)
            (match-with-lvasgn (regexp (str $#literal_at_end?) (regopt)) $_)}
         PATTERN
 
-        def literal_at_end?(regex_str)
-          # is this regexp 'literal' in the sense of only matching literal
-          # chars, rather than using metachars like . and * and so on?
-          # also, is it anchored at the end of the string?
-          regex_str =~ /\A(?:#{LITERAL_REGEX})+\\z\z/
-        end
-
         def on_send(node)
           return unless redundant_regex?(node)
 
@@ -45,7 +46,7 @@ module RuboCop
         def autocorrect(node)
           redundant_regex?(node) do |receiver, regex_str|
             receiver, regex_str = regex_str, receiver if receiver.is_a?(String)
-            regex_str = regex_str[0..-3] # drop \Z anchor
+            regex_str = drop_end_metacharacter(regex_str)
             regex_str = interpret_string_escapes(regex_str)
 
             lambda do |corrector|
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/fixed_size.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/fixed_size.rb
similarity index 97%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/fixed_size.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/fixed_size.rb
index c3a0beb481..76be44259c 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/fixed_size.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/fixed_size.rb
@@ -48,7 +48,7 @@ module RuboCop
       class FixedSize < Cop
         MSG = 'Do not compute the size of statically sized objects.'
 
-        def_node_matcher :counter, <<-MATCHER
+        def_node_matcher :counter, <<~MATCHER
           (send ${array hash str sym} {:count :length :size} $...)
         MATCHER
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/flat_map.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/flat_map.rb
similarity index 97%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/flat_map.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/flat_map.rb
index b5b91876a7..de4677a444 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/flat_map.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/flat_map.rb
@@ -22,7 +22,7 @@ module RuboCop
                                   'and `flatten` can be used to flatten ' \
                                   'multiple levels.'
 
-        def_node_matcher :flat_map_candidate?, <<-PATTERN
+        def_node_matcher :flat_map_candidate?, <<~PATTERN
           (send
             {
               (block $(send _ ${:collect :map}) ...)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/inefficient_hash_search.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/inefficient_hash_search.rb
similarity index 98%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/inefficient_hash_search.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/inefficient_hash_search.rb
index 0a4a1cc0b2..b72063faef 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/inefficient_hash_search.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/inefficient_hash_search.rb
@@ -37,7 +37,7 @@ module RuboCop
       #   h = { a: 1, b: 2 }; h.value?(nil)
       #
       class InefficientHashSearch < Cop
-        def_node_matcher :inefficient_include?, <<-PATTERN
+        def_node_matcher :inefficient_include?, <<~PATTERN
           (send (send $_ {:keys :values}) :include? _)
         PATTERN
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/open_struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/open_struct.rb
similarity index 96%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/open_struct.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/open_struct.rb
index d3d3e212aa..192bc81239 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/open_struct.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/open_struct.rb
@@ -31,7 +31,7 @@ module RuboCop
         MSG = 'Consider using `Struct` over `OpenStruct` ' \
               'to optimize the performance.'
 
-        def_node_matcher :open_struct, <<-PATTERN
+        def_node_matcher :open_struct, <<~PATTERN
           (send (const {nil? cbase} :OpenStruct) :new ...)
         PATTERN
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/range_include.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/range_include.rb
similarity index 96%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/range_include.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/range_include.rb
index 77eebc8bbc..0e49753c54 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/range_include.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/range_include.rb
@@ -31,7 +31,7 @@ module RuboCop
         # Right now, we only detect direct calls on a Range literal
         # (We don't even catch it if the Range is in double parens)
 
-        def_node_matcher :range_include, <<-PATTERN
+        def_node_matcher :range_include, <<~PATTERN
           (send {irange erange (begin {irange erange})} :include? ...)
         PATTERN
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_block_call.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_block_call.rb
similarity index 93%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_block_call.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_block_call.rb
index 315deac115..1301ae821e 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_block_call.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_block_call.rb
@@ -29,16 +29,16 @@ module RuboCop
         CLOSE_PAREN = ')'
         SPACE = ' '
 
-        def_node_matcher :blockarg_def, <<-PATTERN
+        def_node_matcher :blockarg_def, <<~PATTERN
           {(def  _   (args ... (blockarg $_)) $_)
            (defs _ _ (args ... (blockarg $_)) $_)}
         PATTERN
 
-        def_node_search :blockarg_calls, <<-PATTERN
+        def_node_search :blockarg_calls, <<~PATTERN
           (send (lvar %1) :call ...)
         PATTERN
 
-        def_node_search :blockarg_assigned?, <<-PATTERN
+        def_node_search :blockarg_assigned?, <<~PATTERN
           (lvasgn %1 ...)
         PATTERN
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_match.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_match.rb
similarity index 93%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_match.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_match.rb
index b1eabc8ae4..f0bfecde0a 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_match.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_match.rb
@@ -23,12 +23,12 @@ module RuboCop
 
         # 'match' is a fairly generic name, so we don't flag it unless we see
         # a string or regexp literal on one side or the other
-        def_node_matcher :match_call?, <<-PATTERN
+        def_node_matcher :match_call?, <<~PATTERN
           {(send {str regexp} :match _)
            (send !nil? :match {str regexp})}
         PATTERN
 
-        def_node_matcher :only_truthiness_matters?, <<-PATTERN
+        def_node_matcher :only_truthiness_matters?, <<~PATTERN
           ^({if while until case while_post until_post} equal?(%0) ...)
         PATTERN
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_merge.rb
similarity index 89%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_merge.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_merge.rb
index d93ca155d9..bfb7347aec 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/redundant_merge.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/redundant_merge.rb
@@ -5,11 +5,25 @@ module RuboCop
     module Performance
       # This cop identifies places where `Hash#merge!` can be replaced by
       # `Hash#[]=`.
+      # You can set the maximum number of key-value pairs to consider
+      # an offense with `MaxKeyValuePairs`.
       #
       # @example
+      #   # bad
       #   hash.merge!(a: 1)
       #   hash.merge!({'key' => 'value'})
+      #
+      #   # good
+      #   hash[:a] = 1
+      #   hash['key'] = 'value'
+      #
+      # @example MaxKeyValuePairs: 2 (default)
+      #   # bad
       #   hash.merge!(a: 1, b: 2)
+      #
+      #   # good
+      #   hash[:a] = 1
+      #   hash[:b] = 2
       class RedundantMerge < Cop
         AREF_ASGN = '%<receiver>s[%<key>s] = %<value>s'
         MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
@@ -20,11 +34,11 @@ module RuboCop
           %<leading_space>send
         RUBY
 
-        def_node_matcher :redundant_merge_candidate, <<-PATTERN
+        def_node_matcher :redundant_merge_candidate, <<~PATTERN
           (send $!nil? :merge! [(hash $...) !kwsplat_type?])
         PATTERN
 
-        def_node_matcher :modifier_flow_control?, <<-PATTERN
+        def_node_matcher :modifier_flow_control?, <<~PATTERN
           [{if while until} modifier_form?]
         PATTERN
 
@@ -168,13 +182,11 @@ module RuboCop
           end
 
           def unwind(receiver)
-            while receiver.respond_to?(:send_type?) && receiver.send_type?
-              receiver, = *receiver
-            end
+            receiver, = *receiver while receiver.respond_to?(:send_type?) && receiver.send_type?
             receiver
           end
 
-          def_node_matcher :each_with_object_node, <<-PATTERN
+          def_node_matcher :each_with_object_node, <<~PATTERN
             (block (send _ :each_with_object _) (args _ $_) ...)
           PATTERN
         end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/regexp_match.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/regexp_match.rb
similarity index 92%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/regexp_match.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/regexp_match.rb
index e59ea7f63d..bc5579ec05 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/regexp_match.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/regexp_match.rb
@@ -73,32 +73,28 @@ module RuboCop
       #     end
       #   end
       class RegexpMatch < Cop
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.4
-
         # Constants are included in this list because it is unlikely that
         # someone will store `nil` as a constant and then use it for comparison
         TYPES_IMPLEMENTING_MATCH = %i[const regexp str sym].freeze
         MSG = 'Use `match?` instead of `%<current>s` when `MatchData` ' \
           'is not used.'
 
-        def_node_matcher :match_method?, <<-PATTERN
+        def_node_matcher :match_method?, <<~PATTERN
           {
             (send _recv :match {regexp str sym})
             (send {regexp str sym} :match _)
           }
         PATTERN
 
-        def_node_matcher :match_with_int_arg_method?, <<-PATTERN
+        def_node_matcher :match_with_int_arg_method?, <<~PATTERN
           (send _recv :match _ (int ...))
         PATTERN
 
-        def_node_matcher :match_operator?, <<-PATTERN
+        def_node_matcher :match_operator?, <<~PATTERN
           (send !nil? {:=~ :!~} !nil?)
         PATTERN
 
-        def_node_matcher :match_threequals?, <<-PATTERN
+        def_node_matcher :match_threequals?, <<~PATTERN
           (send (regexp (str _) {(regopt) (regopt _)}) :=== !nil?)
         PATTERN
 
@@ -109,7 +105,7 @@ module RuboCop
           regexp.to_regexp.named_captures.empty?
         end
 
-        MATCH_NODE_PATTERN = <<-PATTERN
+        MATCH_NODE_PATTERN = <<~PATTERN
           {
             #match_method?
             #match_with_int_arg_method?
@@ -122,7 +118,7 @@ module RuboCop
         def_node_matcher :match_node?, MATCH_NODE_PATTERN
         def_node_search :search_match_nodes, MATCH_NODE_PATTERN
 
-        def_node_search :last_matches, <<-PATTERN
+        def_node_search :last_matches, <<~PATTERN
           {
             (send (const nil? :Regexp) :last_match)
             (send (const nil? :Regexp) :last_match _)
@@ -256,6 +252,13 @@ module RuboCop
         def correct_operator(corrector, recv, arg, oper = nil)
           op_range = correction_range(recv, arg)
 
+          replace_with_match_predicate_method(corrector, recv, arg, op_range)
+
+          corrector.insert_after(arg.loc.expression, ')') unless op_range.source.end_with?('(')
+          corrector.insert_before(recv.loc.expression, '!') if oper == :!~
+        end
+
+        def replace_with_match_predicate_method(corrector, recv, arg, op_range)
           if TYPES_IMPLEMENTING_MATCH.include?(recv.type)
             corrector.replace(op_range, '.match?(')
           elsif TYPES_IMPLEMENTING_MATCH.include?(arg.type)
@@ -264,9 +267,6 @@ module RuboCop
           else
             corrector.replace(op_range, '&.match?(')
           end
-
-          corrector.insert_after(arg.loc.expression, ')')
-          corrector.insert_before(recv.loc.expression, '!') if oper == :!~
         end
 
         def swap_receiver_and_arg(corrector, recv, arg)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/reverse_each.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/reverse_each.rb
similarity index 82%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/reverse_each.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/reverse_each.rb
index 6c6fdfba14..09a8214123 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/reverse_each.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/reverse_each.rb
@@ -18,7 +18,7 @@ module RuboCop
         MSG = 'Use `reverse_each` instead of `reverse.each`.'
         UNDERSCORE = '_'
 
-        def_node_matcher :reverse_each?, <<-MATCHER
+        def_node_matcher :reverse_each?, <<~MATCHER
           (send $(send _ :reverse) :each)
         MATCHER
 
@@ -34,7 +34,8 @@ module RuboCop
         end
 
         def autocorrect(node)
-          ->(corrector) { corrector.replace(node.loc.dot, UNDERSCORE) }
+          range = range_between(node.loc.dot.begin_pos, node.loc.selector.begin_pos)
+          ->(corrector) { corrector.replace(range, UNDERSCORE) }
         end
       end
     end
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/size.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/size.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/size.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/size.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/start_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/start_with.rb
similarity index 70%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/start_with.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/start_with.rb
index b4a7cae8a1..18733d4bdf 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/start_with.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/start_with.rb
@@ -15,29 +15,27 @@ module RuboCop
       #   'abc'.match(/\Aab/)
       #   /\Aab/.match('abc')
       #
+      #   'abc'.match?(/^ab/)
+      #   /^ab/.match?('abc')
+      #   'abc' =~ /^ab/
+      #   /^ab/ =~ 'abc'
+      #   'abc'.match(/^ab/)
+      #   /^ab/.match('abc')
+      #
       #   # good
       #   'abc'.start_with?('ab')
       class StartWith < Cop
+        include RegexpMetacharacter
+
         MSG = 'Use `String#start_with?` instead of a regex match anchored to ' \
               'the beginning of the string.'
-        SINGLE_QUOTE = "'"
 
-        def_node_matcher :redundant_regex?, <<-PATTERN
+        def_node_matcher :redundant_regex?, <<~PATTERN
           {(send $!nil? {:match :=~ :match?} (regexp (str $#literal_at_start?) (regopt)))
            (send (regexp (str $#literal_at_start?) (regopt)) {:match :match?} $_)
            (match-with-lvasgn (regexp (str $#literal_at_start?) (regopt)) $_)}
         PATTERN
 
-        def literal_at_start?(regex_str)
-          # is this regexp 'literal' in the sense of only matching literal
-          # chars, rather than using metachars like `.` and `*` and so on?
-          # also, is it anchored at the start of the string?
-          # (tricky: \s, \d, and so on are metacharacters, but other characters
-          #  escaped with a slash are just literals. LITERAL_REGEX takes all
-          #  that into account.)
-          regex_str =~ /\A\\A(?:#{LITERAL_REGEX})+\z/
-        end
-
         def on_send(node)
           return unless redundant_regex?(node)
 
@@ -48,7 +46,7 @@ module RuboCop
         def autocorrect(node)
           redundant_regex?(node) do |receiver, regex_str|
             receiver, regex_str = regex_str, receiver if receiver.is_a?(String)
-            regex_str = regex_str[2..-1] # drop \A anchor
+            regex_str = drop_start_metacharacter(regex_str)
             regex_str = interpret_string_escapes(regex_str)
 
             lambda do |corrector|
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/string_replacement.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/string_replacement.rb
similarity index 91%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/string_replacement.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/string_replacement.rb
index b5b0a4dafd..e6dab7e396 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/string_replacement.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/string_replacement.rb
@@ -26,9 +26,8 @@ module RuboCop
         DELETE = 'delete'
         TR = 'tr'
         BANG = '!'
-        SINGLE_QUOTE = "'"
 
-        def_node_matcher :string_replacement?, <<-PATTERN
+        def_node_matcher :string_replacement?, <<~PATTERN
           (send _ {:gsub :gsub!}
                     ${regexp str (send (const nil? :Regexp) {:new :compile} _)}
                     $str)
@@ -48,9 +47,7 @@ module RuboCop
           first_source, = first_source(first_param)
           second_source, = *second_param
 
-          unless first_param.str_type?
-            first_source = interpret_string_escapes(first_source)
-          end
+          first_source = interpret_string_escapes(first_source) unless first_param.str_type?
 
           replacement_method =
             replacement_method(node, first_source, second_source)
@@ -67,9 +64,7 @@ module RuboCop
                                 to_string_literal(first))
             end
 
-            if second.empty? && first.length == 1
-              remove_second_param(corrector, node, first_param)
-            end
+            remove_second_param(corrector, node, first_param) if second.empty? && first.length == 1
           end
         end
 
@@ -99,9 +94,7 @@ module RuboCop
 
         def offense(node, first_param, second_param)
           first_source, = first_source(first_param)
-          unless first_param.str_type?
-            first_source = interpret_string_escapes(first_source)
-          end
+          first_source = interpret_string_escapes(first_source) unless first_param.str_type?
           second_source, = *second_param
           message = message(node, first_source, second_source)
 
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/times_map.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/times_map.rb
similarity index 97%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/times_map.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/times_map.rb
index 1a04732947..cd719da2ce 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/times_map.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/times_map.rb
@@ -61,7 +61,7 @@ module RuboCop
                  map_or_collect: map_or_collect.method_name)
         end
 
-        def_node_matcher :times_map_call, <<-PATTERN
+        def_node_matcher :times_map_call, <<~PATTERN
           {(block $(send (send $!nil? :times) {:map :collect}) ...)
            $(send (send $!nil? :times) {:map :collect} (block_pass ...))}
         PATTERN
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/unfreeze_string.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/unfreeze_string.rb
similarity index 87%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/unfreeze_string.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/unfreeze_string.rb
index 408fa959d4..eb52b1fc32 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/unfreeze_string.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/unfreeze_string.rb
@@ -24,17 +24,13 @@ module RuboCop
       #   +'something'
       #   +''
       class UnfreezeString < Cop
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.3
-
         MSG = 'Use unary plus to get an unfrozen string literal.'
 
-        def_node_matcher :dup_string?, <<-PATTERN
+        def_node_matcher :dup_string?, <<~PATTERN
           (send {str dstr} :dup)
         PATTERN
 
-        def_node_matcher :string_new?, <<-PATTERN
+        def_node_matcher :string_new?, <<~PATTERN
           {
             (send (const nil? :String) :new {str dstr})
             (send (const nil? :String) :new)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/uri_default_parser.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/uri_default_parser.rb
similarity index 95%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/uri_default_parser.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/uri_default_parser.rb
index a8aa3eb128..e0d2ac8f40 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance/uri_default_parser.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance/uri_default_parser.rb
@@ -17,7 +17,7 @@ module RuboCop
         MSG = 'Use `%<double_colon>sURI::DEFAULT_PARSER` instead of ' \
               '`%<double_colon>sURI::Parser.new`.'
 
-        def_node_matcher :uri_parser_new?, <<-PATTERN
+        def_node_matcher :uri_parser_new?, <<~PATTERN
           (send
             (const
               (const ${nil? cbase} :URI) :Parser) :new)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance_cops.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance_cops.rb
similarity index 86%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance_cops.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance_cops.rb
index 0d0a13d621..446357cff3 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/cop/performance_cops.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/cop/performance_cops.rb
@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
+require_relative 'mixin/regexp_metacharacter'
+
+require_relative 'performance/bind_call'
 require_relative 'performance/caller'
 require_relative 'performance/case_when_splat'
 require_relative 'performance/casecmp'
 require_relative 'performance/compare_with_block'
 require_relative 'performance/count'
+require_relative 'performance/delete_prefix'
+require_relative 'performance/delete_suffix'
 require_relative 'performance/detect'
 require_relative 'performance/double_start_end_with'
 require_relative 'performance/end_with'
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance.rb
similarity index 100%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance.rb
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance/inject.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance/inject.rb
similarity index 88%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance/inject.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance/inject.rb
index f82404dad3..e255a881a4 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance/inject.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance/inject.rb
@@ -8,7 +8,7 @@ module RuboCop
       def self.defaults!
         path = CONFIG_DEFAULT.to_s
         hash = ConfigLoader.send(:load_yaml_configuration, path)
-        config = Config.new(hash, path)
+        config = Config.new(hash, path).tap(&:make_excludes_absolute)
         puts "configuration from #{path}" if ConfigLoader.debug?
         config = ConfigLoader.merge_with_default(config, path)
         ConfigLoader.instance_variable_set(:@default_configuration, config)
diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance/version.rb
similarity index 81%
rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance/version.rb
rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance/version.rb
index d07d623aab..a18eaf866b 100644
--- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.5.2/lib/rubocop/performance/version.rb
+++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/rubocop-performance-1.6.0/lib/rubocop/performance/version.rb
@@ -3,7 +3,7 @@
 module RuboCop
   module Performance
     module Version
-      STRING = '1.5.2'
+      STRING = '1.6.0'
     end
   end
 end

From ca47992a6c71d9d0133e4deffffc2deab1e22458 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 22 May 2020 08:52:26 +0100
Subject: [PATCH 129/134] Fix rubocop-performance brew style.

---
 Library/Homebrew/cask/artifact/abstract_uninstall.rb    | 2 +-
 Library/Homebrew/dev-cmd/audit.rb                       | 2 +-
 Library/Homebrew/help.rb                                | 2 +-
 Library/Homebrew/rubocops/urls.rb                       | 2 +-
 Library/Homebrew/test/cmd/shared_examples/args_parse.rb | 5 +++--
 Library/Homebrew/test/rubocops/patches_spec.rb          | 8 ++++----
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/cask/artifact/abstract_uninstall.rb b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
index 32d958f069..e3f99669ca 100644
--- a/Library/Homebrew/cask/artifact/abstract_uninstall.rb
+++ b/Library/Homebrew/cask/artifact/abstract_uninstall.rb
@@ -89,7 +89,7 @@ module Cask
               args: ["list", service],
               sudo: with_sudo, print_stderr: false
             ).stdout
-            if plist_status.match?(/^\{/)
+            if plist_status.start_with?("{")
               command.run!("/bin/launchctl", args: ["remove", service], sudo: with_sudo)
               sleep 1
             end
diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb
index deec12b9d6..82431558e7 100644
--- a/Library/Homebrew/dev-cmd/audit.rb
+++ b/Library/Homebrew/dev-cmd/audit.rb
@@ -984,7 +984,7 @@ module Homebrew
       except_audits = @except
 
       methods.map(&:to_s).grep(/^audit_/).each do |audit_method_name|
-        name = audit_method_name.gsub(/^audit_/, "")
+        name = audit_method_name.delete_prefix("audit_")
         if only_audits
           next unless only_audits.include?(name)
         elsif except_audits
diff --git a/Library/Homebrew/help.rb b/Library/Homebrew/help.rb
index 7e45247b75..0e41977c72 100644
--- a/Library/Homebrew/help.rb
+++ b/Library/Homebrew/help.rb
@@ -103,7 +103,7 @@ module Homebrew
       help_lines = command_help_lines(path)
       return if help_lines.blank?
 
-      Formatter.wrap(help_lines.join.gsub(/^  /, ""), COMMAND_DESC_WIDTH)
+      Formatter.wrap(help_lines.join.delete_prefix("  "), COMMAND_DESC_WIDTH)
                .sub("@hide_from_man_page ", "")
                .sub(/^\* /, "#{Tty.bold}Usage: brew#{Tty.reset} ")
                .gsub(/`(.*?)`/m, "#{Tty.bold}\\1#{Tty.reset}")
diff --git a/Library/Homebrew/rubocops/urls.rb b/Library/Homebrew/rubocops/urls.rb
index 429f5b8ebd..33c1ded388 100644
--- a/Library/Homebrew/rubocops/urls.rb
+++ b/Library/Homebrew/rubocops/urls.rb
@@ -230,7 +230,7 @@ module RuboCop
           # Use new-style archive downloads
           archive_gh_pattern = %r{https://.*github.*/(?:tar|zip)ball/}
           audit_urls(urls, archive_gh_pattern) do |_, url|
-            next if url.match?(/\.git$/)
+            next if url.end_with?(".git")
 
             problem "Use /archive/ URLs for GitHub tarballs (url is #{url})."
           end
diff --git a/Library/Homebrew/test/cmd/shared_examples/args_parse.rb b/Library/Homebrew/test/cmd/shared_examples/args_parse.rb
index 9cc16d455a..c9e8cc1d80 100644
--- a/Library/Homebrew/test/cmd/shared_examples/args_parse.rb
+++ b/Library/Homebrew/test/cmd/shared_examples/args_parse.rb
@@ -3,11 +3,12 @@
 shared_examples "parseable arguments" do
   subject(:method_name) do |example|
     example.metadata[:example_group][:parent_example_group][:description]
-           .gsub(/^Homebrew\./, "")
+           .delete_prefix("Homebrew.")
   end
 
   let(:command_name) do
-    method_name.gsub(/_args$/, "").tr("_", "-")
+    method_name.delete_suffix("_args")
+               .tr("_", "-")
   end
 
   it "can parse arguments" do
diff --git a/Library/Homebrew/test/rubocops/patches_spec.rb b/Library/Homebrew/test/rubocops/patches_spec.rb
index d2ed6ce03a..f2a0fc25a7 100644
--- a/Library/Homebrew/test/rubocops/patches_spec.rb
+++ b/Library/Homebrew/test/rubocops/patches_spec.rb
@@ -68,7 +68,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
              line:     5,
              column:   33,
              source:   source }]
-        elsif patch_url.match?(%r{^http://trac\.macports\.org})
+        elsif patch_url.start_with?("http://trac.macports.org")
           [{ message:
                        <<~EOS.chomp,
                          Patches from MacPorts Trac should be https://, not http:
@@ -78,7 +78,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
              line:     5,
              column:   5,
              source:   source }]
-        elsif patch_url.match?(%r{^http://bugs\.debian\.org})
+        elsif patch_url.start_with?("http://bugs.debian.org")
           [{ message:
                        <<~EOS.chomp,
                          Patches from Debian should be https://, not http:
@@ -205,7 +205,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
              line:     5,
              column:   37,
              source:   source }]
-        elsif patch_url.match?(%r{^http://trac\.macports\.org})
+        elsif patch_url.start_with?("http://trac.macports.org")
           [{ message:
                        <<~EOS.chomp,
                          Patches from MacPorts Trac should be https://, not http:
@@ -215,7 +215,7 @@ describe RuboCop::Cop::FormulaAudit::Patches do
              line:     5,
              column:   9,
              source:   source }]
-        elsif patch_url.match?(%r{^http://bugs\.debian\.org})
+        elsif patch_url.start_with?("http://bugs.debian.org")
           [{ message:
                        <<~EOS.chomp,
                          Patches from Debian should be https://, not http:

From 61b48d8557042519889860a0f57a66fb233e1d23 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 22 May 2020 14:21:40 +0100
Subject: [PATCH 130/134] formulary: install tap if needed.

This matches what `cask_loader` does and is low risk given we no longer
allow tap pinning.

Fixes #7626
---
 Library/Homebrew/formulary.rb           | 2 ++
 Library/Homebrew/test/formulary_spec.rb | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index b01973fab6..8df05b8287 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -279,6 +279,8 @@ module Formulary
     end
 
     def load_file
+      tap.install unless tap.installed?
+
       super
     rescue MethodDeprecatedError => e
       e.issues_url = tap.issues_url || tap.to_s
diff --git a/Library/Homebrew/test/formulary_spec.rb b/Library/Homebrew/test/formulary_spec.rb
index 157b608050..71c6c610e1 100644
--- a/Library/Homebrew/test/formulary_spec.rb
+++ b/Library/Homebrew/test/formulary_spec.rb
@@ -227,7 +227,8 @@ describe Formulary do
       end
     end
 
-    it "raises an error if the Formula is not available" do
+    it "raises an error if the Formula is not available after tapping" do
+      expect_any_instance_of(Tap).to receive(:install)
       expect {
         described_class.to_rack("a/b/#{formula_name}")
       }.to raise_error(TapFormulaUnavailableError)

From e10ade758d7937b9f713c7d4f1c7c95d2f2b6721 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 22 May 2020 16:19:30 +0100
Subject: [PATCH 131/134] Revert "formulary: install tap if needed."

---
 Library/Homebrew/formulary.rb           | 2 --
 Library/Homebrew/test/formulary_spec.rb | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 8df05b8287..b01973fab6 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -279,8 +279,6 @@ module Formulary
     end
 
     def load_file
-      tap.install unless tap.installed?
-
       super
     rescue MethodDeprecatedError => e
       e.issues_url = tap.issues_url || tap.to_s
diff --git a/Library/Homebrew/test/formulary_spec.rb b/Library/Homebrew/test/formulary_spec.rb
index 71c6c610e1..157b608050 100644
--- a/Library/Homebrew/test/formulary_spec.rb
+++ b/Library/Homebrew/test/formulary_spec.rb
@@ -227,8 +227,7 @@ describe Formulary do
       end
     end
 
-    it "raises an error if the Formula is not available after tapping" do
-      expect_any_instance_of(Tap).to receive(:install)
+    it "raises an error if the Formula is not available" do
       expect {
         described_class.to_rack("a/b/#{formula_name}")
       }.to raise_error(TapFormulaUnavailableError)

From 3d3aef40766aae7ce57b38cf0051a7e1889d4f4a Mon Sep 17 00:00:00 2001
From: Shaun Jackman <sjackman@gmail.com>
Date: Fri, 22 May 2020 11:46:42 -0700
Subject: [PATCH 132/134] docker.yml: Tag homebrew/brew:$brew_version

---
 .github/workflows/docker.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b8db4503fd..c804e66553 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -46,7 +46,11 @@ jobs:
       - name: Deploy the homebrew/brew Docker image to GitHub and Docker Hub
         if: startsWith(github.ref, 'refs/tags/') && matrix.version == '20.04'
         run: |
-            docker tag brew "docker.pkg.github.com/homebrew/brew/brew:latest"
-            docker push "docker.pkg.github.com/homebrew/brew/brew:latest"
-            docker tag brew "homebrew/brew:latest"
-            docker push "homebrew/brew:latest"
+          docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$brew_version"
+          docker push "docker.pkg.github.com/homebrew/brew/brew:$brew_version"
+          docker tag brew "docker.pkg.github.com/homebrew/brew/brew:latest"
+          docker push "docker.pkg.github.com/homebrew/brew/brew:latest"
+          docker tag brew "homebrew/brew:$brew_version"
+          docker push "homebrew/brew:$brew_version"
+          docker tag brew "homebrew/brew:latest"
+          docker push "homebrew/brew:latest"

From 6b06043289bc2907d95ff6dc2f2cc2bb4f280492 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Fri, 22 May 2020 23:26:23 +0100
Subject: [PATCH 133/134] formula_installer: fix pruning of test deps also
 marked as build

---
 Library/Homebrew/formula_installer.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index dbb22c9d55..c6b632ee79 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -456,7 +456,7 @@ class FormulaInstaller
         keep_build_test = false
         keep_build_test ||= runtime_requirements.include?(req)
         keep_build_test ||= req.test? && include_test? && dependent == f
-        keep_build_test ||= req.build? && !install_bottle_for_dependent
+        keep_build_test ||= req.build? && !install_bottle_for_dependent && !dependent.latest_version_installed?
 
         if req.prune_from_option?(build)
           Requirement.prune
@@ -491,14 +491,12 @@ class FormulaInstaller
 
       keep_build_test = false
       keep_build_test ||= dep.test? && include_test? && Homebrew.args.include_formula_test_deps?(dependent)
-      keep_build_test ||= dep.build? && !install_bottle_for?(dependent, build)
+      keep_build_test ||= dep.build? && !install_bottle_for?(dependent, build) && !dependent.latest_version_installed?
 
       if dep.prune_from_option?(build)
         Dependency.prune
       elsif (dep.build? || dep.test?) && !keep_build_test
         Dependency.prune
-      elsif dep.prune_if_build_and_not_dependent?(dependent)
-        Dependency.prune
       elsif dep.satisfied?(inherited_options[dep.name])
         Dependency.skip
       else

From 83fa24741e943e74c68c0eb33531f505a17743be Mon Sep 17 00:00:00 2001
From: Zhiming Wang <i@zhimingwang.org>
Date: Sat, 23 May 2020 14:15:29 +0800
Subject: [PATCH 134/134] bump-formula-pr: fix forking error when formula is
 guessed from url

Regression introduced in f90612ccf0db03681dc6cbf6585cca5bc27b84b1 (#6718).

`tap_full_name` returned from `use_correct_linux_tap` has been
required (`GitHub.create_fork(tap_full_name)`), but it was never set when the
formula is guessed from args.url, resulting in an API request to
https://api.github.com/repos//forks which 404s (note the missing :owner/:repo),
and subsequently

    Error: Unable to fork: Not Found!
---
 Library/Homebrew/dev-cmd/bump-formula-pr.rb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index c08997c8aa..77b64f8832 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -118,12 +118,6 @@ module Homebrew
 
     formula = args.formulae.first
 
-    if formula
-      tap_full_name, origin_branch, previous_branch = use_correct_linux_tap(formula)
-      check_for_duplicate_pull_requests(formula, tap_full_name)
-      checked_for_duplicates = true
-    end
-
     new_url = args.url
     if new_url && !formula
       # Split the new URL on / and find any formulae that have the same URL
@@ -152,7 +146,8 @@ module Homebrew
     end
     raise FormulaUnspecifiedError unless formula
 
-    check_for_duplicate_pull_requests(formula, tap_full_name) unless checked_for_duplicates
+    tap_full_name, origin_branch, previous_branch = use_correct_linux_tap(formula)
+    check_for_duplicate_pull_requests(formula, tap_full_name)
 
     requested_spec, formula_spec = if args.devel?
       devel_message = " (devel)"