From 783d30855bbab5a7e8a0472d9653f578eac4b60f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 18:08:20 +0000 Subject: [PATCH 1/3] build(deps): bump addressable from 2.8.4 to 2.8.5 in /Library/Homebrew Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.8.4 to 2.8.5. - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.8.4...addressable-2.8.5) --- updated-dependencies: - dependency-name: addressable dependency-type: direct:production 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 88b617da86..d1ea575981 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -7,7 +7,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) bindata (2.4.15) From b281f51c2589fe59bfd372979bce19041a769e0b Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 3 Aug 2023 18:11:46 +0000 Subject: [PATCH 2/3] brew vendor-gems: commit updates. --- .../Homebrew/vendor/bundle/bundler/setup.rb | 2 +- .../data/unicode.data | Bin .../lib/addressable.rb | 0 .../lib/addressable/idna.rb | 0 .../lib/addressable/idna/native.rb | 0 .../lib/addressable/idna/pure.rb | 0 .../lib/addressable/template.rb | 0 .../lib/addressable/uri.rb | 53 +++++++++++------- .../lib/addressable/version.rb | 2 +- 9 files changed, 36 insertions(+), 21 deletions(-) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/data/unicode.data (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/lib/addressable.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/lib/addressable/idna.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/lib/addressable/idna/native.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/lib/addressable/idna/pure.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/lib/addressable/template.rb (100%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/lib/addressable/uri.rb (98%) rename Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/{addressable-2.8.4 => addressable-2.8.5}/lib/addressable/version.rb (98%) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index d8e6d92683..13fd0573a6 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -30,7 +30,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/zeitwerk-2.6.10/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/activesupport-6.1.7.4/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/public_suffix-5.0.3/lib") -$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/addressable-2.8.4/lib") +$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/addressable-2.8.5/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ast-2.4.2/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bindata-2.4.15/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/universal-darwin-22/#{Gem.extension_api_version}/msgpack-1.7.2") diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/data/unicode.data b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/data/unicode.data similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/data/unicode.data rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/data/unicode.data diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/idna.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/idna.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/idna.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/idna.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/idna/native.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/idna/native.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/idna/native.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/idna/native.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/idna/pure.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/idna/pure.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/idna/pure.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/idna/pure.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/template.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/template.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/template.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/template.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/uri.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/uri.rb similarity index 98% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/uri.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/uri.rb index 50ccdaf517..08ee3348a7 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/uri.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/uri.rb @@ -344,17 +344,13 @@ module Addressable ## # Tables used to optimize encoding operations in `self.encode_component` # and `self.normalize_component` - SEQUENCE_ENCODING_TABLE = Hash.new do |hash, sequence| - hash[sequence] = sequence.unpack("C*").map do |c| - format("%02x", c) - end.join - end + SEQUENCE_ENCODING_TABLE = (0..255).map do |byte| + format("%02x", byte).freeze + end.freeze - SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE = Hash.new do |hash, sequence| - hash[sequence] = sequence.unpack("C*").map do |c| - format("%%%02X", c) - end.join - end + SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE = (0..255).map do |byte| + format("%%%02X", byte).freeze + end.freeze ## # Percent encodes a URI component. @@ -421,16 +417,17 @@ module Addressable component = component.dup component.force_encoding(Encoding::ASCII_8BIT) # Avoiding gsub! because there are edge cases with frozen strings - component = component.gsub(character_class) do |sequence| - SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE[sequence] + component = component.gsub(character_class) do |char| + SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE[char.ord] end if upcase_encoded.length > 0 - upcase_encoded_chars = upcase_encoded.chars.map do |char| - SEQUENCE_ENCODING_TABLE[char] + upcase_encoded_chars = upcase_encoded.bytes.map do |byte| + SEQUENCE_ENCODING_TABLE[byte] end component = component.gsub(/%(#{upcase_encoded_chars.join('|')})/, &:upcase) end + return component end @@ -560,10 +557,9 @@ module Addressable leave_re = if leave_encoded.length > 0 character_class = "#{character_class}%" unless character_class.include?('%') - "|%(?!#{leave_encoded.chars.flat_map do |char| - seq = SEQUENCE_ENCODING_TABLE[char] - [seq.upcase, seq.downcase] - end.join('|')})" + bytes = leave_encoded.bytes + leave_encoded_pattern = bytes.map { |b| SEQUENCE_ENCODING_TABLE[b] }.join('|') + "|%(?!#{leave_encoded_pattern}|#{leave_encoded_pattern.upcase})" end character_class = if leave_re @@ -2396,6 +2392,25 @@ module Addressable @validation_deferred = false end + def encode_with(coder) + instance_variables.each do |ivar| + value = instance_variable_get(ivar) + if value != NONE + key = ivar.to_s.slice(1..-1) + coder[key] = value + end + end + nil + end + + def init_with(coder) + reset_ivs + coder.map.each do |key, value| + instance_variable_set("@#{key}", value) + end + nil + end + protected SELF_REF = '.' PARENT = '..' @@ -2569,7 +2584,7 @@ module Addressable @query = nil end - NONE = Object.new.freeze + NONE = Module.new.freeze private_constant :NONE end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/version.rb similarity index 98% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/version.rb index 6899157fb4..fe6a62f4f4 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.4/lib/addressable/version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/addressable-2.8.5/lib/addressable/version.rb @@ -23,7 +23,7 @@ if !defined?(Addressable::VERSION) module VERSION MAJOR = 2 MINOR = 8 - TINY = 4 + TINY = 5 STRING = [MAJOR, MINOR, TINY].join('.') end From 3fb4c6c069e1af7a65e362a6f296372e4fe6d6bc Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 3 Aug 2023 18:17:42 +0000 Subject: [PATCH 3/3] Update RBI files for addressable. Autogenerated by the [vendor-gems](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/vendor-gems.yml) workflow. --- .../gems/{addressable@2.8.4.rbi => addressable@2.8.5.rbi} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename Library/Homebrew/sorbet/rbi/gems/{addressable@2.8.4.rbi => addressable@2.8.5.rbi} (98%) diff --git a/Library/Homebrew/sorbet/rbi/gems/addressable@2.8.4.rbi b/Library/Homebrew/sorbet/rbi/gems/addressable@2.8.5.rbi similarity index 98% rename from Library/Homebrew/sorbet/rbi/gems/addressable@2.8.4.rbi rename to Library/Homebrew/sorbet/rbi/gems/addressable@2.8.5.rbi index 7bf1311db0..5614b0f339 100644 --- a/Library/Homebrew/sorbet/rbi/gems/addressable@2.8.4.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/addressable@2.8.5.rbi @@ -138,6 +138,7 @@ class Addressable::URI def domain; end def dup; end def empty?; end + def encode_with(coder); end def eql?(uri); end def extname; end def fragment; end @@ -149,6 +150,7 @@ class Addressable::URI def hostname; end def hostname=(new_hostname); end def inferred_port; end + def init_with(coder); end def inspect; end def ip_based?; end def join(uri); end @@ -252,7 +254,7 @@ Addressable::URI::CharacterClasses::SUB_DELIMS = T.let(T.unsafe(nil), String) Addressable::URI::CharacterClasses::UNRESERVED = T.let(T.unsafe(nil), String) Addressable::URI::EMPTY_STR = T.let(T.unsafe(nil), String) class Addressable::URI::InvalidURIError < ::StandardError; end -Addressable::URI::NONE = T.let(T.unsafe(nil), Object) +module Addressable::URI::NONE; end Addressable::URI::NORMPATH = T.let(T.unsafe(nil), Regexp) module Addressable::URI::NormalizeCharacterClasses; end Addressable::URI::NormalizeCharacterClasses::FRAGMENT = T.let(T.unsafe(nil), Regexp) @@ -268,8 +270,8 @@ Addressable::URI::RULE_2B_2C = T.let(T.unsafe(nil), Regexp) Addressable::URI::RULE_2D = T.let(T.unsafe(nil), Regexp) Addressable::URI::RULE_PREFIXED_PARENT = T.let(T.unsafe(nil), Regexp) Addressable::URI::SELF_REF = T.let(T.unsafe(nil), String) -Addressable::URI::SEQUENCE_ENCODING_TABLE = T.let(T.unsafe(nil), Hash) -Addressable::URI::SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE = T.let(T.unsafe(nil), Hash) +Addressable::URI::SEQUENCE_ENCODING_TABLE = T.let(T.unsafe(nil), Array) +Addressable::URI::SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE = T.let(T.unsafe(nil), Array) Addressable::URI::SLASH = T.let(T.unsafe(nil), String) Addressable::URI::URIREGEX = T.let(T.unsafe(nil), Regexp) module Addressable::VERSION; end