From a9ab1699d1da0fab807691a9e652308eb8098dc7 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Fri, 29 Jan 2021 17:08:29 +1100 Subject: [PATCH 01/59] xcode: update for Xcode 12.4 --- Library/Homebrew/os/mac/xcode.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 4a3e729fe8..9a5f765800 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -20,10 +20,10 @@ module OS # This may be a beta version for a beta macOS. sig { returns(String) } def latest_version - latest_stable = "12.3" + latest_stable = "12.4" case MacOS.version when "11" then latest_stable - when "10.15" then "12.3" + when "10.15" then "12.4" when "10.14" then "11.3.1" when "10.13" then "10.1" when "10.12" then "9.2" @@ -280,7 +280,7 @@ module OS sig { returns(String) } def latest_clang_version case MacOS.version - when "11", "10.15" then "1200.0.32.27" + when "11", "10.15" then "1200.0.32.29" when "10.14" then "1100.0.33.17" when "10.13" then "1000.10.44.2" when "10.12" then "900.0.39.2" From 7dd69d2c94ed801285a164439f3fcbf17a2a6894 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Tue, 2 Feb 2021 17:33:54 +0000 Subject: [PATCH 02/59] cmd/--prefix: ignore shared-mime-info and mactex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The shared-mime-info formula and the mactex cask currently install into locations that are picked up by `brew --prefix --unbrewed`. This leads to a very large number of files being found. Before: ``` ❯ brew --prefix --unbrewed | wc -l 206735 ``` After ``` ❯ brew --prefix --unbrewed | wc -l 3 ``` --- Library/Homebrew/cmd/--prefix.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/cmd/--prefix.rb b/Library/Homebrew/cmd/--prefix.rb index 8d97ca3c0f..90c6bbe36b 100644 --- a/Library/Homebrew/cmd/--prefix.rb +++ b/Library/Homebrew/cmd/--prefix.rb @@ -88,6 +88,8 @@ module Homebrew share/pypy3/* share/info/dir share/man/whatis + share/mime/* + texlive/* ].freeze def list_unbrewed From dbf65770aff73b4d3af26f71214f228a8180e92b Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 3 Feb 2021 13:31:24 +0000 Subject: [PATCH 03/59] cmd/update-report: output to stderr when not a TTY. Otherwise things like `$(brew bundle list --formula)` become a bit useless as they can auto-update and then will always fail. --- Library/Homebrew/cmd/update-report.rb | 70 ++++++++++++++++++--------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index b86f0adecb..0ddf162d1e 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -15,9 +15,25 @@ module Homebrew module_function + def ohai_stdout_or_stderr(message) + if $stdout.tty? + ohai(message) + else + $stderr.puts(ohai_title(message)) + end + end + + def puts_stdout_or_stderr(message) + if $stdout.tty? + puts(message) + else + $stderr.puts(message) + end + end + def update_preinstall_header(args:) @update_preinstall_header ||= begin - ohai "Auto-updated Homebrew!" if args.preinstall? + ohai_stdout_or_stderr "Auto-updated Homebrew!" if args.preinstall? true end end @@ -50,8 +66,8 @@ module Homebrew print "\a" # Use an extra newline and bold to avoid this being missed. - ohai "Homebrew has enabled anonymous aggregate formula and cask analytics." - puts <<~EOS + ohai_stdout_or_stderr "Homebrew has enabled anonymous aggregate formula and cask analytics." + puts_stdout_or_stderr <<~EOS #{Tty.bold}Read the analytics documentation (and how to opt-out) here: #{Formatter.url("https://docs.brew.sh/Analytics")}#{Tty.reset} No analytics have been recorded yet (nor will be during this `brew` run). @@ -63,8 +79,8 @@ module Homebrew end if Settings.read("donationmessage") != "true" && !args.quiet? - ohai "Homebrew is run entirely by unpaid volunteers. Please consider donating:" - puts " #{Formatter.url("https://github.com/Homebrew/brew#donations")}\n" + ohai_stdout_or_stderr "Homebrew is run entirely by unpaid volunteers. Please consider donating:" + puts_stdout_or_stderr " #{Formatter.url("https://github.com/Homebrew/brew#donations")}\n" # Consider the message possibly missed if not a TTY. Settings.write "donationmessage", true if $stdout.tty? @@ -81,7 +97,8 @@ module Homebrew if initial_revision != current_revision update_preinstall_header args: args - puts "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." + puts_stdout_or_stderr \ + "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." updated = true old_tag = Settings.read "latesttag" @@ -119,13 +136,14 @@ module Homebrew unless updated_taps.empty? update_preinstall_header args: args - puts "Updated #{updated_taps.count} #{"tap".pluralize(updated_taps.count)} (#{updated_taps.to_sentence})." + puts_stdout_or_stderr \ + "Updated #{updated_taps.count} #{"tap".pluralize(updated_taps.count)} (#{updated_taps.to_sentence})." updated = true end if updated if hub.empty? - puts "No changes to formulae." unless args.quiet? + puts_stdout_or_stderr "No changes to formulae." unless args.quiet? else hub.dump(updated_formula_report: !args.preinstall?) hub.reporters.each(&:migrate_tap_migration) @@ -137,7 +155,7 @@ module Homebrew end puts if args.preinstall? elsif !args.preinstall? && !ENV["HOMEBREW_UPDATE_FAILED"] - puts "Already up-to-date." unless args.quiet? + puts_stdout_or_stderr "Already up-to-date." unless args.quiet? end Commands.rebuild_commands_completion_list @@ -148,8 +166,8 @@ module Homebrew if failed_fetch_dirs.present? failed_fetch_taps = failed_fetch_dirs.map { |dir| Tap.from_path(dir) } - puts Formatter.headline "Some taps failed to update!", color: :red - puts <<~EOS + ofail <<~EOS + Some taps failed to update! The following taps can not read their remote branches: #{failed_fetch_taps.join("\n ")} This is happening because the remote branch was renamed or deleted. @@ -159,14 +177,14 @@ module Homebrew return if new_repository_version.blank? - ohai "Homebrew was updated to version #{new_repository_version}" + ohai_stdout_or_stderr "Homebrew was updated to version #{new_repository_version}" if new_repository_version.split(".").last == "0" - puts <<~EOS + puts_stdout_or_stderr <<~EOS More detailed release notes are available on the Homebrew Blog: #{Formatter.url("https://brew.sh/blog/#{new_repository_version}")} EOS else - puts <<~EOS + puts_stdout_or_stderr <<~EOS The changelog can be found at: #{Formatter.url("https://github.com/Homebrew/brew/releases/tag/#{new_repository_version}")} EOS @@ -355,13 +373,13 @@ class Reporter new_tap = Tap.fetch(new_tap_name) new_tap.install unless new_tap.installed? - ohai "#{name} has been moved to Homebrew.", <<~EOS + ohai_stdout_or_stderr "#{name} has been moved to Homebrew.", <<~EOS To uninstall the cask, run: brew uninstall --cask --force #{name} EOS next if (HOMEBREW_CELLAR/new_name.split("/").last).directory? - ohai "Installing #{new_name}..." + ohai_stdout_or_stderr "Installing #{new_name}..." system HOMEBREW_BREW_FILE, "install", new_full_name begin unless Formulary.factory(new_full_name).keg_only? @@ -382,12 +400,12 @@ class Reporter # For formulae migrated to cask: Auto-install cask or provide install instructions. if new_tap_name.start_with?("homebrew/cask") if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory? - ohai "#{name} has been moved to Homebrew Cask." - ohai "brew unlink #{name}" + ohai_stdout_or_stderr "#{name} has been moved to Homebrew Cask." + ohai_stdout_or_stderr "brew unlink #{name}" system HOMEBREW_BREW_FILE, "unlink", name - ohai "brew cleanup" + ohai_stdout_or_stderr "brew cleanup" system HOMEBREW_BREW_FILE, "cleanup" - ohai "brew install --cask #{new_name}" + ohai_stdout_or_stderr "brew install --cask #{new_name}" system HOMEBREW_BREW_FILE, "install", "--cask", new_name ohai <<~EOS #{name} has been moved to Homebrew Cask. @@ -396,7 +414,7 @@ class Reporter brew uninstall --force #{name} EOS else - ohai "#{name} has been moved to Homebrew Cask.", <<~EOS + ohai_stdout_or_stderr "#{name} has been moved to Homebrew Cask.", <<~EOS To uninstall the formula and install the cask, run: brew uninstall --force #{name} brew tap #{new_tap_name} @@ -483,7 +501,10 @@ class ReporterHub dump_formula_report :M, "Updated Formulae" else updated = select_formula(:M).count - ohai "Updated Formulae", "Updated #{updated} #{"formula".pluralize(updated)}." if updated.positive? + if updated.positive? + ohai_stdout_or_stderr "Updated Formulae", + "Updated #{updated} #{"formula".pluralize(updated)}." + end end dump_formula_report :R, "Renamed Formulae" dump_formula_report :D, "Deleted Formulae" @@ -492,7 +513,10 @@ class ReporterHub dump_formula_report :MC, "Updated Casks" else updated = select_formula(:MC).count - ohai "Updated Casks", "Updated #{updated} #{"cask".pluralize(updated)}." if updated.positive? + if updated.positive? + ohai_stdout_or_stderr "Updated Casks", + "Updated #{updated} #{"cask".pluralize(updated)}." + end end dump_formula_report :DC, "Deleted Casks" end From 6de5de788b82a21b98423d2c348c8df018894b5d Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Wed, 3 Feb 2021 10:12:36 -0500 Subject: [PATCH 04/59] formula_auditor: skip archived audits if disabled --- Library/Homebrew/formula_auditor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index 3e7745e498..761d921710 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -399,7 +399,7 @@ module Homebrew end def audit_github_repository_archived - return if formula.deprecated? + return if formula.deprecated? || formula.disabled? user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if @online return if user.blank? @@ -411,7 +411,7 @@ module Homebrew end def audit_gitlab_repository_archived - return if formula.deprecated? + return if formula.deprecated? || formula.disabled? user, repo = get_repo_data(%r{https?://gitlab\.com/([^/]+)/([^/]+)/?.*}) if @online return if user.blank? From 824b38102e031cab2595b426bbec81e265b980aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 06:01:35 +0000 Subject: [PATCH 05/59] build(deps): bump sorbet from 0.5.6262 to 0.5.6267 in /Library/Homebrew Bumps [sorbet](https://github.com/sorbet/sorbet) from 0.5.6262 to 0.5.6267. - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) Signed-off-by: dependabot[bot] --- 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 21073312a0..b7225f84fd 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -139,11 +139,11 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - sorbet (0.5.6262) - sorbet-static (= 0.5.6262) + sorbet (0.5.6267) + sorbet-static (= 0.5.6267) sorbet-runtime (0.5.6262) sorbet-runtime-stub (0.2.0) - sorbet-static (0.5.6262-universal-darwin-14) + sorbet-static (0.5.6267-universal-darwin-14) spoom (1.0.7) colorize sorbet (~> 0.5.5) From 902e00968cf9cae9d836219123ecc9a0739c5db3 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 4 Feb 2021 06:06:21 +0000 Subject: [PATCH 06/59] brew vendor-gems: commit updates. --- Library/Homebrew/Gemfile.lock | 2 +- Library/Homebrew/vendor/bundle/bundler/setup.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index b7225f84fd..7f75fec56a 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -141,7 +141,7 @@ GEM simplecov_json_formatter (0.1.2) sorbet (0.5.6267) sorbet-static (= 0.5.6267) - sorbet-runtime (0.5.6262) + sorbet-runtime (0.5.6267) sorbet-runtime-stub (0.2.0) sorbet-static (0.5.6267-universal-darwin-14) spoom (1.0.7) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index e7244827b6..1f79811022 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -55,7 +55,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.20.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-3.4.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-3.0.0.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-runtime-0.5.6262/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-runtime-0.5.6267/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parlour-5.0.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/patchelf-1.3.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.6.0/lib" @@ -74,8 +74,8 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.10.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-github-2.3.1/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/sorbet-static-0.5.6262-universal-darwin-14/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.6262/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-static-0.5.6267-universal-darwin-14/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.6267/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-sorbet-1.8.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-ast-1.4.1/lib" From 7347534306c9a6fdd9375dfdf190d174d49ec88f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 4 Feb 2021 08:52:15 +0000 Subject: [PATCH 07/59] workflows/vendor-gems: disable for pull requests. --- .github/workflows/vendor-gems.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/vendor-gems.yml b/.github/workflows/vendor-gems.yml index 81c3b9b892..2e3fef6b15 100644 --- a/.github/workflows/vendor-gems.yml +++ b/.github/workflows/vendor-gems.yml @@ -1,7 +1,6 @@ name: Vendor Gems on: - pull_request_target: workflow_dispatch: inputs: pull_request: From 2de172e050ac1c1f7ff27e3430820d4922bf50c7 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Thu, 4 Feb 2021 11:04:57 +0000 Subject: [PATCH 08/59] rubocops/bottle: disable bottle order check This is causing CI failures at homebrew/core [1], so let's disable this for now. [1] https://github.com/Homebrew/homebrew-core/commit/01b6830646c216a80e4747154963942626ce4cbe --- Library/Homebrew/rubocops/bottle.rb | 18 +- .../test/rubocops/bottle/bottle_order_spec.rb | 212 +++++++++--------- 2 files changed, 115 insertions(+), 115 deletions(-) diff --git a/Library/Homebrew/rubocops/bottle.rb b/Library/Homebrew/rubocops/bottle.rb index e1e4cd01c5..2e409eeef6 100644 --- a/Library/Homebrew/rubocops/bottle.rb +++ b/Library/Homebrew/rubocops/bottle.rb @@ -167,15 +167,15 @@ module RuboCop return if sha256_order(sha256_nodes) == sha256_order(arm64_nodes + intel_nodes) - offending_node(bottle_node) - problem "ARM bottles should be listed before Intel bottles" do |corrector| - lines = ["bottle do"] - lines += non_sha256_nodes.map { |node| " #{node.source}" } - lines += arm64_nodes.map { |node| " #{node.source}" } - lines += intel_nodes.map { |node| " #{node.source}" } - lines << " end" - corrector.replace(bottle_node.source_range, lines.join("\n")) - end + # offending_node(bottle_node) + # problem "ARM bottles should be listed before Intel bottles" do |corrector| + # lines = ["bottle do"] + # lines += non_sha256_nodes.map { |node| " #{node.source}" } + # lines += arm64_nodes.map { |node| " #{node.source}" } + # lines += intel_nodes.map { |node| " #{node.source}" } + # lines << " end" + # corrector.replace(bottle_node.source_range, lines.join("\n")) + # end end def sha256_order(nodes) diff --git a/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb b/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb index 356a6ac48e..1ee35ab706 100644 --- a/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb +++ b/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb @@ -116,125 +116,125 @@ describe RuboCop::Cop::FormulaAudit::BottleOrder do RUBY end - it "reports and corrects arm bottles below intel bottles" do - expect_offense(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # it "reports and corrects arm bottles below intel bottles" do + # expect_offense(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - ^^^^^^^^^ ARM bottles should be listed before Intel bottles - rebuild 4 - sha256 big_sur: "faceb00c" - sha256 catalina: "deadbeef" - sha256 arm64_big_sur: "aaaaaaaa" - end - end - RUBY + # bottle do + # ^^^^^^^^^ ARM bottles should be listed before Intel bottles + # rebuild 4 + # sha256 big_sur: "faceb00c" + # sha256 catalina: "deadbeef" + # sha256 arm64_big_sur: "aaaaaaaa" + # end + # end + # RUBY - expect_correction(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # expect_correction(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - rebuild 4 - sha256 arm64_big_sur: "aaaaaaaa" - sha256 big_sur: "faceb00c" - sha256 catalina: "deadbeef" - end - end - RUBY - end + # bottle do + # rebuild 4 + # sha256 arm64_big_sur: "aaaaaaaa" + # sha256 big_sur: "faceb00c" + # sha256 catalina: "deadbeef" + # end + # end + # RUBY + # end - it "reports and corrects multiple arm bottles below intel bottles" do - expect_offense(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # it "reports and corrects multiple arm bottles below intel bottles" do + # expect_offense(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - ^^^^^^^^^ ARM bottles should be listed before Intel bottles - rebuild 4 - sha256 big_sur: "faceb00c" - sha256 arm64_catalina: "aaaaaaaa" - sha256 catalina: "deadbeef" - sha256 arm64_big_sur: "aaaaaaaa" - end - end - RUBY + # bottle do + # ^^^^^^^^^ ARM bottles should be listed before Intel bottles + # rebuild 4 + # sha256 big_sur: "faceb00c" + # sha256 arm64_catalina: "aaaaaaaa" + # sha256 catalina: "deadbeef" + # sha256 arm64_big_sur: "aaaaaaaa" + # end + # end + # RUBY - expect_correction(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # expect_correction(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - rebuild 4 - sha256 arm64_catalina: "aaaaaaaa" - sha256 arm64_big_sur: "aaaaaaaa" - sha256 big_sur: "faceb00c" - sha256 catalina: "deadbeef" - end - end - RUBY - end + # bottle do + # rebuild 4 + # sha256 arm64_catalina: "aaaaaaaa" + # sha256 arm64_big_sur: "aaaaaaaa" + # sha256 big_sur: "faceb00c" + # sha256 catalina: "deadbeef" + # end + # end + # RUBY + # end - it "reports and corrects arm bottles with cellars below intel bottles" do - expect_offense(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # it "reports and corrects arm bottles with cellars below intel bottles" do + # expect_offense(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - ^^^^^^^^^ ARM bottles should be listed before Intel bottles - rebuild 4 - sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" - sha256 catalina: "deadbeef" - sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" - sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" - end - end - RUBY + # bottle do + # ^^^^^^^^^ ARM bottles should be listed before Intel bottles + # rebuild 4 + # sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" + # sha256 catalina: "deadbeef" + # sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" + # sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" + # end + # end + # RUBY - expect_correction(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # expect_correction(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - rebuild 4 - sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" - sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" - sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" - sha256 catalina: "deadbeef" - end - end - RUBY - end + # bottle do + # rebuild 4 + # sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" + # sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" + # sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" + # sha256 catalina: "deadbeef" + # end + # end + # RUBY + # end - it "reports and corrects arm bottles below intel bottles with old bottle syntax" do - expect_offense(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # it "reports and corrects arm bottles below intel bottles with old bottle syntax" do + # expect_offense(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - ^^^^^^^^^ ARM bottles should be listed before Intel bottles - cellar :any - sha256 "faceb00c" => :big_sur - sha256 "aaaaaaaa" => :arm64_big_sur - sha256 "aaaaaaaa" => :arm64_catalina - sha256 "deadbeef" => :catalina - end - end - RUBY + # bottle do + # ^^^^^^^^^ ARM bottles should be listed before Intel bottles + # cellar :any + # sha256 "faceb00c" => :big_sur + # sha256 "aaaaaaaa" => :arm64_big_sur + # sha256 "aaaaaaaa" => :arm64_catalina + # sha256 "deadbeef" => :catalina + # end + # end + # RUBY - expect_correction(<<~RUBY) - class Foo < Formula - url "https://brew.sh/foo-1.0.tgz" + # expect_correction(<<~RUBY) + # class Foo < Formula + # url "https://brew.sh/foo-1.0.tgz" - bottle do - cellar :any - sha256 "aaaaaaaa" => :arm64_big_sur - sha256 "aaaaaaaa" => :arm64_catalina - sha256 "faceb00c" => :big_sur - sha256 "deadbeef" => :catalina - end - end - RUBY - end + # bottle do + # cellar :any + # sha256 "aaaaaaaa" => :arm64_big_sur + # sha256 "aaaaaaaa" => :arm64_catalina + # sha256 "faceb00c" => :big_sur + # sha256 "deadbeef" => :catalina + # end + # end + # RUBY + # end end From a90fb27adb42655191b90fdc42acae364fde81de Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Thu, 4 Feb 2021 18:36:32 +0100 Subject: [PATCH 09/59] untap: add missing --force switch --- Library/Homebrew/cmd/untap.rb | 2 ++ completions/bash/brew | 1 + completions/fish/brew.fish | 1 + completions/zsh/_brew | 1 + docs/Manpage.md | 5 ++++- manpages/brew.1 | 6 +++++- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb index 33f56c4ba8..888d768e47 100644 --- a/Library/Homebrew/cmd/untap.rb +++ b/Library/Homebrew/cmd/untap.rb @@ -14,6 +14,8 @@ module Homebrew description <<~EOS Remove a tapped formula repository. EOS + switch "-f", "--force", + description: "Untap even if formulae or casks from this tap are currently installed." named_args :tap, min: 1 end diff --git a/completions/bash/brew b/completions/bash/brew index 9ea9ef0932..71098288b9 100644 --- a/completions/bash/brew +++ b/completions/bash/brew @@ -2047,6 +2047,7 @@ _brew_untap() { -*) __brewcomp " --debug + --force --help --quiet --verbose diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 680a138e54..8ff4e3174e 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -1406,6 +1406,7 @@ __fish_brew_complete_arg 'unpin' -a '(__fish_brew_suggest_formulae_installed)' __fish_brew_complete_cmd 'untap' 'Remove a tapped formula repository' __fish_brew_complete_arg 'untap' -l debug -d 'Display any debugging information' +__fish_brew_complete_arg 'untap' -l force -d 'Untap even if formulae or casks from this tap are currently installed' __fish_brew_complete_arg 'untap' -l help -d 'Show this message' __fish_brew_complete_arg 'untap' -l quiet -d 'Make some output more quiet' __fish_brew_complete_arg 'untap' -l verbose -d 'Make some output more verbose' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 1b020e171f..7792c24eed 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -1638,6 +1638,7 @@ _brew_unpin() { _brew_untap() { _arguments \ '--debug[Display any debugging information]' \ + '--force[Untap even if formulae or casks from this tap are currently installed]' \ '--help[Show this message]' \ '--quiet[Make some output more quiet]' \ '--verbose[Make some output more verbose]' \ diff --git a/docs/Manpage.md b/docs/Manpage.md index 5952adac90..2581d00e34 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -590,10 +590,13 @@ for temporarily disabling a formula: Unpin *`formula`*, allowing them to be upgraded by `brew upgrade` *`formula`*. See also `pin`. -### `untap` *`tap`* [...] +### `untap` [*`--force`*] *`tap`* [...] Remove a tapped formula repository. +* `-f`, `--force`: + Untap even if formulae or casks from this tap are currently installed. + ### `update` [*`options`*] Fetch the newest version of Homebrew and all formulae from GitHub using `git`(1) and perform any necessary migrations. diff --git a/manpages/brew.1 b/manpages/brew.1 index edcc929dd2..81c06baee8 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -793,9 +793,13 @@ List files which would be unlinked without actually unlinking or deleting any fi .SS "\fBunpin\fR \fIinstalled_formula\fR [\.\.\.]" Unpin \fIformula\fR, allowing them to be upgraded by \fBbrew upgrade\fR \fIformula\fR\. See also \fBpin\fR\. . -.SS "\fBuntap\fR \fItap\fR [\.\.\.]" +.SS "\fBuntap\fR [\fI\-\-force\fR] \fItap\fR [\.\.\.]" Remove a tapped formula repository\. . +.TP +\fB\-f\fR, \fB\-\-force\fR +Untap even if formulae or casks from this tap are currently installed\. +. .SS "\fBupdate\fR [\fIoptions\fR]" Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1) and perform any necessary migrations\. . From 703d59b521b4e0b0569f2d14ff8d01d94c94f647 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:41:29 -0500 Subject: [PATCH 10/59] livecheck: check stable before head by default --- Library/Homebrew/livecheck/livecheck.rb | 2 +- Library/Homebrew/test/livecheck/livecheck_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index 83b7a78961..4ff07d864b 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -352,11 +352,11 @@ module Homebrew case formula_or_cask when Formula - urls << formula_or_cask.head.url if formula_or_cask.head if formula_or_cask.stable urls << formula_or_cask.stable.url urls.concat(formula_or_cask.stable.mirrors) end + urls << formula_or_cask.head.url if formula_or_cask.head urls << formula_or_cask.homepage if formula_or_cask.homepage when Cask::Cask urls << formula_or_cask.appcast.to_s if formula_or_cask.appcast diff --git a/Library/Homebrew/test/livecheck/livecheck_spec.rb b/Library/Homebrew/test/livecheck/livecheck_spec.rb index 13f3f3593c..3b5df88553 100644 --- a/Library/Homebrew/test/livecheck/livecheck_spec.rb +++ b/Library/Homebrew/test/livecheck/livecheck_spec.rb @@ -133,7 +133,7 @@ describe Homebrew::Livecheck do describe "::checkable_urls" do it "returns the list of URLs to check" do - expect(livecheck.checkable_urls(f)).to eq([head_url, stable_url, homepage_url]) + expect(livecheck.checkable_urls(f)).to eq([stable_url, head_url, homepage_url]) expect(livecheck.checkable_urls(c)).to eq([cask_url, homepage_url]) end end From 3dccea251fd03fd35626de1654ab0e930ae6c53d Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Thu, 4 Feb 2021 13:30:16 -0500 Subject: [PATCH 11/59] bottle: write bottles in correct order --- Library/Homebrew/software_spec.rb | 5 +- Library/Homebrew/test/dev-cmd/bottle_spec.rb | 86 +++++++++++++------- 2 files changed, 62 insertions(+), 29 deletions(-) diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 0492c08c89..83c7e36de9 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -435,7 +435,10 @@ class BottleSpecification def checksums tags = collector.keys.sort_by do |tag| - "#{OS::Mac::Version.from_symbol(tag)}_#{tag}" + version = OS::Mac::Version.from_symbol(tag) + # Give arm64 bottles a higher priority so they are first + priority = version.arch == :arm64 ? "2" : "1" + "#{priority}.#{version}_#{tag}" rescue MacOSVersionError # Sort non-MacOS tags below MacOS tags. "0.#{tag}" diff --git a/Library/Homebrew/test/dev-cmd/bottle_spec.rb b/Library/Homebrew/test/dev-cmd/bottle_spec.rb index 9b0c8a523b..f349b40952 100644 --- a/Library/Homebrew/test/dev-cmd/bottle_spec.rb +++ b/Library/Homebrew/test/dev-cmd/bottle_spec.rb @@ -50,6 +50,17 @@ describe "brew bottle" do end before do + Pathname("#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json").write stub_hash( + name: "testball", + version: "1.0", + path: "#{core_tap.path}/Formula/testball.rb", + cellar: "any_skip_relocation", + os: "arm64_big_sur", + filename: "testball-1.0.arm64_big_sur.bottle.tar.gz", + local_filename: "testball--1.0.arm64_big_sur.bottle.tar.gz", + sha256: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149", + ) + Pathname("#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json").write stub_hash( name: "testball", version: "1.0", @@ -74,6 +85,7 @@ describe "brew bottle" do end after do + FileUtils.rm_f "#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json" FileUtils.rm_f "#{TEST_TMPDIR}/testball-1.0.catalina.bottle.json" FileUtils.rm_f "#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json" end @@ -90,14 +102,16 @@ describe "brew bottle" do brew "bottle", "--merge", "--write", + "#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.catalina.bottle.json" }.to output(<<~EOS).to_stdout ==> testball bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" end EOS @@ -110,8 +124,9 @@ describe "brew bottle" do bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" end option "with-foo", "Build with foo" @@ -141,8 +156,9 @@ describe "brew bottle" do bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" cellar :any_skip_relocation - sha256 big_sur: "6b276491297d4052538bd2fd22d5129389f27d90a98f831987236a5b90511b98" - sha256 catalina: "16cf230afdfcb6306c208d169549cf8773c831c8653d2c852315a048960d7e72" + sha256 "6b276491297d4052538bd2fd22d5129389f27d90a98f831987236a5b90511b98" => :big_sur + sha256 "c3c650d75f5188f5d6edd351dd3215e141b73b8ec1cf9144f30e39cbc45de72e" => :arm64_big_sur + sha256 "16cf230afdfcb6306c208d169549cf8773c831c8653d2c852315a048960d7e72" => :catalina end EOS system "git", "add", "--all" @@ -153,14 +169,16 @@ describe "brew bottle" do brew "bottle", "--merge", "--write", + "#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.catalina.bottle.json" }.to output(<<~EOS).to_stdout ==> testball bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" end EOS @@ -175,8 +193,9 @@ describe "brew bottle" do bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" end def install @@ -203,8 +222,9 @@ describe "brew bottle" do bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "6b276491297d4052538bd2fd22d5129389f27d90a98f831987236a5b90511b98" - sha256 cellar: :any_skip_relocation, catalina: "16cf230afdfcb6306c208d169549cf8773c831c8653d2c852315a048960d7e72" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "c3c650d75f5188f5d6edd351dd3215e141b73b8ec1cf9144f30e39cbc45de72e" + sha256 cellar: :any_skip_relocation, big_sur: "6b276491297d4052538bd2fd22d5129389f27d90a98f831987236a5b90511b98" + sha256 cellar: :any_skip_relocation, catalina: "16cf230afdfcb6306c208d169549cf8773c831c8653d2c852315a048960d7e72" end EOS system "git", "add", "--all" @@ -215,14 +235,16 @@ describe "brew bottle" do brew "bottle", "--merge", "--write", + "#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.catalina.bottle.json" }.to output(<<~EOS).to_stdout ==> testball bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" end EOS @@ -237,8 +259,9 @@ describe "brew bottle" do bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" end def install @@ -271,6 +294,7 @@ describe "brew bottle" do "--merge", "--write", "--keep-old", + "#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.catalina.bottle.json" }.to output("Error: `--keep-old` was passed but there was no existing bottle block!\n").to_stderr @@ -296,15 +320,17 @@ describe "brew bottle" do "--merge", "--write", "--keep-old", + "#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.catalina.bottle.json" }.to output(<<~EOS).to_stdout ==> testball bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" - sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" end EOS @@ -319,9 +345,10 @@ describe "brew bottle" do bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" - sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" end def install @@ -360,15 +387,17 @@ describe "brew bottle" do "--merge", "--write", "--keep-old", + "#{TEST_TMPDIR}/testball-1.0.arm64_big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.big_sur.bottle.json", "#{TEST_TMPDIR}/testball-1.0.catalina.bottle.json" }.to output(<<~EOS).to_stdout ==> testball bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" - sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" end EOS @@ -383,9 +412,10 @@ describe "brew bottle" do bottle do root_url "#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}" - sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" - sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" - sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "8f9aecd233463da6a4ea55f5f88fc5841718c013f3e2a7941350d6130f1dc149" + sha256 cellar: :any_skip_relocation, big_sur: "a0af7dcbb5c83f6f3f7ecd507c2d352c1a018f894d51ad241ce8492fa598010f" + sha256 cellar: :any_skip_relocation, catalina: "5334dd344986e46b2aa4f0471cac7b0914bd7de7cb890a34415771788d03f2ac" + sha256 cellar: :any, high_sierra: "6971b6eebf4c00eaaed72a1104a49be63861eabc95d679a0c84040398e320059" end def install From 5f57601fd8c55c14353e1c81b8a051fededee75b Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Thu, 4 Feb 2021 13:34:37 -0500 Subject: [PATCH 12/59] style: re-enable bottle order cop --- Library/Homebrew/rubocops/bottle.rb | 18 +- .../test/rubocops/bottle/bottle_order_spec.rb | 212 +++++++++--------- 2 files changed, 115 insertions(+), 115 deletions(-) diff --git a/Library/Homebrew/rubocops/bottle.rb b/Library/Homebrew/rubocops/bottle.rb index 2e409eeef6..e1e4cd01c5 100644 --- a/Library/Homebrew/rubocops/bottle.rb +++ b/Library/Homebrew/rubocops/bottle.rb @@ -167,15 +167,15 @@ module RuboCop return if sha256_order(sha256_nodes) == sha256_order(arm64_nodes + intel_nodes) - # offending_node(bottle_node) - # problem "ARM bottles should be listed before Intel bottles" do |corrector| - # lines = ["bottle do"] - # lines += non_sha256_nodes.map { |node| " #{node.source}" } - # lines += arm64_nodes.map { |node| " #{node.source}" } - # lines += intel_nodes.map { |node| " #{node.source}" } - # lines << " end" - # corrector.replace(bottle_node.source_range, lines.join("\n")) - # end + offending_node(bottle_node) + problem "ARM bottles should be listed before Intel bottles" do |corrector| + lines = ["bottle do"] + lines += non_sha256_nodes.map { |node| " #{node.source}" } + lines += arm64_nodes.map { |node| " #{node.source}" } + lines += intel_nodes.map { |node| " #{node.source}" } + lines << " end" + corrector.replace(bottle_node.source_range, lines.join("\n")) + end end def sha256_order(nodes) diff --git a/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb b/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb index 1ee35ab706..356a6ac48e 100644 --- a/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb +++ b/Library/Homebrew/test/rubocops/bottle/bottle_order_spec.rb @@ -116,125 +116,125 @@ describe RuboCop::Cop::FormulaAudit::BottleOrder do RUBY end - # it "reports and corrects arm bottles below intel bottles" do - # expect_offense(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + it "reports and corrects arm bottles below intel bottles" do + expect_offense(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # ^^^^^^^^^ ARM bottles should be listed before Intel bottles - # rebuild 4 - # sha256 big_sur: "faceb00c" - # sha256 catalina: "deadbeef" - # sha256 arm64_big_sur: "aaaaaaaa" - # end - # end - # RUBY + bottle do + ^^^^^^^^^ ARM bottles should be listed before Intel bottles + rebuild 4 + sha256 big_sur: "faceb00c" + sha256 catalina: "deadbeef" + sha256 arm64_big_sur: "aaaaaaaa" + end + end + RUBY - # expect_correction(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + expect_correction(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # rebuild 4 - # sha256 arm64_big_sur: "aaaaaaaa" - # sha256 big_sur: "faceb00c" - # sha256 catalina: "deadbeef" - # end - # end - # RUBY - # end + bottle do + rebuild 4 + sha256 arm64_big_sur: "aaaaaaaa" + sha256 big_sur: "faceb00c" + sha256 catalina: "deadbeef" + end + end + RUBY + end - # it "reports and corrects multiple arm bottles below intel bottles" do - # expect_offense(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + it "reports and corrects multiple arm bottles below intel bottles" do + expect_offense(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # ^^^^^^^^^ ARM bottles should be listed before Intel bottles - # rebuild 4 - # sha256 big_sur: "faceb00c" - # sha256 arm64_catalina: "aaaaaaaa" - # sha256 catalina: "deadbeef" - # sha256 arm64_big_sur: "aaaaaaaa" - # end - # end - # RUBY + bottle do + ^^^^^^^^^ ARM bottles should be listed before Intel bottles + rebuild 4 + sha256 big_sur: "faceb00c" + sha256 arm64_catalina: "aaaaaaaa" + sha256 catalina: "deadbeef" + sha256 arm64_big_sur: "aaaaaaaa" + end + end + RUBY - # expect_correction(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + expect_correction(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # rebuild 4 - # sha256 arm64_catalina: "aaaaaaaa" - # sha256 arm64_big_sur: "aaaaaaaa" - # sha256 big_sur: "faceb00c" - # sha256 catalina: "deadbeef" - # end - # end - # RUBY - # end + bottle do + rebuild 4 + sha256 arm64_catalina: "aaaaaaaa" + sha256 arm64_big_sur: "aaaaaaaa" + sha256 big_sur: "faceb00c" + sha256 catalina: "deadbeef" + end + end + RUBY + end - # it "reports and corrects arm bottles with cellars below intel bottles" do - # expect_offense(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + it "reports and corrects arm bottles with cellars below intel bottles" do + expect_offense(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # ^^^^^^^^^ ARM bottles should be listed before Intel bottles - # rebuild 4 - # sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" - # sha256 catalina: "deadbeef" - # sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" - # sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" - # end - # end - # RUBY + bottle do + ^^^^^^^^^ ARM bottles should be listed before Intel bottles + rebuild 4 + sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" + sha256 catalina: "deadbeef" + sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" + sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" + end + end + RUBY - # expect_correction(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + expect_correction(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # rebuild 4 - # sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" - # sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" - # sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" - # sha256 catalina: "deadbeef" - # end - # end - # RUBY - # end + bottle do + rebuild 4 + sha256 cellar: :any, arm64_big_sur: "aaaaaaaa" + sha256 cellar: :any_skip_relocation, arm64_catalina: "aaaaaaaa" + sha256 cellar: "/usr/local/Cellar", big_sur: "faceb00c" + sha256 catalina: "deadbeef" + end + end + RUBY + end - # it "reports and corrects arm bottles below intel bottles with old bottle syntax" do - # expect_offense(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + it "reports and corrects arm bottles below intel bottles with old bottle syntax" do + expect_offense(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # ^^^^^^^^^ ARM bottles should be listed before Intel bottles - # cellar :any - # sha256 "faceb00c" => :big_sur - # sha256 "aaaaaaaa" => :arm64_big_sur - # sha256 "aaaaaaaa" => :arm64_catalina - # sha256 "deadbeef" => :catalina - # end - # end - # RUBY + bottle do + ^^^^^^^^^ ARM bottles should be listed before Intel bottles + cellar :any + sha256 "faceb00c" => :big_sur + sha256 "aaaaaaaa" => :arm64_big_sur + sha256 "aaaaaaaa" => :arm64_catalina + sha256 "deadbeef" => :catalina + end + end + RUBY - # expect_correction(<<~RUBY) - # class Foo < Formula - # url "https://brew.sh/foo-1.0.tgz" + expect_correction(<<~RUBY) + class Foo < Formula + url "https://brew.sh/foo-1.0.tgz" - # bottle do - # cellar :any - # sha256 "aaaaaaaa" => :arm64_big_sur - # sha256 "aaaaaaaa" => :arm64_catalina - # sha256 "faceb00c" => :big_sur - # sha256 "deadbeef" => :catalina - # end - # end - # RUBY - # end + bottle do + cellar :any + sha256 "aaaaaaaa" => :arm64_big_sur + sha256 "aaaaaaaa" => :arm64_catalina + sha256 "faceb00c" => :big_sur + sha256 "deadbeef" => :catalina + end + end + RUBY + end end From e9a5ef8916d950c36e3f41341bdb3ece4a18b2b4 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 5 Feb 2021 03:09:48 +0100 Subject: [PATCH 13/59] Re-enable `vendor-gems` for pull requests. --- .github/workflows/vendor-gems.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vendor-gems.yml b/.github/workflows/vendor-gems.yml index 2e3fef6b15..46b3d454b0 100644 --- a/.github/workflows/vendor-gems.yml +++ b/.github/workflows/vendor-gems.yml @@ -1,6 +1,7 @@ name: Vendor Gems on: + pull_request_target: workflow_dispatch: inputs: pull_request: @@ -40,17 +41,25 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} - name: Vendor Gems + env: + GEM_NAME: ${{ steps.checkout.outputs.gem_name }} run: | - if [[ '${{ steps.checkout.outputs.gem_name }}' == 'sorbet' ]]; then + set -u + + if [[ "${GEM_NAME}" == 'sorbet' ]]; then brew vendor-gems --update sorbet,sorbet-runtime else brew vendor-gems fi - name: Update RBI files + env: + GEM_NAME: ${{ steps.checkout.outputs.gem_name }} run: | + set -u + if brew typecheck --update --fail-if-not-changed; then if git add Library/Homebrew/sorbet; then - git commit -m "Update RBI files for ${{ steps.checkout.outputs.gem_name }}." + git commit -m "Update RBI files for ${GEM_NAME}." fi git reset --hard From f14f98c4f96c55b747951810662dd79c223dfe65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 06:02:23 +0000 Subject: [PATCH 14/59] build(deps): bump codecov from 0.4.2 to 0.4.3 in /Library/Homebrew Bumps [codecov](https://github.com/codecov/codecov-ruby) from 0.4.2 to 0.4.3. - [Release notes](https://github.com/codecov/codecov-ruby/releases) - [Changelog](https://github.com/codecov/codecov-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-ruby/compare/v0.4.2...v0.4.3) Signed-off-by: dependabot[bot] --- 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 7f75fec56a..1ae53e5cad 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -12,7 +12,7 @@ GEM bootsnap (1.7.0) msgpack (~> 1.0) byebug (11.1.3) - codecov (0.4.2) + codecov (0.4.3) simplecov (>= 0.15, < 0.22) coderay (1.1.3) colorize (0.8.1) From 11e3ec4110f52c0a4c91e7c876e69e7e649f42bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 06:02:38 +0000 Subject: [PATCH 15/59] build(deps): bump bootsnap from 1.7.0 to 1.7.1 in /Library/Homebrew Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.0...v1.7.1) Signed-off-by: dependabot[bot] --- 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 7f75fec56a..cb98b3bda7 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -9,7 +9,7 @@ GEM zeitwerk (~> 2.3) ast (2.4.2) bindata (2.4.8) - bootsnap (1.7.0) + bootsnap (1.7.1) msgpack (~> 1.0) byebug (11.1.3) codecov (0.4.2) From 1332f6d15b0764935c4e3805146569b6963c5452 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 06:03:07 +0000 Subject: [PATCH 16/59] build(deps): bump sorbet from 0.5.6267 to 0.5.6274 in /Library/Homebrew Bumps [sorbet](https://github.com/sorbet/sorbet) from 0.5.6267 to 0.5.6274. - [Release notes](https://github.com/sorbet/sorbet/releases) - [Commits](https://github.com/sorbet/sorbet/commits) Signed-off-by: dependabot[bot] --- 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 7f75fec56a..c438f2b766 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -139,11 +139,11 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) - sorbet (0.5.6267) - sorbet-static (= 0.5.6267) + sorbet (0.5.6274) + sorbet-static (= 0.5.6274) sorbet-runtime (0.5.6267) sorbet-runtime-stub (0.2.0) - sorbet-static (0.5.6267-universal-darwin-14) + sorbet-static (0.5.6274-universal-darwin-14) spoom (1.0.7) colorize sorbet (~> 0.5.5) From da0e0884df582d34f8464ada8631a07efdf3aec2 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 5 Feb 2021 08:52:56 +0000 Subject: [PATCH 17/59] docs/Releases: update process documentation. - Note that Homebrew/homebrew-core CI jobs should complete successfully before creating a release - No code changes only required for 4 hours, 24 hours is a bit excessive/unrealistic - Note that commented `odeprecated` code should be uncommented - TinyLetter emails are no longer required (MailChimp does so automatically from the RSS feed) - Note that `brew release` will output the major/minor blog post content (after #10499 is merged) instead of referencing the now-deprecated `brew release-notes` - Note why you should not create a release on older `master` commits and provide an alternate process to handle this case - Various style tweaks --- docs/Releases.md | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/docs/Releases.md b/docs/Releases.md index 48a300b27b..74e0c70127 100644 --- a/docs/Releases.md +++ b/docs/Releases.md @@ -1,18 +1,21 @@ # Releases Since Homebrew 1.0.0 most Homebrew users (those who haven't run a `dev-cmd` or -set `HOMEBREW_DEVELOPER=1`) require tags on the [Homebrew/brew repository](https://github.com/homebrew/brew) +set `HOMEBREW_DEVELOPER=1` which is ~99.9% based on analytics data) require tags +on the [Homebrew/brew repository](https://github.com/homebrew/brew) in order to get new versions of Homebrew. There are a few steps in making a new Homebrew release: 1. Check the [Homebrew/brew pull requests](https://github.com/homebrew/brew/pulls), [issues](https://github.com/homebrew/brew/issues), - [Homebrew/core issues](https://github.com/homebrew/homebrew-core/issues) and + [Homebrew/homebrew-core issues](https://github.com/homebrew/homebrew-core/issues) and [Homebrew/discussions (forum)](https://github.com/homebrew/discussions/discussions) to see if there is anything pressing that needs to be fixed or merged before the next release. If so, fix and merge these changes. -2. Ensure that no code changes have happened for at least a couple of hours (ideally 24 hours) - and that you are confident there are no major regressions on the current `master` +2. Ensure that no code changes have happened for at least a couple of hours (ideally 4 hours), + at least one Homebrew/homebrew-core pull request CI job has completed successfully, + checked the state of the Homebrew/brew `master` CI job (i.e. main jobs green or green after rerunning), + and that you are confident there are no major regressions on the current `master`, branch. 3. Run `brew release` to create a new draft release. For major or minor version bumps, pass `--major` or `--minor`, respectively. @@ -21,20 +24,24 @@ Homebrew release: If this is a major or minor release (e.g. X.0.0 or X.Y.0) then there are a few more steps: 1. Before creating the tag you should delete any `odisabled` code, make any - `odeprecated` code `odisabled` and add any new `odeprecations` that are - desired. + `odeprecated` code `odisabled`, uncomment any `# odeprecated` code and add + any new `odeprecations` that are desired. 2. Write up a release notes blog post to e.g. [brew.sh#319](https://github.com/Homebrew/brew.sh/pull/319). - This should use `brew release-notes` as input but have the wording adjusted - to be more human readable and explain not just what has changed but why. + This should use the output from `brew release [--major|--minor]` as input but + have the wording adjusted to be more human readable and explain not just what has changed but why. 3. When the release has shipped and the blog post has been merged, tweet the blog post as the [@MacHomebrew Twitter account](https://twitter.com/MacHomebrew) or tweet it yourself and retweet it with the @MacHomebrew Twitter account (credentials are in 1Password). -4. Send the email to the Homebrew TinyLetter email list (credentials are in - 1Password). -5. Consider whether to submit it to other sources e.g. Hacker News, Reddit. - +4. Consider whether to submit it to other sources e.g. Hacker News, Reddit. - Pros: gets a wider reach and user feedback - Cons: negative comments are common and people take this as a chance to complain about Homebrew (regardless of their usage) + +Please do not manually create a release based on older commits on the `master` branch. +It's very hard to judge whether these have been sufficiently tested by users or if they will +cause negative side-effects with the current state of Homebrew/homebrew-core. +If a new branch is needed ASAP but there are things on `master` that cannot be released yet +(e.g. new deprecations and you want to make a patch release) then revert the relevant PRs, +follow the process above and then revert the reverted PRs to reapply them on `master`. From ec3e078bcb706b17e0c9eb41aa5cefff24781009 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 5 Feb 2021 12:26:28 +0000 Subject: [PATCH 18/59] os/mac/diagnostic: always require dev tools on Apple Silicon --- Library/Homebrew/extend/os/mac/diagnostic.rb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 11b7970122..71fe9f3c4a 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -42,8 +42,20 @@ module Homebrew end class Checks - undef fatal_build_from_source_checks, fatal_setup_build_environment_checks, - supported_configuration_checks, build_from_source_checks + undef fatal_preinstall_checks, fatal_build_from_source_checks, + fatal_setup_build_environment_checks, supported_configuration_checks, + build_from_source_checks + + def fatal_preinstall_checks + checks = %w[ + check_access_directories + ] + + # We need the developer tools for `codesign`. + checks << "check_for_installed_developer_tools" if Hardware::CPU.arm? + + checks.freeze + end def fatal_build_from_source_checks %w[ @@ -405,6 +417,7 @@ module Homebrew end def check_if_supported_sdk_available + return unless DevelopmentTools.installed? return unless MacOS.sdk_root_needed? return if MacOS.sdk From ccb6d5e834dbfe91043b324af95872840903aec7 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Thu, 4 Feb 2021 23:35:15 +0000 Subject: [PATCH 19/59] utils/github: Handle users not having any GitHub credentials - When running `brew request-bottle`, users who don't have credentials in the macOS keychain (ie, Linux users) or `HOMEBREW_GITHUB_API_TOKEN` receive "Error: Not Found" from the GitHub API returning a 404. - This is cryptic and confusing for newcomers to Linux maintenance, and potentially confusing to other folks using `open_api` where credentials are expected yet unset. - This adds a new `MissingAuthenticationError` to handle the case where the GitHub API returns 404 and there are no creds yet API scopes are required. Before: ``` issyl0@sky:/home/linuxbrew/.linuxbrew/Homebrew$ brew request-bottle hello ==> Dispatching request to Homebrew/linuxbrew-core for hello Error: Not Found ``` After: ``` issyl0@sky:/home/linuxbrew/.linuxbrew/Homebrew$ brew request-bottle hello ==> Dispatching request to Homebrew/linuxbrew-core for hello Error: No GitHub credentials found in Keychain or environment. Create a GitHub personal access token: https://github.com/settings/tokens/new?scopes=gist,public_repo&description=Homebrew echo 'export HOMEBREW_GITHUB_API_TOKEN=your_token_here' >> ~/.profile ``` --- Library/Homebrew/utils/github.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index 75fd5ae3d1..27b832daa6 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -24,6 +24,11 @@ module GitHub ALL_SCOPES_URL = Formatter.url( "https://github.com/settings/tokens/new?scopes=#{ALL_SCOPES.join(",")}&description=Homebrew", ).freeze + CREATE_GITHUB_PAT_MESSAGE = <<~EOS + Create a GitHub personal access token: + #{ALL_SCOPES_URL} + #{Utils::Shell.set_variable_in_profile("HOMEBREW_GITHUB_API_TOKEN", "your_token_here")} + EOS # Generic API error. class Error < RuntimeError @@ -79,6 +84,15 @@ module GitHub end end + # Error when the user has no GitHub API credentials set at all (macOS keychain or envvar). + class MissingAuthenticationError < Error + def initialize + message = +"No GitHub credentials found in Keychain or environment.\n" + message << CREATE_GITHUB_PAT_MESSAGE + super message + end + end + # Error when the API returns a validation error. class ValidationFailedError < Error def initialize(github_message, errors) @@ -277,6 +291,8 @@ module GitHub when "401", "403" raise AuthenticationFailedError, message when "404" + raise MissingAuthenticationError if api_credentials_type == :none && scopes.present? + raise HTTPNotFoundError, message when "422" errors = json&.[]("errors") || [] From 9394fe2b5211e5a5f5a3d2bb5b991a3c7ccc7bc4 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Fri, 5 Feb 2021 12:34:11 +0000 Subject: [PATCH 20/59] utils/github: Use constant everywhere for "create a PAT" message - This way if we ever change this messaging, we only have to do so once. --- Library/Homebrew/utils/github.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index 27b832daa6..d8d5effc24 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -49,9 +49,8 @@ module GitHub @github_message = github_message super <<~EOS GitHub API Error: #{github_message} - Try again in #{pretty_ratelimit_reset(reset)}, or create a personal access token: - #{ALL_SCOPES_URL} - #{Utils::Shell.set_variable_in_profile("HOMEBREW_GITHUB_API_TOKEN", "your_token_here")} + Try again in #{pretty_ratelimit_reset(reset)}, or: + #{CREATE_GITHUB_PAT_MESSAGE} EOS end @@ -75,9 +74,7 @@ module GitHub The GitHub credentials in the macOS keychain may be invalid. Clear them with: printf "protocol=https\\nhost=github.com\\n" | git credential-osxkeychain erase - Or create a personal access token: - #{ALL_SCOPES_URL} - #{Utils::Shell.set_variable_in_profile("HOMEBREW_GITHUB_API_TOKEN", "your_token_here")} + #{CREATE_GITHUB_PAT_MESSAGE} EOS end super message.freeze @@ -182,9 +179,7 @@ module GitHub Your #{what} credentials do not have sufficient scope! Scopes required: #{needed_scopes} Scopes present: #{credentials_scopes} - Create a personal access token: - #{ALL_SCOPES_URL} - #{Utils::Shell.set_variable_in_profile("HOMEBREW_GITHUB_API_TOKEN", "your_token_here")} + #{CREATE_GITHUB_PAT_MESSAGE} EOS end From f71ea65ee0951b7992a0fa9a1d4a6d469276b628 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Fri, 5 Feb 2021 13:52:32 +0000 Subject: [PATCH 21/59] utils/github: Say "macOS keychain" in `MissingAuthenticationError` Co-authored-by: Mike McQuaid --- Library/Homebrew/utils/github.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index d8d5effc24..fa3439f967 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -84,7 +84,7 @@ module GitHub # Error when the user has no GitHub API credentials set at all (macOS keychain or envvar). class MissingAuthenticationError < Error def initialize - message = +"No GitHub credentials found in Keychain or environment.\n" + message = +"No GitHub credentials found in macOS Keychain or environment.\n" message << CREATE_GITHUB_PAT_MESSAGE super message end From 72cb6ffd1203dda238f53798c5221bb848aa1f57 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 5 Feb 2021 15:03:31 +0000 Subject: [PATCH 22/59] utils: import {ohai,puts}_stdout_or_stderr Fixes #10536 --- Library/Homebrew/cmd/update-report.rb | 16 ---------------- Library/Homebrew/utils.rb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 0ddf162d1e..3e071d8371 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -15,22 +15,6 @@ module Homebrew module_function - def ohai_stdout_or_stderr(message) - if $stdout.tty? - ohai(message) - else - $stderr.puts(ohai_title(message)) - end - end - - def puts_stdout_or_stderr(message) - if $stdout.tty? - puts(message) - else - $stderr.puts(message) - end - end - def update_preinstall_header(args:) @update_preinstall_header ||= begin ohai_stdout_or_stderr "Auto-updated Homebrew!" if args.preinstall? diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 553ed7524c..63824dd53e 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -111,6 +111,22 @@ module Kernel puts sput end + def ohai_stdout_or_stderr(message) + if $stdout.tty? + ohai(message) + else + $stderr.puts(ohai_title(message)) + end + end + + def puts_stdout_or_stderr(message) + if $stdout.tty? + puts(message) + else + $stderr.puts(message) + end + end + def odebug(title, *sput, always_display: false) debug = if respond_to?(:debug) debug? From 4e5a48df8d27faef3404b9162c084c69c1228717 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 5 Feb 2021 15:07:52 +0000 Subject: [PATCH 23/59] brew vendor-gems: commit updates. --- .../Homebrew/vendor/bundle/bundler/setup.rb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 1f79811022..b942dd742e 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -11,30 +11,30 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.4.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.1.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bindata-2.4.8/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/msgpack-1.4.2" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/msgpack-1.4.2" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/msgpack-1.4.2/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/bootsnap-1.7.0" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bootsnap-1.7.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/bootsnap-1.7.1" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bootsnap-1.7.1/lib" $:.unshift "#{path}/" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/byebug-11.1.3" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/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/docile-1.3.5/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.12.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov_json_formatter-0.1.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.21.2/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/codecov-0.4.2/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/codecov-0.4.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coderay-1.1.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/colorize-0.8.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/highline-2.0.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/commander-4.5.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/diff-lcs-1.4.4/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/unf_ext-0.0.7.7" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/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}/gems/elftools-1.1.3/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/hpricot-0.8.6" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/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}/gems/mime-types-data-3.2020.1104/lib" @@ -42,7 +42,7 @@ $:.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.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mini_portile2-2.5.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/racc-1.5.2" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/racc-1.5.2" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/racc-1.5.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/nokogiri-1.11.1-x86_64-darwin/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ntlm-http-0.1.1/lib" @@ -61,7 +61,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/patchelf-1.3.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.6.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/pry-0.13.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rack-2.2.3/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/rdiscount-2.2.0.2" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/rdiscount-2.2.0.2" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/regexp_parser-2.0.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rexml-3.2.4/lib" @@ -74,8 +74,8 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.10.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-github-2.3.1/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/sorbet-static-0.5.6267-universal-darwin-14/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.6267/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-static-0.5.6274-universal-darwin-20/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.6274/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-sorbet-1.8.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-ast-1.4.1/lib" From cdbc1d43a6d9cdad197a68c843cefd94bc2db5d2 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 5 Feb 2021 15:43:55 +0000 Subject: [PATCH 24/59] homebrew_bootsnap: fail more gracefully. If `bootsnap` isn't available then print out an error message rather than failing all of Homebrew. --- Library/Homebrew/homebrew_bootsnap.rb | 34 +++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Library/Homebrew/homebrew_bootsnap.rb b/Library/Homebrew/homebrew_bootsnap.rb index 2f16dd60cd..398018bb01 100644 --- a/Library/Homebrew/homebrew_bootsnap.rb +++ b/Library/Homebrew/homebrew_bootsnap.rb @@ -14,25 +14,29 @@ if !ENV["HOMEBREW_NO_BOOTSNAP"] && begin require "bootsnap" rescue LoadError - raise if ENV["HOMEBREW_BOOTSNAP_RETRY"] + unless ENV["HOMEBREW_BOOTSNAP_RETRY"] + require "utils/gems" + Homebrew.install_bundler_gems! - require "utils/gems" - Homebrew.install_bundler_gems! - - ENV["HOMEBREW_BOOTSNAP_RETRY"] = "1" - exec ENV["HOMEBREW_BREW_FILE"], *ARGV + ENV["HOMEBREW_BOOTSNAP_RETRY"] = "1" + exec ENV["HOMEBREW_BREW_FILE"], *ARGV + end end ENV.delete("HOMEBREW_BOOTSNAP_RETRY") - cache = ENV["HOMEBREW_CACHE"] || ENV["HOMEBREW_DEFAULT_CACHE"] - # Can't use .blank? here because we haven't required active_support yet. - raise "Needs HOMEBREW_CACHE or HOMEBREW_DEFAULT_CACHE!" if cache.nil? || cache.empty? # rubocop:disable Rails/Blank + if defined?(Bootsnap) + cache = ENV["HOMEBREW_CACHE"] || ENV["HOMEBREW_DEFAULT_CACHE"] + # Can't use .blank? here because we haven't required active_support yet. + raise "Needs HOMEBREW_CACHE or HOMEBREW_DEFAULT_CACHE!" if cache.nil? || cache.empty? # rubocop:disable Rails/Blank - Bootsnap.setup( - cache_dir: cache, - load_path_cache: true, - compile_cache_iseq: true, - compile_cache_yaml: true, - ) + Bootsnap.setup( + cache_dir: cache, + load_path_cache: true, + compile_cache_iseq: true, + compile_cache_yaml: true, + ) + else + $stderr.puts "Error: HOMEBREW_BOOTSNAP could not `require \"bootsnap\"`!\n\n" + end end From ab08b01b3f4c6e45c8eba4867b80655f2f24e34a Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 5 Feb 2021 12:54:41 +0000 Subject: [PATCH 25/59] workflows/doctor: fix workflow not running --- .github/workflows/doctor.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/doctor.yml b/.github/workflows/doctor.yml index 9a1c57de85..6cfcff8c73 100644 --- a/.github/workflows/doctor.yml +++ b/.github/workflows/doctor.yml @@ -8,20 +8,22 @@ on: - Library/Homebrew/extend/os/diagnostic.rb - Library/Homebrew/extend/os/mac/diagnostic.rb - Library/Homebrew/os/mac/xcode.rb - branches-ignore: - - master env: HOMEBREW_DEVELOPER: 1 HOMEBREW_NO_AUTO_UPDATE: 1 + HOMEBREW_CHANGE_ARCH_TO_ARM: 1 jobs: tests: strategy: matrix: - version: [10.15, 10.14, 10.13] + version: ['11-arm', '11.0', '10.15', '10.14'] fail-fast: false runs-on: ${{ matrix.version }} env: - PATH: "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + PATH: "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + defaults: + run: + working-directory: /tmp steps: - name: Set up Homebrew id: set-up-homebrew From c6dc42fd9d65ac55cfe866746792fc00ec9a89b5 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Fri, 5 Feb 2021 10:01:24 -0800 Subject: [PATCH 26/59] Utils: fix *_stdout_or_stderr helpers Several calls to ohai and puts were directly changed into calls to these new functions, but they don't share arity or an API. The base functions allow arbitrary number of arguments, allowing for multiline printing that covers both a title and a longer message. --- Library/Homebrew/utils.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 63824dd53e..5d54123121 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -111,15 +111,16 @@ module Kernel puts sput end - def ohai_stdout_or_stderr(message) + def ohai_stdout_or_stderr(message, *sput) if $stdout.tty? - ohai(message) + ohai(message, *sput) else $stderr.puts(ohai_title(message)) + $stderr.puts(sput) end end - def puts_stdout_or_stderr(message) + def puts_stdout_or_stderr(*message) if $stdout.tty? puts(message) else From 6837ffd7537a8e16be467fca788d5c2c4ffefea9 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Sat, 6 Feb 2021 00:55:51 +0000 Subject: [PATCH 27/59] sorbet: Update RBI files. Autogenerated by the [sorbet](https://github.com/Homebrew/brew/blob/master/.github/workflows/sorbet.yml) workflow. --- .../sorbet/rbi/gems/{bootsnap@1.7.0.rbi => bootsnap@1.7.1.rbi} | 0 .../sorbet/rbi/gems/{codecov@0.4.2.rbi => codecov@0.4.3.rbi} | 0 Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi | 2 ++ 3 files changed, 2 insertions(+) rename Library/Homebrew/sorbet/rbi/gems/{bootsnap@1.7.0.rbi => bootsnap@1.7.1.rbi} (100%) rename Library/Homebrew/sorbet/rbi/gems/{codecov@0.4.2.rbi => codecov@0.4.3.rbi} (100%) diff --git a/Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.0.rbi b/Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.1.rbi similarity index 100% rename from Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.0.rbi rename to Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.1.rbi diff --git a/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi b/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.3.rbi similarity index 100% rename from Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi rename to Library/Homebrew/sorbet/rbi/gems/codecov@0.4.3.rbi diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 0742430cb8..23550c707d 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -3062,6 +3062,8 @@ module Bootsnap def self.instrumentation=(callback); end + def self.iseq_cache_supported?(); end + def self.log!(); end def self.logger(); end From f68a3961c75fbc2dc2bd2b3fe0e67f70c981675f Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Sat, 6 Feb 2021 14:27:03 -0500 Subject: [PATCH 28/59] Prepare deprecations for the old bottle syntax --- Library/Homebrew/formula.rb | 8 ++++---- Library/Homebrew/software_spec.rb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 5b563c2ed0..85271ac218 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -2447,11 +2447,11 @@ class Formula # # 
bottle do
     #   root_url "https://example.com" # Optional root to calculate bottle URLs.
