Skip to content

Commit 67217f6

Browse files
authored
Merge pull request Homebrew#16402 from Homebrew/dependabot/bundler/Library/Homebrew/plist-3.7.1
build(deps): bump plist from 3.7.0 to 3.7.1 in /Library/Homebrew
2 parents dbb800b + b61d74f commit 67217f6

File tree

9 files changed

+16
-18
lines changed

9 files changed

+16
-18
lines changed

Library/Homebrew/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ GEM
5252
racc
5353
patchelf (1.4.0)
5454
elftools (>= 1.2)
55-
plist (3.7.0)
55+
plist (3.7.1)
5656
prettier_print (1.2.1)
5757
prism (0.19.0)
5858
pry (0.14.2)

Library/Homebrew/api.rb

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
require "api/analytics"
55
require "api/cask"
66
require "api/formula"
7+
require "base64" # TODO: Add this to the Gemfile or remove it before moving to Ruby 3.4.
78
require "extend/cachable"
89

910
module Homebrew
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Library/Homebrew/vendor/bundle/bundler/setup.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def self.extension_api_version
7474
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.5.11155/lib")
7575
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parlour-8.1.0/lib")
7676
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/patchelf-1.4.0/lib")
77-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.7.0/lib")
77+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/plist-3.7.1/lib")
7878
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prettier_print-1.2.1/lib")
7979
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/prism-0.19.0")
8080
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prism-0.19.0/lib")

Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist.rb Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist.rb

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# Distributed under the MIT License
1010
#
1111

12-
require 'base64'
1312
require 'cgi'
1413
require 'stringio'
1514

Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/generator.rb Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/generator.rb

+2-4
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,9 @@ def tag(type, contents, level, &block)
124124

125125
def data_tag(data, level)
126126
# note that apple plists are wrapped at a different length then
127-
# what ruby's base64 wraps by default.
128-
# I used #encode64 instead of #b64encode (which allows a length arg)
129-
# because b64encode is b0rked and ignores the length arg.
127+
# what ruby's pack wraps by default.
130128
tag('data', nil, level) do
131-
Base64.encode64(data)
129+
[data].pack("m") # equivalent to Base64.encode64(data)
132130
.gsub(/\s+/, '')
133131
.scan(/.{1,68}/o)
134132
.collect { |line| indent(line, level) }

Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.0/lib/plist/parser.rb Library/Homebrew/vendor/bundle/ruby/3.1.0/gems/plist-3.7.1/lib/plist/parser.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ def to_ruby
246246
end
247247
end
248248

249-
require 'base64'
250249
class PData < PTag
251250
def to_ruby
252-
data = Base64.decode64(text.gsub(/\s+/, '')) unless text.nil?
251+
# unpack("m")[0] is equivalent to Base64.decode64
252+
data = text.gsub(/\s+/, '').unpack("m")[0] unless text.nil?
253253
begin
254254
return Marshal.load(data) if options[:marshal]
255255
rescue Exception
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# encoding: utf-8
22

33
module Plist
4-
VERSION = '3.7.0'.freeze
4+
VERSION = '3.7.1'.freeze
55
end

0 commit comments

Comments
 (0)