From 6c5109be7a44bb91d13dfd7a9710117448c89919 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 16 Mar 2020 15:02:43 +0100 Subject: [PATCH 01/62] cli/parser: chomp '=' from comma_array flag name --- Library/Homebrew/cli/parser.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb index a9537aec1b..d1b0d4ba43 100644 --- a/Library/Homebrew/cli/parser.rb +++ b/Library/Homebrew/cli/parser.rb @@ -95,6 +95,7 @@ module Homebrew end def comma_array(name, description: nil) + name = name.chomp "=" description = option_to_description(name) if description.nil? process_option(name, description) @parser.on(name, OptionParser::REQUIRED_ARGUMENT, Array, *wrap_option_desc(description)) do |list| From 7ea6d5c6484d75e6d53efc4aaba800e8ab366408 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Thu, 19 Mar 2020 18:40:13 +0000 Subject: [PATCH 02/62] manpages: Run `brew man` after `brew bundle` Whalebrew inclusion - This was added in https://github.com/Homebrew/homebrew-bundle/pull/656 but the subcommand docs were never updated here, causing failures on other, unrelated `brew` PRs. --- docs/Manpage.md | 8 +++++--- manpages/brew.1 | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/Manpage.md b/docs/Manpage.md index 44dd2750cb..4d74e7e3c6 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1015,8 +1015,8 @@ Install macOS applications distributed as binaries. See `brew-cask`(1). ### `bundle` *`subcommand`* -Bundler for non-Ruby dependencies from Homebrew, Homebrew Cask and the Mac App -Store. +Bundler for non-Ruby dependencies from Homebrew, Homebrew Cask, Mac App Store +and Whalebrew. `brew bundle` [`install`] @@ -1024,7 +1024,7 @@ Install or upgrade all dependencies in a `Brewfile`. `brew bundle dump` -Write all installed casks/formulae/taps into a `Brewfile`. +Write all installed casks/formulae/images/taps into a `Brewfile`. `brew bundle cleanup` @@ -1065,6 +1065,8 @@ dependencies are listed. `list` tap dependencies. * `--mas`: `list` Mac App Store dependencies. +* `--whalebrew`: + `list` Whalebrew dependencies. * `--describe`: `dump` a description comment above each line, unless the dependency does not have a description. * `--no-restart`: diff --git a/manpages/brew.1 b/manpages/brew.1 index d5f724b0f3..6e43fee61f 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1290,7 +1290,7 @@ Install macOS applications distributed as binaries\. See \fBbrew\-cask\fR(1)\. \fIhttps://github\.com/Homebrew/homebrew\-cask\fR . .SS "\fBbundle\fR \fIsubcommand\fR" -Bundler for non\-Ruby dependencies from Homebrew, Homebrew Cask and the Mac App Store\. +Bundler for non\-Ruby dependencies from Homebrew, Homebrew Cask, Mac App Store and Whalebrew\. . .P \fBbrew bundle\fR [\fBinstall\fR] @@ -1302,7 +1302,7 @@ Install or upgrade all dependencies in a \fBBrewfile\fR\. \fBbrew bundle dump\fR . .P -Write all installed casks/formulae/taps into a \fBBrewfile\fR\. +Write all installed casks/formulae/images/taps into a \fBBrewfile\fR\. . .P \fBbrew bundle cleanup\fR @@ -1373,6 +1373,10 @@ Read the \fBBrewfile\fR from \fB~/\.Brewfile\fR\. \fBlist\fR Mac App Store dependencies\. . .TP +\fB\-\-whalebrew\fR +\fBlist\fR Whalebrew dependencies\. +. +.TP \fB\-\-describe\fR \fBdump\fR a description comment above each line, unless the dependency does not have a description\. . From e210e85debee04c4b16cfcf2e416425e7b89f5de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 19:06:41 +0000 Subject: [PATCH 03/62] build: bump activesupport from 6.0.2.1 to 6.0.2.2 in /docs Bumps [activesupport](https://github.com/rails/rails) from 6.0.2.1 to 6.0.2.2. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v6.0.2.2/activesupport/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v6.0.2.1...v6.0.2.2) Signed-off-by: dependabot-preview[bot] --- docs/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index c2f9bb3541..3fdc5b2aac 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.2.1) + activesupport (6.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) From 1da81c675f8e53eb30d11ed9c9b98eb0bb1c4ba5 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Thu, 19 Mar 2020 19:17:26 +0000 Subject: [PATCH 04/62] actions/tests: Run `brew style` and `brew man` before `brew tests` - The style and man page checks are quicker than `brew tests`, which can take forever. - If people make mistakes with style or forget to run `brew man`, they will notice quicker, thus fixing issues quicker. - This also wastes less compute time (and therefore energy) by only running `brew tests` when all the other less-involved checks work. --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9785ecfe05..4bf4f9bec7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,6 +78,12 @@ jobs: sudo chmod -R g-w,o-w /home/linuxbrew /home/runner /opt fi + - name: Run brew style + run: brew style --display-cop-names + + - name: Run brew man + run: brew man --fail-if-changed + - name: Run brew tests run: | # brew tests doesn't like world writable directories @@ -107,12 +113,6 @@ jobs: # These cannot be queried at the macOS level on GitHub Actions. HOMEBREW_LANGUAGES: en-GB - - name: Run brew style - run: brew style --display-cop-names - - - name: Run brew man - run: brew man --fail-if-changed - - name: Run brew update-tests run: | git config --global user.name "BrewTestBot" From 2dffdf5ddf91d9a2d55b18a887c6bdcb56cec4ed Mon Sep 17 00:00:00 2001 From: vidusheeamoli Date: Fri, 20 Mar 2020 01:07:27 +0530 Subject: [PATCH 05/62] docs: fix broken link --- docs/Brew-Test-Bot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Brew-Test-Bot.md b/docs/Brew-Test-Bot.md index aab1ca3e4d..e72199778c 100644 --- a/docs/Brew-Test-Bot.md +++ b/docs/Brew-Test-Bot.md @@ -8,7 +8,7 @@ by [our Kickstarter in 2013](https://www.kickstarter.com/projects/homebrew/brew- It comprises four Mac Minis and three Xserves running in two data centres which host [a Jenkins instance at https://jenkins.brew.sh](https://jenkins.brew.sh) and run the -[`brew-test-bot.rb`](https://github.com/Homebrew/homebrew-test-bot/blob/master/cmd/brew-test-bot.rb) +[`test-bot.rb`](https://github.com/Homebrew/homebrew-test-bot/blob/master/cmd/test-bot.rb) Ruby script to perform automated testing of commits to the master branch, pull requests and custom builds requested by maintainers. From c47fe6bc28fd8783f1f19288692fa4a4c17f1e3a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 11:37:02 +0000 Subject: [PATCH 06/62] build: bump activesupport from 6.0.2.1 to 6.0.2.2 in /Library/Homebrew Bumps [activesupport](https://github.com/rails/rails) from 6.0.2.1 to 6.0.2.2. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v6.0.2.2/activesupport/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v6.0.2.1...v6.0.2.2) Signed-off-by: dependabot-preview[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 8f023d3f2b..25adc97139 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.2.1) + activesupport (6.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) From a5dbb8e6cdce708ce6bd7a490152a03ad103894d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 20 Mar 2020 11:40:12 +0000 Subject: [PATCH 07/62] brew vendor-gems: commit updates. --- Library/Homebrew/vendor/bundle/bundler/setup.rb | 2 +- .../lib/active_support/actionable_error.rb | 0 .../lib/active_support/array_inquirer.rb | 0 .../lib/active_support/backtrace_cleaner.rb | 0 .../lib/active_support/benchmarkable.rb | 0 .../lib/active_support/builder.rb | 0 .../lib/active_support/callbacks.rb | 0 .../lib/active_support/concern.rb | 0 .../lib/active_support/configurable.rb | 0 .../lib/active_support/core_ext.rb | 0 .../lib/active_support/core_ext/array.rb | 0 .../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 .../lib/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/prepend_and_append.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 .../lib/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 .../lib/active_support/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 .../lib/active_support/core_ext/date_and_time/calculations.rb | 0 .../lib/active_support/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 .../lib/active_support/core_ext/date_time/calculations.rb | 0 .../lib/active_support/core_ext/date_time/compatibility.rb | 0 .../lib/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/compact.rb | 0 .../lib/active_support/core_ext/hash/conversions.rb | 0 .../lib/active_support/core_ext/hash/deep_merge.rb | 0 .../lib/active_support/core_ext/hash/deep_transform_values.rb | 0 .../lib/active_support/core_ext/hash/except.rb | 0 .../lib/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/hash/transform_values.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 .../lib/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 .../lib/active_support/core_ext/module/attr_internal.rb | 0 .../lib/active_support/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 .../lib/active_support/core_ext/module/introspection.rb | 0 .../lib/active_support/core_ext/module/reachable.rb | 0 .../lib/active_support/core_ext/module/redefine_method.rb | 0 .../lib/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/inquiry.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 .../lib/active_support/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 .../lib/active_support/core_ext/range/include_range.rb | 0 .../lib/active_support/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 .../lib/active_support/core_ext/string/output_safety.rb | 0 .../lib/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/time.rb | 0 .../lib/active_support/core_ext/time/acts_like.rb | 0 .../lib/active_support/core_ext/time/calculations.rb | 0 .../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 .../lib/active_support/deprecation.rb | 0 .../lib/active_support/deprecation/behaviors.rb | 0 .../lib/active_support/deprecation/constant_accessor.rb | 0 .../lib/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/evented_file_update_checker.rb | 0 .../lib/active_support/execution_wrapper.rb | 0 .../lib/active_support/executor.rb | 0 .../lib/active_support/file_update_checker.rb | 0 .../lib/active_support/gem_version.rb | 2 +- .../lib/active_support/gzip.rb | 0 .../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/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 195 files changed, 2 insertions(+), 2 deletions(-) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/actionable_error.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/array_inquirer.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/backtrace_cleaner.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/benchmarkable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/builder.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/callbacks.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/concern.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/configurable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/extract.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/extract_options.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/grouping.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/inquiry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/prepend_and_append.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/array/wrap.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/benchmark.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/big_decimal.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/big_decimal/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/class.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/class/attribute.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/class/attribute_accessors.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/class/subclasses.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date/blank.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date/calculations.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_and_time/calculations.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_and_time/compatibility.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_and_time/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_time/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_time/blank.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_time/calculations.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_time/compatibility.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/date_time/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/digest.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/digest/uuid.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/enumerable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/file.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/file/atomic.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/compact.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/deep_merge.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/deep_transform_values.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/except.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/indifferent_access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/keys.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/reverse_merge.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/slice.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/hash/transform_values.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/integer.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/integer/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/integer/multiple.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/integer/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/kernel.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/kernel/concern.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/kernel/reporting.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/kernel/singleton_class.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/load_error.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/marshal.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/aliasing.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/anonymous.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/attr_internal.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/attribute_accessors.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.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.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/concerning.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/delegation.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/deprecation.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/introspection.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/reachable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/redefine_method.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/module/remove_method.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/name_error.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/numeric.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/numeric/bytes.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/numeric/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/numeric/inquiry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/numeric/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/blank.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/deep_dup.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/duplicable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/inclusion.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/instance_variables.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/json.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/to_param.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/to_query.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/try.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/object/with_options.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/range.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/range/compare_range.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/range/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/range/each.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/range/include_range.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.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.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/range/overlaps.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/regexp.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/securerandom.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/behavior.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/exclude.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/filters.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/indent.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/inquiry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/multibyte.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/output_safety.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/starts_ends_with.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/strip.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/string/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/time/acts_like.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/time/calculations.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/time/compatibility.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/time/conversions.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/time/zones.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/core_ext/uri.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/current_attributes.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/deprecation.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/deprecation/behaviors.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/deprecation/constant_accessor.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/deprecation/instance_delegator.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/deprecation/method_wrappers.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/deprecation/proxy_wrappers.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/deprecation/reporting.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/descendants_tracker.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/digest.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/duration.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/encrypted_configuration.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/encrypted_file.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/evented_file_update_checker.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/execution_wrapper.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/executor.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/file_update_checker.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/gem_version.rb (95%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/gzip.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/hash_with_indifferent_access.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/i18n.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/i18n_railtie.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/inflector.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/inflector/inflections.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/inflector/methods.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/inflector/transliterate.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/key_generator.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/lazy_load_hooks.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/locale/en.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/locale/en.yml (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/logger.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/logger_silence.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/logger_thread_safe_level.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/message_encryptor.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/message_verifier.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/multibyte.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/notifications.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/notifications/fanout.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/notifications/instrumenter.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/option_merger.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/ordered_hash.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/ordered_options.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/parameter_filter.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/per_thread_registry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/proxy_object.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/rails.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/railtie.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/reloader.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/rescuable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/security_utils.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/string_inquirer.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/subscriber.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/tagged_logging.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/test_case.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/time.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/time_with_zone.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/values/time_zone.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/version.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/xml_mini.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/xml_mini/jdom.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/xml_mini/libxml.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/xml_mini/libxmlsax.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/xml_mini/nokogiri.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/xml_mini/nokogirisax.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{activesupport-6.0.2.1 => activesupport-6.0.2.2}/lib/active_support/xml_mini/rexml.rb (100%) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index aeb5789d55..3e59f7af81 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -9,7 +9,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.14.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.6/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.3.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.0.2.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.0.2.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib" $:.unshift "#{path}/" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.2/lib" diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/actionable_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/actionable_error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/actionable_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/actionable_error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/array_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/array_inquirer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/array_inquirer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/array_inquirer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/backtrace_cleaner.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/backtrace_cleaner.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/backtrace_cleaner.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/backtrace_cleaner.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/benchmarkable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/benchmarkable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/benchmarkable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/benchmarkable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/builder.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/builder.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/builder.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/builder.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/callbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/callbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/callbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/callbacks.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/concern.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/concern.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/concern.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/configurable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/configurable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/configurable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/configurable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/array/access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/array/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/extract.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/array/extract.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/extract.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/extract_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/array/extract_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/extract_options.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/grouping.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/array/grouping.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/grouping.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/array/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/prepend_and_append.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/prepend_and_append.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/prepend_and_append.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/prepend_and_append.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/array/wrap.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/array/wrap.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/array/wrap.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/benchmark.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/benchmark.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/benchmark.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/benchmark.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/big_decimal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/big_decimal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/big_decimal.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/big_decimal/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/big_decimal/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/big_decimal/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/class/attribute.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/class/attribute.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/attribute.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/class/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/class/attribute_accessors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/attribute_accessors.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/class/subclasses.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/class/subclasses.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/class/subclasses.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/blank.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/calculations.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date/zones.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date_and_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_and_time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_and_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_and_time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_and_time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_and_time/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date_time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/blank.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/calculations.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/date_time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/date_time/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/date_time/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/digest.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/digest.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/digest.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/digest/uuid.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/digest/uuid.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/digest/uuid.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/enumerable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/enumerable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/enumerable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/enumerable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/file.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/file/atomic.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/file/atomic.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/file/atomic.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/compact.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/compact.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/compact.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/compact.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/deep_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/deep_merge.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/deep_merge.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/deep_transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/deep_transform_values.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/except.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/except.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/except.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/indifferent_access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/indifferent_access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/keys.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/keys.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/keys.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/reverse_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/reverse_merge.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/reverse_merge.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/slice.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/hash/slice.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/slice.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/transform_values.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/hash/transform_values.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/hash/transform_values.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/integer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/integer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/integer/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/integer/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/integer/multiple.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/integer/multiple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/multiple.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/integer/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/integer/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/integer/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/kernel.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/kernel.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/kernel/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/kernel/concern.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/concern.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/kernel/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/kernel/reporting.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/reporting.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/kernel/singleton_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/kernel/singleton_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/kernel/singleton_class.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/load_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/load_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/load_error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/marshal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/marshal.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/marshal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/marshal.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/aliasing.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/aliasing.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/aliasing.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/anonymous.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/anonymous.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/anonymous.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/attr_internal.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/attr_internal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attr_internal.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/attribute_accessors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attribute_accessors.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.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.0.2.1/lib/active_support/core_ext/module/concerning.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/concerning.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/concerning.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/delegation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/delegation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/delegation.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/deprecation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/deprecation.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/introspection.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/introspection.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/introspection.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/reachable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/reachable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/reachable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/reachable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/redefine_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/redefine_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/redefine_method.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/module/remove_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/module/remove_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/module/remove_method.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/name_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/name_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/name_error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/numeric.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/numeric.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/numeric/bytes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/numeric/bytes.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/bytes.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/numeric/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/numeric/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/numeric/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/inquiry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/numeric/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/numeric/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/numeric/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/numeric/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/blank.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/deep_dup.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/deep_dup.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/deep_dup.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/duplicable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/duplicable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/duplicable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/inclusion.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/inclusion.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/inclusion.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/instance_variables.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/instance_variables.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/instance_variables.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/json.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/json.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/json.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/to_param.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/to_param.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/to_param.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/to_query.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/to_query.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/to_query.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/try.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/try.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/try.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/object/with_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/object/with_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/object/with_options.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range/compare_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/range/compare_range.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/compare_range.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/range/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range/each.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/range/each.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/each.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range/include_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/include_range.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range/include_range.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/include_range.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/range/include_time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/include_time_with_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.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.0.2.1/lib/active_support/core_ext/range/overlaps.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/range/overlaps.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/range/overlaps.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/regexp.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/regexp.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/regexp.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/regexp.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/securerandom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/securerandom.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/securerandom.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/securerandom.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/behavior.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/behavior.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/behavior.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/exclude.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/exclude.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/exclude.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/filters.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/filters.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/filters.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/indent.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/indent.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/indent.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/multibyte.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/multibyte.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/output_safety.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/output_safety.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/output_safety.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/starts_ends_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/starts_ends_with.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/strip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/strip.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/strip.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/string/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/string/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/string/zones.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/time/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/calculations.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/calculations.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/time/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/conversions.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/core_ext/time/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/time/zones.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/uri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/uri.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/core_ext/uri.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/core_ext/uri.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/current_attributes.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/current_attributes.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/current_attributes.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/current_attributes.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/behaviors.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/behaviors.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/behaviors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/behaviors.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/constant_accessor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/constant_accessor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/constant_accessor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/constant_accessor.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/instance_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/instance_delegator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/instance_delegator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/instance_delegator.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/method_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/method_wrappers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/method_wrappers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/method_wrappers.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/proxy_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/proxy_wrappers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/proxy_wrappers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/proxy_wrappers.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/reporting.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/deprecation/reporting.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/deprecation/reporting.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/descendants_tracker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/descendants_tracker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/descendants_tracker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/descendants_tracker.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/digest.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/digest.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/digest.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/duration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/duration.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/duration.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/duration.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/encrypted_configuration.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_configuration.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/encrypted_configuration.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_configuration.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/encrypted_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/encrypted_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/encrypted_file.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/evented_file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/evented_file_update_checker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/evented_file_update_checker.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/execution_wrapper.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/execution_wrapper.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/execution_wrapper.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/execution_wrapper.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/executor.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/file_update_checker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/file_update_checker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/file_update_checker.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/gem_version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gem_version.rb similarity index 95% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/gem_version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gem_version.rb index 96ab1fd154..e75f204995 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/gem_version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gem_version.rb @@ -10,7 +10,7 @@ module ActiveSupport MAJOR = 6 MINOR = 0 TINY = 2 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/gzip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gzip.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/gzip.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/gzip.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/hash_with_indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/hash_with_indifferent_access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/hash_with_indifferent_access.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/i18n.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/i18n.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/i18n_railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n_railtie.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/i18n_railtie.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/i18n_railtie.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/inflections.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector/methods.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/methods.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector/methods.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/methods.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector/transliterate.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/transliterate.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/inflector/transliterate.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/inflector/transliterate.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/key_generator.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/key_generator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/key_generator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/key_generator.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/lazy_load_hooks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/lazy_load_hooks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/lazy_load_hooks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/lazy_load_hooks.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/locale/en.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/locale/en.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/locale/en.yml b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.yml similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/locale/en.yml rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/locale/en.yml diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/logger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/logger.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/logger_silence.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger_silence.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/logger_silence.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger_silence.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/logger_thread_safe_level.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.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.0.2.1/lib/active_support/logger_thread_safe_level.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/logger_thread_safe_level.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/message_encryptor.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_encryptor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/message_encryptor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_encryptor.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/message_verifier.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_verifier.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/message_verifier.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/message_verifier.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/multibyte.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/multibyte.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/multibyte.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/notifications.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/notifications.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/notifications/fanout.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/fanout.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/notifications/fanout.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/fanout.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/notifications/instrumenter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/instrumenter.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/notifications/instrumenter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/notifications/instrumenter.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/option_merger.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/option_merger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/option_merger.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/option_merger.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/ordered_hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/ordered_hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_hash.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/ordered_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_options.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/ordered_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/ordered_options.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/parameter_filter.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/parameter_filter.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/parameter_filter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/parameter_filter.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/per_thread_registry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/per_thread_registry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/per_thread_registry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/per_thread_registry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/proxy_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/proxy_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/proxy_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/proxy_object.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/rails.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rails.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/rails.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rails.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/railtie.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/railtie.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/railtie.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/reloader.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/reloader.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/reloader.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/reloader.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/rescuable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rescuable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/rescuable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/rescuable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/security_utils.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/security_utils.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/security_utils.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/security_utils.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/string_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/string_inquirer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/string_inquirer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/string_inquirer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/subscriber.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/subscriber.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/subscriber.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/subscriber.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/tagged_logging.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/tagged_logging.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/tagged_logging.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/tagged_logging.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/test_case.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/test_case.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/test_case.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/test_case.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time_with_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/time_with_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/time_with_zone.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/values/time_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/values/time_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/values/time_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/values/time_zone.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/version.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/jdom.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/jdom.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/jdom.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/jdom.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/libxml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxml.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/libxml.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxml.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/libxmlsax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxmlsax.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/libxmlsax.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/libxmlsax.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/nokogiri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogiri.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/nokogiri.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogiri.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/nokogirisax.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogirisax.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/nokogirisax.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/nokogirisax.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/rexml.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/rexml.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.1/lib/active_support/xml_mini/rexml.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.2.2/lib/active_support/xml_mini/rexml.rb From 69066d3087babb03526e18c8af3a1fc95f7ac818 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 20 Mar 2020 14:08:47 +0000 Subject: [PATCH 08/62] Tweak Acceptable Formulae - make clearer how self-updates should be handled - move from OSI to Debian approved licenses - don't allow open source software to depend on proprietary software --- docs/Acceptable-Formulae.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/Acceptable-Formulae.md b/docs/Acceptable-Formulae.md index d21f719457..fc6b386df7 100644 --- a/docs/Acceptable-Formulae.md +++ b/docs/Acceptable-Formulae.md @@ -13,7 +13,7 @@ We now accept versioned formulae as long as they [meet the requirements](Version ### We don’t like tools that upgrade themselves Software that can upgrade itself does not integrate well with Homebrew's own -upgrade functionality. The self-update functionality should be disabled (if possible without complicating the formula). +upgrade functionality. The self-update functionality should be disabled (while minimising complication to the formula). ### We don’t like install scripts that download unversioned things We don't like install scripts that are pulling from the `master` branch of Git repositories or unversioned, unchecksummed tarballs. These should use `resource` blocks with specific revisions or checksummed tarballs instead. Note that we now allow tools like `cargo`, `gem` and `pip` to download specifically versioned libraries during installation. @@ -21,10 +21,19 @@ We don't like install scripts that are pulling from the `master` branch of Git r ### We don’t like binary formulae Our policy is that formulae in the core tap ([homebrew/core](https://github.com/Homebrew/homebrew-core)) must be open-source -with an [OSI-approved license](https://opensource.org/licenses) and either built +with an [Debian Free Software Guidelines license](https://wiki.debian.org/DFSGLicenses) and either built from source or produce cross-platform binaries (e.g. Java, Mono). Binary-only formulae should go to [homebrew/cask](https://github.com/Homebrew/homebrew-cask). +Additionally, [homebrew/core](https://github.com/Homebrew/homebrew-core) formulae must also not depend on proprietary software/casks except the following: + +- macOS +- Java +- OSXFuse +- XQuartz + +This includes automatic installation of casks at runtime. + ### Stable versions Formulae in the core repository must have a stable version tagged by the upstream project. Tarballs are preferred to Git checkouts, and From 50b61fa7f231a79ff3d359c86739ef99d54e7f80 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 20 Mar 2020 18:14:51 +0100 Subject: [PATCH 09/62] Retry `curl` requests 3 times by default. --- Library/Homebrew/manpages/brew.1.md.erb | 1 + Library/Homebrew/test/utils/curl_spec.rb | 8 ++++++-- Library/Homebrew/utils/curl.rb | 3 ++- docs/Manpage.md | 1 + manpages/brew.1 | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb index 7dcf471164..4c51c0596b 100644 --- a/Library/Homebrew/manpages/brew.1.md.erb +++ b/Library/Homebrew/manpages/brew.1.md.erb @@ -168,6 +168,7 @@ Note that environment variables must have a value set to be detected. For exampl * `HOMEBREW_CURL_RETRIES`: If set, Homebrew will pass the given retry count to `--retry` when invoking `curl`(1). + By default, `curl`(1) is invoked with `--retry 3`. * `HOMEBREW_DEBUG`: If set, any commands that can emit debugging information will do so. diff --git a/Library/Homebrew/test/utils/curl_spec.rb b/Library/Homebrew/test/utils/curl_spec.rb index baab4d4bdc..e9b48009d8 100644 --- a/Library/Homebrew/test/utils/curl_spec.rb +++ b/Library/Homebrew/test/utils/curl_spec.rb @@ -14,9 +14,13 @@ describe "curl" do expect(curl_args("foo").first).not_to eq("-q") end - it "returns --retry when HOMEBREW_CURL_RETRIES is set" do - ENV["HOMEBREW_CURL_RETRIES"] = "3" + it "uses `--retry 3` when HOMEBREW_CURL_RETRIES is unset" do expect(curl_args("foo").join(" ")).to include("--retry 3") end + + it "uses the given value for `--retry` when HOMEBREW_CURL_RETRIES is set" do + ENV["HOMEBREW_CURL_RETRIES"] = "10" + expect(curl_args("foo").join(" ")).to include("--retry 10") + end end end diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index 670b06a828..d78e4bc96c 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -39,7 +39,8 @@ def curl_args(*extra_args, show_output: false, user_agent: :default) args << "--silent" unless $stdout.tty? end - args << "--retry" << ENV["HOMEBREW_CURL_RETRIES"] if ENV["HOMEBREW_CURL_RETRIES"] + # When changing the default value, the manpage has to be updated. + args << "--retry" << (ENV["HOMEBREW_CURL_RETRIES"] || "3") args + extra_args end diff --git a/docs/Manpage.md b/docs/Manpage.md index 4d74e7e3c6..8d41ee6b33 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1200,6 +1200,7 @@ Note that environment variables must have a value set to be detected. For exampl * `HOMEBREW_CURL_RETRIES`: If set, Homebrew will pass the given retry count to `--retry` when invoking `curl`(1). + By default, `curl`(1) is invoked with `--retry 3`. * `HOMEBREW_DEBUG`: If set, any commands that can emit debugging information will do so. diff --git a/manpages/brew.1 b/manpages/brew.1 index 6e43fee61f..bfd405ff00 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1496,7 +1496,7 @@ If set, Homebrew will pass \fB\-\-verbose\fR when invoking \fBcurl\fR(1)\. . .TP \fBHOMEBREW_CURL_RETRIES\fR -If set, Homebrew will pass the given retry count to \fB\-\-retry\fR when invoking \fBcurl\fR(1)\. +If set, Homebrew will pass the given retry count to \fB\-\-retry\fR when invoking \fBcurl\fR(1)\. By default, \fBcurl\fR(1) is invoked with \fB\-\-retry 3\fR\. . .TP \fBHOMEBREW_DEBUG\fR From 0600043ec092ee3319075265df96e76b598abfb0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 18:27:59 +0000 Subject: [PATCH 10/62] build: bump parser from 2.7.0.4 to 2.7.0.5 in /Library/Homebrew Bumps [parser](https://github.com/whitequark/parser) from 2.7.0.4 to 2.7.0.5. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v2.7.0.4...v2.7.0.5) Signed-off-by: dependabot-preview[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 25adc97139..d35953f956 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -51,7 +51,7 @@ GEM parallel (1.19.1) parallel_tests (2.32.0) parallel - parser (2.7.0.4) + parser (2.7.0.5) ast (~> 2.4.0) plist (3.5.0) rainbow (3.0.0) From a3eefda0f96ed7588afb1f0117353da87b357c1c Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 21 Mar 2020 15:32:52 +0100 Subject: [PATCH 11/62] create: add --ruby option --- Library/Homebrew/dev-cmd/create.rb | 4 ++++ Library/Homebrew/formula_creator.rb | 8 ++++++++ docs/Manpage.md | 2 ++ manpages/brew.1 | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/Library/Homebrew/dev-cmd/create.rb b/Library/Homebrew/dev-cmd/create.rb index 77fa86246f..10d5f5df85 100644 --- a/Library/Homebrew/dev-cmd/create.rb +++ b/Library/Homebrew/dev-cmd/create.rb @@ -31,6 +31,8 @@ module Homebrew description: "Create a basic template for a Perl build." switch "--python", description: "Create a basic template for a Python build." + switch "--ruby", + description: "Create a basic template for a Ruby build." switch "--rust", description: "Create a basic template for a Rust build." switch "--no-fetch", @@ -86,6 +88,8 @@ module Homebrew :perl elsif args.python? :python + elsif args.ruby? + :ruby elsif args.rust? :rust end diff --git a/Library/Homebrew/formula_creator.rb b/Library/Homebrew/formula_creator.rb index 3e4c8aeb96..11d3249b2a 100644 --- a/Library/Homebrew/formula_creator.rb +++ b/Library/Homebrew/formula_creator.rb @@ -112,6 +112,8 @@ module Homebrew uses_from_macos "perl" <% elsif mode == :python %> depends_on "python" + <% elsif mode == :ruby %> + uses_from_macos "ruby" <% elsif mode == :rust %> depends_on "rust" => :build <% elsif mode.nil? %> @@ -166,6 +168,12 @@ module Homebrew bin.env_script_all_files(libexec/"bin", :PERL5LIB => ENV["PERL5LIB"]) <% elsif mode == :python %> virtualenv_install_with_resources + <% elsif mode == :ruby %> + ENV["GEM_HOME"] = libexec + system "gem", "build", "\#{name}.gemspec" + system "gem", "install", "\#{name}-\#{version}.gem" + bin.install libexec/"bin/\#{name}" + bin.env_script_all_files(libexec/"bin", :GEM_HOME => ENV["GEM_HOME"]) <% elsif mode == :rust %> system "cargo", "install", "--locked", "--root", prefix, "--path", "." <% else %> diff --git a/docs/Manpage.md b/docs/Manpage.md index 8d41ee6b33..10e1b6a58f 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -813,6 +813,8 @@ a simple example. For the complete API, see: Create a basic template for a Perl build. * `--python`: Create a basic template for a Python build. +* `--ruby`: + Create a basic template for a Ruby build. * `--rust`: Create a basic template for a Rust build. * `--no-fetch`: diff --git a/manpages/brew.1 b/manpages/brew.1 index bfd405ff00..aa9d2213e0 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1044,6 +1044,10 @@ Create a basic template for a Perl build\. Create a basic template for a Python build\. . .TP +\fB\-\-ruby\fR +Create a basic template for a Ruby build\. +. +.TP \fB\-\-rust\fR Create a basic template for a Rust build\. . From 096a5bdfb431b366d9a67340366195e805efc748 Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Sat, 21 Mar 2020 02:49:17 -0700 Subject: [PATCH 12/62] FormulaInstaller: link tmp kegs during rescue In #6807, the FormulaInstaller began to rescue from FormulaInstallationAlreadyAttemptedError but there is the potential for tmp kegs to remain unlinked in the cellar. I've merged the rescue statements so they both re-link tmp kegs, but it doesn't raise for FormulaInstallationAlreadyAttemptedError. --- Library/Homebrew/formula_installer.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 0cc5470bcb..e070a466c3 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -598,16 +598,16 @@ class FormulaInstaller oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}" fi.install fi.finish - rescue FormulaInstallationAlreadyAttemptedError - # We already attempted to install f as part of the dependency tree of - # another formula. In that case, don't generate an error, just move on. - nil - rescue Exception # rubocop:disable Lint/RescueException + rescue Exception => e # rubocop:disable Lint/RescueException ignore_interrupts do tmp_keg.rename(installed_keg) if tmp_keg && !installed_keg.directory? linked_keg.link if keg_was_linked end - raise + raise unless e.is_a? FormulaInstallationAlreadyAttemptedError + + # We already attempted to install f as part of another formula's + # dependency tree. In that case, don't generate an error, just move on. + nil else ignore_interrupts { tmp_keg.rmtree if tmp_keg&.directory? } end From 4bb66c12e8afa79d838fd9f0b4c86021050c33eb Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Sun, 22 Mar 2020 13:12:06 +1100 Subject: [PATCH 13/62] utils/github: add repository_dispatch API --- Library/Homebrew/utils/github.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index 4e0e42e9eb..7c3b36d284 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -431,6 +431,13 @@ module GitHub comments.any? { |comment| comment["body"].eql?(body) } end + def dispatch(user, repo, event, **payload) + url = "#{API_URL}/repos/#{user}/#{repo}/dispatches" + open_api(url, data: { event_type: event, client_payload: payload }, + request_method: :POST, + scopes: CREATE_ISSUE_FORK_OR_PR_SCOPES) + end + def api_errors [GitHub::AuthenticationFailedError, GitHub::HTTPNotFoundError, GitHub::RateLimitExceededError, GitHub::Error, JSON::ParserError].freeze From 86f245effb8746edae1655ece5038bd8cfaaf908 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Sun, 22 Mar 2020 13:12:48 +1100 Subject: [PATCH 14/62] dev-cmd: new pr-publish command --- Library/Homebrew/dev-cmd/pr-publish.rb | 36 +++++++++++++++++++ .../Homebrew/test/dev-cmd/pr-publish_spec.rb | 7 ++++ 2 files changed, 43 insertions(+) create mode 100644 Library/Homebrew/dev-cmd/pr-publish.rb create mode 100644 Library/Homebrew/test/dev-cmd/pr-publish_spec.rb diff --git a/Library/Homebrew/dev-cmd/pr-publish.rb b/Library/Homebrew/dev-cmd/pr-publish.rb new file mode 100644 index 0000000000..c2a81d9e9e --- /dev/null +++ b/Library/Homebrew/dev-cmd/pr-publish.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +require "cli/parser" +require "utils/github" + +module Homebrew + module_function + + def pr_publish_args + Homebrew::CLI::Parser.new do + usage_banner <<~EOS + `pr-publish` + + Publishes bottles for a pull request with GitHub Actions. + Requires write access to the repository. + EOS + switch :verbose + end + end + + def pr_publish + pr_publish_args.parse + + odie "You need to specify a pull request number!" if Homebrew.args.named.empty? + + args.named.each do |arg| + arg = "#{CoreTap.instance.default_remote}/pull/#{arg}" if arg.to_i.positive? + url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX + _, user, repo, issue = *url_match + tap = Tap.fetch(user, repo) if repo.match?(HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX) + odie "Not a GitHub pull request: #{arg}" unless issue + ohai "Dispatching #{tap} pull request ##{issue}" + GitHub.dispatch(user, repo, "Publish ##{issue}", pull_request: issue) + end + end +end diff --git a/Library/Homebrew/test/dev-cmd/pr-publish_spec.rb b/Library/Homebrew/test/dev-cmd/pr-publish_spec.rb new file mode 100644 index 0000000000..f0b8e25cd6 --- /dev/null +++ b/Library/Homebrew/test/dev-cmd/pr-publish_spec.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +require "cmd/shared_examples/args_parse" + +describe "Homebrew.pr_publish_args" do + it_behaves_like "parseable arguments" +end From e08ffb351525087f2d1e34e848785927c75fc344 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Sun, 22 Mar 2020 13:34:48 +1100 Subject: [PATCH 15/62] manpages: update for brew pr-publish --- docs/Manpage.md | 5 +++++ manpages/brew.1 | 3 +++ 2 files changed, 8 insertions(+) diff --git a/docs/Manpage.md b/docs/Manpage.md index 8d41ee6b33..4c7c6f89b3 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -880,6 +880,11 @@ Generate Homebrew's manpages. * `--link`: This is now done automatically by `brew update`. +### `pr-publish` *`pull_request`* + +Publishes bottles for a pull request with GitHub Actions. Requires write access +to the repository. + ### `prof` *`command`* Run Homebrew with the Ruby profiler, e.g. `brew prof readall`. diff --git a/manpages/brew.1 b/manpages/brew.1 index bfd405ff00..f286c8d09d 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1120,6 +1120,9 @@ Return a failing status code if changes are detected in the manpage outputs\. Th \fB\-\-link\fR This is now done automatically by \fBbrew update\fR\. . +.SS "\fBpr\-publish\fR \fIpull_request\fR" +Publishes bottles for a pull request with GitHub Actions\. Requires write access to the repository\. +. .SS "\fBprof\fR \fIcommand\fR" Run Homebrew with the Ruby profiler, e\.g\. \fBbrew prof readall\fR\. . From f6b260d7c4b04a353c6ca42bd07941251316740f Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Sun, 22 Mar 2020 22:00:32 +0900 Subject: [PATCH 16/62] audit whether prerelease or not --- Library/Homebrew/dev-cmd/audit.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index d83a5bea1d..67028a2a6a 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -795,6 +795,13 @@ module Homebrew return if stable_url_minor_version.even? problem "#{stable.version} is a development release" + when %r(^https://github.com/) + repo_url = URI.parse(stable.url) + path = repo_url.path.split('/') + owner = path[1] + repo = path[2] + return unless GitHub.open_api("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{stable.version}")["prerelease"] + problem "#{stable.version} is a pre release" end end From a6fcc94249441c1d26257d16c4d208907bfdd86a Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Sun, 22 Mar 2020 22:18:00 +0900 Subject: [PATCH 17/62] repair style --- Library/Homebrew/dev-cmd/audit.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 67028a2a6a..1805ff5fa4 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -795,13 +795,14 @@ module Homebrew return if stable_url_minor_version.even? problem "#{stable.version} is a development release" - when %r(^https://github.com/) + when %r{^https://github.com/} repo_url = URI.parse(stable.url) - path = repo_url.path.split('/') + path = repo_url.path.split("/") owner = path[1] repo = path[2] - return unless GitHub.open_api("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{stable.version}")["prerelease"] - problem "#{stable.version} is a pre release" + if GitHub.open_api("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{stable.version}")["prerelease"] + problem "#{stable.version} is a pre release" + end end end From fa80296ab4de396ff91d3803d26c313fb4a98622 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Sun, 22 Mar 2020 23:25:13 +0900 Subject: [PATCH 18/62] repair notation --- Library/Homebrew/dev-cmd/audit.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 1805ff5fa4..dc8ea8d603 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -796,12 +796,9 @@ module Homebrew problem "#{stable.version} is a development release" when %r{^https://github.com/} - repo_url = URI.parse(stable.url) - path = repo_url.path.split("/") - owner = path[1] - repo = path[2] + _, owner, repo, = URI.parse(stable.url).path.split("/") if GitHub.open_api("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{stable.version}")["prerelease"] - problem "#{stable.version} is a pre release" + problem "#{stable.version} is a GitHub prerelease" end end end From cdb9d0fbe4e3fcf3009aade0a7debfd3a1dacc39 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Sun, 22 Mar 2020 23:53:34 +0100 Subject: [PATCH 19/62] Revert "Merge pull request #7203 from hyuraku/audit_whether_prerelease-or-not" This reverts commit 081f6cdcd514396b1d396ce7d0eb40291a1a317c, reversing changes made to 12d3a2a2d269e0a26565eb3e63552803f826f366. This fails on some formulae with: Error: Not Found See: https://github.com/Homebrew/homebrew-core/pull/52031 --- Library/Homebrew/dev-cmd/audit.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index aadf4bb3d3..09734fc964 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -795,11 +795,6 @@ module Homebrew return if stable_url_minor_version.even? problem "#{stable.version} is a development release" - when %r{^https://github.com/} - _, owner, repo, = URI.parse(stable.url).path.split("/") - if GitHub.open_api("#{GitHub::API_URL}/repos/#{owner}/#{repo}/releases/tags/#{stable.version}")["prerelease"] - problem "#{stable.version} is a GitHub prerelease" - end end end From e3b472380d0c2f66f820662d7d3ab87f70719228 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 23 Mar 2020 10:59:27 +0100 Subject: [PATCH 20/62] bump-formula-pr: remove trailing '=' from --mirror in help message --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 2 +- docs/Manpage.md | 8 +++++--- manpages/brew.1 | 8 ++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index efc7963bbe..510cdc3348 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -40,7 +40,7 @@ module Homebrew description: "Print the pull request URL instead of opening in a browser." switch "--no-fork", description: "Don't try to fork the repository." - comma_array "--mirror=", + comma_array "--mirror", description: "Use the specified as a mirror URL. If is a comma-separated list "\ "of URLs, multiple mirrors will be added." flag "--version=", diff --git a/docs/Manpage.md b/docs/Manpage.md index 44dd2750cb..4d74e7e3c6 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1015,8 +1015,8 @@ Install macOS applications distributed as binaries. See `brew-cask`(1). ### `bundle` *`subcommand`* -Bundler for non-Ruby dependencies from Homebrew, Homebrew Cask and the Mac App -Store. +Bundler for non-Ruby dependencies from Homebrew, Homebrew Cask, Mac App Store +and Whalebrew. `brew bundle` [`install`] @@ -1024,7 +1024,7 @@ Install or upgrade all dependencies in a `Brewfile`. `brew bundle dump` -Write all installed casks/formulae/taps into a `Brewfile`. +Write all installed casks/formulae/images/taps into a `Brewfile`. `brew bundle cleanup` @@ -1065,6 +1065,8 @@ dependencies are listed. `list` tap dependencies. * `--mas`: `list` Mac App Store dependencies. +* `--whalebrew`: + `list` Whalebrew dependencies. * `--describe`: `dump` a description comment above each line, unless the dependency does not have a description. * `--no-restart`: diff --git a/manpages/brew.1 b/manpages/brew.1 index d5f724b0f3..6e43fee61f 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1290,7 +1290,7 @@ Install macOS applications distributed as binaries\. See \fBbrew\-cask\fR(1)\. \fIhttps://github\.com/Homebrew/homebrew\-cask\fR . .SS "\fBbundle\fR \fIsubcommand\fR" -Bundler for non\-Ruby dependencies from Homebrew, Homebrew Cask and the Mac App Store\. +Bundler for non\-Ruby dependencies from Homebrew, Homebrew Cask, Mac App Store and Whalebrew\. . .P \fBbrew bundle\fR [\fBinstall\fR] @@ -1302,7 +1302,7 @@ Install or upgrade all dependencies in a \fBBrewfile\fR\. \fBbrew bundle dump\fR . .P -Write all installed casks/formulae/taps into a \fBBrewfile\fR\. +Write all installed casks/formulae/images/taps into a \fBBrewfile\fR\. . .P \fBbrew bundle cleanup\fR @@ -1373,6 +1373,10 @@ Read the \fBBrewfile\fR from \fB~/\.Brewfile\fR\. \fBlist\fR Mac App Store dependencies\. . .TP +\fB\-\-whalebrew\fR +\fBlist\fR Whalebrew dependencies\. +. +.TP \fB\-\-describe\fR \fBdump\fR a description comment above each line, unless the dependency does not have a description\. . From 9c342b5dcad769bafeb5b257309da0f507280447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Mon, 23 Mar 2020 16:13:50 +0000 Subject: [PATCH 21/62] cask-caveats-kext: retry installation if it fails --- Library/Homebrew/cask/dsl/caveats.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb index 2b635931a8..035c1d6a3b 100644 --- a/Library/Homebrew/cask/dsl/caveats.rb +++ b/Library/Homebrew/cask/dsl/caveats.rb @@ -49,9 +49,11 @@ module Cask next if MacOS.version < :high_sierra <<~EOS - To install and/or use #{@cask} you may need to enable its kernel extension in: + #{@cask} requires a kernel extension to work. + If the installation fails, retry after you enable it in: System Preferences → Security & Privacy → General - For more information refer to vendor documentation or this Apple Technical Note: + + For more information, refer to vendor documentation or this Apple Technical Note: #{Formatter.url("https://developer.apple.com/library/content/technotes/tn2459/_index.html")} EOS end From 626f9406b1987932382814bc7d7cae3b41b771f4 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 23 Mar 2020 17:58:17 +0100 Subject: [PATCH 22/62] remove flaky cask upgrade test --- .../Homebrew/test/cask/cmd/upgrade_spec.rb | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/Library/Homebrew/test/cask/cmd/upgrade_spec.rb b/Library/Homebrew/test/cask/cmd/upgrade_spec.rb index 2c0fff3d7b..476364c7c6 100644 --- a/Library/Homebrew/test/cask/cmd/upgrade_spec.rb +++ b/Library/Homebrew/test/cask/cmd/upgrade_spec.rb @@ -71,31 +71,6 @@ describe Cask::Cmd::Upgrade, :cask do expect(local_transmission_path).to be_a_directory expect(local_transmission.versions).to include("2.60") end - - it 'updates "auto_updates" and "latest" Casks when their tokens are provided in the command line' do - local_caffeine = Cask::CaskLoader.load("local-caffeine") - local_caffeine_path = Cask::Config.global.appdir.join("Caffeine.app") - auto_updates = Cask::CaskLoader.load("auto-updates") - auto_updates_path = Cask::Config.global.appdir.join("MyFancyApp.app") - - expect(local_caffeine).to be_installed - expect(local_caffeine_path).to be_a_directory - expect(local_caffeine.versions).to include("1.2.2") - - expect(auto_updates).to be_installed - expect(auto_updates_path).to be_a_directory - expect(auto_updates.versions).to include("2.57") - - described_class.run("local-caffeine", "auto-updates") - - expect(local_caffeine).to be_installed - expect(local_caffeine_path).to be_a_directory - expect(local_caffeine.versions).to include("1.2.3") - - expect(auto_updates).to be_installed - expect(auto_updates_path).to be_a_directory - expect(auto_updates.versions).to include("2.61") - end end describe "with --greedy it checks additional Casks" do From 7c752e487f81e138a63b2ebb8915d75790b3e095 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 24 Mar 2020 12:31:58 +1100 Subject: [PATCH 23/62] pr-publish: wording fixes --- Library/Homebrew/dev-cmd/pr-publish.rb | 4 ++-- Library/Homebrew/utils/github.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-publish.rb b/Library/Homebrew/dev-cmd/pr-publish.rb index c2a81d9e9e..f8da3b7b2f 100644 --- a/Library/Homebrew/dev-cmd/pr-publish.rb +++ b/Library/Homebrew/dev-cmd/pr-publish.rb @@ -21,7 +21,7 @@ module Homebrew def pr_publish pr_publish_args.parse - odie "You need to specify a pull request number!" if Homebrew.args.named.empty? + odie "You need to specify at least one pull request number!" if Homebrew.args.named.empty? args.named.each do |arg| arg = "#{CoreTap.instance.default_remote}/pull/#{arg}" if arg.to_i.positive? @@ -30,7 +30,7 @@ module Homebrew tap = Tap.fetch(user, repo) if repo.match?(HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX) odie "Not a GitHub pull request: #{arg}" unless issue ohai "Dispatching #{tap} pull request ##{issue}" - GitHub.dispatch(user, repo, "Publish ##{issue}", pull_request: issue) + GitHub.dispatch_event(user, repo, "Publish ##{issue}", pull_request: issue) end end end diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index 7c3b36d284..eb6289d7a1 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -431,7 +431,7 @@ module GitHub comments.any? { |comment| comment["body"].eql?(body) } end - def dispatch(user, repo, event, **payload) + def dispatch_event(user, repo, event, **payload) url = "#{API_URL}/repos/#{user}/#{repo}/dispatches" open_api(url, data: { event_type: event, client_payload: payload }, request_method: :POST, From f3307193e0ae3ac6dd2061020a93a9a5da04790b Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Wed, 25 Mar 2020 12:27:50 -0700 Subject: [PATCH 24/62] .github/workflows/tests.yml: Deploy Docker image Deploy the latest Docker image on a push to master. Deploy a tagged Docker image upon publication of a release. --- .github/workflows/tests.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4bf4f9bec7..76ad3624bb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,6 +3,9 @@ on: push: branches: master pull_request: [] + release: + types: + - published jobs: tests: if: github.repository == 'Homebrew/brew' @@ -140,6 +143,22 @@ jobs: run: | if [ "$RUNNER_OS" = "Linux" ]; then docker-compose -f Dockerfile.yml run --rm -v $GITHUB_WORKSPACE:/tmp/test-bot sut + docker tag homebrew_sut brew else brew test-bot fi + + - name: Deploy the latest Docker image + if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master' + run: | + docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}} + docker tag brew docker.pkg.github.com/homebrew/brew/brew + docker push docker.pkg.github.com/homebrew/brew/brew + + - name: Deploy the tagged Docker image + if: matrix.os == 'ubuntu-latest' && startsWith(github.ref, 'refs/tags/') + run: | + docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}} + v=${GITHUB_REF:10} + docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$v" + docker push "docker.pkg.github.com/homebrew/brew/brew:$v" From 33f9180e1dcd656de51d8571e99a1c54a3e0e6af Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 05:13:39 +0000 Subject: [PATCH 25/62] build: bump octokit from 4.17.0 to 4.18.0 in /docs Bumps [octokit](https://github.com/octokit/octokit.rb) from 4.17.0 to 4.18.0. - [Release notes](https://github.com/octokit/octokit.rb/releases) - [Changelog](https://github.com/octokit/octokit.rb/blob/4-stable/RELEASE.md) - [Commits](https://github.com/octokit/octokit.rb/compare/v4.17.0...v4.18.0) Signed-off-by: dependabot-preview[bot] --- docs/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 3fdc5b2aac..c618823416 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -216,7 +216,7 @@ GEM mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) - octokit (4.17.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.19.1) From 8b62e8d67d0098e3a39886a45282a152ac10be6a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 11:55:42 +0000 Subject: [PATCH 26/62] build: bump html-proofer from 3.15.1 to 3.15.2 in /docs Bumps [html-proofer](https://github.com/gjtorikian/html-proofer) from 3.15.1 to 3.15.2. - [Release notes](https://github.com/gjtorikian/html-proofer/releases) - [Commits](https://github.com/gjtorikian/html-proofer/compare/v3.15.1...v3.15.2) Signed-off-by: dependabot-preview[bot] --- docs/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index c618823416..68c3eef67a 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -83,7 +83,7 @@ GEM html-pipeline (2.12.3) activesupport (>= 2) nokogiri (>= 1.4) - html-proofer (3.15.1) + html-proofer (3.15.2) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) From 871974650b16d9d4b741fec8986608b081e294a4 Mon Sep 17 00:00:00 2001 From: Charles Gould Date: Thu, 26 Mar 2020 09:38:25 -0500 Subject: [PATCH 27/62] shellenv: use PATH variable, fish_user_paths should remain universal in scope --- Library/Homebrew/cmd/shellenv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/shellenv.sh b/Library/Homebrew/cmd/shellenv.sh index a4b043d574..d1dd7db8b0 100644 --- a/Library/Homebrew/cmd/shellenv.sh +++ b/Library/Homebrew/cmd/shellenv.sh @@ -11,7 +11,7 @@ homebrew-shellenv() { echo "set -gx HOMEBREW_PREFIX \"$HOMEBREW_PREFIX\";" echo "set -gx HOMEBREW_CELLAR \"$HOMEBREW_CELLAR\";" echo "set -gx HOMEBREW_REPOSITORY \"$HOMEBREW_REPOSITORY\";" - echo "set -g fish_user_paths \"$HOMEBREW_PREFIX/bin\" \"$HOMEBREW_PREFIX/sbin\" \$fish_user_paths;" + echo "set -q PATH; or set PATH ''; set -gx PATH \"$HOMEBREW_PREFIX/bin\" \"$HOMEBREW_PREFIX/sbin\" \$PATH;" echo "set -q MANPATH; or set MANPATH ''; set -gx MANPATH \"$HOMEBREW_PREFIX/share/man\" \$MANPATH;" echo "set -q INFOPATH; or set INFOPATH ''; set -gx INFOPATH \"$HOMEBREW_PREFIX/share/info\" \$INFOPATH;" ;; From 94d6f361a404ec563074afb7552d174cd4bfb74c Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Thu, 26 Mar 2020 22:03:54 +0000 Subject: [PATCH 28/62] os/mac/xcode: support Xcode 11.4 --- Library/Homebrew/os/mac/xcode.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 2a67e47d41..c9d1332cd0 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -16,13 +16,13 @@ module OS when "10.11" then "8.2.1" when "10.12" then "9.2" when "10.13" then "10.1" - when "10.14" then "11.3" - when "10.15" then "11.3" + when "10.14" then "11.3.1" + when "10.15" then "11.4" else raise "macOS '#{MacOS.version}' is invalid" unless OS::Mac.prerelease? # Default to newest known version of Xcode for unreleased macOS versions. - "11.3" + "11.4" end end @@ -175,9 +175,9 @@ module OS when 81 then "8.3" when 90 then "9.2" when 91 then "9.4" - when 100 then "10.2.1" - when 110 then "11.3" - else "11.3" + when 100 then "10.3" + when 110 then "11.4" + else "11.4" end end @@ -236,8 +236,8 @@ module OS # on the older supported platform for that Xcode release, i.e there's no # CLT package for 10.11 that contains the Clang version from Xcode 8. case MacOS.version - when "10.15" then "1100.0.33.16" - when "10.14" then "1001.0.46.4" + when "10.15" then "1103.0.32.29" + when "10.14" then "1001.0.46.4" # Later versions are available, but not via Software Update when "10.13" then "1000.10.44.2" when "10.12" then "900.0.39.2" when "10.11" then "800.0.42.1" From 6f7302e4bc7c9e819de494d0b46af75044d0247a Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Fri, 27 Mar 2020 08:01:01 +0000 Subject: [PATCH 29/62] keg_only_whitelist: add libsigc++@2 --- Library/Homebrew/dev-cmd/audit.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 09734fc964..d13466fd0e 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -520,6 +520,7 @@ module Homebrew gnupg@1.4 lua@5.1 numpy@1.16 + libsigc++@2 ].freeze return if keg_only_whitelist.include?(formula.name) || formula.name.start_with?("gcc@") From 119b3fe69a46452b00ec03a964e61bfb7a62a991 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 27 Mar 2020 13:04:10 +0000 Subject: [PATCH 30/62] utils/shebang: add rewrite_shebang --- Library/Homebrew/formula.rb | 2 ++ Library/Homebrew/utils/shebang.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 Library/Homebrew/utils/shebang.rb diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 1df01f60a6..4da0e79b41 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -6,6 +6,7 @@ require "lock_file" require "formula_pin" require "hardware" require "utils/bottles" +require "utils/shebang" require "utils/shell" require "build_environment" require "build_options" @@ -50,6 +51,7 @@ require "find" class Formula include FileUtils include Utils::Inreplace + include Utils::Shebang include Utils::Shell extend Enumerable extend Forwardable diff --git a/Library/Homebrew/utils/shebang.rb b/Library/Homebrew/utils/shebang.rb new file mode 100644 index 0000000000..eda6eec190 --- /dev/null +++ b/Library/Homebrew/utils/shebang.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +module Utils + module Shebang + module_function + + class RewriteInfo + attr_reader :regex, :max_length, :replacement + + def initialize(regex, max_length, replacement) + @regex = regex + @max_length = max_length + @replacement = replacement + end + end + + def rewrite_shebang(rewrite_info, *paths) + paths.each do |f| + f = Pathname(f) + next unless f.file? + next unless rewrite_info.regex.match?(f.read(rewrite_info.max_length)) + + Utils::Inreplace.inreplace f.to_s, rewrite_info.regex, "#!#{rewrite_info.replacement}" + end + end + end +end From 878bb0e9830fb339469f46c0e7b901a990c7844d Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Thu, 26 Mar 2020 18:29:21 +0000 Subject: [PATCH 31/62] language/perl: add detected_perl_shebang --- Library/Homebrew/language/perl.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Library/Homebrew/language/perl.rb diff --git a/Library/Homebrew/language/perl.rb b/Library/Homebrew/language/perl.rb new file mode 100644 index 0000000000..7368b36ee6 --- /dev/null +++ b/Library/Homebrew/language/perl.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +module Language + module Perl + module Shebang + module_function + + def detected_perl_shebang(formula = self) + perl_path = if formula.uses_from_macos_elements&.include? "perl" + "/usr/bin/perl" + elsif formula.deps.map(&:name).include? "perl" + Formula["perl"].opt_bin/"perl" + else + raise "Cannot detect Perl shebang: formula does not depend on Perl." + end + + Utils::Shebang::RewriteInfo.new( + %r{^#! ?/usr/bin/(env )?perl$}, + 20, # the length of "#! /usr/bin/env perl" + perl_path, + ) + end + end + end +end From 5d68856350a6c1e8ce892dbf348fc73f41865e07 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 27 Mar 2020 15:40:43 +0000 Subject: [PATCH 32/62] language/python: use rewrite_shebang, add detected_python_shebang --- Library/Homebrew/language/python.rb | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb index 5ec93a8a06..01f47d71fc 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -88,13 +88,29 @@ module Language end def self.rewrite_python_shebang(python_path) - regex = %r{^#! ?/usr/bin/(env )?python([23](\.\d{1,2})?)?$} - maximum_regex_length = 28 # the length of "#! /usr/bin/env pythonx.yyy$" - Pathname(".").find do |f| - next unless f.file? - next unless regex.match?(f.read(maximum_regex_length)) + Pathname.pwd.find { |f| Utils::Shebang.rewrite_shebang(Shebang.python_shebang_rewrite_info(python_path), f) } + end - Utils::Inreplace.inreplace f.to_s, regex, "#!#{python_path}" + # Mixin module for {Formula} adding shebang rewrite features. + module Shebang + module_function + + # @private + def python_shebang_rewrite_info(python_path) + Utils::Shebang::RewriteInfo.new( + %r{^#! ?/usr/bin/(env )?python([23](\.\d{1,2})?)?$}, + 28, # the length of "#! /usr/bin/env pythonx.yyy$" + python_path, + ) + end + + def detected_python_shebang(formula = self) + python_deps = formula.deps.map(&:name).grep(/^python(@.*)?$/) + + raise "Cannot detect Python shebang: formula does not depend on Python." if python_deps.empty? + raise "Cannot detect Python shebang: formula has multiple Python dependencies." if python_deps.length > 1 + + python_shebang_rewrite_info(Formula[python_deps.first].opt_bin/"python3") end end From 3955e7e13b980ad4f8d38ffc3c0253d86204902e Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 27 Mar 2020 19:18:05 +0000 Subject: [PATCH 33/62] language/test: add shebang tests --- .../test/language/perl/shebang_spec.rb | 52 +++++++++++++++++++ Library/Homebrew/test/language/python_spec.rb | 43 +++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 Library/Homebrew/test/language/perl/shebang_spec.rb diff --git a/Library/Homebrew/test/language/perl/shebang_spec.rb b/Library/Homebrew/test/language/perl/shebang_spec.rb new file mode 100644 index 0000000000..5a59f162b7 --- /dev/null +++ b/Library/Homebrew/test/language/perl/shebang_spec.rb @@ -0,0 +1,52 @@ +# frozen_string_literal: true + +require "language/perl" +require "utils/shebang" + +describe Language::Perl::Shebang do + let(:file) { Tempfile.new("perl-shebang") } + let(:perl_f) do + formula "perl" do + url "https://brew.sh/perl-1.0.tgz" + end + end + let(:f) do + formula "foo" do + url "https://brew.sh/foo-1.0.tgz" + + uses_from_macos "perl" + end + end + + before do + file.write <<~EOS + #!/usr/bin/env perl + a + b + c + EOS + file.flush + end + + after { file.unlink } + + describe "#detected_perl_shebang" do + it "can be used to replace Perl shebangs" do + allow(Formulary).to receive(:factory).with(perl_f.name).and_return(perl_f) + Utils::Shebang.rewrite_shebang described_class.detected_perl_shebang(f), file + + expected_shebang = if OS.mac? + "/usr/bin/perl" + else + HOMEBREW_PREFIX/"opt/perl/bin/perl" + end + + expect(File.read(file)).to eq <<~EOS + #!#{expected_shebang} + a + b + c + EOS + end + end +end diff --git a/Library/Homebrew/test/language/python_spec.rb b/Library/Homebrew/test/language/python_spec.rb index a474e04da6..174373d999 100644 --- a/Library/Homebrew/test/language/python_spec.rb +++ b/Library/Homebrew/test/language/python_spec.rb @@ -2,6 +2,7 @@ require "language/python" require "resource" +require "utils/shebang" describe Language::Python, :needs_python do describe "#major_minor_version" do @@ -32,6 +33,48 @@ describe Language::Python, :needs_python do end end +describe Language::Python::Shebang do + let(:file) { Tempfile.new("python-shebang") } + let(:python_f) do + formula "python" do + url "https://brew.sh/python-1.0.tgz" + end + end + let(:f) do + formula "foo" do + url "https://brew.sh/foo-1.0.tgz" + + depends_on "python" + end + end + + before do + file.write <<~EOS + #!/usr/bin/env python3 + a + b + c + EOS + file.flush + end + + after { file.unlink } + + describe "#detected_python_shebang" do + it "can be used to replace Python shebangs" do + expect(Formulary).to receive(:factory).with(python_f.name).and_return(python_f) + Utils::Shebang.rewrite_shebang described_class.detected_python_shebang(f), file + + expect(File.read(file)).to eq <<~EOS + #!#{HOMEBREW_PREFIX}/opt/python/bin/python3 + a + b + c + EOS + end + end +end + describe Language::Python::Virtualenv::Virtualenv do subject { described_class.new(formula, dir, "python") } From 32ab83d055244af47d775481dbb806452699aada Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 27 Mar 2020 22:27:06 +0000 Subject: [PATCH 34/62] language/python: move rewrite_python_shebang to compat --- Library/Homebrew/compat.rb | 1 + Library/Homebrew/compat/language/python.rb | 17 +++++++++++++++++ Library/Homebrew/language/python.rb | 4 ---- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 Library/Homebrew/compat/language/python.rb diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb index b82a492f60..9a2cf29459 100644 --- a/Library/Homebrew/compat.rb +++ b/Library/Homebrew/compat.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true require "compat/cask/dsl/version" +require "compat/language/python" require "compat/requirements/macos_requirement" require "compat/formula" diff --git a/Library/Homebrew/compat/language/python.rb b/Library/Homebrew/compat/language/python.rb new file mode 100644 index 0000000000..54784465ba --- /dev/null +++ b/Library/Homebrew/compat/language/python.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Language + module Python + class << self + module Compat + def rewrite_python_shebang(python_path) + Pathname.pwd.find do |f| + Utils::Shebang.rewrite_shebang(Shebang.python_shebang_rewrite_info(python_path), f) + end + end + end + + prepend Compat + end + end +end diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb index 01f47d71fc..caaa6cb6a4 100644 --- a/Library/Homebrew/language/python.rb +++ b/Library/Homebrew/language/python.rb @@ -87,10 +87,6 @@ module Language ] end - def self.rewrite_python_shebang(python_path) - Pathname.pwd.find { |f| Utils::Shebang.rewrite_shebang(Shebang.python_shebang_rewrite_info(python_path), f) } - end - # Mixin module for {Formula} adding shebang rewrite features. module Shebang module_function From c241dccbc8d4eca71a6130208ef09ec8e89a42c9 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Sat, 28 Mar 2020 00:10:42 +0000 Subject: [PATCH 35/62] test/resource_spec: fix flaky test --- Library/Homebrew/test/resource_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/test/resource_spec.rb b/Library/Homebrew/test/resource_spec.rb index ec21741f08..fd4e591014 100644 --- a/Library/Homebrew/test/resource_spec.rb +++ b/Library/Homebrew/test/resource_spec.rb @@ -157,7 +157,7 @@ describe Resource do end specify "#verify_download_integrity_mismatch" do - fn = double(file?: true) + fn = double(file?: true, basename: "foo") checksum = subject.sha256(TEST_SHA256) expect(fn).to receive(:verify_checksum).with(checksum) From 7ad6dab28840a5eeb94d6d69614009854df0a700 Mon Sep 17 00:00:00 2001 From: Gautham G Date: Tue, 24 Mar 2020 19:44:05 +0530 Subject: [PATCH 36/62] ARGV: Deprecate ARGV.collect_build_args --- Library/Homebrew/cli/args.rb | 39 +++++++++++++++++++++++++-- Library/Homebrew/extend/ARGV.rb | 17 ------------ Library/Homebrew/formula_installer.rb | 2 +- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb index cc3796db15..c6ff74f20a 100644 --- a/Library/Homebrew/cli/args.rb +++ b/Library/Homebrew/cli/args.rb @@ -68,6 +68,19 @@ module Homebrew named.blank? end + # If the user passes any flags that trigger building over installing from + # a bottle, they are collected here and returned as an Array for checking. + def collect_build_args + build_flags = [] + + build_flags << "--HEAD" if head + build_flags << "--universal" if build_universal + build_flags << "--build-bottle" if build_bottle + build_flags << "--build-from-source" if build_from_source + + build_flags + end + def formulae require "formula" @formulae ||= (downcased_unique_named - casks).map do |name| @@ -160,11 +173,33 @@ module Homebrew end def head - (args_parsed && HEAD?) || cmdline_args.include?("--HEAD") + return true if args_parsed && HEAD? + + cmdline_args.include?("--HEAD") end def devel - (args_parsed && devel?) || cmdline_args.include?("--devel") + return true if args_parsed && devel? + + cmdline_args.include?("--devel") + end + + def build_universal + return true if args_parsed && universal? + + cmdline_args.include?("--universal") + end + + def build_bottle + return true if args_parsed && build_bottle? + + cmdline_args.include?("--build-bottle") + end + + def build_from_source + return true if args_parsed && (build_from_source? || s?) + + cmdline_args.include?("--build-from-source") || cmdline_args.include?("-s") end def spec(default = :stable) diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index ee59e9722e..ae9283add0 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -47,10 +47,6 @@ module HomebrewArgvExtension !(include?("--HEAD") || include?("--devel")) end - def build_universal? - include? "--universal" - end - def build_bottle? include?("--build-bottle") end @@ -84,19 +80,6 @@ module HomebrewArgvExtension value "env" end - # If the user passes any flags that trigger building over installing from - # a bottle, they are collected here and returned as an Array for checking. - def collect_build_flags - build_flags = [] - - build_flags << "--HEAD" if include?("--HEAD") - build_flags << "--universal" if build_universal? - build_flags << "--build-bottle" if build_bottle? - build_flags << "--build-from-source" if build_from_source? - - build_flags - end - private def options_only diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index e070a466c3..de418af649 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -80,7 +80,7 @@ class FormulaInstaller # it's necessary to interrupt the user before any sort of installation # can proceed. Only invoked when the user has no developer tools. def self.prevent_build_flags - build_flags = ARGV.collect_build_flags + build_flags = Homebrew.args.collect_build_args return if build_flags.empty? all_bottled = ARGV.formulae.all?(&:bottled?) From 870bae8ce694143a1b5be2e1df7a60dfbf2f55fe Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 27 Mar 2020 23:50:37 +0000 Subject: [PATCH 37/62] cmd/update-report: check for HOMEBREW_DISABLE_LOAD_FORMULA --- Library/Homebrew/cmd/update-report.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 614d55deef..be4034c764 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -73,7 +73,6 @@ module Homebrew install_core_tap_if_necessary - hub = ReporterHub.new updated = false initial_revision = ENV["HOMEBREW_UPDATE_BEFORE"].to_s @@ -86,6 +85,11 @@ module Homebrew updated = true end + Homebrew.failed = true if ENV["HOMEBREW_UPDATE_FAILED"] + return if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] + + hub = ReporterHub.new + updated_taps = [] Tap.each do |tap| next unless tap.git? @@ -127,8 +131,6 @@ module Homebrew link_completions_manpages_and_docs Tap.each(&:link_completions_and_manpages) - - Homebrew.failed = true if ENV["HOMEBREW_UPDATE_FAILED"] end def shorten_revision(revision) From 1a86fa44212500751b6f8ae8cd47dad12a558796 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 29 Mar 2020 13:57:16 +0000 Subject: [PATCH 38/62] build: bump faraday from 1.0.0 to 1.0.1 in /docs Bumps [faraday](https://github.com/lostisland/faraday) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/lostisland/faraday/releases) - [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md) - [Commits](https://github.com/lostisland/faraday/compare/v1.0.0...v1.0.1) Signed-off-by: dependabot-preview[bot] --- docs/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 68c3eef67a..a0f49c03f8 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -26,7 +26,7 @@ GEM ffi (>= 1.3.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (1.0.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) ffi (1.12.2) forwardable-extended (2.6.0) From 6ab3267e8ee5067481afc0be50e58cbd110dddc3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 29 Mar 2020 17:14:30 +0000 Subject: [PATCH 39/62] build: bump unf_ext from 0.0.7.6 to 0.0.7.7 in /Library/Homebrew Bumps [unf_ext](https://github.com/knu/ruby-unf_ext) from 0.0.7.6 to 0.0.7.7. - [Release notes](https://github.com/knu/ruby-unf_ext/releases) - [Changelog](https://github.com/knu/ruby-unf_ext/blob/master/CHANGELOG.md) - [Commits](https://github.com/knu/ruby-unf_ext/commits) Signed-off-by: dependabot-preview[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 d35953f956..c7e9fc91c4 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -111,7 +111,7 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.7.7) unicode-display_width (1.6.1) webrobots (0.1.2) zeitwerk (2.3.0) From 2e8aa3eb97b6cac1d4b7bfe49b3d342c6191152e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Sat, 28 Mar 2020 19:38:39 +0000 Subject: [PATCH 40/62] Use long --disable instead of short -q in curl --- Library/Homebrew/manpages/brew.1.md.erb | 2 +- Library/Homebrew/test/utils/curl_spec.rb | 10 +++++----- Library/Homebrew/utils/analytics.rb | 2 +- Library/Homebrew/utils/curl.rb | 2 +- docs/Manpage.md | 2 +- manpages/brew.1 | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb index 4c51c0596b..5581f2f6c8 100644 --- a/Library/Homebrew/manpages/brew.1.md.erb +++ b/Library/Homebrew/manpages/brew.1.md.erb @@ -160,7 +160,7 @@ Note that environment variables must have a value set to be detected. For exampl `git`(1) remote. If set, instructs Homebrew to instead use the specified URL. * `HOMEBREW_CURLRC`: - If set, Homebrew will not pass `-q` when invoking `curl`(1), which disables + If set, Homebrew will not pass `--disable` when invoking `curl`(1), which disables the use of `curlrc`. * `HOMEBREW_CURL_VERBOSE`: diff --git a/Library/Homebrew/test/utils/curl_spec.rb b/Library/Homebrew/test/utils/curl_spec.rb index e9b48009d8..544e57bc1b 100644 --- a/Library/Homebrew/test/utils/curl_spec.rb +++ b/Library/Homebrew/test/utils/curl_spec.rb @@ -4,14 +4,14 @@ require "utils/curl" describe "curl" do describe "curl_args" do - it "returns -q as the first argument when HOMEBREW_CURLRC is not set" do - # -q must be the first argument according to "man curl" - expect(curl_args("foo").first).to eq("-q") + it "returns --disable as the first argument when HOMEBREW_CURLRC is not set" do + # --disable must be the first argument according to "man curl" + expect(curl_args("foo").first).to eq("--disable") end - it "doesn't return -q as the first argument when HOMEBREW_CURLRC is set" do + it "doesn't return --disable as the first argument when HOMEBREW_CURLRC is set" do ENV["HOMEBREW_CURLRC"] = "1" - expect(curl_args("foo").first).not_to eq("-q") + expect(curl_args("foo").first).not_to eq("--disable") end it "uses `--retry 3` when HOMEBREW_CURL_RETRIES is unset" do diff --git a/Library/Homebrew/utils/analytics.rb b/Library/Homebrew/utils/analytics.rb index c225be5ac9..882f11315e 100644 --- a/Library/Homebrew/utils/analytics.rb +++ b/Library/Homebrew/utils/analytics.rb @@ -12,7 +12,7 @@ module Utils args = [] # do not load .curlrc unless requested (must be the first argument) - args << "-q" unless ENV["HOMEBREW_CURLRC"] + args << "--disable" unless ENV["HOMEBREW_CURLRC"] args += %W[ --max-time 3 diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index d78e4bc96c..d8ff9a0984 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -17,7 +17,7 @@ def curl_args(*extra_args, show_output: false, user_agent: :default) args = [] # do not load .curlrc unless requested (must be the first argument) - args << "-q" unless ENV["HOMEBREW_CURLRC"] + args << "--disable" unless ENV["HOMEBREW_CURLRC"] args << "--globoff" diff --git a/docs/Manpage.md b/docs/Manpage.md index 230698e4ee..ace12b9b16 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1199,7 +1199,7 @@ Note that environment variables must have a value set to be detected. For exampl `git`(1) remote. If set, instructs Homebrew to instead use the specified URL. * `HOMEBREW_CURLRC`: - If set, Homebrew will not pass `-q` when invoking `curl`(1), which disables + If set, Homebrew will not pass `--disable` when invoking `curl`(1), which disables the use of `curlrc`. * `HOMEBREW_CURL_VERBOSE`: diff --git a/manpages/brew.1 b/manpages/brew.1 index ff46ac5bbb..228d6853db 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1495,7 +1495,7 @@ By default, Homebrew uses \fBhttps://github\.com/Homebrew/homebrew\-core\fR (or . .TP \fBHOMEBREW_CURLRC\fR -If set, Homebrew will not pass \fB\-q\fR when invoking \fBcurl\fR(1), which disables the use of \fBcurlrc\fR\. +If set, Homebrew will not pass \fB\-\-disable\fR when invoking \fBcurl\fR(1), which disables the use of \fBcurlrc\fR\. . .TP \fBHOMEBREW_CURL_VERBOSE\fR From 4fb5b935417212f548c8a9fb13c99f91b4a939f1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 05:42:43 +0000 Subject: [PATCH 41/62] build: bump ruby-enum from 0.7.2 to 0.8.0 in /docs Bumps [ruby-enum](https://github.com/dblock/ruby-enum) from 0.7.2 to 0.8.0. - [Release notes](https://github.com/dblock/ruby-enum/releases) - [Changelog](https://github.com/dblock/ruby-enum/blob/master/CHANGELOG.md) - [Commits](https://github.com/dblock/ruby-enum/compare/v0.7.2...v0.8.0) Signed-off-by: dependabot-preview[bot] --- docs/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index a0f49c03f8..739ffd9583 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -229,7 +229,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rouge (3.13.0) - ruby-enum (0.7.2) + ruby-enum (0.8.0) i18n rubyzip (2.3.0) safe_yaml (1.0.5) From 5b1d0786a45e69b4af1d71d433cc11bb676fd6b6 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 00:47:13 +1100 Subject: [PATCH 42/62] utils/github: add fetch_artifact API --- Library/Homebrew/utils/github.rb | 67 +++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index eb6289d7a1..787e3c0647 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true -require "uri" +require "download_strategy" require "tempfile" +require "uri" module GitHub module_function @@ -438,6 +439,70 @@ module GitHub scopes: CREATE_ISSUE_FORK_OR_PR_SCOPES) end + def fetch_artifact(user, repo, pr, dir, workflow_id: "tests.yml", artifact_name: "bottles") + base_url = "#{API_URL}/repos/#{user}/#{repo}" + pr_payload = open_api("#{base_url}/pulls/#{pr}") + pr_sha = pr_payload["head"]["sha"] + pr_branch = pr_payload["head"]["ref"] + + workflow = open_api("#{base_url}/actions/workflows/#{workflow_id}/runs?branch=#{pr_branch}") + workflow_run = workflow["workflow_runs"].select do |run| + run["head_sha"] == pr_sha + end + + if workflow_run.empty? + raise Error, <<~EOS + No matching workflow run found for these criteria! + Commit SHA: #{pr_sha} + Branch ref: #{pr_branch} + Pull request: #{pr} + Workflow: #{workflow_id} + EOS + end + + status = workflow_run.first["status"].sub("_", " ") + if status != "completed" + raise Error, <<~EOS + The newest workflow run for ##{pr} is still #{status}! + #{Formatter.url workflow_run.first["html_url"]} + EOS + end + + artifacts = open_api(workflow_run.first["artifacts_url"]) + + artifact = artifacts["artifacts"].select do |art| + art["name"] == artifact_name + end + + if artifact.empty? + raise Error, <<~EOS + No artifact with the name `#{artifact_name}` was found! + #{Formatter.url workflow_run.first["html_url"]} + EOS + end + + artifact_url = artifact.first["archive_download_url"] + + token, username = api_credentials + case api_credentials_type + when :env_username_password, :keychain_username_password + curl_args = { user: "#{username}:#{token}" } + when :env_token + curl_args = { header: "Authorization: token #{token}" } + end + + # Download the artifact as a zip file and unpack it into `dir`. This is + # preferred over system `curl` and `tar` as this leverages the Homebrew + # cache to avoid repeated downloads of (possibly large) bottles. + FileUtils.chdir dir do + curl_args[:cache] = Pathname.new(dir) + curl_args[:secrets] = [token] + downloader = CurlDownloadStrategy.new(artifact_url, "artifact", pr, **curl_args) + downloader.fetch + downloader.stage + end + end + def api_errors [GitHub::AuthenticationFailedError, GitHub::HTTPNotFoundError, GitHub::RateLimitExceededError, GitHub::Error, JSON::ParserError].freeze From 49c5a4393a679bff908799b96b1df5a276cb1ca1 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 19:35:54 +1100 Subject: [PATCH 43/62] bintray: add Bintray API functions --- Library/Homebrew/bintray.rb | 125 ++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 Library/Homebrew/bintray.rb diff --git a/Library/Homebrew/bintray.rb b/Library/Homebrew/bintray.rb new file mode 100644 index 0000000000..990b3ed3da --- /dev/null +++ b/Library/Homebrew/bintray.rb @@ -0,0 +1,125 @@ +# frozen_string_literal: true + +require "utils/curl" +require "json" + +class Bintray + API_URL = "https://api.bintray.com" + + class Error < RuntimeError + end + + def inspect + "#" + end + + def initialize(user: nil, key: nil, org: nil, clear: true) + @bintray_user = user || ENV["HOMEBREW_BINTRAY_USER"] + @bintray_key = key || ENV["HOMEBREW_BINTRAY_KEY"] + + if !@bintray_user || !@bintray_key + raise Error, "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!" unless Homebrew.args.dry_run? + end + + @bintray_org = org || "homebrew" + ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] = "1" if @bintray_org == "homebrew" && !OS.mac? + + ENV.clear_sensitive_environment! if clear + end + + def open_api(url, *extra_curl_args, auth: true) + args = extra_curl_args + args += ["--user", "#{@bintray_user}:#{@bintray_key}"] if auth + curl(*args, url, + show_output: Homebrew.args.verbose?, + secrets: @bintray_key) + end + + def upload(local_file, repo:, package:, version:, remote_file:, sha256: nil) + url = "#{API_URL}/content/#{@bintray_org}/#{repo}/#{package}/#{version}/#{remote_file}" + args = ["--upload-file", local_file] + args += ["--header", "X-Checksum-Sha2: #{sha256}"] unless sha256.blank? + open_api url, *args + end + + def publish(repo:, package:, version:) + url = "#{API_URL}/content/#{@bintray_org}/#{repo}/#{package}/#{version}/publish" + open_api url, "--request", "POST" + end + + def official_org?(org: @bintray_org) + %w[homebrew linuxbrew].include? org + end + + def create_package(repo:, package:, **extra_data_args) + url = "#{API_URL}/packages/#{@bintray_org}/#{repo}/#{package}" + data = { name: package, public_download_numbers: true } + data[:public_stats] = official_org? + data.merge! extra_data_args + open_api url, "--request", "POST", "--data", data.to_json + end + + def package_exists?(repo:, package:) + url = "#{API_URL}/packages/#{@bintray_org}/#{repo}/#{package}" + open_api url, "--output", "/dev/null", auth: false + end + + def file_published?(repo:, remote_file:) + url = "https://dl.bintray.com/#{@bintray_org}/#{repo}/#{remote_file}" + begin + curl "--silent", "--head", "--output", "/dev/null", url + rescue ErrorDuringExecution => e + stderr = e.output.select { |type,| type == :stderr } + .map { |_, line| line } + .join + raise if e.status.exitstatus != 22 && !stderr.include?("404 Not Found") + + false + else + true + end + end + + def upload_bottle_json(json_files, publish_package: false) + bottles_hash = json_files.reduce({}) do |hash, json_file| + hash.deep_merge(JSON.parse(IO.read(json_file))) + end + + formula_packaged = {} + + bottles_hash.each do |formula_name, bottle_hash| + version = bottle_hash["formula"]["pkg_version"] + bintray_package = bottle_hash["bintray"]["package"] + bintray_repo = bottle_hash["bintray"]["repository"] + + bottle_hash["bottle"]["tags"].each do |_tag, tag_hash| + filename = tag_hash["filename"] + sha256 = tag_hash["sha256"] + + if file_published? repo: bintray_repo, remote_file: filename + raise Error, <<~EOS + #{filename} is already published. + Please remove it manually from: + https://bintray.com/#{@bintray_org}/#{bintray_repo}/#{bintray_package}/view#files + Or run: + curl -X DELETE -u $HOMEBREW_BINTRAY_USER:$HOMEBREW_BINTRAY_KEY \\ + https://api.bintray.com/content/#{@bintray_org}/#{bintray_repo}/#{filename} + EOS + end + + if !formula_packaged[formula_name] && !package_exists?(repo: bintray_repo, package: bintray_package) + create_package repo: bintray_repo, package: bintray_package + formula_packaged[formula_name] = true + end + + upload(tag_hash["local_filename"], + repo: bintray_repo, + package: bintray_package, + version: version, + remote_file: filename, + sha256: sha256) + end + publish repo: bintray_repo, package: bintray_package, version: version if publish_package + end + end +end From 0574ba436bb193eb899c22cc36799367364469e7 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 00:47:38 +1100 Subject: [PATCH 44/62] dev-cmd: add pr-pull command --- Library/Homebrew/dev-cmd/pr-pull.rb | 143 ++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 Library/Homebrew/dev-cmd/pr-pull.rb diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb new file mode 100644 index 0000000000..fe15b54c27 --- /dev/null +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -0,0 +1,143 @@ +# frozen_string_literal: true + +require "cli/parser" +require "utils/github" +require "tmpdir" +require "bintray" + +module Homebrew + module_function + + def pr_pull_args + Homebrew::CLI::Parser.new do + usage_banner <<~EOS + `pr-pull` + + Download and publish bottles, and apply the bottle commit from a + pull request with artifacts generated from GitHub Actions. + Requires write access to the repository. + EOS + switch "--no-publish", + description: "Download the bottles, apply the bottle commit, and "\ + "upload the bottles to Bintray, but don't publish them." + switch "--no-upload", + description: "Download the bottles and apply the bottle commit, "\ + "but don't upload to Bintray." + switch "--dry-run", "-n", + description: "Print what would be done rather than doing it." + switch "--clean", + description: "Do not amend the commits from pull requests." + switch "--branch-okay", + description: "Do not warn if pulling to a branch besides master (useful for testing)." + switch "--resolve", + description: "When a patch fails to apply, leave in progress and allow user to resolve, instead "\ + "of aborting." + flag "--workflow=", + description: "Retrieve artifacts from the specified workflow (default: tests.yml)." + flag "--artifact=", + description: "Download artifacts with the specified name (default: bottles)." + flag "--bintray-org=", + description: "Upload to the specified Bintray organisation." + switch :verbose + switch :debug + min_named 1 + end + end + + def signoff!(pr, path: ".", dry_run: false) + message = Utils.popen_read "git", "-C", path, "log", "-1", "--pretty=%B" + close_message = "Closes ##{pr}." + message += "\n#{close_message}" unless message.include? close_message + if dry_run + puts "git commit --amend --signoff -m $message" + else + safe_system "git", "-C", path, "commit", "--amend", "--signoff", "--allow-empty", "-q", "-m", message + end + end + + def cherry_pick_pr!(pr, path: ".", dry_run: false) + if dry_run + puts <<~EOS + git fetch --force origin +refs/pull/#{pr}/head + git merge-base HEAD FETCH_HEAD + git cherry-pick --ff --allow-empty $merge_base..FETCH_HEAD + EOS + else + safe_system "git", "-C", path, "fetch", "--quiet", "--force", "origin", "+refs/pull/#{pr}/head" + merge_base = Utils.popen_read("git", "-C", path, "merge-base", "HEAD", "FETCH_HEAD").strip + commit_count = Utils.popen_read("git", "-C", path, "rev-list", "#{merge_base}..FETCH_HEAD").lines.count + + # git cherry-pick unfortunately has no quiet option + ohai "Cherry-picking #{commit_count} commit#{"s" unless commit_count == 1} from ##{pr}" + cherry_pick_args = "git", "-C", path, "cherry-pick", "--ff", "--allow-empty", "#{merge_base}..FETCH_HEAD" + result = Homebrew.args.verbose? ? system(*cherry_pick_args) : quiet_system(*cherry_pick_args) + + unless result + if Homebrew.args.resolve? + odie "Cherry-pick failed: try to resolve it." + else + system "git", "-C", path, "cherry-pick", "--abort" + odie "Cherry-pick failed!" + end + end + end + end + + def check_branch(path, ref) + branch = Utils.popen_read("git", "-C", path, "symbolic-ref", "--short", "HEAD").strip + + return if branch == ref || args.clean? || args.branch_okay? + + opoo "Current branch is #{branch}: do you need to pull inside #{ref}?" + end + + def pr_pull + pr_pull_args.parse + + bintray_user = ENV["HOMEBREW_BINTRAY_USER"] + bintray_key = ENV["HOMEBREW_BINTRAY_KEY"] + ENV.clear_sensitive_environment! + + if bintray_user.blank? || bintray_key.blank? + odie "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!" if !args.dry_run? && !args.no_upload? + else + bintray = Bintray.new(user: bintray_user, key: bintray_key, org: args.bintray_org) + end + + workflow = args.workflow || "tests.yml" + artifact = args.artifact || "bottles" + + args.named.each do |arg| + arg = "#{CoreTap.instance.default_remote}/pull/#{arg}" if arg.to_i.positive? + url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX + _, user, repo, pr = *url_match + tap = Tap.fetch(user, repo) if repo.match?(HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX) + odie "Not a GitHub pull request: #{arg}" unless pr + + check_branch tap.path, "master" + + ohai "Fetching #{tap} pull request ##{pr}" + Dir.mktmpdir pr do |dir| + cd dir do + GitHub.fetch_artifact(user, repo, pr, dir, workflow_id: workflow, artifact_name: artifact) + cherry_pick_pr! pr, path: tap.path, dry_run: args.dry_run? + signoff! pr, path: tap.path, dry_run: args.dry_run? unless args.clean? + + if args.dry_run? + puts "brew bottle --merge --write #{Dir["*.json"].join " "}" + else + quiet_system "#{HOMEBREW_PREFIX}/bin/brew", "bottle", "--merge", "--write", *Dir["*.json"] + end + + next if args.no_upload? + + if args.dry_run? + puts "Upload bottles described by these JSON files to Bintray:\n #{Dir["*.json"].join("\n ")}" + else + bintray.upload_bottle_json Dir["*.json"], publish_package: !args.no_publish? + end + end + end + end + end +end From d459718bc4e79984879abd31879ccaf0dc1b2265 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 19:37:12 +1100 Subject: [PATCH 45/62] manpages: update for new pr-pull command --- docs/Manpage.md | 25 +++++++++++++++++++++++++ manpages/brew.1 | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/docs/Manpage.md b/docs/Manpage.md index ace12b9b16..e503d4f954 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -887,6 +887,31 @@ Generate Homebrew's manpages. Publishes bottles for a pull request with GitHub Actions. Requires write access to the repository. +### `pr-pull` *`pull_request`* + +Download and publish bottles, and apply the bottle commit from a pull request +with artifacts generated from GitHub Actions. Requires write access to the +repository. + +* `--no-publish`: + Download the bottles, apply the bottle commit, and upload the bottles to Bintray, but don't publish them. +* `--no-upload`: + Download the bottles and apply the bottle commit, but don't upload to Bintray. +* `-n`, `--dry-run`: + Print what would be done rather than doing it. +* `--clean`: + Do not amend the commits from pull requests. +* `--branch-okay`: + Do not warn if pulling to a branch besides master (useful for testing). +* `--resolve`: + When a patch fails to apply, leave in progress and allow user to resolve, instead of aborting. +* `--workflow`: + Retrieve artifacts from the specified workflow (default: tests.yml). +* `--artifact`: + Download artifacts with the specified name (default: bottles). +* `--bintray-org`: + Upload to the specified Bintray organisation. + ### `prof` *`command`* Run Homebrew with the Ruby profiler, e.g. `brew prof readall`. diff --git a/manpages/brew.1 b/manpages/brew.1 index 228d6853db..7501f2cf09 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1127,6 +1127,45 @@ This is now done automatically by \fBbrew update\fR\. .SS "\fBpr\-publish\fR \fIpull_request\fR" Publishes bottles for a pull request with GitHub Actions\. Requires write access to the repository\. . +.SS "\fBpr\-pull\fR \fIpull_request\fR" +Download and publish bottles, and apply the bottle commit from a pull request with artifacts generated from GitHub Actions\. Requires write access to the repository\. +. +.TP +\fB\-\-no\-publish\fR +Download the bottles, apply the bottle commit, and upload the bottles to Bintray, but don\'t publish them\. +. +.TP +\fB\-\-no\-upload\fR +Download the bottles and apply the bottle commit, but don\'t upload to Bintray\. +. +.TP +\fB\-n\fR, \fB\-\-dry\-run\fR +Print what would be done rather than doing it\. +. +.TP +\fB\-\-clean\fR +Do not amend the commits from pull requests\. +. +.TP +\fB\-\-branch\-okay\fR +Do not warn if pulling to a branch besides master (useful for testing)\. +. +.TP +\fB\-\-resolve\fR +When a patch fails to apply, leave in progress and allow user to resolve, instead of aborting\. +. +.TP +\fB\-\-workflow\fR +Retrieve artifacts from the specified workflow (default: tests\.yml)\. +. +.TP +\fB\-\-artifact\fR +Download artifacts with the specified name (default: bottles)\. +. +.TP +\fB\-\-bintray\-org\fR +Upload to the specified Bintray organisation\. +. .SS "\fBprof\fR \fIcommand\fR" Run Homebrew with the Ruby profiler, e\.g\. \fBbrew prof readall\fR\. . From 282bfbf70adc3e343bfddb192b130771f8dba6ea Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 21:07:45 +1100 Subject: [PATCH 46/62] bintray: add tests --- Library/Homebrew/test/bintray_spec.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Library/Homebrew/test/bintray_spec.rb diff --git a/Library/Homebrew/test/bintray_spec.rb b/Library/Homebrew/test/bintray_spec.rb new file mode 100644 index 0000000000..0e1eceaf29 --- /dev/null +++ b/Library/Homebrew/test/bintray_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +require "bintray" + +describe Bintray, :needs_network do + bintray = described_class.new(user: "BrewTestBot", key: "deadbeef", org: "homebrew") + describe "::file_published?" do + it "detects a published file" do + results = bintray.file_published?(repo: "bottles", remote_file: "hello-2.10.catalina.bottle.tar.gz") + expect(results).to be true + end + + it "fails on a non-existant file" do + results = bintray.file_published?(repo: "bottles", remote_file: "my-fake-bottle-1.0.snow_hyena.tar.gz") + expect(results).to be false + end + end + + describe "::package_exists?" do + it "detects a package" do + results = bintray.package_exists?(repo: "bottles", package: "hello") + expect(results.status.exitstatus).to be 0 + end + end +end From bab564f2030680bcde3a66664bf88e445c1ff258 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 21:07:56 +1100 Subject: [PATCH 47/62] pr-pull: add tests --- Library/Homebrew/test/dev-cmd/pr-pull_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Library/Homebrew/test/dev-cmd/pr-pull_spec.rb diff --git a/Library/Homebrew/test/dev-cmd/pr-pull_spec.rb b/Library/Homebrew/test/dev-cmd/pr-pull_spec.rb new file mode 100644 index 0000000000..99dfa041e9 --- /dev/null +++ b/Library/Homebrew/test/dev-cmd/pr-pull_spec.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +require "cmd/shared_examples/args_parse" + +describe "Homebrew.pr_pull_args" do + it_behaves_like "parseable arguments" +end From 0d3a4d98c0ebb7e5a97cb8151f7c348e6955002a Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 22:17:41 +1100 Subject: [PATCH 48/62] utils/github: add test for fetch_artifact --- Library/Homebrew/test/utils/github_spec.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Library/Homebrew/test/utils/github_spec.rb b/Library/Homebrew/test/utils/github_spec.rb index 936ae03ae6..c2dc27b443 100644 --- a/Library/Homebrew/test/utils/github_spec.rb +++ b/Library/Homebrew/test/utils/github_spec.rb @@ -41,4 +41,18 @@ describe GitHub do expect(results.first["title"]).to eq("Shall we run `brew update` automatically?") end end + + describe "::fetch_artifact", :needs_network do + it "fails to find a nonexistant workflow" do + expect { + subject.fetch_artifact("Homebrew", "homebrew-core", 1, ".") + }.to raise_error(/No matching workflow run found/) + end + + it "fails to find artifacts that don't exist" do + expect { + subject.fetch_artifact("Homebrew", "homebrew-core", 51971, ".", artifact_name: "false_bottles") + }.to raise_error(/No artifact .+ was found/) + end + end end From e601c3f87cb144afdedb69a15dec300da26feb3e Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Mon, 30 Mar 2020 22:29:31 +1100 Subject: [PATCH 49/62] bintray: streamline initialization Co-Authored-By: Mike McQuaid --- Library/Homebrew/bintray.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/bintray.rb b/Library/Homebrew/bintray.rb index 990b3ed3da..5338d4efb6 100644 --- a/Library/Homebrew/bintray.rb +++ b/Library/Homebrew/bintray.rb @@ -13,15 +13,17 @@ class Bintray "#" end - def initialize(user: nil, key: nil, org: nil, clear: true) - @bintray_user = user || ENV["HOMEBREW_BINTRAY_USER"] - @bintray_key = key || ENV["HOMEBREW_BINTRAY_KEY"] + def initialize(user: ENV["HOMEBREW_BINTRAY_USER"], key: ENV["HOMEBREW_BINTRAY_KEY"], org: "homebrew", clear: true) + @bintray_user = user + @bintray_key = key + @bintray_org = org if !@bintray_user || !@bintray_key - raise Error, "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!" unless Homebrew.args.dry_run? + unless Homebrew.args.dry_run? + raise UsageError, "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!" + end end - @bintray_org = org || "homebrew" ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] = "1" if @bintray_org == "homebrew" && !OS.mac? ENV.clear_sensitive_environment! if clear From bd076049a0971584bb0c5b73f702190a259899a3 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 30 Mar 2020 20:25:42 +0100 Subject: [PATCH 50/62] integration_test: only run on system Ruby. There appear to be random, seemingly impossible to debug issues with running integration tests on portable Ruby. Instead of confusing contributors when these will be run on CI anyway: let's just skip them by default (like we do with `--online` for online tests anyway). --- .../support/helper/spec/shared_context/integration_test.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb index 0a28b8b558..c5adb08b86 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb @@ -9,6 +9,11 @@ RSpec::Matchers.define_negated_matcher :be_a_failure, :be_a_success RSpec.shared_context "integration test" do extend RSpec::Matchers::DSL + if OS.mac? && + !RUBY_BIN.to_s.match?(%r{^/(System/Library/Frameworks/Ruby\.framework/Versions/(Current|\d+\.\d+)/)usr/bin$}) + skip "integration test requires system Ruby" + end + matcher :be_a_success do match do |actual| status = actual.is_a?(Proc) ? actual.call : actual From 90b410c2a95b9672467b748aee40bfffcdec36d2 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Tue, 31 Mar 2020 00:17:42 +0200 Subject: [PATCH 51/62] brew.sh: obey HOMEBREW_COLOR --- Library/Homebrew/brew.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 421129f8b5..de3d5b5e54 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -27,7 +27,7 @@ esac export HOMEBREW_COMMAND_DEPTH=$((HOMEBREW_COMMAND_DEPTH + 1)) ohai() { - if [[ -t 1 && -z "$HOMEBREW_NO_COLOR" ]] # check whether stdout is a tty. + if [[ -n "$HOMEBREW_COLOR" || (-t 1 && -z "$HOMEBREW_NO_COLOR") ]] # check whether stdout is a tty. then echo -e "\\033[34m==>\\033[0m \\033[1m$*\\033[0m" # blue arrow and bold text else @@ -36,7 +36,7 @@ ohai() { } onoe() { - if [[ -t 2 && -z "$HOMEBREW_NO_COLOR" ]] # check whether stderr is a tty. + if [[ -n "$HOMEBREW_COLOR" || (-t 2 && -z "$HOMEBREW_NO_COLOR") ]] # check whether stderr is a tty. then echo -ne "\\033[4;31mError\\033[0m: " >&2 # highlight Error with underline and red color else From bfcba0f5f0a4c039939441c6f257b771f054c649 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Fri, 27 Mar 2020 14:29:50 +0000 Subject: [PATCH 52/62] Library/Homebrew: add free_port test helper Co-Authored-By: Mike McQuaid --- Library/Homebrew/dev-cmd/test.rb | 1 + Library/Homebrew/formula_free_port.rb | 15 +++++++++++ Library/Homebrew/test.rb | 2 ++ .../Homebrew/test/formula_free_port_spec.rb | 25 +++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 Library/Homebrew/formula_free_port.rb create mode 100644 Library/Homebrew/test/formula_free_port_spec.rb diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb index 1874c985d4..e97ebd7eb7 100644 --- a/Library/Homebrew/dev-cmd/test.rb +++ b/Library/Homebrew/dev-cmd/test.rb @@ -36,6 +36,7 @@ module Homebrew test_args.parse require "formula_assertions" + require "formula_free_port" args.resolved_formulae.each do |f| # Cannot test uninstalled formulae diff --git a/Library/Homebrew/formula_free_port.rb b/Library/Homebrew/formula_free_port.rb new file mode 100644 index 0000000000..894b5cf8c2 --- /dev/null +++ b/Library/Homebrew/formula_free_port.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Homebrew + module FreePort + require "socket" + + def free_port + server = TCPServer.new 0 + _, port, = server.addr + server.close + + port + end + end +end diff --git a/Library/Homebrew/test.rb b/Library/Homebrew/test.rb index 095905ba67..c14cb2517f 100644 --- a/Library/Homebrew/test.rb +++ b/Library/Homebrew/test.rb @@ -7,6 +7,7 @@ require "extend/ENV" require "timeout" require "debrew" require "formula_assertions" +require "formula_free_port" require "fcntl" require "socket" require "cli/parser" @@ -26,6 +27,7 @@ begin formula = Homebrew.args.resolved_formulae.first formula.extend(Homebrew::Assertions) + formula.extend(Homebrew::FreePort) formula.extend(Debrew::Formula) if Homebrew.args.debug? # tests can also return false to indicate failure diff --git a/Library/Homebrew/test/formula_free_port_spec.rb b/Library/Homebrew/test/formula_free_port_spec.rb new file mode 100644 index 0000000000..04320edf5d --- /dev/null +++ b/Library/Homebrew/test/formula_free_port_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +require "socket" +require "formula_free_port" + +module Homebrew + describe FreePort do + include described_class + + describe "#free_port" do + # IANA suggests user port from 1024 to 49151 + # and dynamic port for 49152 to 65535 + # http://www.iana.org/assignments/port-numbers + MIN_PORT = 1024 + MAX_PORT = 65535 + + it "returns a free TCP/IP port" do + port = free_port + + expect(port).to be_between(MIN_PORT, MAX_PORT) + expect { TCPServer.new(port).close }.not_to raise_error + end + end + end +end From c563b9c6a279c9259079926bf9aa9a7d633b431f Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Tue, 31 Mar 2020 10:02:29 +0200 Subject: [PATCH 53/62] pr-publish: make it work on linux too --- Library/Homebrew/dev-cmd/pr-publish.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/dev-cmd/pr-publish.rb b/Library/Homebrew/dev-cmd/pr-publish.rb index f8da3b7b2f..c87973e4a8 100644 --- a/Library/Homebrew/dev-cmd/pr-publish.rb +++ b/Library/Homebrew/dev-cmd/pr-publish.rb @@ -21,6 +21,8 @@ module Homebrew def pr_publish pr_publish_args.parse + ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] = "1" unless OS.mac? + odie "You need to specify at least one pull request number!" if Homebrew.args.named.empty? args.named.each do |arg| From ffc1b4902622d2d7a285485c53ffe8f6a8f258e2 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Tue, 31 Mar 2020 11:24:10 +0200 Subject: [PATCH 54/62] pr-pull: allow to specify tap --- Library/Homebrew/dev-cmd/pr-pull.rb | 8 +++++--- docs/Manpage.md | 4 +++- manpages/brew.1 | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index fe15b54c27..4860eb3bdb 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -37,7 +37,9 @@ module Homebrew flag "--artifact=", description: "Download artifacts with the specified name (default: bottles)." flag "--bintray-org=", - description: "Upload to the specified Bintray organisation." + description: "Upload to the specified Bintray organisation (default: homebrew)." + flag "--tap=", + description: "Target repository tap (default: homebrew/core)." switch :verbose switch :debug min_named 1 @@ -106,12 +108,12 @@ module Homebrew workflow = args.workflow || "tests.yml" artifact = args.artifact || "bottles" + tap = Tap.fetch(args.tap || "homebrew/core") args.named.each do |arg| - arg = "#{CoreTap.instance.default_remote}/pull/#{arg}" if arg.to_i.positive? + arg = "#{tap.default_remote}/pull/#{arg}" if arg.to_i.positive? url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX _, user, repo, pr = *url_match - tap = Tap.fetch(user, repo) if repo.match?(HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX) odie "Not a GitHub pull request: #{arg}" unless pr check_branch tap.path, "master" diff --git a/docs/Manpage.md b/docs/Manpage.md index e503d4f954..2982e3ff79 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -910,7 +910,9 @@ repository. * `--artifact`: Download artifacts with the specified name (default: bottles). * `--bintray-org`: - Upload to the specified Bintray organisation. + Upload to the specified Bintray organisation (default: homebrew). +* `--tap`: + Target repository tap (default: homebrew/core). ### `prof` *`command`* diff --git a/manpages/brew.1 b/manpages/brew.1 index 7501f2cf09..f182cbb489 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1164,7 +1164,11 @@ Download artifacts with the specified name (default: bottles)\. . .TP \fB\-\-bintray\-org\fR -Upload to the specified Bintray organisation\. +Upload to the specified Bintray organisation (default: homebrew)\. +. +.TP +\fB\-\-tap\fR +Target repository tap (default: homebrew/core)\. . .SS "\fBprof\fR \fIcommand\fR" Run Homebrew with the Ruby profiler, e\.g\. \fBbrew prof readall\fR\. From 39040fba8b909dda0276496149cf4cf1807e3695 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 31 Mar 2020 17:57:19 +1100 Subject: [PATCH 55/62] utils/github: properly use token scopes --- Library/Homebrew/utils/github.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index 787e3c0647..b885c065f8 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -440,12 +440,13 @@ module GitHub end def fetch_artifact(user, repo, pr, dir, workflow_id: "tests.yml", artifact_name: "bottles") + scopes = CREATE_ISSUE_FORK_OR_PR_SCOPES base_url = "#{API_URL}/repos/#{user}/#{repo}" - pr_payload = open_api("#{base_url}/pulls/#{pr}") + pr_payload = open_api("#{base_url}/pulls/#{pr}", scopes: scopes) pr_sha = pr_payload["head"]["sha"] pr_branch = pr_payload["head"]["ref"] - workflow = open_api("#{base_url}/actions/workflows/#{workflow_id}/runs?branch=#{pr_branch}") + workflow = open_api("#{base_url}/actions/workflows/#{workflow_id}/runs?branch=#{pr_branch}", scopes: scopes) workflow_run = workflow["workflow_runs"].select do |run| run["head_sha"] == pr_sha end @@ -468,7 +469,7 @@ module GitHub EOS end - artifacts = open_api(workflow_run.first["artifacts_url"]) + artifacts = open_api(workflow_run.first["artifacts_url"], scopes: scopes) artifact = artifacts["artifacts"].select do |art| art["name"] == artifact_name @@ -489,6 +490,8 @@ module GitHub curl_args = { user: "#{username}:#{token}" } when :env_token curl_args = { header: "Authorization: token #{token}" } + when :none + raise Error, "Credentials must be set to access the Artifacts API" end # Download the artifact as a zip file and unpack it into `dir`. This is From 11471061343f918347f1773c976cd2bdbd3ff163 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 31 Mar 2020 17:57:19 +1100 Subject: [PATCH 56/62] bintray: only clear Bintray key Also add debugging statements --- Library/Homebrew/bintray.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/bintray.rb b/Library/Homebrew/bintray.rb index 5338d4efb6..6dada447d5 100644 --- a/Library/Homebrew/bintray.rb +++ b/Library/Homebrew/bintray.rb @@ -24,9 +24,11 @@ class Bintray end end + raise UsageError, "Must set a Bintray organisation!" unless @bintray_org + ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] = "1" if @bintray_org == "homebrew" && !OS.mac? - ENV.clear_sensitive_environment! if clear + ENV.delete "HOMEBREW_BINTRAY_KEY" if clear end def open_api(url, *extra_curl_args, auth: true) @@ -98,6 +100,7 @@ class Bintray filename = tag_hash["filename"] sha256 = tag_hash["sha256"] + odebug "Checking remote file #{@bintray_org}/#{bintray_repo}/#{filename}" if file_published? repo: bintray_repo, remote_file: filename raise Error, <<~EOS #{filename} is already published. @@ -110,10 +113,12 @@ class Bintray end if !formula_packaged[formula_name] && !package_exists?(repo: bintray_repo, package: bintray_package) + odebug "Creating package #{@bintray_org}/#{bintray_repo}/#{package}" create_package repo: bintray_repo, package: bintray_package formula_packaged[formula_name] = true end + odebug "Uploading #{@bintray_org}/#{bintray_repo}/#{bintray_package}/#{version}/#{tag_hash["local_filename"]}" upload(tag_hash["local_filename"], repo: bintray_repo, package: bintray_package, @@ -121,7 +126,10 @@ class Bintray remote_file: filename, sha256: sha256) end - publish repo: bintray_repo, package: bintray_package, version: version if publish_package + if publish_package + odebug "Publishing #{@bintray_org}/#{bintray_repo}/#{bintray_package}/#{version}" + publish repo: bintray_repo, package: bintray_package, version: version + end end end end From cd56e8b03e152c43e36684f706a425e2f40bf996 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 31 Mar 2020 22:11:30 +1100 Subject: [PATCH 57/62] pr-pull: update for gpg environment and secrets Co-Authored-By: Mike McQuaid --- Library/Homebrew/dev-cmd/pr-pull.rb | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index 4860eb3bdb..3689495c36 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -46,6 +46,27 @@ module Homebrew end end + def setup_git_environment! + # Passthrough Git environment variables + ENV["GIT_COMMITTER_NAME"] = ENV["HOMEBREW_GIT_NAME"] if ENV["HOMEBREW_GIT_NAME"] + ENV["GIT_COMMITTER_EMAIL"] = ENV["HOMEBREW_GIT_EMAIL"] if ENV["HOMEBREW_GIT_EMAIL"] + + # Depending on user configuration, git may try to invoke gpg. + return unless Utils.popen_read("git config --get --bool commit.gpgsign").chomp == "true" + + begin + gnupg = Formula["gnupg"] + rescue FormulaUnavailableError + nil + else + if gnupg.installed? + path = PATH.new(ENV.fetch("PATH")) + path.prepend(gnupg.installed_prefix/"bin") + ENV["PATH"] = path + end + end + end + def signoff!(pr, path: ".", dry_run: false) message = Utils.popen_read "git", "-C", path, "log", "-1", "--pretty=%B" close_message = "Closes ##{pr}." @@ -98,18 +119,20 @@ module Homebrew bintray_user = ENV["HOMEBREW_BINTRAY_USER"] bintray_key = ENV["HOMEBREW_BINTRAY_KEY"] - ENV.clear_sensitive_environment! + bintray_org = args.bintray_org || "homebrew" if bintray_user.blank? || bintray_key.blank? odie "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!" if !args.dry_run? && !args.no_upload? else - bintray = Bintray.new(user: bintray_user, key: bintray_key, org: args.bintray_org) + bintray = Bintray.new(user: bintray_user, key: bintray_key, org: bintray_org) end workflow = args.workflow || "tests.yml" artifact = args.artifact || "bottles" tap = Tap.fetch(args.tap || "homebrew/core") + setup_git_environment! + args.named.each do |arg| arg = "#{tap.default_remote}/pull/#{arg}" if arg.to_i.positive? url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX From 76059242320ed6d1dee55a625b59a99b0e26fc09 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Mon, 30 Mar 2020 20:44:01 +0100 Subject: [PATCH 58/62] When a HEAD build fails, output an instruction to raise PRs not issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - This has to be in multiple places, hence a new method. A patch failing to apply, which is a common occurrence with HEAD builds because the patch is already upstream, raises a different exception to another, "normal" build failure. Tested with: ``` ╭─issyl0@rigel /home/linuxbrew/.linuxbrew/Homebrew ‹head-builds-arent-officially-supported*› ╰─ $ brew install --HEAD mtr ==> Cloning https://github.com/traviscross/mtr.git Updating /home/issyl0/.cache/Homebrew/mtr--git ==> Checking out branch master Already on 'master' Your branch is up to date with 'origin/master'. HEAD is now at 155f76a Merge pull request #340 from Sea-n/master ==> Downloading https://github.com/traviscross/mtr/pull/315.patch?full_index=1 Already downloaded: /home/issyl0/.cache/Homebrew/downloads/82d9d939303d8fceb7a3ae071ecd49a5f075e0fb451b308653b555ffbae74336--315.patch ==> Patching ==> Applying 315.patch patching file packet/probe.c Hunk #1 FAILED at 323. Hunk #2 FAILED at 364. 2 out of 2 hunks FAILED -- saving rejects to file packet/probe.c.rej Error: Failure while executing; `patch -g 0 -f -p1 -i /tmp/mtr--patch-20200330-10734-avjmyy/315.patch` exited with 1. HEAD builds are unsupported by maintainers - please file pull requests instead of issues. ``` and ``` ╭─issyl0@rigel /home/linuxbrew/.linuxbrew/Homebrew ‹head-builds-arent-officially-supported*› ╰─ $ brew install --HEAD zookeeper ==> Cloning https://gitbox.apache.org/repos/asf/zookeeper.git Updating /home/issyl0/.cache/Homebrew/zookeeper--git ==> Checking out branch master Already on 'master' Your branch is up to date with 'origin/master'. HEAD is now at 1ff1b779 ZOOKEEPER-3755: Use maven to create fatjar ==> ant compile_jute Last 15 lines from /home/issyl0/.cache/Homebrew/Logs/zookeeper/01.ant: 2020-03-30 21:45:10 +0100 ant compile_jute Picked up _JAVA_OPTIONS: -Duser.home=/home/issyl0/.cache/Homebrew/java_cache Buildfile: build.xml does not exist! Build failed READ THIS: https://docs.brew.sh/Troubleshooting HEAD builds are unsupported by maintainers - please file pull requests instead of issues. ``` --- Library/Homebrew/brew.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb index 939e73bba3..a55184628c 100644 --- a/Library/Homebrew/brew.rb +++ b/Library/Homebrew/brew.rb @@ -35,6 +35,13 @@ rescue MissingEnvironmentVariables => e exec ENV["HOMEBREW_BREW_FILE"], *ARGV end +def head_unsupported_error + $stderr.puts <<~EOS + Please create pull requests instead of asking for help on Homebrew's GitHub, + Discourse, Twitter or IRC. + EOS +end + begin trap("INT", std_trap) # restore default CTRL-C handler @@ -141,12 +148,18 @@ rescue Interrupt rescue BuildError => e Utils::Analytics.report_build_error(e) e.dump + + head_unsupported_error if Homebrew.args.HEAD? + exit 1 rescue RuntimeError, SystemCallError => e raise if e.message.empty? onoe e $stderr.puts e.backtrace if ARGV.debug? + + head_unsupported_error if Homebrew.args.HEAD? + exit 1 rescue MethodDeprecatedError => e onoe e From 27c2fe32e284995ad7f37115bcd0acd29ab0feda Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 09:04:30 +0000 Subject: [PATCH 59/62] build: bump rubocop from 0.80.1 to 0.81.0 in /Library/Homebrew Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.80.1 to 0.81.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.1...v0.81.0) Signed-off-by: dependabot-preview[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 c7e9fc91c4..d7f35a4fb0 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -81,14 +81,14 @@ GEM rspec-support (3.9.2) rspec-wait (0.0.9) rspec (>= 3, < 4) - rubocop (0.80.1) + rubocop (0.81.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) rexml ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) rubocop-performance (1.5.2) rubocop (>= 0.71.0) rubocop-rspec (1.38.1) @@ -112,7 +112,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) webrobots (0.1.2) zeitwerk (2.3.0) From 9ab8e1d51d7dbaee286dce64018dcd9ed1950fec Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 1 Apr 2020 11:47:22 +0100 Subject: [PATCH 60/62] rubocop_rspec: fix includes. Otherwise taps with specs don't get their style fixed. --- Library/.rubocop_rspec.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/.rubocop_rspec.yml b/Library/.rubocop_rspec.yml index dfaccdacf6..c9fe520ac5 100644 --- a/Library/.rubocop_rspec.yml +++ b/Library/.rubocop_rspec.yml @@ -2,7 +2,9 @@ inherit_from: ./.rubocop.yml AllCops: Include: - - '**/*_spec.rb' + - '**/cmd/**/*.rb' + - '**/lib/**/*.rb' + - '**/spec/**/*.rb' Exclude: - '**/vendor/**/*' From 4265540cc41959c4bf5d68cd5e9f046b8aa79cc5 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Wed, 1 Apr 2020 10:23:18 +0100 Subject: [PATCH 61/62] load_path: trim entries where possible to fix Ruby crashes --- Library/Homebrew/load_path.rb | 5 ++++- .../support/helper/spec/shared_context/integration_test.rb | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/load_path.rb b/Library/Homebrew/load_path.rb index c3eb983565..ea9f8a2306 100644 --- a/Library/Homebrew/load_path.rb +++ b/Library/Homebrew/load_path.rb @@ -4,6 +4,9 @@ require "pathname" HOMEBREW_LIBRARY_PATH = Pathname(__dir__).realpath.freeze -$LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s) unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s) +$LOAD_PATH.push HOMEBREW_LIBRARY_PATH.to_s require "vendor/bundle/bundler/setup" + +$LOAD_PATH.select! { |d| Pathname(d).directory? } +$LOAD_PATH.uniq! diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb index c5adb08b86..0a28b8b558 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb @@ -9,11 +9,6 @@ RSpec::Matchers.define_negated_matcher :be_a_failure, :be_a_success RSpec.shared_context "integration test" do extend RSpec::Matchers::DSL - if OS.mac? && - !RUBY_BIN.to_s.match?(%r{^/(System/Library/Frameworks/Ruby\.framework/Versions/(Current|\d+\.\d+)/)usr/bin$}) - skip "integration test requires system Ruby" - end - matcher :be_a_success do match do |actual| status = actual.is_a?(Proc) ? actual.call : actual From e1ce5c852dc68783ab4741173173824b1e79a266 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Wed, 1 Apr 2020 12:01:55 +0200 Subject: [PATCH 62/62] github: return output if JSON parsing is not desired --- Library/Homebrew/utils/github.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index b885c065f8..e84a68d2f2 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -172,7 +172,7 @@ module GitHub end end - def open_api(url, data: nil, request_method: nil, scopes: [].freeze) + def open_api(url, data: nil, request_method: nil, scopes: [].freeze, parse_json: true) # This is a no-op if the user is opting out of using the GitHub API. return block_given? ? yield({}) : {} if ENV["HOMEBREW_NO_GITHUB_API"] @@ -227,11 +227,11 @@ module GitHub return if http_code == "204" # No Content - json = JSON.parse output + output = JSON.parse output if parse_json if block_given? - yield json + yield output else - json + output end rescue JSON::ParserError => e raise Error, "Failed to parse JSON response\n#{e.message}", e.backtrace