From c1973ae2be658c880d65aa85517fadc7770c92c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Dec 2021 18:05:15 +0000 Subject: [PATCH 1/3] build(deps): bump zeitwerk from 2.5.1 to 2.5.2 in /Library/Homebrew Bumps [zeitwerk](https://github.com/fxn/zeitwerk) from 2.5.1 to 2.5.2. - [Release notes](https://github.com/fxn/zeitwerk/releases) - [Changelog](https://github.com/fxn/zeitwerk/blob/main/CHANGELOG.md) - [Commits](https://github.com/fxn/zeitwerk/compare/v2.5.1...v2.5.2) --- updated-dependencies: - dependency-name: zeitwerk dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Library/Homebrew/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index d1c857c2c0..e50a181279 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -195,7 +195,7 @@ GEM yard-sorbet (0.6.1) sorbet-runtime (>= 0.5) yard (>= 0.9) - zeitwerk (2.5.1) + zeitwerk (2.5.2) PLATFORMS ruby From f4af03075169ccdf72830a46af90156ec1dbcacb Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Mon, 27 Dec 2021 18:15:43 +0000 Subject: [PATCH 2/3] brew vendor-gems: commit updates. --- .../Homebrew/vendor/bundle/bundler/setup.rb | 2 +- .../lib/zeitwerk.rb | 0 .../lib/zeitwerk/error.rb | 0 .../lib/zeitwerk/explicit_namespace.rb | 0 .../lib/zeitwerk/gem_inflector.rb | 0 .../lib/zeitwerk/inflector.rb | 0 .../lib/zeitwerk/kernel.rb | 19 +++++++++-------- .../lib/zeitwerk/loader.rb | 21 ++++++++----------- .../lib/zeitwerk/loader/callbacks.rb | 0 .../lib/zeitwerk/loader/config.rb | 0 .../lib/zeitwerk/loader/helpers.rb | 0 .../lib/zeitwerk/real_mod_name.rb | 0 .../lib/zeitwerk/registry.rb | 0 .../lib/zeitwerk/version.rb | 2 +- 14 files changed, 21 insertions(+), 23 deletions(-) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/error.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/explicit_namespace.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/gem_inflector.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/inflector.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/kernel.rb (85%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/loader.rb (96%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/loader/callbacks.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/loader/config.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/loader/helpers.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/real_mod_name.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/registry.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{zeitwerk-2.5.1 => zeitwerk-2.5.2}/lib/zeitwerk/version.rb (71%) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 2f45c99b86..5096eb2c4b 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -7,7 +7,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.9 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.8.11/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.15.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-2.0.4/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.5.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/zeitwerk-2.5.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.1.4.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/public_suffix-4.0.6/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/addressable-2.8.0/lib" diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/error.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/error.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/explicit_namespace.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/explicit_namespace.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/explicit_namespace.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/explicit_namespace.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/gem_inflector.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/gem_inflector.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/gem_inflector.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/gem_inflector.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/inflector.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/inflector.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/inflector.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/inflector.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/kernel.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/kernel.rb similarity index 85% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/kernel.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/kernel.rb index 78efbd831a..1fed5a1acf 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/kernel.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/kernel.rb @@ -24,22 +24,23 @@ module Kernel def require(path) if loader = Zeitwerk::Registry.loader_for(path) if path.end_with?(".rb") - zeitwerk_original_require(path).tap do |required| - loader.on_file_autoloaded(path) if required - end + required = zeitwerk_original_require(path) + loader.on_file_autoloaded(path) if required + required else loader.on_dir_autoloaded(path) + $LOADED_FEATURES << path true end else - zeitwerk_original_require(path).tap do |required| - if required - abspath = $LOADED_FEATURES.last - if loader = Zeitwerk::Registry.loader_for(abspath) - loader.on_file_autoloaded(abspath) - end + required = zeitwerk_original_require(path) + if required + abspath = $LOADED_FEATURES.last + if loader = Zeitwerk::Registry.loader_for(abspath) + loader.on_file_autoloaded(abspath) end end + required end end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader.rb similarity index 96% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader.rb index d6073c695f..a0b96210e5 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "set" -require "securerandom" module Zeitwerk class Loader @@ -124,13 +123,7 @@ module Zeitwerk # @sig () -> void def unload mutex.synchronize do - # We are going to keep track of the files that were required by our - # autoloads to later remove them from $LOADED_FEATURES, thus making them - # loadable by Kernel#require again. - # - # Directories are not stored in $LOADED_FEATURES, keeping track of files - # is enough. - unloaded_files = Set.new + abspaths_of_unloaded_crefs = Set.new autoloads.each do |abspath, (parent, cname)| if parent.autoload?(cname) @@ -140,7 +133,7 @@ module Zeitwerk # and the constant path would escape unloadable_cpath? This is just # defensive code to clean things up as much as we are able to. unload_cref(parent, cname) - unloaded_files.add(abspath) if ruby?(abspath) + abspaths_of_unloaded_crefs.add(abspath) end end @@ -151,10 +144,14 @@ module Zeitwerk end unload_cref(parent, cname) - unloaded_files.add(abspath) if ruby?(abspath) + abspaths_of_unloaded_crefs.add(abspath) end - unless unloaded_files.empty? + unless abspaths_of_unloaded_crefs.empty? + # We remove these abspaths from $LOADED_FEATURES because, otherwise, + # `require`'s idempotence would prevent newly defined autoloads from + # loading them again. + # # Bootsnap decorates Kernel#require to speed it up using a cache and # this optimization does not check if $LOADED_FEATURES has the file. # @@ -166,7 +163,7 @@ module Zeitwerk # Rails applications may depend on bootsnap, so for unloading to work # in that setting it is preferable that we restrict our API choice to # one of those methods. - $LOADED_FEATURES.reject! { |file| unloaded_files.member?(file) } + $LOADED_FEATURES.reject! { |file| abspaths_of_unloaded_crefs.member?(file) } end autoloads.clear diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader/callbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader/callbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader/callbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader/callbacks.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader/config.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader/config.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader/config.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader/config.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader/helpers.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader/helpers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/loader/helpers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/loader/helpers.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/real_mod_name.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/real_mod_name.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/real_mod_name.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/real_mod_name.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/registry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/registry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/registry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/registry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/version.rb similarity index 71% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/version.rb index 6a40d9dad3..0f8f24a444 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.1/lib/zeitwerk/version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.5.2/lib/zeitwerk/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Zeitwerk - VERSION = "2.5.1" + VERSION = "2.5.2" end From 9141c883c27b099e505665f89ce62dc135bbf772 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Mon, 27 Dec 2021 18:20:07 +0000 Subject: [PATCH 3/3] Update RBI files for zeitwerk. --- .../rbi/gems/{zeitwerk@2.5.1.rbi => zeitwerk@2.5.2.rbi} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename Library/Homebrew/sorbet/rbi/gems/{zeitwerk@2.5.1.rbi => zeitwerk@2.5.2.rbi} (100%) diff --git a/Library/Homebrew/sorbet/rbi/gems/zeitwerk@2.5.1.rbi b/Library/Homebrew/sorbet/rbi/gems/zeitwerk@2.5.2.rbi similarity index 100% rename from Library/Homebrew/sorbet/rbi/gems/zeitwerk@2.5.1.rbi rename to Library/Homebrew/sorbet/rbi/gems/zeitwerk@2.5.2.rbi index 1943a250a7..f8b56fae2e 100644 --- a/Library/Homebrew/sorbet/rbi/gems/zeitwerk@2.5.1.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/zeitwerk@2.5.2.rbi @@ -1,9 +1,9 @@ +# typed: true + # DO NOT EDIT MANUALLY # This is an autogenerated file for types exported from the `zeitwerk` gem. # Please instead update this file by running `bin/tapioca gem zeitwerk`. -# typed: true - module Kernel extend ::Forwardable