diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index dda275ccbf..c5142f3fb9 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -10,7 +10,7 @@ GEM addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - bindata (2.4.11) + bindata (2.4.12) bootsnap (1.13.0) msgpack (~> 1.2) byebug (11.1.3) diff --git a/Library/Homebrew/sorbet/rbi/gems/bindata@2.4.11.rbi b/Library/Homebrew/sorbet/rbi/gems/bindata@2.4.12.rbi similarity index 99% rename from Library/Homebrew/sorbet/rbi/gems/bindata@2.4.11.rbi rename to Library/Homebrew/sorbet/rbi/gems/bindata@2.4.12.rbi index 34dd18bc1d..33c16953df 100644 --- a/Library/Homebrew/sorbet/rbi/gems/bindata@2.4.11.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/bindata@2.4.12.rbi @@ -456,9 +456,6 @@ class BinData::DelayedIO < ::BinData::Base def do_num_bytes; end def do_read(io); end def do_write(io); end - def eval_parameter(key, overrides = T.unsafe(nil)); end - def eval_parameter_with_delayed_io(key, overrides = T.unsafe(nil)); end - def eval_parameter_without_delayed_io(key, overrides = T.unsafe(nil)); end def include_obj?; end def initialize_instance; end def method_missing(symbol, *args, &block); end @@ -1037,6 +1034,7 @@ class BinData::Struct < ::BinData::Base def find_index_of(obj); end def find_obj_for_name(name); end def include_obj?(obj); end + def include_obj_for_io?(obj); end def instantiate_all_objs; end def instantiate_obj_at(index); end def sum_num_bytes_below_index(index); end diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 43bc20b3ef..7ddf43f7bd 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -12,7 +12,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.1.7/l $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/public_suffix-5.0.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/addressable-2.8.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.2/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bindata-2.4.11/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bindata-2.4.12/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/msgpack-1.6.0" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/msgpack-1.6.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/bootsnap-1.13.0" diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/version.rb deleted file mode 100644 index 19f2bfc0b4..0000000000 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module BinData - VERSION = "2.4.11" -end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/alignment.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/alignment.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/alignment.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/alignment.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/array.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/array.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/array.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/base.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/base.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/base.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/base.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/base_primitive.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/base_primitive.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/base_primitive.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/base_primitive.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/bits.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/bits.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/bits.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/bits.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/buffer.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/buffer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/buffer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/buffer.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/choice.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/choice.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/choice.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/choice.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/count_bytes_remaining.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/count_bytes_remaining.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/count_bytes_remaining.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/count_bytes_remaining.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/delayed_io.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/delayed_io.rb similarity index 91% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/delayed_io.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/delayed_io.rb index 8e20b922fe..e1926da949 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/delayed_io.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/delayed_io.rb @@ -116,19 +116,8 @@ module BinData 0 end - def eval_parameter_with_delayed_io(key, overrides = nil) - result = eval_parameter_without_delayed_io(key, overrides) - - # Delay processing :onlyif until we do the actual read/write - result = true if key == :onlyif && ! result - - result - end - alias_method :eval_parameter_without_delayed_io, :eval_parameter - alias_method :eval_parameter, :eval_parameter_with_delayed_io - def include_obj? - ! has_parameter?(:onlyif) || eval_parameter_without_delayed_io(:onlyif) + ! has_parameter?(:onlyif) || eval_parameter(:onlyif) end # DelayedIO objects aren't read when #read is called. diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/dsl.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/dsl.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/dsl.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/dsl.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/float.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/float.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/float.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/float.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/framework.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/framework.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/framework.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/framework.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/int.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/int.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/int.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/int.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/io.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/io.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/io.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/io.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/lazy.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/lazy.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/lazy.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/lazy.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/name.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/name.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/name.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/name.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/offset.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/offset.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/offset.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/offset.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/params.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/params.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/params.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/params.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/primitive.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/primitive.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/primitive.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/primitive.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/record.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/record.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/record.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/record.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/registry.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/registry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/registry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/registry.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/rest.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/rest.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/rest.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/rest.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/sanitize.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/sanitize.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/sanitize.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/sanitize.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/skip.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/skip.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/skip.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/skip.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/string.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/string.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/string.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/stringz.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/stringz.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/stringz.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/stringz.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/struct.rb similarity index 96% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/struct.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/struct.rb index a34ec85701..f990036e1b 100644 --- a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/struct.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/struct.rb @@ -1,4 +1,5 @@ require 'bindata/base' +require 'bindata/delayed_io' module BinData @@ -136,12 +137,12 @@ module BinData def do_read(io) #:nodoc: instantiate_all_objs - @field_objs.each { |f| f.do_read(io) if include_obj?(f) } + @field_objs.each { |f| f.do_read(io) if include_obj_for_io?(f) } end def do_write(io) #:nodoc instantiate_all_objs - @field_objs.each { |f| f.do_write(io) if include_obj?(f) } + @field_objs.each { |f| f.do_write(io) if include_obj_for_io?(f) } end def do_num_bytes #:nodoc: @@ -263,6 +264,12 @@ module BinData end end + def include_obj_for_io?(obj) + # Used by #do_read and #do_write, to ensure the stream is passed to + # DelayedIO objects for delayed processing. + include_obj?(obj) || DelayedIO === obj + end + def include_obj?(obj) !obj.has_parameter?(:onlyif) || obj.eval_parameter(:onlyif) end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/trace.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/trace.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/trace.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/trace.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/uint8_array.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/uint8_array.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/uint8_array.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/uint8_array.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/version.rb new file mode 100644 index 0000000000..b4e1f12df7 --- /dev/null +++ b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/version.rb @@ -0,0 +1,3 @@ +module BinData + VERSION = "2.4.12" +end diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/virtual.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/virtual.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/virtual.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/virtual.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/warnings.rb b/Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/warnings.rb similarity index 100% rename from Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/warnings.rb rename to Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.12/lib/bindata/warnings.rb