Merge pull request #14771 from Homebrew/dependabot/bundler/Library/Homebrew/plist-3.7.0

build(deps): bump plist from 3.6.0 to 3.7.0 in /Library/Homebrew
This commit is contained in:
Bo Anderson 2023-02-22 23:10:08 +00:00 committed by GitHub
commit 7008771051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 28 additions and 19 deletions

View File

@ -86,7 +86,7 @@ GEM
ast (~> 2.4.1)
patchelf (1.4.0)
elftools (>= 1.2)
plist (3.6.0)
plist (3.7.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)

View File

@ -232,7 +232,7 @@ module FormulaCellarChecks
return unless prefix.directory?
plist = begin
Plist.parse_xml(plist)
Plist.parse_xml(plist, marshal: false)
rescue
nil
end

View File

@ -6,7 +6,7 @@
module Plist
class << self
def parse_xml(filename_or_xml); end
def parse_xml(filename_or_xml, options = T.unsafe(nil)); end
end
end
@ -38,7 +38,7 @@ class Plist::Emit::PlistBuilder
end
class Plist::Listener
def initialize; end
def initialize(options = T.unsafe(nil)); end
def open; end
def open=(_arg0); end
@ -90,10 +90,12 @@ class Plist::PString < ::Plist::PTag
end
class Plist::PTag
def initialize; end
def initialize(options); end
def children; end
def children=(_arg0); end
def options; end
def options=(_arg0); end
def text; end
def text=(_arg0); end
def to_ruby; end

View File

@ -357,7 +357,7 @@ class SystemCommand
Regexp.last_match(1)
end
Plist.parse_xml(output)
Plist.parse_xml(output, marshal: false)
end
end

View File

@ -81,7 +81,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.10461/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parlour-8.1.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/patchelf-1.4.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.6.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.7.0/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/pry-0.14.2/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rack-3.0.4.1/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/unparser-0.6.4/lib")

View File

@ -26,8 +26,13 @@ module Plist
# can't be parsed into a Time object, please create an issue
# attaching your plist file at https://github.com/patsplat/plist/issues
# so folks can implement the proper support.
def self.parse_xml(filename_or_xml)
listener = Listener.new
#
# By default, <data> will be assumed to be a marshaled Ruby object and
# interpreted with <tt>Marshal.load</tt>. Pass <tt>marshal: false</tt>
# to disable this behavior and return the raw binary data as an IO
# object instead.
def self.parse_xml(filename_or_xml, options={})
listener = Listener.new(options)
# parser = REXML::Parsers::StreamParser.new(File.new(filename), listener)
parser = StreamParser.new(filename_or_xml, listener)
parser.parse
@ -39,13 +44,14 @@ module Plist
attr_accessor :result, :open
def initialize
def initialize(options={})
@result = nil
@open = []
@options = { :marshal => true }.merge(options).freeze
end
def tag_start(name, attributes)
@open.push PTag.mappings[name].new
@open.push PTag.mappings[name].new(@options)
end
def text(contents)
@ -154,9 +160,10 @@ module Plist
mappings[key] = sub_class
end
attr_accessor :text, :children
def initialize
attr_accessor :text, :children, :options
def initialize(options)
@children = []
@options = options
end
def to_ruby
@ -244,13 +251,13 @@ module Plist
def to_ruby
data = Base64.decode64(text.gsub(/\s+/, '')) unless text.nil?
begin
return Marshal.load(data)
return Marshal.load(data) if options[:marshal]
rescue Exception
end
io = StringIO.new
io.write data
io.rewind
return io
end
io
end
end
end

View File

@ -1,5 +1,5 @@
# encoding: utf-8
module Plist
VERSION = '3.6.0'.freeze
VERSION = '3.7.0'.freeze
end