-    #   cellar "/opt/homebrew/Cellar" # Optional HOMEBREW_CELLAR in which the bottles were built.
     #   rebuild 1 # Marks the old bottle as outdated without bumping the version/revision of the formula.
-    #   sha256 "ef65c759c5097a36323fa9c77756468649e8d1980a3a4e05695c05e39568967c" => :catalina
-    #   sha256 "28f4090610946a4eb207df102d841de23ced0d06ba31cb79e040d883906dcd4f" => :mojave
-    #   sha256 "91dd0caca9bd3f38c439d5a7b6f68440c4274945615fae035ff0a369264b8a2f" => :high_sierra
+    #   # Optionally specify the HOMEBREW_CELLAR in which the bottles were built.
+    #   sha256 cellar: "/brew/Cellar", catalina:    "ef65c759c5097a36323fa9c77756468649e8d1980a3a4e05695c05e39568967c"
+    #   sha256 cellar: :any,           mojave:      "28f4090610946a4eb207df102d841de23ced0d06ba31cb79e040d883906dcd4f"
+    #   sha256                         high_sierra: "91dd0caca9bd3f38c439d5a7b6f68440c4274945615fae035ff0a369264b8a2f"
     # end
# # Homebrew maintainers aim to bottle all formulae that require compilation. diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 83c7e36de9..7ea09450bf 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -371,6 +371,14 @@ class BottleSpecification end def cellar(val = nil) + # TODO: (3.1) uncomment to deprecate the old bottle syntax + # if val.present? + # odeprecated( + # "`cellar` in a bottle block", + # "`brew style --fix` on the formula to update the style or use `sha256` with a `cellar:` argument", + # ) + # end + return collector.dig(Utils::Bottles.tag, :cellar) || @all_tags_cellar if val.nil? @all_tags_cellar = val @@ -422,6 +430,14 @@ class BottleSpecification digest, tag = hash.find do |key, value| key.is_a?(String) && value.is_a?(Symbol) && key.match?(sha256_regex) end + + # TODO: (3.1) uncomment to deprecate the old bottle syntax + # if digest && tag + # odeprecated( + # '`sha256 "digest" => :tag` in a bottle block', + # '`brew style --fix` on the formula to update the style or use `sha256 tag: "digest"`', + # ) + # end end cellar ||= all_tags_cellar From fee42c4d5f62b511ef7e27cde1054b5ff976160a Mon Sep 17 00:00:00 2001 From: Max Nordlund Date: Sat, 6 Feb 2021 23:05:26 +0100 Subject: [PATCH 29/59] Fix typo --- Library/Homebrew/completions/fish.erb | 2 +- completions/fish/brew.fish | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/completions/fish.erb b/Library/Homebrew/completions/fish.erb index 6c880d6b5f..6ba78a5172 100644 --- a/Library/Homebrew/completions/fish.erb +++ b/Library/Homebrew/completions/fish.erb @@ -74,7 +74,7 @@ end # This can be used to match any given option against the given list of arguments: # * to add condition on interdependent options -# * to ddd condition on mutually exclusive options +# * to add condition on mutually exclusive options # # Usage examples (for `completion -n '...'`): # * `__fish_brew_opt -s --long` returns true if _either_ `-s` _or_ `--long` is present diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 8ff4e3174e..d146d6ce6c 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -61,7 +61,7 @@ end # This can be used to match any given option against the given list of arguments: # * to add condition on interdependent options -# * to ddd condition on mutually exclusive options +# * to add condition on mutually exclusive options # # Usage examples (for `completion -n '...'`): # * `__fish_brew_opt -s --long` returns true if _either_ `-s` _or_ `--long` is present From 0ee63b0c519ee9a16a8a372a22f7c4a84a4ab401 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 8 Feb 2021 10:29:22 +0000 Subject: [PATCH 30/59] workflows/tests: remove hadolint. It's failing to install. --- .github/workflows/tests.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 29c9a57250..f396dd046d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,11 +40,6 @@ jobs: brew install vale vale docs/ - - name: Lint Dockerfile - run: | - brew install hadolint - hadolint Dockerfile - tap-syntax: name: tap syntax (Linux) if: startsWith(github.repository, 'Homebrew/') From 39b3bcdce4134c2108a8f080fa228b20e8b9b8f9 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 8 Feb 2021 11:11:21 +0000 Subject: [PATCH 31/59] Undeprecate ENV.O1/ENV.O0 These are still used in Homebrew/homebrew-core. The others are either - default (Os on macOS, O2 on Linux) - less reliable than the default (O3) While we're here, also remove an outdated `ncurses_define` comment. --- Library/Homebrew/extend/ENV/shared.rb | 1 - Library/Homebrew/extend/ENV/std.rb | 9 ++++++++- Library/Homebrew/extend/ENV/super.rb | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index c4585dff61..d81f3328bc 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -238,7 +238,6 @@ module SharedEnvExtension # Snow Leopard defines an NCURSES value the opposite of most distros. # @see https://bugs.python.org/issue6848 - # Currently only used by aalib in core. sig { void } def ncurses_define odeprecated "ENV.ncurses_define" diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index bfd4657b10..b94f31533f 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -97,7 +97,7 @@ module Stdenv old end - %w[O3 O2 O1 O0 Os].each do |opt| + %w[O3 O2 Os].each do |opt| define_method opt do odisabled "ENV.#{opt}" @@ -106,6 +106,13 @@ module Stdenv end end + %w[O1 O0].each do |opt| + define_method opt do + send(:remove_from_cflags, /-O./) + send(:append_to_cflags, "-#{opt}") + end + end + sig { returns(T.any(String, Pathname)) } def determine_cc s = super diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 4d48592657..aae72826bb 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -344,7 +344,7 @@ module Superenv append_to_cccfg "O" end - %w[O3 O2 O1 O0 Os].each do |opt| + %w[O3 O2 Os].each do |opt| define_method opt do odisabled "ENV.#{opt}" @@ -352,6 +352,12 @@ module Superenv end end + %w[O1 O0].each do |opt| + define_method opt do + send(:[]=, "HOMEBREW_OPTIMIZATION_LEVEL", opt) + end + end + sig { void } def set_x11_env_if_installed odisabled "ENV.set_x11_env_if_installed" From 4f5f3824c64ed15f53a51a6aca9c92ae6baf3031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Fri, 5 Feb 2021 18:54:28 +0100 Subject: [PATCH 32/59] Add full_token to cask json output --- Library/Homebrew/cask/cask.rb | 1 + Library/Homebrew/test/cask/cmd/list_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb index d60261bb36..d54a31cbb6 100644 --- a/Library/Homebrew/cask/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -169,6 +169,7 @@ module Cask def to_h { "token" => token, + "full_token" => "#{tap.name}/#{token}", "name" => name, "desc" => desc, "homepage" => homepage, diff --git a/Library/Homebrew/test/cask/cmd/list_spec.rb b/Library/Homebrew/test/cask/cmd/list_spec.rb index 07ed585a4c..5c8d89931d 100644 --- a/Library/Homebrew/test/cask/cmd/list_spec.rb +++ b/Library/Homebrew/test/cask/cmd/list_spec.rb @@ -84,10 +84,10 @@ describe Cask::Cmd::List, :cask do end describe "lists json" do - let(:casks) { ["local-caffeine", "local-transmission"] } + let(:casks) { ["local-caffeine", "local-transmission", "third-party/tap/third-party-cask"] } let(:expected_output) { <<~EOS - [{"token":"local-caffeine","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","name":["Transmission"],"desc":"BitTorrent client","homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","installed":"2.61","outdated":false,"sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}] + [{"token":"local-caffeine","full_token":"homebrew/cask/local-caffeine","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","full_token":"homebrew/cask/local-transmission","name":["Transmission"],"desc":"BitTorrent client","homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","installed":"2.61","outdated":false,"sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"third-party-cask","full_token":"third-party/tap/third-party-cask","name":[],"desc":null,"homepage":"https://brew.sh/","url":"https://brew.sh/ThirdParty.dmg","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b","artifacts":[["ThirdParty.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}] EOS } @@ -103,7 +103,7 @@ describe Cask::Cmd::List, :cask do it "of given Casks" do expect { - described_class.run("--json", "local-caffeine", "local-transmission") + described_class.run("--json", "local-caffeine", "local-transmission", "third-party/tap/third-party-cask") }.to output(expected_output).to_stdout end end From 84d80cf0bf9d651d5f1668e122215324fd7d015f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 6 Feb 2021 19:49:25 +0100 Subject: [PATCH 33/59] Add tap to cask json output --- Library/Homebrew/cask/cask.rb | 1 + Library/Homebrew/test/cask/cmd/list_spec.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb index d54a31cbb6..7598166061 100644 --- a/Library/Homebrew/cask/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -170,6 +170,7 @@ module Cask { "token" => token, "full_token" => "#{tap.name}/#{token}", + "tap" => tap.name, "name" => name, "desc" => desc, "homepage" => homepage, diff --git a/Library/Homebrew/test/cask/cmd/list_spec.rb b/Library/Homebrew/test/cask/cmd/list_spec.rb index 5c8d89931d..d04e2f9bac 100644 --- a/Library/Homebrew/test/cask/cmd/list_spec.rb +++ b/Library/Homebrew/test/cask/cmd/list_spec.rb @@ -87,7 +87,7 @@ describe Cask::Cmd::List, :cask do let(:casks) { ["local-caffeine", "local-transmission", "third-party/tap/third-party-cask"] } let(:expected_output) { <<~EOS - [{"token":"local-caffeine","full_token":"homebrew/cask/local-caffeine","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","full_token":"homebrew/cask/local-transmission","name":["Transmission"],"desc":"BitTorrent client","homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","installed":"2.61","outdated":false,"sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"third-party-cask","full_token":"third-party/tap/third-party-cask","name":[],"desc":null,"homepage":"https://brew.sh/","url":"https://brew.sh/ThirdParty.dmg","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b","artifacts":[["ThirdParty.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}] + [{"token":"local-caffeine","full_token":"homebrew/cask/local-caffeine","tap":"homebrew/cask","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","full_token":"homebrew/cask/local-transmission","tap":"homebrew/cask","name":["Transmission"],"desc":"BitTorrent client","homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","installed":"2.61","outdated":false,"sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"third-party-cask","full_token":"third-party/tap/third-party-cask","tap":"third-party/tap","name":[],"desc":null,"homepage":"https://brew.sh/","url":"https://brew.sh/ThirdParty.dmg","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b","artifacts":[["ThirdParty.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}] EOS } From a20b60112059a2f807406a79505bc066c86712d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 6 Feb 2021 20:18:40 +0100 Subject: [PATCH 34/59] Add tap to formula json output --- Library/Homebrew/formula.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 5b563c2ed0..ca2cf52183 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1766,6 +1766,7 @@ class Formula hsh = { "name" => name, "full_name" => full_name, + "tap" => tap.name, "oldname" => oldname, "aliases" => aliases.sort, "versioned_formulae" => versioned_formulae.map(&:name), From 7ca79553f0ba9e2e83d3bad069ba90eb576fd3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 6 Feb 2021 21:11:55 +0100 Subject: [PATCH 35/59] Add test to check --json=v2 format --- Library/Homebrew/test/cmd/info_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Library/Homebrew/test/cmd/info_spec.rb b/Library/Homebrew/test/cmd/info_spec.rb index 9189b106d9..aaadf55297 100644 --- a/Library/Homebrew/test/cmd/info_spec.rb +++ b/Library/Homebrew/test/cmd/info_spec.rb @@ -6,6 +6,19 @@ require "cmd/info" require "cmd/shared_examples/args_parse" describe "brew info" do + let(:tarball) do + if OS.linux? + TEST_FIXTURE_DIR/"tarballs/testball-0.1-linux.tbz" + else + TEST_FIXTURE_DIR/"tarballs/testball-0.1.tbz" + end + end + let(:expected_output) { + <<~EOS + {"formulae":[{"name":"testball","full_name":"testball","tap":"homebrew/core","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"Some test","license":null,"homepage":"https://brew.sh/testball","versions":{"stable":"0.1","head":null,"bottle":false},"urls":{"stable":{"url":"file://#{tarball}","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{},"keg_only":false,"bottle_disabled":false,"options":[{"option":"--with-foo","description":"Build with foo"}],"build_dependencies":[],"dependencies":[],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":[],"requirements":[],"conflicts_with":[],"caveats":null,"installed":[],"linked_keg":null,"pinned":false,"outdated":false,"deprecated":false,"deprecation_date":null,"deprecation_reason":null,"disabled":false,"disable_date":null,"disable_reason":null}],"casks":[]} + EOS + } + it_behaves_like "parseable arguments" it "prints as json with the --json=v1 flag", :integration_test do @@ -26,6 +39,13 @@ describe "brew info" do .and be_a_success end + it "check --json=v2 format", :integration_test do + setup_test_formula "testball" + + expect { brew "info", "testball", "--json=v2" } + .to output(expected_output).to_stdout + end + describe Homebrew do describe "::github_remote_path" do let(:remote) { "https://github.com/Homebrew/homebrew-core" } From aebf4c9100ead9fca5fb3f12cc5bf037dc92e771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sun, 7 Feb 2021 19:00:07 +0100 Subject: [PATCH 36/59] Safe access to tap attributes Prevent calling name tap attribute when the tap is nil Co-Authored-By: Rylan Polster --- Library/Homebrew/cask/cask.rb | 4 ++-- Library/Homebrew/formula.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb index 7598166061..2475b84da0 100644 --- a/Library/Homebrew/cask/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -169,8 +169,8 @@ module Cask def to_h { "token" => token, - "full_token" => "#{tap.name}/#{token}", - "tap" => tap.name, + "full_token" => full_name, + "tap" => tap&.name, "name" => name, "desc" => desc, "homepage" => homepage, diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index ca2cf52183..439cb2076a 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1766,7 +1766,7 @@ class Formula hsh = { "name" => name, "full_name" => full_name, - "tap" => tap.name, + "tap" => tap&.name, "oldname" => oldname, "aliases" => aliases.sort, "versioned_formulae" => versioned_formulae.map(&:name), From ce7ab823ed5b93ae4588e754c3cc64974c0882f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sun, 7 Feb 2021 19:07:54 +0100 Subject: [PATCH 37/59] Replace test for checking formulae tap As suggested by @Rylan12, integration tests are super slow. Co-Authored-By: Rylan Polster --- Library/Homebrew/test/cmd/info_spec.rb | 20 -------------------- Library/Homebrew/test/formula_spec.rb | 1 + 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Library/Homebrew/test/cmd/info_spec.rb b/Library/Homebrew/test/cmd/info_spec.rb index aaadf55297..9189b106d9 100644 --- a/Library/Homebrew/test/cmd/info_spec.rb +++ b/Library/Homebrew/test/cmd/info_spec.rb @@ -6,19 +6,6 @@ require "cmd/info" require "cmd/shared_examples/args_parse" describe "brew info" do - let(:tarball) do - if OS.linux? - TEST_FIXTURE_DIR/"tarballs/testball-0.1-linux.tbz" - else - TEST_FIXTURE_DIR/"tarballs/testball-0.1.tbz" - end - end - let(:expected_output) { - <<~EOS - {"formulae":[{"name":"testball","full_name":"testball","tap":"homebrew/core","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"Some test","license":null,"homepage":"https://brew.sh/testball","versions":{"stable":"0.1","head":null,"bottle":false},"urls":{"stable":{"url":"file://#{tarball}","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{},"keg_only":false,"bottle_disabled":false,"options":[{"option":"--with-foo","description":"Build with foo"}],"build_dependencies":[],"dependencies":[],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":[],"requirements":[],"conflicts_with":[],"caveats":null,"installed":[],"linked_keg":null,"pinned":false,"outdated":false,"deprecated":false,"deprecation_date":null,"deprecation_reason":null,"disabled":false,"disable_date":null,"disable_reason":null}],"casks":[]} - EOS - } - it_behaves_like "parseable arguments" it "prints as json with the --json=v1 flag", :integration_test do @@ -39,13 +26,6 @@ describe "brew info" do .and be_a_success end - it "check --json=v2 format", :integration_test do - setup_test_formula "testball" - - expect { brew "info", "testball", "--json=v2" } - .to output(expected_output).to_stdout - end - describe Homebrew do describe "::github_remote_path" do let(:remote) { "https://github.com/Homebrew/homebrew-core" } diff --git a/Library/Homebrew/test/formula_spec.rb b/Library/Homebrew/test/formula_spec.rb index 54e497b13c..0148bb4158 100644 --- a/Library/Homebrew/test/formula_spec.rb +++ b/Library/Homebrew/test/formula_spec.rb @@ -838,6 +838,7 @@ describe Formula do expect(h).to be_a(Hash) expect(h["name"]).to eq("foo") expect(h["full_name"]).to eq("foo") + expect(h["tap"]).to eq("homebrew/core") expect(h["versions"]["stable"]).to eq("1.0") expect(h["versions"]["bottle"]).to be_truthy end From 65d5c11f15644bc0103e5cb87011d4ba7a61b586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Mon, 8 Feb 2021 07:06:47 +0100 Subject: [PATCH 38/59] Update list_spec.rb for cask full_name --- Library/Homebrew/test/cask/cmd/list_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/test/cask/cmd/list_spec.rb b/Library/Homebrew/test/cask/cmd/list_spec.rb index d04e2f9bac..8d44a65beb 100644 --- a/Library/Homebrew/test/cask/cmd/list_spec.rb +++ b/Library/Homebrew/test/cask/cmd/list_spec.rb @@ -87,7 +87,7 @@ describe Cask::Cmd::List, :cask do let(:casks) { ["local-caffeine", "local-transmission", "third-party/tap/third-party-cask"] } let(:expected_output) { <<~EOS - [{"token":"local-caffeine","full_token":"homebrew/cask/local-caffeine","tap":"homebrew/cask","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","full_token":"homebrew/cask/local-transmission","tap":"homebrew/cask","name":["Transmission"],"desc":"BitTorrent client","homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","installed":"2.61","outdated":false,"sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"third-party-cask","full_token":"third-party/tap/third-party-cask","tap":"third-party/tap","name":[],"desc":null,"homepage":"https://brew.sh/","url":"https://brew.sh/ThirdParty.dmg","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b","artifacts":[["ThirdParty.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}] + [{"token":"local-caffeine","full_token":"local-caffeine","tap":"homebrew/cask","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","full_token":"local-transmission","tap":"homebrew/cask","name":["Transmission"],"desc":"BitTorrent client","homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","installed":"2.61","outdated":false,"sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"third-party-cask","full_token":"third-party/tap/third-party-cask","tap":"third-party/tap","name":[],"desc":null,"homepage":"https://brew.sh/","url":"https://brew.sh/ThirdParty.dmg","appcast":null,"version":"1.2.3","installed":"1.2.3","outdated":false,"sha256":"8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b","artifacts":[["ThirdParty.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}] EOS } From 221983dbcff442fa98d28c36cb2fb74af376d937 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Wed, 3 Feb 2021 21:28:11 +0100 Subject: [PATCH 39/59] compilers: prefer gcc 5 on linux Fixes #10170 by preferring gcc@5 on linux This makes sure ENV.cc and ENV.cxx is correctly set: If a formula does not explicitely depend on a brewed gcc, ENV.cc is set to gcc-5 (system gcc-5 or brewed gcc-5) with this change, even if other gcc versions are installed on the system. --- Library/Homebrew/compilers.rb | 10 +++++++++- Library/Homebrew/extend/os/compilers.rb | 4 ++++ Library/Homebrew/extend/os/linux/compilers.rb | 11 +++++++++++ .../Homebrew/test/compiler_selector_spec.rb | 18 +++++++++++++++++- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 Library/Homebrew/extend/os/compilers.rb create mode 100644 Library/Homebrew/extend/os/linux/compilers.rb diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb index 8881c84133..4802530d73 100644 --- a/Library/Homebrew/compilers.rb +++ b/Library/Homebrew/compilers.rb @@ -78,6 +78,7 @@ end # # @api private class CompilerSelector + extend T::Sig include CompilerConstants Compiler = Struct.new(:name, :version) @@ -111,9 +112,14 @@ class CompilerSelector private + sig { returns(String) } + def preferred_gcc + "gcc" + end + def gnu_gcc_versions # prioritize gcc version provided by gcc formula. - v = Formulary.factory("gcc").version.to_s.slice(/\d+/) + v = Formulary.factory(preferred_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 @@ -150,3 +156,5 @@ class CompilerSelector end end end + +require "extend/os/compilers" diff --git a/Library/Homebrew/extend/os/compilers.rb b/Library/Homebrew/extend/os/compilers.rb new file mode 100644 index 0000000000..19e999889f --- /dev/null +++ b/Library/Homebrew/extend/os/compilers.rb @@ -0,0 +1,4 @@ +# typed: strict +# frozen_string_literal: true + +require "extend/os/linux/compilers" if OS.linux? diff --git a/Library/Homebrew/extend/os/linux/compilers.rb b/Library/Homebrew/extend/os/linux/compilers.rb new file mode 100644 index 0000000000..93698765de --- /dev/null +++ b/Library/Homebrew/extend/os/linux/compilers.rb @@ -0,0 +1,11 @@ +# typed: strict +# frozen_string_literal: true + +class CompilerSelector + sig { returns(String) } + def preferred_gcc + # gcc-5 is the lowest gcc version we support on Linux. + # gcc-5 is the default gcc in Ubuntu 16.04 (used for our CI) + "gcc@5" + end +end diff --git a/Library/Homebrew/test/compiler_selector_spec.rb b/Library/Homebrew/test/compiler_selector_spec.rb index 58017c2b20..46c62fe8a3 100644 --- a/Library/Homebrew/test/compiler_selector_spec.rb +++ b/Library/Homebrew/test/compiler_selector_spec.rb @@ -22,6 +22,7 @@ describe CompilerSelector do case name when "gcc-7" then Version.create("7.1") when "gcc-6" then Version.create("6.1") + when "gcc-5" then Version.create("5.1") else Version::NULL end end @@ -42,16 +43,31 @@ describe CompilerSelector do expect(selector.compiler).to eq("gcc-7") end - it "returns gcc-6 if gcc formula offers gcc-6" do + it "returns gcc-6 if gcc formula offers gcc-6 on mac", :needs_macos do software_spec.fails_with(:clang) allow(Formulary).to receive(:factory).with("gcc").and_return(double(version: "6.0")) expect(selector.compiler).to eq("gcc-6") end + it "returns gcc-5 if gcc formula offers gcc-5 on linux", :needs_linux do + software_spec.fails_with(:clang) + allow(Formulary).to receive(:factory).with("gcc@5").and_return(double(version: "5.0")) + expect(selector.compiler).to eq("gcc-5") + end + + it "returns gcc-6 if gcc formula offers gcc-6 and fails with gcc-5 and gcc-7 on linux", :needs_linux do + software_spec.fails_with(:clang) + software_spec.fails_with(gcc: "5") + software_spec.fails_with(gcc: "7") + allow(Formulary).to receive(:factory).with("gcc@5").and_return(double(version: "5.0")) + expect(selector.compiler).to eq("gcc-6") + end + it "raises an error when gcc or llvm is missing" do software_spec.fails_with(:clang) software_spec.fails_with(gcc: "7") software_spec.fails_with(gcc: "6") + software_spec.fails_with(gcc: "5") expect { selector.compiler }.to raise_error(CompilerSelectionError) end From 865fb15ad7d51d2cae0632f1725020c8dc37b208 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Sun, 7 Feb 2021 22:26:06 +0100 Subject: [PATCH 40/59] on_os block: allow to contain conflicts_with Some conflicts are os-specific. --- Library/Homebrew/rubocops/components_order.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/rubocops/components_order.rb b/Library/Homebrew/rubocops/components_order.rb index 27e5a55e86..3f955d225b 100644 --- a/Library/Homebrew/rubocops/components_order.rb +++ b/Library/Homebrew/rubocops/components_order.rb @@ -110,7 +110,7 @@ module RuboCop end def check_on_os_block_content(component_precedence_list, on_os_block) - on_os_allowed_methods = %w[depends_on patch resource deprecate! disable!] + on_os_allowed_methods = %w[depends_on patch resource deprecate! disable! conflicts_with] _, offensive_node = check_order(component_precedence_list, on_os_block.body) component_problem(*offensive_node) if offensive_node child_nodes = on_os_block.body.begin_type? ? on_os_block.body.child_nodes : [on_os_block.body] From f1ef1afd2130993cce87f27a634929810331ba1a Mon Sep 17 00:00:00 2001 From: Marcus Maxwell Date: Mon, 8 Feb 2021 12:30:19 +0000 Subject: [PATCH 41/59] Add workflow scope to github.rb --- Library/Homebrew/utils/github.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index fa3439f967..293ae71d1d 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -20,7 +20,8 @@ module GitHub CREATE_GIST_SCOPES = ["gist"].freeze CREATE_ISSUE_FORK_OR_PR_SCOPES = ["public_repo"].freeze - ALL_SCOPES = (CREATE_GIST_SCOPES + CREATE_ISSUE_FORK_OR_PR_SCOPES).freeze + CREATE_WORKFLOW_SCOPES = ["workflow"].freeze + ALL_SCOPES = (CREATE_GIST_SCOPES + CREATE_ISSUE_FORK_OR_PR_SCOPES + CREATE_WORKFLOW_SCOPES).freeze ALL_SCOPES_URL = Formatter.url( "https://github.com/settings/tokens/new?scopes=#{ALL_SCOPES.join(",")}&description=Homebrew", ).freeze From 6026c7c74d18a110d2bafe303a1a83534ff2d832 Mon Sep 17 00:00:00 2001 From: nandahkrishna Date: Thu, 4 Feb 2021 17:00:50 +0530 Subject: [PATCH 42/59] `brew update-maintainers`: dev-cmd to update maintainers in README --- Library/Homebrew/.rubocop.yml | 2 +- .../Homebrew/dev-cmd/update-maintainers.rb | 64 +++++++++++++++++++ Library/Homebrew/utils/github.rb | 29 +++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 Library/Homebrew/dev-cmd/update-maintainers.rb diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml index 6a49053b64..799d1baf79 100644 --- a/Library/Homebrew/.rubocop.yml +++ b/Library/Homebrew/.rubocop.yml @@ -37,7 +37,7 @@ Metrics/PerceivedComplexity: Metrics/MethodLength: Max: 260 Metrics/ModuleLength: - Max: 600 + Max: 650 Exclude: - "test/**/*" diff --git a/Library/Homebrew/dev-cmd/update-maintainers.rb b/Library/Homebrew/dev-cmd/update-maintainers.rb new file mode 100644 index 0000000000..32c690d779 --- /dev/null +++ b/Library/Homebrew/dev-cmd/update-maintainers.rb @@ -0,0 +1,64 @@ +# typed: false +# frozen_string_literal: true + +require "cli/parser" +require "utils/github" + +module Homebrew + extend T::Sig + + module_function + + sig { returns(CLI::Parser) } + def update_maintainers_args + Homebrew::CLI::Parser.new do + description <<~EOS + Update the list of maintainers in the `Homebrew/brew` README. + EOS + + named_args :none + end + end + + def update_maintainers + update_maintainers_args.parse + + # We assume that only public members wish to be included in the README + public_members = GitHub.public_member_usernames("Homebrew") + + plc = GitHub.members_by_team("Homebrew", "plc") + tsc = GitHub.members_by_team("Homebrew", "tsc") + linux = GitHub.members_by_team("Homebrew", "linux") + other = GitHub.members_by_team("Homebrew", "maintainers") + other.except!(*[plc, tsc, linux].map(&:keys).flatten.uniq) + + sentences = [plc, tsc, linux, other].map do |h| + h.slice!(*public_members) + h.each { |k, v| h[k] = "[#{v}](https://github.com/#{k})" } + h.values.sort.to_sentence + end + + readme = HOMEBREW_REPOSITORY/"README.md" + + content = readme.read + content.gsub!(/(Homebrew's \[Project Leadership Committee.*) is .*\./, + "\\1 is #{sentences[0]}.") + content.gsub!(/(Homebrew's \[Technical Steering Committee.*) is .*\./, + "\\1 is #{sentences[1]}.") + content.gsub!(%r{(Homebrew/brew's Linux maintainers are).*\.}, + "\\1 #{sentences[2]}.") + content.gsub!(/(Homebrew's other current maintainers are).*\./, + "\\1 #{sentences[3]}.") + + File.open(readme, "w+") { |f| f.write(content) } + + diff = system_command "git", args: [ + "-C", HOMEBREW_REPOSITORY, "diff", "--exit-code", "README.md" + ] + if diff.status.success? + puts "No changes to list of maintainers." + else + puts "List of maintainers updated in README." + end + end +end diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index 293ae71d1d..feec12c973 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -572,6 +572,35 @@ module GitHub artifact.first["archive_download_url"] end + def public_member_usernames(org, per_page: 100) + url = "#{API_URL}/orgs/#{org}/public_members?per_page=#{per_page}" + members = [] + + (1..API_MAX_PAGES).each do |page| + result = open_api(url + "&page=#{page}").map { |m| m["login"] } + members.concat(result) + + return members if result.length < per_page + end + end + + def members_by_team(org, team) + query = <<~EOS + { organization(login: "#{org}") { + team(slug: "#{team}") { + members(first: 100) { + nodes { + ... on User { login name } + } + } + } + } + } + EOS + result = open_graphql(query, scopes: ["read:org", "user"]) + result["organization"]["team"]["members"]["nodes"].map { |m| [m["login"], m["name"]] }.to_h + end + def sponsors_by_tier(user) query = <<~EOS { organization(login: "#{user}") { From 7bb059b523827d49cc8f56f1d1c7d02befd29222 Mon Sep 17 00:00:00 2001 From: nandahkrishna Date: Thu, 4 Feb 2021 17:49:38 +0530 Subject: [PATCH 43/59] Update manpage and completions --- completions/bash/brew | 16 ++++++++++++++++ completions/fish/brew.fish | 7 +++++++ completions/internal_commands_list.txt | 1 + completions/zsh/_brew | 10 ++++++++++ docs/Manpage.md | 4 ++++ manpages/brew.1 | 3 +++ 6 files changed, 41 insertions(+) diff --git a/completions/bash/brew b/completions/bash/brew index 71098288b9..abd7782871 100644 --- a/completions/bash/brew +++ b/completions/bash/brew @@ -2108,6 +2108,21 @@ _brew_update_license_data() { esac } +_brew_update_maintainers() { + local cur="${COMP_WORDS[COMP_CWORD]}" + case "$cur" in + -*) + __brewcomp " + --debug + --help + --quiet + --verbose + " + return + ;; + esac +} + _brew_update_python_resources() { local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in @@ -2382,6 +2397,7 @@ _brew() { up) _brew_up ;; update) _brew_update ;; update-license-data) _brew_update_license_data ;; + update-maintainers) _brew_update_maintainers ;; update-python-resources) _brew_update_python_resources ;; update-report) _brew_update_report ;; update-test) _brew_update_test ;; diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index d146d6ce6c..a2c251d9b9 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -1439,6 +1439,13 @@ __fish_brew_complete_arg 'update-license-data' -l quiet -d 'Make some output mor __fish_brew_complete_arg 'update-license-data' -l verbose -d 'Make some output more verbose' +__fish_brew_complete_cmd 'update-maintainers' 'Update the list of maintainers in the `Homebrew/brew` README' +__fish_brew_complete_arg 'update-maintainers' -l debug -d 'Display any debugging information' +__fish_brew_complete_arg 'update-maintainers' -l help -d 'Show this message' +__fish_brew_complete_arg 'update-maintainers' -l quiet -d 'Make some output more quiet' +__fish_brew_complete_arg 'update-maintainers' -l verbose -d 'Make some output more verbose' + + __fish_brew_complete_cmd 'update-python-resources' 'Update versions for PyPI resource blocks in formula' __fish_brew_complete_arg 'update-python-resources' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'update-python-resources' -l exclude-packages -d 'Exclude these packages when finding resources' diff --git a/completions/internal_commands_list.txt b/completions/internal_commands_list.txt index b1d36a5ddc..0b5931a16e 100644 --- a/completions/internal_commands_list.txt +++ b/completions/internal_commands_list.txt @@ -97,6 +97,7 @@ untap up update update-license-data +update-maintainers update-python-resources update-reset update-test diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 7792c24eed..22c4e2e749 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -212,6 +212,7 @@ __brew_internal_commands() { 'untap:Remove a tapped formula repository' 'update:Fetch the newest version of Homebrew and all formulae from GitHub using `git`(1) and perform any necessary migrations' 'update-license-data:Update SPDX license data in the Homebrew repository' + 'update-maintainers:Update the list of maintainers in the `Homebrew/brew` README' 'update-python-resources:Update versions for PyPI resource blocks in formula' 'update-report:The Ruby implementation of `brew update`' 'update-reset:Fetch and reset Homebrew and all tap repositories (or any specified repository) using `git`(1) to their latest `origin/HEAD`' @@ -1677,6 +1678,15 @@ _brew_update_license_data() { '--verbose[Make some output more verbose]' } +# brew update-maintainers +_brew_update_maintainers() { + _arguments \ + '--debug[Display any debugging information]' \ + '--help[Show this message]' \ + '--quiet[Make some output more quiet]' \ + '--verbose[Make some output more verbose]' +} + # brew update-python-resources _brew_update_python_resources() { _arguments \ diff --git a/docs/Manpage.md b/docs/Manpage.md index 2581d00e34..c7a72bd5ff 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1384,6 +1384,10 @@ Update SPDX license data in the Homebrew repository. * `--fail-if-not-changed`: Return a failing status code if current license data's version is the same as the upstream. This can be used to notify CI when the SPDX license data is out of date. +### `update-maintainers` + +Update the list of maintainers in the `Homebrew/brew` README. + ### `update-python-resources` [*`options`*] *`formula`* [...] Update versions for PyPI resource blocks in *`formula`*. diff --git a/manpages/brew.1 b/manpages/brew.1 index 81c06baee8..759b9edbad 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1916,6 +1916,9 @@ Update SPDX license data in the Homebrew repository\. \fB\-\-fail\-if\-not\-changed\fR Return a failing status code if current license data\'s version is the same as the upstream\. This can be used to notify CI when the SPDX license data is out of date\. . +.SS "\fBupdate\-maintainers\fR" +Update the list of maintainers in the \fBHomebrew/brew\fR README\. +. .SS "\fBupdate\-python\-resources\fR [\fIoptions\fR] \fIformula\fR [\.\.\.]" Update versions for PyPI resource blocks in \fIformula\fR\. . From 0474fe60933d604575c4fab5a95f27cf333863e8 Mon Sep 17 00:00:00 2001 From: nandahkrishna Date: Thu, 4 Feb 2021 23:48:03 +0530 Subject: [PATCH 44/59] dev-cmd/update-maintainers: add tests --- Library/Homebrew/test/dev-cmd/update-maintainers_spec.rb | 8 ++++++++ Library/Homebrew/test/utils/github_spec.rb | 7 +++++++ 2 files changed, 15 insertions(+) create mode 100644 Library/Homebrew/test/dev-cmd/update-maintainers_spec.rb diff --git a/Library/Homebrew/test/dev-cmd/update-maintainers_spec.rb b/Library/Homebrew/test/dev-cmd/update-maintainers_spec.rb new file mode 100644 index 0000000000..8e8ad57369 --- /dev/null +++ b/Library/Homebrew/test/dev-cmd/update-maintainers_spec.rb @@ -0,0 +1,8 @@ +# typed: false +# frozen_string_literal: true + +require "cmd/shared_examples/args_parse" + +describe "brew update-maintainers" do + it_behaves_like "parseable arguments" +end diff --git a/Library/Homebrew/test/utils/github_spec.rb b/Library/Homebrew/test/utils/github_spec.rb index b1de7fd7f4..10067e9359 100644 --- a/Library/Homebrew/test/utils/github_spec.rb +++ b/Library/Homebrew/test/utils/github_spec.rb @@ -50,6 +50,13 @@ describe GitHub do end end + describe "::public_member_usernames", :needs_network do + it "gets the usernames of all publicly visible members of the organisation" do + response = described_class.public_member_usernames("Homebrew") + expect(response).to be_a(Array) + end + end + describe "::sponsors_by_tier", :needs_network do it "errors on an unauthenticated token" do expect { From 90632ce274be1718e6688962119bbae9ee3aaa7d Mon Sep 17 00:00:00 2001 From: nandahkrishna Date: Fri, 5 Feb 2021 01:43:07 +0530 Subject: [PATCH 45/59] dev-cmd/update-maintainers: modify Linux maintainer wording in README --- Library/Homebrew/dev-cmd/man.rb | 2 +- Library/Homebrew/dev-cmd/update-maintainers.rb | 2 +- README.md | 2 +- docs/Manpage.md | 2 +- manpages/brew.1 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb index 999916dfc9..2d375eaa6a 100644 --- a/Library/Homebrew/dev-cmd/man.rb +++ b/Library/Homebrew/dev-cmd/man.rb @@ -88,7 +88,7 @@ module Homebrew readme.read[/(Homebrew's \[Technical Steering Committee.*\.)/, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:linux] = - readme.read[%r{(Homebrew/brew's Linux maintainers .*\.)}, 1] + readme.read[/(Homebrew's Linux maintainers .*\.)/, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:maintainers] = readme.read[/(Homebrew's other current maintainers .*\.)/, 1] diff --git a/Library/Homebrew/dev-cmd/update-maintainers.rb b/Library/Homebrew/dev-cmd/update-maintainers.rb index 32c690d779..2701fc800b 100644 --- a/Library/Homebrew/dev-cmd/update-maintainers.rb +++ b/Library/Homebrew/dev-cmd/update-maintainers.rb @@ -45,7 +45,7 @@ module Homebrew "\\1 is #{sentences[0]}.") content.gsub!(/(Homebrew's \[Technical Steering Committee.*) is .*\./, "\\1 is #{sentences[1]}.") - content.gsub!(%r{(Homebrew/brew's Linux maintainers are).*\.}, + content.gsub!(/(Homebrew's Linux maintainers are).*\./, "\\1 #{sentences[2]}.") content.gsub!(/(Homebrew's other current maintainers are).*\./, "\\1 #{sentences[3]}.") diff --git a/README.md b/README.md index 800ad90083..e6e8ed99d7 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Homebrew's [Project Leadership Committee](https://docs.brew.sh/Homebrew-Governan Homebrew's [Technical Steering Committee](https://docs.brew.sh/Homebrew-Governance#7-technical-steering-committee) is [Michka Popoff](https://github.com/imichka), [FX Coudert](https://github.com/fxcoudert), [Markus Reiter](https://github.com/reitermarkus), [Misty De Meo](https://github.com/mistydemeo) and [Mike McQuaid](https://github.com/MikeMcQuaid). -Homebrew/brew's Linux maintainers are [Michka Popoff](https://github.com/imichka), [Shaun Jackman](https://github.com/sjackman), [Dawid Dziurla](https://github.com/dawidd6), [Issy Long](https://github.com/issyl0) and [Maxim Belkin](https://github.com/maxim-belkin). +Homebrew's Linux maintainers are [Michka Popoff](https://github.com/imichka), [Shaun Jackman](https://github.com/sjackman), [Dawid Dziurla](https://github.com/dawidd6), [Issy Long](https://github.com/issyl0) and [Maxim Belkin](https://github.com/maxim-belkin). Homebrew's other current maintainers are [Claudia Pellegrino](https://github.com/claui), [Zach Auten](https://github.com/zachauten), [Rui Chen](https://github.com/chenrui333), [Vitor Galvao](https://github.com/vitorgalvao), [Caleb Xu](https://github.com/alebcay), [Gautham Goli](https://github.com/GauthamGoli), [Steven Peters](https://github.com/scpeters), [Bo Anderson](https://github.com/Bo98), [William Woodruff](https://github.com/woodruffw), [Igor Kapkov](https://github.com/igas), [Sam Ford](https://github.com/samford), [Alexander Bayandin](https://github.com/bayandin), [Izaak Beekman](https://github.com/zbeekman), [Eric Knibbe](https://github.com/EricFromCanada), [Viktor Szakats](https://github.com/vszakats), [Thierry Moisan](https://github.com/moisan), [Steven Peters](https://github.com/scpeters), [Tom Schoonjans](https://github.com/tschoonj), [Issy Long](https://github.com/issyl0), [CoreCode](https://github.com/core-code), [Randall](https://github.com/ran-dall), [Rylan Polster](https://github.com/Rylan12), [SeekingMeaning](https://github.com/SeekingMeaning), [William Ma](https://github.com/whoiswillma) and [Dustin Rodrigues](https://github.com/dtrodrigues). diff --git a/docs/Manpage.md b/docs/Manpage.md index c7a72bd5ff..e38f47c8fb 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1965,7 +1965,7 @@ Homebrew's Project Leadership Committee is Misty De Meo, Shaun Jackman, Jonathan Homebrew's Technical Steering Committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid. -Homebrew/brew's Linux maintainers are Michka Popoff, Shaun Jackman, Dawid Dziurla, Issy Long and Maxim Belkin. +Homebrew's Linux maintainers are Michka Popoff, Shaun Jackman, Dawid Dziurla, Issy Long and Maxim Belkin. Homebrew's other current maintainers are Claudia Pellegrino, Zach Auten, Rui Chen, Vitor Galvao, Caleb Xu, Gautham Goli, Steven Peters, Bo Anderson, William Woodruff, Igor Kapkov, Sam Ford, Alexander Bayandin, Izaak Beekman, Eric Knibbe, Viktor Szakats, Thierry Moisan, Steven Peters, Tom Schoonjans, Issy Long, CoreCode, Randall, Rylan Polster, SeekingMeaning, William Ma and Dustin Rodrigues. diff --git a/manpages/brew.1 b/manpages/brew.1 index 759b9edbad..1c7ae3c6b2 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -2849,7 +2849,7 @@ Homebrew\'s Project Leadership Committee is Misty De Meo, Shaun Jackman, Jonatha Homebrew\'s Technical Steering Committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid\. . .P -Homebrew/brew\'s Linux maintainers are Michka Popoff, Shaun Jackman, Dawid Dziurla, Issy Long and Maxim Belkin\. +Homebrew\'s Linux maintainers are Michka Popoff, Shaun Jackman, Dawid Dziurla, Issy Long and Maxim Belkin\. . .P Homebrew\'s other current maintainers are Claudia Pellegrino, Zach Auten, Rui Chen, Vitor Galvao, Caleb Xu, Gautham Goli, Steven Peters, Bo Anderson, William Woodruff, Igor Kapkov, Sam Ford, Alexander Bayandin, Izaak Beekman, Eric Knibbe, Viktor Szakats, Thierry Moisan, Steven Peters, Tom Schoonjans, Issy Long, CoreCode, Randall, Rylan Polster, SeekingMeaning, William Ma and Dustin Rodrigues\. From 15f936a22a228f01482ce6819fefccdf73045afb Mon Sep 17 00:00:00 2001 From: nandahkrishna Date: Sat, 6 Feb 2021 02:58:17 +0530 Subject: [PATCH 46/59] dev-cmd/update-maintainers: implement suggestions from code review --- Library/Homebrew/.rubocop.yml | 3 +- .../Homebrew/dev-cmd/update-maintainers.rb | 29 ++++++++++--------- Library/Homebrew/utils/github.rb | 16 ++++++++-- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml index 799d1baf79..b5cdb52bf7 100644 --- a/Library/Homebrew/.rubocop.yml +++ b/Library/Homebrew/.rubocop.yml @@ -36,8 +36,9 @@ Metrics/PerceivedComplexity: Max: 90 Metrics/MethodLength: Max: 260 +# TODO: Reduce to 600 after refactoring utils/github Metrics/ModuleLength: - Max: 650 + Max: 620 Exclude: - "test/**/*" diff --git a/Library/Homebrew/dev-cmd/update-maintainers.rb b/Library/Homebrew/dev-cmd/update-maintainers.rb index 2701fc800b..1ce882b7b5 100644 --- a/Library/Homebrew/dev-cmd/update-maintainers.rb +++ b/Library/Homebrew/dev-cmd/update-maintainers.rb @@ -26,29 +26,32 @@ module Homebrew # We assume that only public members wish to be included in the README public_members = GitHub.public_member_usernames("Homebrew") - plc = GitHub.members_by_team("Homebrew", "plc") - tsc = GitHub.members_by_team("Homebrew", "tsc") - linux = GitHub.members_by_team("Homebrew", "linux") - other = GitHub.members_by_team("Homebrew", "maintainers") - other.except!(*[plc, tsc, linux].map(&:keys).flatten.uniq) + members = { + plc: GitHub.members_by_team("Homebrew", "plc"), + tsc: GitHub.members_by_team("Homebrew", "tsc"), + linux: GitHub.members_by_team("Homebrew", "linux"), + } + members[:other] = GitHub.members_by_team("Homebrew", "maintainers") + .except(*members.values.map(&:keys).flatten.uniq) - sentences = [plc, tsc, linux, other].map do |h| - h.slice!(*public_members) - h.each { |k, v| h[k] = "[#{v}](https://github.com/#{k})" } - h.values.sort.to_sentence + sentences = {} + members.each do |group, hash| + hash.slice!(*public_members) + hash.each { |login, name| hash[login] = "[#{name}](https://github.com/#{login})" } + sentences[group] = hash.values.sort.to_sentence end readme = HOMEBREW_REPOSITORY/"README.md" content = readme.read content.gsub!(/(Homebrew's \[Project Leadership Committee.*) is .*\./, - "\\1 is #{sentences[0]}.") + "\\1 is #{sentences[:plc]}.") content.gsub!(/(Homebrew's \[Technical Steering Committee.*) is .*\./, - "\\1 is #{sentences[1]}.") + "\\1 is #{sentences[:tsc]}.") content.gsub!(/(Homebrew's Linux maintainers are).*\./, - "\\1 #{sentences[2]}.") + "\\1 #{sentences[:linux]}.") content.gsub!(/(Homebrew's other current maintainers are).*\./, - "\\1 #{sentences[3]}.") + "\\1 #{sentences[:other]}.") File.open(readme, "w+") { |f| f.write(content) } diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index feec12c973..a18b146200 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -577,7 +577,7 @@ module GitHub members = [] (1..API_MAX_PAGES).each do |page| - result = open_api(url + "&page=#{page}").map { |m| m["login"] } + result = open_api("#{url}&page=#{page}").map { |member| member["login"] } members.concat(result) return members if result.length < per_page @@ -587,6 +587,11 @@ module GitHub def members_by_team(org, team) query = <<~EOS { organization(login: "#{org}") { + teams(first: 100) { + nodes { + ... on Team { name } + } + } team(slug: "#{team}") { members(first: 100) { nodes { @@ -598,7 +603,14 @@ module GitHub } EOS result = open_graphql(query, scopes: ["read:org", "user"]) - result["organization"]["team"]["members"]["nodes"].map { |m| [m["login"], m["name"]] }.to_h + + if result["organization"]["teams"]["nodes"].blank? + raise Error, + "Your token needs the 'read:org' scope to access this API" + end + raise Error, "The team #{org}/#{team} does not exist" if result["organization"]["team"].blank? + + result["organization"]["team"]["members"]["nodes"].map { |member| [member["login"], member["name"]] }.to_h end def sponsors_by_tier(user) From 0969361c54e4f1843aa9b65f37c6a097fe202a9d Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 9 Feb 2021 00:50:45 +0000 Subject: [PATCH 47/59] sorbet: Update RBI files. Autogenerated by the [sorbet](https://github.com/Homebrew/brew/blob/master/.github/workflows/sorbet.yml) workflow. --- Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 23550c707d..24ed86c8dd 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -6187,6 +6187,11 @@ class CompilerSelector::Compiler def self.members(); end end +class CompilerSelector + extend ::T::Private::Methods::MethodHooks + extend ::T::Private::Methods::SingletonMethodHooks +end + class Concurrent::Promises::AbstractEventFuture include ::Concurrent::Promises::InternalStates end From 024f053cdd7fc7b72b7dd5270c1f8dc4f2eb1c39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Feb 2021 06:01:24 +0000 Subject: [PATCH 48/59] build(deps): bump bootsnap from 1.7.1 to 1.7.2 in /Library/Homebrew Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.1 to 1.7.2. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.1...v1.7.2) Signed-off-by: dependabot[bot] --- 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 601e1d7d99..668d4cec24 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -9,7 +9,7 @@ GEM zeitwerk (~> 2.3) ast (2.4.2) bindata (2.4.8) - bootsnap (1.7.1) + bootsnap (1.7.2) msgpack (~> 1.0) byebug (11.1.3) codecov (0.4.3) From 10f93ab6e392a194ada01ab8c0a97d4c24b7cf34 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 9 Feb 2021 06:03:44 +0000 Subject: [PATCH 49/59] brew vendor-gems: commit updates. --- .../Homebrew/vendor/bundle/bundler/setup.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index b942dd742e..73f2cf09e9 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -11,12 +11,12 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.4.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.1.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bindata-2.4.8/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/msgpack-1.4.2" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/msgpack-1.4.2" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/msgpack-1.4.2/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/bootsnap-1.7.1" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bootsnap-1.7.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/bootsnap-1.7.2" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bootsnap-1.7.2/lib" $:.unshift "#{path}/" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/byebug-11.1.3" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/byebug-11.1.3" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/byebug-11.1.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.5/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.12.3/lib" @@ -29,12 +29,12 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/highline-2.0.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/commander-4.5.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/diff-lcs-1.4.4/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/unf_ext-0.0.7.7" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/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}/gems/elftools-1.1.3/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/hpricot-0.8.6" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/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}/gems/mime-types-data-3.2020.1104/lib" @@ -42,7 +42,7 @@ $:.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.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mini_portile2-2.5.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/racc-1.5.2" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/racc-1.5.2" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/racc-1.5.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/nokogiri-1.11.1-x86_64-darwin/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ntlm-http-0.1.1/lib" @@ -61,7 +61,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/patchelf-1.3.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.6.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/pry-0.13.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rack-2.2.3/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-20/2.6.0/rdiscount-2.2.0.2" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/rdiscount-2.2.0.2" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/regexp_parser-2.0.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rexml-3.2.4/lib" @@ -74,7 +74,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.10.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-github-2.3.1/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/sorbet-static-0.5.6274-universal-darwin-20/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-static-0.5.6274-universal-darwin-14/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.6274/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-sorbet-1.8.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib" From ca65767f205dc952389f69a1c18fd62e2d375b2a Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 9 Feb 2021 06:04:34 +0000 Subject: [PATCH 50/59] Update RBI files for bootsnap. --- .../rbi/gems/{bootsnap@1.7.1.rbi => bootsnap@1.7.2.rbi} | 0 Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi | 7 +++++++ 2 files changed, 7 insertions(+) rename Library/Homebrew/sorbet/rbi/gems/{bootsnap@1.7.1.rbi => bootsnap@1.7.2.rbi} (100%) diff --git a/Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.1.rbi b/Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.2.rbi similarity index 100% rename from Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.1.rbi rename to Library/Homebrew/sorbet/rbi/gems/bootsnap@1.7.2.rbi diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 23550c707d..fafa6bf8e4 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -2999,6 +2999,8 @@ end module Bootsnap::LoadPathCache::PathScanner def self.call(path); end + def self.os_path(path); end + def self.walk(absolute_dir_path, relative_dir_path, &block); end end @@ -6187,6 +6189,11 @@ class CompilerSelector::Compiler def self.members(); end end +class CompilerSelector + extend ::T::Private::Methods::MethodHooks + extend ::T::Private::Methods::SingletonMethodHooks +end + class Concurrent::Promises::AbstractEventFuture include ::Concurrent::Promises::InternalStates end From 35344476eb0a435fcb91c3b47fb9d7e91faaae72 Mon Sep 17 00:00:00 2001 From: miccal Date: Tue, 9 Feb 2021 10:15:36 +0000 Subject: [PATCH 51/59] README, manpage: update maintainers. --- README.md | 8 ++++---- docs/Manpage.md | 8 ++++---- manpages/brew.1 | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e6e8ed99d7..0490277333 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,13 @@ Please report security issues to our [HackerOne](https://hackerone.com/homebrew/ ## Who We Are Homebrew's [Project Leader](https://docs.brew.sh/Homebrew-Governance#6-project-leader) is [Mike McQuaid](https://github.com/MikeMcQuaid). -Homebrew's [Project Leadership Committee](https://docs.brew.sh/Homebrew-Governance#4-project-leadership-committee) is [Misty De Meo](https://github.com/mistydemeo), [Shaun Jackman](https://github.com/sjackman), [Jonathan Chang](https://github.com/jonchang), [Sean Molenaar](https://github.com/SMillerDev) and [Markus Reiter](https://github.com/reitermarkus). +Homebrew's [Project Leadership Committee](https://docs.brew.sh/Homebrew-Governance#4-project-leadership-committee) is [Jonathan Chang](https://github.com/jonchang), [Markus Reiter](https://github.com/reitermarkus), [Misty De Meo](https://github.com/mistydemeo), [Sean Molenaar](https://github.com/SMillerDev) and [Shaun Jackman](https://github.com/sjackman). -Homebrew's [Technical Steering Committee](https://docs.brew.sh/Homebrew-Governance#7-technical-steering-committee) is [Michka Popoff](https://github.com/imichka), [FX Coudert](https://github.com/fxcoudert), [Markus Reiter](https://github.com/reitermarkus), [Misty De Meo](https://github.com/mistydemeo) and [Mike McQuaid](https://github.com/MikeMcQuaid). +Homebrew's [Technical Steering Committee](https://docs.brew.sh/Homebrew-Governance#7-technical-steering-committee) is [FX Coudert](https://github.com/fxcoudert), [Markus Reiter](https://github.com/reitermarkus), [Michka Popoff](https://github.com/iMichka), [Mike McQuaid](https://github.com/MikeMcQuaid) and [Misty De Meo](https://github.com/mistydemeo). -Homebrew's Linux maintainers are [Michka Popoff](https://github.com/imichka), [Shaun Jackman](https://github.com/sjackman), [Dawid Dziurla](https://github.com/dawidd6), [Issy Long](https://github.com/issyl0) and [Maxim Belkin](https://github.com/maxim-belkin). +Homebrew's Linux maintainers are [Daniel Nachun](https://github.com/danielnachun), [Dawid Dziurla](https://github.com/dawidd6), [Issy Long](https://github.com/issyl0), [Jonathan Chang](https://github.com/jonchang), [Michka Popoff](https://github.com/iMichka) and [Shaun Jackman](https://github.com/sjackman). -Homebrew's other current maintainers are [Claudia Pellegrino](https://github.com/claui), [Zach Auten](https://github.com/zachauten), [Rui Chen](https://github.com/chenrui333), [Vitor Galvao](https://github.com/vitorgalvao), [Caleb Xu](https://github.com/alebcay), [Gautham Goli](https://github.com/GauthamGoli), [Steven Peters](https://github.com/scpeters), [Bo Anderson](https://github.com/Bo98), [William Woodruff](https://github.com/woodruffw), [Igor Kapkov](https://github.com/igas), [Sam Ford](https://github.com/samford), [Alexander Bayandin](https://github.com/bayandin), [Izaak Beekman](https://github.com/zbeekman), [Eric Knibbe](https://github.com/EricFromCanada), [Viktor Szakats](https://github.com/vszakats), [Thierry Moisan](https://github.com/moisan), [Steven Peters](https://github.com/scpeters), [Tom Schoonjans](https://github.com/tschoonj), [Issy Long](https://github.com/issyl0), [CoreCode](https://github.com/core-code), [Randall](https://github.com/ran-dall), [Rylan Polster](https://github.com/Rylan12), [SeekingMeaning](https://github.com/SeekingMeaning), [William Ma](https://github.com/whoiswillma) and [Dustin Rodrigues](https://github.com/dtrodrigues). +Homebrew's other current maintainers are [Alexander Bayandin](https://github.com/bayandin), [Bo Anderson](https://github.com/Bo98), [Caleb Xu](https://github.com/alebcay), [Carlo Cabrera](https://github.com/carlocab), [Claudia Pellegrino](https://github.com/claui), [Dustin Rodrigues](https://github.com/dtrodrigues), [Eric Knibbe](https://github.com/EricFromCanada), [Maxim Belkin](https://github.com/maxim-belkin), [Miccal Matthews](https://github.com/miccal), [Nanda H Krishna](https://github.com/nandahkrishna), [Randall](https://github.com/ran-dall), [Rylan Polster](https://github.com/Rylan12), [Sam Ford](https://github.com/samford), [Seeker](https://github.com/SeekingMeaning), [Steve Peters](https://github.com/scpeters), [Thierry Moisan](https://github.com/Moisan), [Tom Schoonjans](https://github.com/tschoonj), [Vítor Galvão](https://github.com/vitorgalvao) and [rui](https://github.com/chenrui333). Former maintainers with significant contributions include [Jan Viljanen](https://github.com/javian), [JCount](https://github.com/jcount), [commitay](https://github.com/commitay), [Dominyk Tiller](https://github.com/DomT4), [Tim Smith](https://github.com/tdsmith), [Baptiste Fontaine](https://github.com/bfontaine), [Xu Cheng](https://github.com/xu-cheng), [Martin Afanasjew](https://github.com/UniqMartin), [Brett Koonce](https://github.com/asparagui), [Charlie Sharpsteen](https://github.com/Sharpie), [Jack Nagel](https://github.com/jacknagel), [Adam Vandenberg](https://github.com/adamv), [Andrew Janke](https://github.com/apjanke), [Alex Dunn](https://github.com/dunn), [neutric](https://github.com/neutric), [Tomasz Pajor](https://github.com/nijikon), [Uladzislau Shablinski](https://github.com/vladshablinsky), [Alyssa Ross](https://github.com/alyssais), [ilovezfs](https://github.com/ilovezfs), [Chongyu Zhu](https://github.com/lembacon) and Homebrew's creator: [Max Howell](https://github.com/mxcl). diff --git a/docs/Manpage.md b/docs/Manpage.md index e38f47c8fb..e977015f9d 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1961,13 +1961,13 @@ Homebrew API: Homebrew's Project Leader is Mike McQuaid. -Homebrew's Project Leadership Committee is Misty De Meo, Shaun Jackman, Jonathan Chang, Sean Molenaar and Markus Reiter. +Homebrew's Project Leadership Committee is Jonathan Chang, Markus Reiter, Misty De Meo, Sean Molenaar and Shaun Jackman. -Homebrew's Technical Steering Committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid. +Homebrew's Technical Steering Committee is FX Coudert, Markus Reiter, Michka Popoff, Mike McQuaid and Misty De Meo. -Homebrew's Linux maintainers are Michka Popoff, Shaun Jackman, Dawid Dziurla, Issy Long and Maxim Belkin. +Homebrew's Linux maintainers are Daniel Nachun, Dawid Dziurla, Issy Long, Jonathan Chang, Michka Popoff and Shaun Jackman. -Homebrew's other current maintainers are Claudia Pellegrino, Zach Auten, Rui Chen, Vitor Galvao, Caleb Xu, Gautham Goli, Steven Peters, Bo Anderson, William Woodruff, Igor Kapkov, Sam Ford, Alexander Bayandin, Izaak Beekman, Eric Knibbe, Viktor Szakats, Thierry Moisan, Steven Peters, Tom Schoonjans, Issy Long, CoreCode, Randall, Rylan Polster, SeekingMeaning, William Ma and Dustin Rodrigues. +Homebrew's other current maintainers are Alexander Bayandin, Bo Anderson, Caleb Xu, Carlo Cabrera, Claudia Pellegrino, Dustin Rodrigues, Eric Knibbe, Maxim Belkin, Miccal Matthews, Nanda H Krishna, Randall, Rylan Polster, Sam Ford, Seeker, Steve Peters, Thierry Moisan, Tom Schoonjans, Vítor Galvão and rui. Former maintainers with significant contributions include Jan Viljanen, JCount, commitay, Dominyk Tiller, Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg, Andrew Janke, Alex Dunn, neutric, Tomasz Pajor, Uladzislau Shablinski, Alyssa Ross, ilovezfs, Chongyu Zhu and Homebrew's creator: Max Howell. diff --git a/manpages/brew.1 b/manpages/brew.1 index 1c7ae3c6b2..cfb2168156 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -2843,16 +2843,16 @@ Homebrew API: \fIhttps://rubydoc\.brew\.sh\fR Homebrew\'s Project Leader is Mike McQuaid\. . .P -Homebrew\'s Project Leadership Committee is Misty De Meo, Shaun Jackman, Jonathan Chang, Sean Molenaar and Markus Reiter\. +Homebrew\'s Project Leadership Committee is Jonathan Chang, Markus Reiter, Misty De Meo, Sean Molenaar and Shaun Jackman\. . .P -Homebrew\'s Technical Steering Committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid\. +Homebrew\'s Technical Steering Committee is FX Coudert, Markus Reiter, Michka Popoff, Mike McQuaid and Misty De Meo\. . .P -Homebrew\'s Linux maintainers are Michka Popoff, Shaun Jackman, Dawid Dziurla, Issy Long and Maxim Belkin\. +Homebrew\'s Linux maintainers are Daniel Nachun, Dawid Dziurla, Issy Long, Jonathan Chang, Michka Popoff and Shaun Jackman\. . .P -Homebrew\'s other current maintainers are Claudia Pellegrino, Zach Auten, Rui Chen, Vitor Galvao, Caleb Xu, Gautham Goli, Steven Peters, Bo Anderson, William Woodruff, Igor Kapkov, Sam Ford, Alexander Bayandin, Izaak Beekman, Eric Knibbe, Viktor Szakats, Thierry Moisan, Steven Peters, Tom Schoonjans, Issy Long, CoreCode, Randall, Rylan Polster, SeekingMeaning, William Ma and Dustin Rodrigues\. +Homebrew\'s other current maintainers are Alexander Bayandin, Bo Anderson, Caleb Xu, Carlo Cabrera, Claudia Pellegrino, Dustin Rodrigues, Eric Knibbe, Maxim Belkin, Miccal Matthews, Nanda H Krishna, Randall, Rylan Polster, Sam Ford, Seeker, Steve Peters, Thierry Moisan, Tom Schoonjans, Vítor Galvão and rui\. . .P Former maintainers with significant contributions include Jan Viljanen, JCount, commitay, Dominyk Tiller, Tim Smith, Baptiste Fontaine, Xu Cheng, Martin Afanasjew, Brett Koonce, Charlie Sharpsteen, Jack Nagel, Adam Vandenberg, Andrew Janke, Alex Dunn, neutric, Tomasz Pajor, Uladzislau Shablinski, Alyssa Ross, ilovezfs, Chongyu Zhu and Homebrew\'s creator: Max Howell\. From 0aed1fc62ebd6696c81d8c260d0b594c20a2dbd6 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Tue, 9 Feb 2021 13:00:45 +0100 Subject: [PATCH 52/59] Docs: Migrate casks FAQ --- docs/Acceptable-Casks.md | 129 +++++++++++++++++++++++++++++++++++++++ docs/FAQ.md | 48 +++++++++++++++ docs/README.md | 1 + 3 files changed, 178 insertions(+) create mode 100644 docs/Acceptable-Casks.md diff --git a/docs/Acceptable-Casks.md b/docs/Acceptable-Casks.md new file mode 100644 index 0000000000..ac2184c991 --- /dev/null +++ b/docs/Acceptable-Casks.md @@ -0,0 +1,129 @@ +# Acceptable Casks + +Some casks should not go in +[homebrew/cask](https://github.com/Homebrew/homebrew-cask). But there are +additional [Interesting Taps and Forks](Interesting-Taps-and-Forks.md) and anyone can start their +own! + +## Finding a Home For Your Cask + +We maintain separate Taps for different types of binaries. Our nomenclature is: + ++ **Stable**: The latest version provided by the developer defined by them as such. ++ **Beta, Development, Unstable**: Subsequent versions to **stable**, yet incomplete and under development, aiming to eventually become the new **stable**. Also includes alternate versions specifically targeted at developers. ++ **Nightly**: Constantly up-to-date versions of the current development state. ++ **Legacy**: Any **stable** version that is not the most recent. ++ **Regional, Localized**: Any version that isn’t the US English one, when that exists. ++ **Trial**: Date-limited version that stops working entirely after it expires, requiring payment to lift the limitation. ++ **Freemium**: Gratis version that works indefinitely but with limitations that can be removed by paying. ++ **Fork**: An alternate version of an existing project, with a based-on but modified source and binary. ++ **Unofficial**: An *allegedly* unmodified compiled binary, by a third-party, of a binary that has no existing build by the owner of the source code. ++ **Vendorless**: A binary distributed without an official website, like a forum posting. ++ **Walled**: When the download URL is both behind a login/registration form and from a host that differs from the homepage. ++ **Font**: Data file containing a set of glyphs, characters, or symbols, that changes typed text. ++ **Driver**: Software to make a hardware peripheral recognisable and usable by the system. If the software is useless without the peripheral, it’s considered a driver. + +### Stable Versions + +Stable versions live in the main repository at [Homebrew/homebrew-cask](https://github.com/Homebrew/homebrew-cask). They should run on the latest release of macOS or the previous point release (High Sierra and Mojave as of late 2018). + +### But There Is No Stable Version! + +When an App is only available as beta, development, or unstable versions, or in cases where such a version is the general standard, then said version can go into the main repo. + +### Beta, Unstable, Development, Nightly, or Legacy + +When an App has a main stable version, alternative versions should be submitted to [Homebrew/homebrew-cask-versions](https://github.com/Homebrew/homebrew-cask-versions). + +### Regional and Localized + +When an App exists in more than one language or has different regional editions, [the `language` stanza should be used to switch between languages or regions](https://github.com/Homebrew/homebrew-cask/blob/HEAD/doc/cask_language_reference/stanzas/language.md). + +### Trial and Freemium Versions + +Before submitting a trial, make sure it can be made into a full working version without the need to be redownloaded. If an App provides a trial but the only way to buy the full version is via the Mac App Store, it does not belong in any of the official repos. Freemium versions are fine. + +### Forks and Apps with Conflicting Names + +Forks must have the vendor’s name as a prefix on the Cask’s file name and token. If the original software is discontinued, forks still need to follow this rule so as to not be surprising to the user. There are two exceptions which allow the fork to replace the main cask: + +* The original discontinued software recommends that fork. +* The fork is so overwhelmingly popular that it surpasses the original and is now the de facto project when people think of the name. + +For unrelated Apps that share a name, the most popular one (usually the one already present) stays unprefixed. Since this can be subjective, if you disagree with a decision, open an issue and make your case to the maintainers. + +### Unofficial, Vendorless, and Walled Builds + +We do not accept these casks since they offer a higher-than-normal security risk. + +### Fonts + +Font Casks live in the [Homebrew/homebrew-cask-fonts](https://github.com/Homebrew/homebrew-cask-fonts) repository. See the font repo [CONTRIBUTING.md](https://github.com/Homebrew/homebrew-cask-fonts/blob/HEAD/CONTRIBUTING.md) +for details. + +### Drivers + +Driver Casks live in the [Homebrew/homebrew-cask-drivers](https://github.com/Homebrew/homebrew-cask-drivers) repository. See the drivers repo [CONTRIBUTING.md](https://github.com/Homebrew/homebrew-cask-drivers/blob/master/CONTRIBUTING.md) +for details. + +## Apps that bundle malware + +Unfortunately, in the world of software there are bad actors that bundle malware with their apps. Even so, Homebrew Cask has long decided it will not be an active gatekeeper ([macOS already has one](https://support.apple.com/en-us/HT202491)) and [users are expected to know about the software they are installing](#homebrew-cask-is-not-a-discoverability-service). This means we will not always remove casks that link to these apps, in part because there is no clear line between useful app, potentially unwanted program, and the different shades of malware — what is useful to one user may be seen as malicious by another. + +Within that context, we would still like for users to enjoy some kind of protection while minimising occurrences of legitimate developers being branded as malware carriers. To do so, we evaluate casks on a case-by-case basis, and any user is free to bring a potential malware case to our attention. It is, however, important to never forget the last line of defence is *always* the user. + +If an app that bundles malware was not signed with an Apple Developer ID and you purposefully disabled or bypassed Gatekeeper, no action will be taken on our part. When you disable security features, you do so at your own risk. If, however, an app that bundles malware is signed, Apple can revoke its permissions and it will no longer run on the computers of users that keep security features on — we all benefit, Homebrew Cask users or not. To report a signed app that bundles malware, use [Apple’s Bug Reporter](https://bugreport.apple.com/) + +We are also open to removing casks where we feel there is enough evidence that the app is malicious. To suggest a cask for removal, submit a Pull Request to delete it, together with your reasoning. Typically, this will mean presenting a [VirusTotal](https://www.virustotal.com) scan of the app showing it is malicious, ideally with some other reporting indicating it’s not a false positive. + +Likewise, software that provides both “clean” and malware-infested versions might be removed from the repo — even if we could have access to the *good* version — if its developers push for users to install the *bad* version. We do so because in these cases, there’s a higher than normal risk that both versions are (or will soon become) compromised in some manner. + +If a cask you depend on was removed due to these rules, fear not. Removal of a cask from the official repositories means we won’t support it, but you can do so by hosting your own [tap](How-to-Create-and-Maintain-a-Tap.md). + +## Exceptions to the Notability Threshold + +Casks which do not reach a minimum notability threshold (see [Rejected Casks](#rejected-casks)) aren’t accepted in the main repositories because the increased maintenance burden doesn’t justify the poor usage numbers they will likely get. This notability check is performed automatically by the audit commands we provide, but its decisions aren’t set in stone. A cask which fails the notability check can be added if it is: + +1. A popular app that has their own website but the developers use GitHub for hosting the binaries. That repository won’t be notable but the app may be. +2. Submitted by a maintainer or prolific contributor. A big part of the reasoning for the notability rule is unpopular software garners less attention and the cask gets abandoned, outdated, and broken. Someone with a proven investment in Hombrew Cask is less likely to let that happen for software they depend on. +3. A piece of software that was recently released to great fanfare—everyone is talking about it on Twitter and Hacker News and we’ve even gotten multiple premature submissions for it. That’s a clear case of an app that will reach the threshold in no time so that’s a PR we won’t close immediately (but may wait to merge). + +Note none of these exceptions is a guarantee for inclusion, but examples of situations where we may take a second look. + +## Homebrew Cask is not a discoverability service + +From the inception of Homebrew Cask, various requests fell under the umbrella of this reply. Though a somewhat popular request, after careful consideration on multiple occasions we’ve always come back to the same conclusion: we’re not a discoverability service and our users are expected to have reasonable knowledge about the apps they’re installing through us before doing so. For example, [grouping casks by categories](https://github.com/Homebrew/homebrew-cask/issues/5425) is not within the scope of the project. + +Amongst other things, the logistics of such requests are unsustainable for Homebrew Cask. Before making a request of this nature, you must read through previous related issues, as well as any other issues they link to, to get a full understanding of why that is the case, and why “but project *x* does *y*” arguments aren’t applicable, and not every package manager is the same. + +You should also be able to present clear actionable fixes to those concerns. Simply asking for it without solutions will get your issue closed. + +There is a difference between discoverability and searchability however, and while the former (finding new apps you didn’t know about) is unlikely to ever become part of our goals. The latter (identifying the app you know about and want to install) is indeed important to us, and we continue to work on it. + +## Rejected Casks + +Before submitting a Cask to any of our repos, you must read [our documentation on acceptable Casks](#finding-a-home-for-your-cask) and perform a (at least quick) search to see if there were any previous attempts to introduce it. + +Common reasons to reject a Cask entirely: + ++ We have strong reasons to believe including the Cask can put the whole project at risk. Happened only once so far, [with Popcorn Time](https://github.com/Homebrew/homebrew-cask/pull/3954). ++ The Cask is unreasonably difficult to maintain. Examples include [Audacity](https://github.com/Homebrew/homebrew-cask/pull/27517) and [older Java development Casks](https://github.com/Homebrew/homebrew-cask/issues/57387). ++ The app is a trial version, and the only way to acquire the full version is through the Mac App Store. + + Similarly (and trickier to spot), the app has moved to the Mac App Store but still provides old versions via direct download. We reject these in all official repos so users don’t get stuck using an old version, wrongly thinking they’re using the most up-to-date one (which, amongst other things, might be a security risk). ++ The app is both open-source and CLI-only (i.e. it only uses the `binary` artifact). In that case, and [in the spirit of deduplication](https://github.com/Homebrew/homebrew-cask/issues/15603), submit it first to [Homebrew/core](https://github.com/Homebrew/homebrew-core) as a formula that builds from source. If it is rejected, you may then try again as a cask (link us to the issue so we can see the discussion and reasoning for rejection). ++ The app is open-source and has a GUI but no compiled versions (or only old ones) are provided. It’s better to have them in [Homebrew](https://github.com/Homebrew/homebrew) so users don’t get perpetually outdated versions. See [`gedit`](https://github.com/Homebrew/homebrew-cask/pull/23360) for example. ++ The app has been rejected before due to an issue we cannot fix, and this new submission doesn’t fix that . An example would be [the first submission of `soapui`](https://github.com/Homebrew/homebrew-cask/pull/4939), whose installation problems were not fixed in the two subsequent submissions ([#9969](https://github.com/Homebrew/homebrew-cask/pull/9969), [#10606](https://github.com/Homebrew/homebrew-cask/pull/10606)). ++ The Cask is a duplicate. These submissions mostly occur when the [token reference](https://github.com/Homebrew/homebrew-cask/blob/HEAD/doc/cask_language_reference/token_reference.md) was not followed. ++ The download URL for the app is both behind a login/registration form and from a host that differs from the homepage, meaning users can’t easily verify its authenticity. [alehouse/homebrew-unofficial](https://github.com/alehouse/homebrew-unofficial) is a sister repo where you may wish to submit your cask. ++ The Cask is for an app that is unmaintained (no releases in the last year, or [explicitly discontinued](https://github.com/Homebrew/homebrew-cask/pull/22699)). ++ The Cask is for an app that is too obscure. Examples: + + An app from a code repository that is not notable enough (under 30 forks, 30 watchers, 75 stars). + + [Electronic Identification (eID) software](https://github.com/Homebrew/homebrew-cask/issues/59021). ++ The Cask is for an app with no information on the homepage (example: a GitHub repository without a README). ++ The author has [specifically asked us not to include it](https://github.com/Homebrew/homebrew-cask/pull/5342). ++ The Cask requires [SIP to be disabled](https://github.com/Homebrew/homebrew-cask/pull/41890) to be installed and/or used. ++ The Cask is a `pkg` that requires [`allow_untrusted: true`](https://github.com/Homebrew/homebrew-cask/blob/HEAD/doc/cask_language_reference/stanzas/pkg.md#pkg-allow_untrusted). + +Common reasons to reject a Cask from the main repo: + ++ The cask was submitted to the wrong repo. When drafting a cask, consult “[Finding a Home For Your Cask](#finding-a-home-for-your-cask)” to see where it belongs. diff --git a/docs/FAQ.md b/docs/FAQ.md index a8c530678e..f13d44aae5 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -193,3 +193,51 @@ You can still link in the formula if you need to with `brew link `, tho ## How can I specify different configure arguments for a formula? `brew edit ` and edit the formula. Currently there is no other way to do this. + + +## The app can’t be opened because it is from an unidentified developer +Chances are that certain apps will give you a popup message like this: + +Gatekeeper message + +This is a [security feature from Apple](https://support.apple.com/en-us/HT202491). The single most important thing to know is that **you can allow individual apps to be exempt from that feature.** This allows the app to run while the rest of the system remains under protection. + +**Always leave system-wide protection enabled,** and disable it only for specific apps as needed. + +If you are sure you want to trust the app, you can disable protection for that app by right-clicking its icon and choosing `Open`: + +Right-click the app and choose Open + +Finally, click the `Open` button if you want macOS to permanently allow the app to run on this Mac. **Don’t do this unless you’re sure you trust the app.** + +Gatekeeper message + +Alternatively, you may provide the [`--no-quarantine` flag](https://github.com/Homebrew/homebrew-cask/blob/HEAD/USAGE.md#options) at install time to not add this feature to a specific app. + + +## Why some apps aren’t included in `upgrade` +After running `brew upgrade`, you may notice some casks you think should be upgrading, aren’t. + +As you’re likely aware, a lot of macOS software can upgrade itself: + +Sparkle update window + +That could cause conflicts when used in tandem with Homebrew Cask’s `upgrade` mechanism. + +If you upgrade software through it’s built-in mechanism, that happens without Homebrew Cask’s knowledge so both versions get out of sync. If you then upgraded through Homebrew Cask and we have a lower version on the software on record, you’d get a downgrade. + +There are a few ideas to fix this problem: + +* Try to prevent the software’s automated updates. That won’t be a universal solution and may cause it to break. Most software on Homebrew Cask is closed-source, so we’d be guessing. This is also why pinning casks to a version isn’t available. +* Try to extract the installed software’s version and compare it to the cask, deciding what to do at that time. That’s a complicated solution that breaks other parts of our methodology, such as using versions to interpolate in `url`s (a definite win for maintainability). That solution also isn’t universal, as many software developers are inconsistent in their versioning schemes (and app bundles are meant to have two version strings) and it doesn’t work for all types of software we support. + +So we let software be. Installing it with Homebrew Cask should make it behave the same as if you had installed it manually. But we also want to support software that does not auto-upgrade, so we add [`auto_updates true`](https://github.com/Homebrew/homebrew-cask/blob/62c0495b254845a481dacac6ea7c8005e27a3fb0/Casks/alfred.rb#L10) to casks of software that can do it, which excludes them from `brew upgrade`. + +Casks which use [`version :latest`](https://github.com/Homebrew/homebrew-cask/blob/HEAD/doc/cask_language_reference/stanzas/version.md#version-latest) are also excluded, because we have no way to track the version they’re in. It helps to ask the developers of such software to provide versioned releases (i.e. have the version in the path of the download `url`). + +If you still want to force software to be upgraded via Homebrew Cask, you can: + +* Reference it specifically in the `upgrade` command: `brew upgrade {{cask_name}}`. +* Use the `--greedy` flag: `brew upgrade --greedy`. + +Refer to the `upgrade` section of the `brew` manual page by running `man -P 'less --pattern "^ {3}upgrade"' brew`. \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 8bfa541391..9dab185efa 100644 --- a/docs/README.md +++ b/docs/README.md @@ -38,6 +38,7 @@ - [How To Open A Pull Request (and get it merged)](How-To-Open-a-Homebrew-Pull-Request.md) - [Formula Cookbook](Formula-Cookbook.md) - [Acceptable Formulae](Acceptable-Formulae.md) +- [Acceptable Casks](Acceptable-Casks.md) - [License Guidelines](License-Guidelines.md) - [Formulae Versions](Versions.md) - [Deprecating, Disabling, and Removing Formulae](Deprecating-Disabling-and-Removing-Formulae.md) From 0f48498ad82d8b0de046a64e38538b6f1e600386 Mon Sep 17 00:00:00 2001 From: Gibson Fahnestock Date: Tue, 9 Feb 2021 15:29:54 +0000 Subject: [PATCH 53/59] fix(tap): set clone remote name to origin explicitly Git now allows setting a different default remote name than `origin` when you do a fresh clone by running: ```shell git config --global clone.defaultRemoteName notorigin ``` This causes `brew tap && brew update` to fail, as it clones with a different remote name in the `tap` and then expects the remote to be `origin` in the `update`. Fix this by explicitly setting the origin remote in the clone command. --- Library/Homebrew/tap.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index 9c1d44cbf1..f6a5a1bf80 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -296,6 +296,10 @@ class Tap $stderr.ohai "Tapping #{name}" unless quiet args = %W[clone #{requested_remote} #{path}] + + # Override possible user configs like: + # git config --global clone.defaultRemoteName notorigin + args << "--origin=origin" args << "--depth=1" unless full_clone args << "-q" if quiet From 0a292c7041d4497d51259882fc7e44892e875133 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Mon, 8 Feb 2021 20:06:09 +0100 Subject: [PATCH 54/59] linux: use preferred_gcc instead of gcc --- Library/Homebrew/compilers.rb | 8 ++++---- Library/Homebrew/extend/os/linux/compilers.rb | 2 +- Library/Homebrew/extend/os/linux/keg_relocate.rb | 4 +++- Library/Homebrew/extend/os/linux/linkage_checker.rb | 4 +++- Library/Homebrew/extend/os/linux/system_config.rb | 3 ++- Library/Homebrew/test/formula_installer_bottle_spec.rb | 1 + Library/Homebrew/test/formulary_spec.rb | 1 + 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb index 4802530d73..47baccc603 100644 --- a/Library/Homebrew/compilers.rb +++ b/Library/Homebrew/compilers.rb @@ -110,16 +110,16 @@ class CompilerSelector raise CompilerSelectionError, formula end - private - sig { returns(String) } - def preferred_gcc + def self.preferred_gcc "gcc" end + private + def gnu_gcc_versions # prioritize gcc version provided by gcc formula. - v = Formulary.factory(preferred_gcc).version.to_s.slice(/\d+/) + v = Formulary.factory(CompilerSelector.preferred_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 diff --git a/Library/Homebrew/extend/os/linux/compilers.rb b/Library/Homebrew/extend/os/linux/compilers.rb index 93698765de..21ac0954d5 100644 --- a/Library/Homebrew/extend/os/linux/compilers.rb +++ b/Library/Homebrew/extend/os/linux/compilers.rb @@ -3,7 +3,7 @@ class CompilerSelector sig { returns(String) } - def preferred_gcc + def self.preferred_gcc # gcc-5 is the lowest gcc version we support on Linux. # gcc-5 is the default gcc in Ubuntu 16.04 (used for our CI) "gcc@5" diff --git a/Library/Homebrew/extend/os/linux/keg_relocate.rb b/Library/Homebrew/extend/os/linux/keg_relocate.rb index b4307b71d9..8a3d713abd 100644 --- a/Library/Homebrew/extend/os/linux/keg_relocate.rb +++ b/Library/Homebrew/extend/os/linux/keg_relocate.rb @@ -1,6 +1,8 @@ # typed: true # frozen_string_literal: true +require "compilers" + class Keg def relocate_dynamic_linkage(relocation) # Patching the dynamic linker of glibc breaks it. @@ -84,7 +86,7 @@ class Keg def self.bottle_dependencies @bottle_dependencies ||= begin formulae = relocation_formulae - gcc = Formula["gcc"] + gcc = Formulary.factory(CompilerSelector.preferred_gcc) if !Homebrew::EnvConfig.force_homebrew_on_linux? && DevelopmentTools.non_apple_gcc_version("gcc") < gcc.version.to_i formulae += gcc.recursive_dependencies.map(&:name) diff --git a/Library/Homebrew/extend/os/linux/linkage_checker.rb b/Library/Homebrew/extend/os/linux/linkage_checker.rb index 6b7d0ea53e..d3d431c1b1 100644 --- a/Library/Homebrew/extend/os/linux/linkage_checker.rb +++ b/Library/Homebrew/extend/os/linux/linkage_checker.rb @@ -1,6 +1,8 @@ # typed: true # frozen_string_literal: true +require "compilers" + class LinkageChecker # Libraries provided by glibc and gcc. SYSTEM_LIBRARY_ALLOWLIST = %w[ @@ -30,6 +32,6 @@ class LinkageChecker @unwanted_system_dylibs = @system_dylibs.reject do |s| SYSTEM_LIBRARY_ALLOWLIST.include? File.basename(s) end - @undeclared_deps -= ["gcc", "glibc"] + @undeclared_deps -= [CompilerSelector.preferred_gcc, "glibc"] end end diff --git a/Library/Homebrew/extend/os/linux/system_config.rb b/Library/Homebrew/extend/os/linux/system_config.rb index 2f07c89b18..fee1f439d6 100644 --- a/Library/Homebrew/extend/os/linux/system_config.rb +++ b/Library/Homebrew/extend/os/linux/system_config.rb @@ -1,6 +1,7 @@ # typed: true # frozen_string_literal: true +require "compilers" require "os/linux/glibc" require "system_command" @@ -46,7 +47,7 @@ module SystemConfig out.puts "Host glibc: #{host_glibc_version}" out.puts "/usr/bin/gcc: #{host_gcc_version}" out.puts "/usr/bin/ruby: #{host_ruby_version}" if RUBY_PATH != HOST_RUBY_PATH - ["glibc", "gcc", "xorg"].each do |f| + ["glibc", CompilerSelector.preferred_gcc, "xorg"].each do |f| out.puts "#{f}: #{formula_linked_version(f)}" end end diff --git a/Library/Homebrew/test/formula_installer_bottle_spec.rb b/Library/Homebrew/test/formula_installer_bottle_spec.rb index c399404410..5bd845b559 100644 --- a/Library/Homebrew/test/formula_installer_bottle_spec.rb +++ b/Library/Homebrew/test/formula_installer_bottle_spec.rb @@ -24,6 +24,7 @@ describe FormulaInstaller do stub_formula_loader formula stub_formula_loader formula("gcc") { url "gcc-1.0" } + stub_formula_loader formula("gcc@5") { url "gcc-5.0" } stub_formula_loader formula("patchelf") { url "patchelf-1.0" } allow(Formula["patchelf"]).to receive(:latest_version_installed?).and_return(true) diff --git a/Library/Homebrew/test/formulary_spec.rb b/Library/Homebrew/test/formulary_spec.rb index b8ca07410d..7da52e0771 100644 --- a/Library/Homebrew/test/formulary_spec.rb +++ b/Library/Homebrew/test/formulary_spec.rb @@ -142,6 +142,7 @@ describe Formulary do before do allow(described_class).to receive(:loader_for).and_call_original stub_formula_loader formula("gcc") { url "gcc-1.0" } + stub_formula_loader formula("gcc@5") { url "gcc-5.0" } stub_formula_loader formula("patchelf") { url "patchelf-1.0" } allow(Formula["patchelf"]).to receive(:latest_version_installed?).and_return(true) end From 8ff7b58cba948eac1120f5f6a5a8ac1f4a45cd96 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 9 Feb 2021 20:58:30 +0000 Subject: [PATCH 55/59] system_config: remove describe_java --- Library/Homebrew/diagnostic.rb | 1 - Library/Homebrew/system_config.rb | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 62efe3feaf..ade58101d1 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -872,7 +872,6 @@ module Homebrew "N/A" end end - add_info "Java", SystemConfig.describe_java nil end diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb index 6702c71635..14f16388ca 100644 --- a/Library/Homebrew/system_config.rb +++ b/Library/Homebrew/system_config.rb @@ -113,16 +113,6 @@ module SystemConfig `uname -m`.chomp end - sig { returns(String) } - def describe_java - return "N/A" unless which "java" - - _, err, status = system_command("java", args: ["-version"], print_stderr: false) - return "N/A" unless status.success? - - err[/java version "([\d._]+)"/, 1] || "N/A" - end - sig { returns(String) } def describe_git return "N/A" unless Utils::Git.available? @@ -132,7 +122,7 @@ module SystemConfig sig { returns(String) } def describe_curl - out, = system_command(curl_executable, args: ["--version"]) + out, = system_command(curl_executable, args: ["--version"], verbose: false) if /^curl (?[\d.]+)/ =~ out "#{curl_version} => #{curl_executable}" @@ -194,7 +184,6 @@ module SystemConfig f.puts "Clang: #{describe_clang}" f.puts "Git: #{describe_git}" f.puts "Curl: #{describe_curl}" - f.puts "Java: #{describe_java}" if describe_java != "N/A" end def dump_verbose_config(f = $stdout) From 7f7e22fe65d83b5b65ca82d0cfacfc9e76dfbf4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 05:58:32 +0000 Subject: [PATCH 56/59] build(deps): bump activesupport from 6.1.1 to 6.1.2 in /Library/Homebrew Bumps [activesupport](https://github.com/rails/rails) from 6.1.1 to 6.1.2. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v6.1.2/activesupport/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v6.1.1...v6.1.2) Signed-off-by: dependabot[bot] --- 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 668d4cec24..e2573ae3a2 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.1) + activesupport (6.1.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -30,7 +30,7 @@ GEM hpricot (0.8.6) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.8.7) + i18n (1.8.8) concurrent-ruby (~> 1.0) mechanize (2.7.7) domain_name (~> 0.5, >= 0.5.1) From 1533ab6b66e5322cadf71f2842bf23abba720753 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Wed, 10 Feb 2021 06:00:45 +0000 Subject: [PATCH 57/59] brew vendor-gems: commit updates. --- Library/Homebrew/vendor/bundle/bundler/setup.rb | 4 ++-- .../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/configuration_file.rb | 0 .../lib/active_support/core_ext.rb | 0 .../lib/active_support/core_ext/array.rb | 0 .../lib/active_support/core_ext/array/access.rb | 0 .../lib/active_support/core_ext/array/conversions.rb | 0 .../lib/active_support/core_ext/array/extract.rb | 0 .../active_support/core_ext/array/extract_options.rb | 0 .../lib/active_support/core_ext/array/grouping.rb | 0 .../lib/active_support/core_ext/array/inquiry.rb | 0 .../lib/active_support/core_ext/array/wrap.rb | 0 .../lib/active_support/core_ext/benchmark.rb | 0 .../lib/active_support/core_ext/big_decimal.rb | 0 .../active_support/core_ext/big_decimal/conversions.rb | 0 .../lib/active_support/core_ext/class.rb | 0 .../lib/active_support/core_ext/class/attribute.rb | 0 .../core_ext/class/attribute_accessors.rb | 0 .../lib/active_support/core_ext/class/subclasses.rb | 0 .../lib/active_support/core_ext/date.rb | 0 .../lib/active_support/core_ext/date/acts_like.rb | 0 .../lib/active_support/core_ext/date/blank.rb | 0 .../lib/active_support/core_ext/date/calculations.rb | 0 .../lib/active_support/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 .../lib/active_support/core_ext/date_and_time/zones.rb | 0 .../lib/active_support/core_ext/date_time.rb | 0 .../lib/active_support/core_ext/date_time/acts_like.rb | 0 .../lib/active_support/core_ext/date_time/blank.rb | 0 .../active_support/core_ext/date_time/calculations.rb | 0 .../active_support/core_ext/date_time/compatibility.rb | 0 .../active_support/core_ext/date_time/conversions.rb | 0 .../lib/active_support/core_ext/digest.rb | 0 .../lib/active_support/core_ext/digest/uuid.rb | 0 .../lib/active_support/core_ext/enumerable.rb | 0 .../lib/active_support/core_ext/file.rb | 0 .../lib/active_support/core_ext/file/atomic.rb | 0 .../lib/active_support/core_ext/hash.rb | 0 .../lib/active_support/core_ext/hash/conversions.rb | 0 .../lib/active_support/core_ext/hash/deep_merge.rb | 0 .../core_ext/hash/deep_transform_values.rb | 0 .../lib/active_support/core_ext/hash/except.rb | 0 .../active_support/core_ext/hash/indifferent_access.rb | 0 .../lib/active_support/core_ext/hash/keys.rb | 0 .../lib/active_support/core_ext/hash/reverse_merge.rb | 0 .../lib/active_support/core_ext/hash/slice.rb | 0 .../lib/active_support/core_ext/integer.rb | 0 .../lib/active_support/core_ext/integer/inflections.rb | 0 .../lib/active_support/core_ext/integer/multiple.rb | 0 .../lib/active_support/core_ext/integer/time.rb | 0 .../lib/active_support/core_ext/kernel.rb | 0 .../lib/active_support/core_ext/kernel/concern.rb | 0 .../lib/active_support/core_ext/kernel/reporting.rb | 0 .../active_support/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 .../lib/active_support/core_ext/module/aliasing.rb | 0 .../lib/active_support/core_ext/module/anonymous.rb | 0 .../active_support/core_ext/module/attr_internal.rb | 0 .../core_ext/module/attribute_accessors.rb | 0 .../core_ext/module/attribute_accessors_per_thread.rb | 0 .../lib/active_support/core_ext/module/concerning.rb | 0 .../lib/active_support/core_ext/module/delegation.rb | 0 .../lib/active_support/core_ext/module/deprecation.rb | 0 .../active_support/core_ext/module/introspection.rb | 0 .../active_support/core_ext/module/redefine_method.rb | 0 .../active_support/core_ext/module/remove_method.rb | 0 .../lib/active_support/core_ext/name_error.rb | 0 .../lib/active_support/core_ext/numeric.rb | 0 .../lib/active_support/core_ext/numeric/bytes.rb | 0 .../lib/active_support/core_ext/numeric/conversions.rb | 0 .../lib/active_support/core_ext/numeric/time.rb | 0 .../lib/active_support/core_ext/object.rb | 0 .../lib/active_support/core_ext/object/acts_like.rb | 0 .../lib/active_support/core_ext/object/blank.rb | 0 .../lib/active_support/core_ext/object/conversions.rb | 0 .../lib/active_support/core_ext/object/deep_dup.rb | 0 .../lib/active_support/core_ext/object/duplicable.rb | 0 .../lib/active_support/core_ext/object/inclusion.rb | 0 .../core_ext/object/instance_variables.rb | 0 .../lib/active_support/core_ext/object/json.rb | 0 .../lib/active_support/core_ext/object/to_param.rb | 0 .../lib/active_support/core_ext/object/to_query.rb | 0 .../lib/active_support/core_ext/object/try.rb | 0 .../lib/active_support/core_ext/object/with_options.rb | 0 .../lib/active_support/core_ext/range.rb | 0 .../lib/active_support/core_ext/range/compare_range.rb | 0 .../lib/active_support/core_ext/range/conversions.rb | 0 .../lib/active_support/core_ext/range/each.rb | 0 .../core_ext/range/include_time_with_zone.rb | 0 .../lib/active_support/core_ext/range/overlaps.rb | 0 .../lib/active_support/core_ext/regexp.rb | 0 .../lib/active_support/core_ext/securerandom.rb | 0 .../lib/active_support/core_ext/string.rb | 0 .../lib/active_support/core_ext/string/access.rb | 0 .../lib/active_support/core_ext/string/behavior.rb | 0 .../lib/active_support/core_ext/string/conversions.rb | 0 .../lib/active_support/core_ext/string/exclude.rb | 0 .../lib/active_support/core_ext/string/filters.rb | 0 .../lib/active_support/core_ext/string/indent.rb | 0 .../lib/active_support/core_ext/string/inflections.rb | 0 .../lib/active_support/core_ext/string/inquiry.rb | 0 .../lib/active_support/core_ext/string/multibyte.rb | 0 .../active_support/core_ext/string/output_safety.rb | 0 .../active_support/core_ext/string/starts_ends_with.rb | 0 .../lib/active_support/core_ext/string/strip.rb | 0 .../lib/active_support/core_ext/string/zones.rb | 0 .../lib/active_support/core_ext/symbol.rb | 0 .../active_support/core_ext/symbol/starts_ends_with.rb | 0 .../lib/active_support/core_ext/time.rb | 0 .../lib/active_support/core_ext/time/acts_like.rb | 0 .../lib/active_support/core_ext/time/calculations.rb | 10 ++++++++-- .../lib/active_support/core_ext/time/compatibility.rb | 0 .../lib/active_support/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 .../active_support/current_attributes/test_helper.rb | 0 .../lib/active_support/deprecation.rb | 0 .../lib/active_support/deprecation/behaviors.rb | 0 .../active_support/deprecation/constant_accessor.rb | 0 .../lib/active_support/deprecation/disallowed.rb | 0 .../active_support/deprecation/instance_delegator.rb | 0 .../lib/active_support/deprecation/method_wrappers.rb | 0 .../lib/active_support/deprecation/proxy_wrappers.rb | 0 .../lib/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 .../lib/active_support/encrypted_configuration.rb | 0 .../lib/active_support/encrypted_file.rb | 0 .../lib/active_support/environment_inquirer.rb | 0 .../lib/active_support/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/fork_tracker.rb | 0 .../lib/active_support/gem_version.rb | 2 +- .../lib/active_support/gzip.rb | 0 .../lib/active_support/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 .../lib/active_support/inflector/inflections.rb | 0 .../lib/active_support/inflector/methods.rb | 0 .../lib/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 .../lib/active_support/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 .../lib/active_support/notifications/fanout.rb | 0 .../lib/active_support/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/secure_compare_rotator.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 .../lib/active_support/xml_mini/nokogirisax.rb | 0 .../lib/active_support/xml_mini/rexml.rb | 0 .../2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n.rb | 3 ++- .../{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend.rb | 0 .../lib/i18n/backend/base.rb | 0 .../lib/i18n/backend/cache.rb | 6 +++--- .../lib/i18n/backend/cache_file.rb | 4 ++-- .../lib/i18n/backend/cascade.rb | 0 .../lib/i18n/backend/chain.rb | 0 .../lib/i18n/backend/fallbacks.rb | 2 ++ .../lib/i18n/backend/flatten.rb | 0 .../lib/i18n/backend/gettext.rb | 0 .../lib/i18n/backend/interpolation_compiler.rb | 0 .../lib/i18n/backend/key_value.rb | 0 .../lib/i18n/backend/memoize.rb | 0 .../lib/i18n/backend/metadata.rb | 0 .../lib/i18n/backend/pluralization.rb | 0 .../lib/i18n/backend/simple.rb | 4 ++-- .../lib/i18n/backend/transliterator.rb | 0 .../gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/config.rb | 0 .../lib/i18n/core_ext/hash.rb | 0 .../{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/exceptions.rb | 0 .../{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/gettext.rb | 0 .../lib/i18n/gettext/helpers.rb | 0 .../lib/i18n/gettext/po_parser.rb | 0 .../lib/i18n/interpolate/ruby.rb | 0 .../gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale.rb | 0 .../lib/i18n/locale/fallbacks.rb | 0 .../{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale/tag.rb | 0 .../lib/i18n/locale/tag/parents.rb | 0 .../lib/i18n/locale/tag/rfc4646.rb | 0 .../lib/i18n/locale/tag/simple.rb | 0 .../{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/middleware.rb | 0 .../{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/version.rb | 2 +- 229 files changed, 23 insertions(+), 14 deletions(-) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/actionable_error.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/array_inquirer.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/backtrace_cleaner.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/benchmarkable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/builder.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/callbacks.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/concern.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/configurable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/configuration_file.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array/access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array/extract.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array/extract_options.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array/grouping.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array/inquiry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/array/wrap.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/benchmark.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/big_decimal.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/big_decimal/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/class.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/class/attribute.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/class/attribute_accessors.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/class/subclasses.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date/blank.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date/calculations.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_and_time/calculations.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_and_time/compatibility.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_and_time/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_time/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_time/blank.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_time/calculations.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_time/compatibility.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/date_time/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/digest.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/digest/uuid.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/enumerable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/file.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/file/atomic.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/deep_merge.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/deep_transform_values.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/except.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/indifferent_access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/keys.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/reverse_merge.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/hash/slice.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/integer.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/integer/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/integer/multiple.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/integer/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/kernel.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/kernel/concern.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/kernel/reporting.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/kernel/singleton_class.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/load_error.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/marshal.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/aliasing.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/anonymous.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/attr_internal.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/attribute_accessors.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/concerning.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/delegation.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/deprecation.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/introspection.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/redefine_method.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/module/remove_method.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/name_error.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/numeric.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/numeric/bytes.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/numeric/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/numeric/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/blank.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/deep_dup.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/duplicable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/inclusion.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/instance_variables.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/json.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/to_param.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/to_query.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/try.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/object/with_options.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/range.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/range/compare_range.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/range/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/range/each.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/range/include_time_with_zone.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/range/overlaps.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/regexp.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/securerandom.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/behavior.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/exclude.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/filters.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/indent.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/inquiry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/multibyte.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/output_safety.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/starts_ends_with.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/strip.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/string/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/symbol.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/symbol/starts_ends_with.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/time/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/time/calculations.rb (98%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/time/compatibility.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/time/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/time/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/core_ext/uri.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/current_attributes.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/current_attributes/test_helper.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation/behaviors.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation/constant_accessor.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation/disallowed.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation/instance_delegator.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation/method_wrappers.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation/proxy_wrappers.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/deprecation/reporting.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/descendants_tracker.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/digest.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/duration.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/encrypted_configuration.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/encrypted_file.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/environment_inquirer.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/evented_file_update_checker.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/execution_wrapper.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/executor.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/file_update_checker.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/fork_tracker.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/gem_version.rb (96%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/gzip.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/hash_with_indifferent_access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/i18n.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/i18n_railtie.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/inflector.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/inflector/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/inflector/methods.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/inflector/transliterate.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/key_generator.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/lazy_load_hooks.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/locale/en.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/locale/en.yml (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/logger.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/logger_silence.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/logger_thread_safe_level.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/message_encryptor.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/message_verifier.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/multibyte.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/notifications.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/notifications/fanout.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/notifications/instrumenter.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/option_merger.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/ordered_hash.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/ordered_options.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/parameter_filter.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/per_thread_registry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/proxy_object.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/rails.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/railtie.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/reloader.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/rescuable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/secure_compare_rotator.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/security_utils.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/string_inquirer.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/subscriber.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/tagged_logging.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/test_case.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/time_with_zone.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/values/time_zone.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/version.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/xml_mini.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/xml_mini/jdom.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/xml_mini/libxml.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/xml_mini/libxmlsax.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/xml_mini/nokogiri.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/xml_mini/nokogirisax.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.1.1 => activesupport-6.1.2}/lib/active_support/xml_mini/rexml.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n.rb (99%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/base.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/cache.rb (94%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/cache_file.rb (92%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/cascade.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/chain.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/fallbacks.rb (97%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/flatten.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/gettext.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/interpolation_compiler.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/key_value.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/memoize.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/metadata.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/pluralization.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/simple.rb (96%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/backend/transliterator.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/config.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/core_ext/hash.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/exceptions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/gettext.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/gettext/helpers.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/gettext/po_parser.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/interpolate/ruby.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale/fallbacks.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale/tag.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale/tag/parents.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale/tag/rfc4646.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/locale/tag/simple.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/middleware.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{i18n-1.8.7 => i18n-1.8.8}/lib/i18n/version.rb (70%) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 73f2cf09e9..b5b325ee1b 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -4,11 +4,11 @@ ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' ruby_version = RbConfig::CONFIG["ruby_version"] path = File.expand_path('..', __FILE__) $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.8/lib/concurrent-ruby" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.8.7/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.8.8/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.14.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-2.0.4/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.4.2/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.1.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.1.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bindata-2.4.8/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/msgpack-1.4.2" diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/actionable_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/actionable_error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/actionable_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/actionable_error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/array_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/array_inquirer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/array_inquirer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/array_inquirer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/backtrace_cleaner.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/backtrace_cleaner.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/backtrace_cleaner.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/backtrace_cleaner.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/benchmarkable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/benchmarkable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/benchmarkable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/benchmarkable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/builder.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/builder.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/builder.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/builder.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/callbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/callbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/callbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/callbacks.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/concern.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/concern.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/concern.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/configurable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/configurable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/configurable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/configurable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/configuration_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/configuration_file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/configuration_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/configuration_file.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/access.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/extract.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/extract.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/extract.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/extract.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/extract_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/array/extract_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/extract_options.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/grouping.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/grouping.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/grouping.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/grouping.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/inquiry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/wrap.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/wrap.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/array/wrap.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/array/wrap.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/benchmark.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/benchmark.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/benchmark.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/benchmark.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/big_decimal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/big_decimal.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/big_decimal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/big_decimal.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/big_decimal/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/big_decimal/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/big_decimal/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/class.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/class/attribute.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/class/attribute.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/class/attribute.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/class/attribute.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/class/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/class/attribute_accessors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/class/attribute_accessors.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/class/subclasses.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/class/subclasses.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/class/subclasses.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/class/subclasses.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/blank.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/blank.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/calculations.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/calculations.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/zones.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date/zones.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_and_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_and_time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_and_time/calculations.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_and_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_and_time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_and_time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_and_time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_and_time/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_and_time/zones.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_time/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_time/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_time/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_time/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_time/blank.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_time/calculations.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/date_time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/date_time/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/date_time/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/digest.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/digest.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/digest.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/digest/uuid.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/digest/uuid.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/digest/uuid.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/digest/uuid.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/enumerable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/enumerable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/enumerable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/enumerable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/file.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/file/atomic.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/file/atomic.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/file/atomic.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/file/atomic.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/deep_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/hash/deep_merge.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/deep_merge.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/deep_transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/hash/deep_transform_values.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/deep_transform_values.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/except.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/except.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/except.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/except.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/hash/indifferent_access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/indifferent_access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/keys.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/keys.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/keys.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/keys.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/reverse_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/hash/reverse_merge.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/reverse_merge.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/slice.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/slice.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/hash/slice.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/hash/slice.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer/multiple.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer/multiple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer/multiple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer/multiple.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/integer/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/integer/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/kernel.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/kernel.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/kernel.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/kernel.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/kernel/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/kernel/concern.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/kernel/concern.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/kernel/concern.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/kernel/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/kernel/reporting.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/kernel/reporting.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/kernel/reporting.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/kernel/singleton_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/kernel/singleton_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/kernel/singleton_class.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/load_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/load_error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/load_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/load_error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/marshal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/marshal.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/marshal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/marshal.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/aliasing.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/aliasing.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/aliasing.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/aliasing.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/anonymous.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/anonymous.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/anonymous.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/anonymous.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/attr_internal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/module/attr_internal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/attr_internal.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/module/attribute_accessors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/attribute_accessors.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/module/concerning.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/concerning.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/concerning.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/concerning.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/delegation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/delegation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/delegation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/delegation.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/deprecation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/deprecation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/deprecation.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/introspection.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/introspection.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/introspection.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/introspection.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/redefine_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/module/redefine_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/redefine_method.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/module/remove_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/module/remove_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/module/remove_method.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/name_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/name_error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/name_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/name_error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric/bytes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric/bytes.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric/bytes.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric/bytes.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/numeric/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/numeric/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/object/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/blank.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/blank.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/deep_dup.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/object/deep_dup.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/deep_dup.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/duplicable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/duplicable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/duplicable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/duplicable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/inclusion.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/inclusion.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/inclusion.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/inclusion.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/instance_variables.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/object/instance_variables.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/instance_variables.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/json.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/json.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/json.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/json.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/to_param.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/object/to_param.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/to_param.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/to_query.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/object/to_query.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/to_query.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/try.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/try.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/try.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/try.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/object/with_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/object/with_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/object/with_options.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range/compare_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/range/compare_range.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range/compare_range.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range/each.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range/each.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range/each.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range/each.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range/include_time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/range/include_time_with_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/range/overlaps.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range/overlaps.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/range/overlaps.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/range/overlaps.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/regexp.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/regexp.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/regexp.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/regexp.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/securerandom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/securerandom.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/securerandom.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/securerandom.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/access.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/behavior.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/behavior.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/behavior.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/behavior.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/exclude.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/exclude.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/exclude.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/exclude.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/filters.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/filters.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/filters.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/filters.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/indent.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/indent.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/indent.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/indent.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/inquiry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/multibyte.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/multibyte.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/multibyte.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/output_safety.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/string/output_safety.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/output_safety.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/starts_ends_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/string/starts_ends_with.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/starts_ends_with.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/strip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/strip.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/strip.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/strip.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/zones.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/string/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/string/zones.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/symbol.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/symbol.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/symbol.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/symbol.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/symbol/starts_ends_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/symbol/starts_ends_with.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/symbol/starts_ends_with.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/symbol/starts_ends_with.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/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.1.1/lib/active_support/core_ext/time/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/calculations.rb similarity index 98% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/calculations.rb index 9c9f26047f..c3dba6d1e9 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/calculations.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/calculations.rb @@ -42,8 +42,14 @@ class Time # Layers additional behavior on Time.at so that ActiveSupport::TimeWithZone and DateTime # instances can be used when called with a single argument - def at_with_coercion(*args) - return at_without_coercion(*args) if args.size != 1 + def at_with_coercion(*args, **kwargs) + if args.size != 1 + if kwargs.empty? + return at_without_coercion(*args) + else + return at_without_coercion(*args, **kwargs) + end + end # Time.at can be called with a time or numerical value time_or_number = args.first diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/compatibility.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/zones.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/time/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/time/zones.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/uri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/uri.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/core_ext/uri.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/core_ext/uri.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/current_attributes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/current_attributes.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/current_attributes.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/current_attributes.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/current_attributes/test_helper.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/current_attributes/test_helper.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/current_attributes/test_helper.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/current_attributes/test_helper.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/behaviors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/behaviors.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/behaviors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/behaviors.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/constant_accessor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/constant_accessor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/constant_accessor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/constant_accessor.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/disallowed.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/disallowed.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/disallowed.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/disallowed.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/instance_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/instance_delegator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/instance_delegator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/instance_delegator.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/method_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/method_wrappers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/method_wrappers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/method_wrappers.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/proxy_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/proxy_wrappers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/proxy_wrappers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/proxy_wrappers.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/reporting.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/deprecation/reporting.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/deprecation/reporting.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/descendants_tracker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/descendants_tracker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/descendants_tracker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/descendants_tracker.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/digest.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/digest.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/digest.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/duration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/duration.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/duration.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/duration.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/encrypted_configuration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/encrypted_configuration.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/encrypted_configuration.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/encrypted_configuration.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/encrypted_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/encrypted_file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/encrypted_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/encrypted_file.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/environment_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/environment_inquirer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/environment_inquirer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/environment_inquirer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/evented_file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/evented_file_update_checker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/evented_file_update_checker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/evented_file_update_checker.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/execution_wrapper.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/execution_wrapper.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/execution_wrapper.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/execution_wrapper.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/executor.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/file_update_checker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/file_update_checker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/file_update_checker.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/fork_tracker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/fork_tracker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/fork_tracker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/fork_tracker.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/gem_version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/gem_version.rb similarity index 96% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/gem_version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/gem_version.rb index db1a53313c..47a1a4219f 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/gem_version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/gem_version.rb @@ -9,7 +9,7 @@ module ActiveSupport module VERSION MAJOR = 6 MINOR = 1 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/gzip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/gzip.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/gzip.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/gzip.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/hash_with_indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/hash_with_indifferent_access.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/hash_with_indifferent_access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/hash_with_indifferent_access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/i18n.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/i18n.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/i18n.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/i18n.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/i18n_railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/i18n_railtie.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/i18n_railtie.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/i18n_railtie.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector/methods.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector/methods.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector/methods.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector/methods.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector/transliterate.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector/transliterate.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/inflector/transliterate.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/inflector/transliterate.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/key_generator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/key_generator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/key_generator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/key_generator.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/lazy_load_hooks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/lazy_load_hooks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/lazy_load_hooks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/lazy_load_hooks.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/locale/en.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/locale/en.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/locale/en.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/locale/en.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/locale/en.yml b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/locale/en.yml similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/locale/en.yml rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/locale/en.yml diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/logger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/logger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/logger.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/logger.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/logger_silence.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/logger_silence.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/logger_silence.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/logger_silence.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/logger_thread_safe_level.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/logger_thread_safe_level.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/logger_thread_safe_level.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/logger_thread_safe_level.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/message_encryptor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/message_encryptor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/message_encryptor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/message_encryptor.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/message_verifier.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/message_verifier.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/message_verifier.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/message_verifier.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/multibyte.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/multibyte.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/multibyte.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/notifications.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/notifications.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/notifications.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/notifications.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/notifications/fanout.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/notifications/fanout.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/notifications/fanout.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/notifications/fanout.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/notifications/instrumenter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/notifications/instrumenter.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/notifications/instrumenter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/notifications/instrumenter.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/option_merger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/option_merger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/option_merger.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/option_merger.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/ordered_hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/ordered_hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/ordered_hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/ordered_hash.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/ordered_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/ordered_options.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/ordered_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/ordered_options.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/parameter_filter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/parameter_filter.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/parameter_filter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/parameter_filter.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/per_thread_registry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/per_thread_registry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/per_thread_registry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/per_thread_registry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/proxy_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/proxy_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/proxy_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/proxy_object.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/rails.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/rails.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/rails.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/rails.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/railtie.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/railtie.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/railtie.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/reloader.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/reloader.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/reloader.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/reloader.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/rescuable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/rescuable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/rescuable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/rescuable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/secure_compare_rotator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/secure_compare_rotator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/secure_compare_rotator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/secure_compare_rotator.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/security_utils.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/security_utils.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/security_utils.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/security_utils.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/string_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/string_inquirer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/string_inquirer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/string_inquirer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/subscriber.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/subscriber.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/subscriber.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/subscriber.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/tagged_logging.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/tagged_logging.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/tagged_logging.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/tagged_logging.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/test_case.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/test_case.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/test_case.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/test_case.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/time_with_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/time_with_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/time_with_zone.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/values/time_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/values/time_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/values/time_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/values/time_zone.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/version.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/jdom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/jdom.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/jdom.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/jdom.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/libxml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/libxml.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/libxml.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/libxml.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/libxmlsax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/libxmlsax.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/libxmlsax.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/libxmlsax.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/nokogiri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/nokogiri.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/nokogiri.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/nokogiri.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/nokogirisax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/nokogirisax.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/nokogirisax.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/nokogirisax.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/rexml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/rexml.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.1/lib/active_support/xml_mini/rexml.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.1.2/lib/active_support/xml_mini/rexml.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n.rb similarity index 99% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n.rb index e998b4a838..237bfb5e03 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'concurrent/map' +require 'concurrent/hash' require 'i18n/version' require 'i18n/exceptions' @@ -33,7 +34,7 @@ module I18n EMPTY_HASH = {}.freeze def self.new_double_nested_cache # :nodoc: - Concurrent::Map.new { |h,k| h[k] = Concurrent::Map.new } + Concurrent::Map.new { |h, k| h[k] = Concurrent::Map.new } end module Base diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/base.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/base.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/base.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/base.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cache.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cache.rb similarity index 94% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cache.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cache.rb index 41b58fc20d..40c18d6575 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cache.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cache.rb @@ -17,11 +17,11 @@ # # The cache_key implementation by default assumes you pass values that return # a valid key from #hash (see -# http://www.ruby-doc.org/core/classes/Object.html#M000337). However, you can +# https://www.ruby-doc.org/core/classes/Object.html#M000337). However, you can # configure your own digest method via which responds to #hexdigest (see -# http://ruby-doc.org/stdlib/libdoc/digest/rdoc/index.html): +# https://ruby-doc.org/stdlib/libdoc/openssl/rdoc/OpenSSL/Digest.html): # -# I18n.cache_key_digest = Digest::MD5.new +# I18n.cache_key_digest = OpenSSL::Digest::SHA256.new # # If you use a lambda as a default value in your translation like this: # diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cache_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cache_file.rb similarity index 92% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cache_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cache_file.rb index 4dafb3e616..0c5e192210 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cache_file.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cache_file.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'digest/sha2' +require 'openssl' module I18n module Backend @@ -19,7 +19,7 @@ module I18n key = I18n::Backend::Flatten.escape_default_separator(normalized_path(filename)) old_mtime, old_digest = initialized && lookup(:i18n, key, :load_file) return if (mtime = File.mtime(filename).to_i) == old_mtime || - (digest = Digest::SHA2.file(filename).hexdigest) == old_digest + (digest = OpenSSL::Digest::SHA256.file(filename).hexdigest) == old_digest super store_translations(:i18n, load_file: { key => [mtime, digest] }) end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cascade.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cascade.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/cascade.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/cascade.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/chain.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/chain.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/chain.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/chain.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/fallbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/fallbacks.rb similarity index 97% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/fallbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/fallbacks.rb index ce8635bb0a..7688c13df8 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/fallbacks.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/fallbacks.rb @@ -16,11 +16,13 @@ module I18n # Returns the current fallbacks implementation. Defaults to +I18n::Locale::Fallbacks+. def fallbacks @@fallbacks ||= I18n::Locale::Fallbacks.new + Thread.current[:i18n_fallbacks] || @@fallbacks end # Sets the current fallbacks implementation. Use this to set a different fallbacks implementation. def fallbacks=(fallbacks) @@fallbacks = fallbacks.is_a?(Array) ? I18n::Locale::Fallbacks.new(fallbacks) : fallbacks + Thread.current[:i18n_fallbacks] = @@fallbacks end end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/flatten.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/flatten.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/flatten.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/flatten.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/gettext.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/gettext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/gettext.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/gettext.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/interpolation_compiler.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/interpolation_compiler.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/interpolation_compiler.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/interpolation_compiler.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/key_value.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/key_value.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/key_value.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/key_value.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/memoize.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/memoize.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/memoize.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/memoize.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/metadata.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/metadata.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/metadata.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/metadata.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/pluralization.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/pluralization.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/pluralization.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/pluralization.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/simple.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/simple.rb similarity index 96% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/simple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/simple.rb index ed74146cc0..5c7268ef0e 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/simple.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/simple.rb @@ -40,7 +40,7 @@ module I18n return data end locale = locale.to_sym - translations[locale] ||= {} + translations[locale] ||= Concurrent::Hash.new data = data.deep_symbolize_keys translations[locale].deep_merge!(data) end @@ -71,7 +71,7 @@ module I18n # call `init_translations` init_translations if do_init && !initialized? - @translations ||= {} + @translations ||= Concurrent::Hash.new { |h, k| h[k] = Concurrent::Hash.new } end protected diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/transliterator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/transliterator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/backend/transliterator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/backend/transliterator.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/config.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/config.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/config.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/config.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/core_ext/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/core_ext/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/core_ext/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/core_ext/hash.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/exceptions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/exceptions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/exceptions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/exceptions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/gettext.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/gettext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/gettext.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/gettext.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/gettext/helpers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/gettext/helpers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/gettext/helpers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/gettext/helpers.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/gettext/po_parser.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/gettext/po_parser.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/gettext/po_parser.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/gettext/po_parser.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/interpolate/ruby.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/interpolate/ruby.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/interpolate/ruby.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/interpolate/ruby.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/fallbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/fallbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/fallbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/fallbacks.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag/parents.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag/parents.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag/parents.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag/parents.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag/rfc4646.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag/rfc4646.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag/rfc4646.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag/rfc4646.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag/simple.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag/simple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/locale/tag/simple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/locale/tag/simple.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/middleware.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/middleware.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/middleware.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/middleware.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/version.rb similarity index 70% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/version.rb index 0c5204ccbf..0f0cebd5cf 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.7/lib/i18n/version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/i18n-1.8.8/lib/i18n/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module I18n - VERSION = "1.8.7" + VERSION = "1.8.8" end From 805e9fbaf3e83399d229f69ed9b46c0e2a9900cf Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Wed, 10 Feb 2021 06:01:38 +0000 Subject: [PATCH 58/59] Update RBI files for activesupport. --- .../gems/{activesupport@6.1.1.rbi => activesupport@6.1.2.rbi} | 0 .../Homebrew/sorbet/rbi/gems/{i18n@1.8.7.rbi => i18n@1.8.8.rbi} | 0 Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename Library/Homebrew/sorbet/rbi/gems/{activesupport@6.1.1.rbi => activesupport@6.1.2.rbi} (100%) rename Library/Homebrew/sorbet/rbi/gems/{i18n@1.8.7.rbi => i18n@1.8.8.rbi} (100%) diff --git a/Library/Homebrew/sorbet/rbi/gems/activesupport@6.1.1.rbi b/Library/Homebrew/sorbet/rbi/gems/activesupport@6.1.2.rbi similarity index 100% rename from Library/Homebrew/sorbet/rbi/gems/activesupport@6.1.1.rbi rename to Library/Homebrew/sorbet/rbi/gems/activesupport@6.1.2.rbi diff --git a/Library/Homebrew/sorbet/rbi/gems/i18n@1.8.7.rbi b/Library/Homebrew/sorbet/rbi/gems/i18n@1.8.8.rbi similarity index 100% rename from Library/Homebrew/sorbet/rbi/gems/i18n@1.8.7.rbi rename to Library/Homebrew/sorbet/rbi/gems/i18n@1.8.8.rbi diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index fafa6bf8e4..d131d18d4d 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -29580,7 +29580,7 @@ end class Time def self.===(other); end - def self.at_with_coercion(*args); end + def self.at_with_coercion(*args, **kwargs); end def self.at_without_coercion(*_); end From 04804c6db5ad4912efb946313930abee97d7fcf8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 10 Feb 2021 10:36:40 +0000 Subject: [PATCH 59/59] formula: add bottle_hash method. Extract this method from `#to_hash` so it can be used in `brew bundle`. --- Library/Homebrew/formula.rb | 41 ++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 8e81d0b2ec..9ffd65f6f9 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1822,25 +1822,7 @@ class Formula "revision" => stable.specs[:revision], } - if bottle_defined? - bottle_spec = stable.bottle_specification - bottle_info = { - "rebuild" => bottle_spec.rebuild, - "cellar" => (cellar = bottle_spec.cellar).is_a?(Symbol) ? cellar.inspect : cellar, - "prefix" => bottle_spec.prefix, - "root_url" => bottle_spec.root_url, - } - bottle_info["files"] = {} - bottle_spec.collector.each_key do |os| - bottle_url = "#{bottle_spec.root_url}/#{Bottle::Filename.create(self, os, bottle_spec.rebuild).bintray}" - checksum = bottle_spec.collector[os][:checksum] - bottle_info["files"][os] = { - "url" => bottle_url, - "sha256" => checksum.hexdigest, - } - end - hsh["bottle"]["stable"] = bottle_info - end + hsh["bottle"]["stable"] = bottle_hash if bottle_defined? end hsh["options"] = options.map do |opt| @@ -1874,6 +1856,27 @@ class Formula hsh end + # Returns the bottle information for a formula + def bottle_hash + bottle_spec = stable.bottle_specification + hash = { + "rebuild" => bottle_spec.rebuild, + "cellar" => (cellar = bottle_spec.cellar).is_a?(Symbol) ? cellar.inspect : cellar, + "prefix" => bottle_spec.prefix, + "root_url" => bottle_spec.root_url, + "files" => {}, + } + bottle_spec.collector.each_key do |os| + bottle_url = "#{bottle_spec.root_url}/#{Bottle::Filename.create(self, os, bottle_spec.rebuild).bintray}" + checksum = bottle_spec.collector[os][:checksum] + hash["files"][os] = { + "url" => bottle_url, + "sha256" => checksum.hexdigest, + } + end + hash + end + # @private def fetch(verify_download_integrity: true) active_spec.fetch(verify_download_integrity: verify_download_integrity)