[rubygems/rubygems] To use Gem::YAMLSerializer in Bundler
https://github.com/rubygems/rubygems/commit/5351e01b32
This commit is contained in:
parent
40d1a00040
commit
d1c42da7a1
@ -386,8 +386,7 @@ module Bundler
|
|||||||
return unless file
|
return unless file
|
||||||
SharedHelpers.filesystem_access(file) do |p|
|
SharedHelpers.filesystem_access(file) do |p|
|
||||||
FileUtils.mkdir_p(p.dirname)
|
FileUtils.mkdir_p(p.dirname)
|
||||||
require_relative "yaml_serializer"
|
p.open("w") {|f| f.write(serializer_class.dump(hash)) }
|
||||||
p.open("w") {|f| f.write(YAMLSerializer.dump(hash)) }
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -449,8 +448,7 @@ module Bundler
|
|||||||
SharedHelpers.filesystem_access(config_file, :read) do |file|
|
SharedHelpers.filesystem_access(config_file, :read) do |file|
|
||||||
valid_file = file.exist? && !file.size.zero?
|
valid_file = file.exist? && !file.size.zero?
|
||||||
return {} unless valid_file
|
return {} unless valid_file
|
||||||
require_relative "yaml_serializer"
|
serializer_class.load(file.read).inject({}) do |config, (k, v)|
|
||||||
YAMLSerializer.load(file.read).inject({}) do |config, (k, v)|
|
|
||||||
new_k = k
|
new_k = k
|
||||||
|
|
||||||
if k.include?("-")
|
if k.include?("-")
|
||||||
@ -467,6 +465,15 @@ module Bundler
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def serializer_class
|
||||||
|
require "rubygems/yaml_serializer"
|
||||||
|
Gem::YAMLSerializer
|
||||||
|
rescue LoadError
|
||||||
|
# TODO: Remove this when RubyGems 3.4 is EOL
|
||||||
|
require_relative "yaml_serializer"
|
||||||
|
YAMLSerializer
|
||||||
|
end
|
||||||
|
|
||||||
PER_URI_OPTIONS = %w[
|
PER_URI_OPTIONS = %w[
|
||||||
fallback_timeout
|
fallback_timeout
|
||||||
].freeze
|
].freeze
|
||||||
|
Loading…
x
Reference in New Issue
Block a user