[rubygems/rubygems] Added guard condition for replacing __ variable i…

…n YAML keys rubygems/rubygems@e7d31405ea
ruby · Apr 19, 2023 · 30b3290 · 30b3290
1 parent d0dc617
commit 30b3290
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb
@@ -50,15 +50,15 @@ def dump_hash(hash)
       $
     /xo.freeze
 
-    def load(str)
+    def load(str, is_rubygems: false)
       res = {}
       stack = [res]
       last_hash = nil
       last_empty_key = nil
       str.split(/\r?\n/).each do |line|
         if match = HASH_REGEX.match(line)
           indent, key, quote, val = match.captures
-          key = convert_to_backward_compatible_key(key)
+          key = convert_to_backward_compatible_key(key) unless is_rubygems
           key = key[1..-1].to_sym if key.start_with?(":")
           depth = indent.scan(/  /).length
           if quote.empty? && val.empty?

diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
@@ -351,20 +351,8 @@ def load_file(filename)
     return {} unless filename && !filename.empty? && File.exist?(filename)
 
     begin
-      content = Bundler::YAMLSerializer.load(File.read(filename))
+      content = Bundler::YAMLSerializer.load(File.read(filename), is_rubygems: true)
       if content.is_a? Hash
-        content.transform_keys! do |k|
-          if k.match?(/__/)
-            if k.is_a?(Symbol)
-              k.to_s.gsub(/__/,".").to_sym
-            else
-              k.dup.gsub(/__/,".")
-            end
-          else
-            k
-          end
-        end
-
         content.transform_values! do |v|
           if (v.is_a?(Hash) || v.is_a?(String)) && v.empty?
             nil

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
@@ -680,7 +680,7 @@ def load_yaml(yaml)
 
   def load_yaml_file(file)
     require "bundler/yaml_serializer"
-    Bundler::YAMLSerializer.load(File.read(file))
+    Bundler::YAMLSerializer.load(File.read(file), is_rubygems: true)
   end
 
   def all_spec_names