[ruby/rubygems] Load rdoc_options and requirements from YAML

ruby/rubygems@20153ebc78

Author: hsbt

lib/rubygems/specification.rb

@@ -2190,10 +2190,13 @@ def raise_if_conflicts # :nodoc:
   end
 
   ##
-  # Sets rdoc_options to +value+, ensuring it is an array.
+  # Sets rdoc_options to +value+, ensuring it is a flat array of strings.
+  # Handles malformed gemspecs where rdoc_options may be a Hash or contain Hashes.
 
   def rdoc_options=(options)
-    @rdoc_options = Array options
+    @rdoc_options = Array(options).flat_map do |opt|
+      opt.is_a?(Hash) ? opt.to_a.flatten.map(&:to_s) : opt
+    end
   end
 
   ##
@@ -2553,6 +2556,10 @@ def yaml_initialize(tag, vals) # :nodoc:
         self.date = val
       when "platform"
         self.platform = val
+      when "rdoc_options"
+        self.rdoc_options = val
+      when "requirements"
+        self.requirements = val
       else
         instance_variable_set "@#{ivar}", val
       end

test/rubygems/test_gem_safe_yaml.rb

@@ -332,7 +332,7 @@ def test_rdoc_options_hash_converted_to_array
     assert_kind_of Gem::Specification, spec
     assert_equal "test-gem", spec.name
 
-    assert_kind_of Hash, spec.rdoc_options
+    assert_equal [], spec.rdoc_options
   end
 
   def test_load_returns_nil_for_comment_only_yaml
@@ -1117,7 +1117,7 @@ def test_regression_rdoc_options_normalized_to_array
     YAML
 
     spec = Gem::SafeYAML.safe_load(yaml)
-    assert_kind_of Hash, spec.rdoc_options
+    assert_equal ["--title", "MyGem", "--main", "README"], spec.rdoc_options
   end
 
   def test_regression_requirements_field_normalized_to_array
@@ -1133,6 +1133,6 @@ def test_regression_requirements_field_normalized_to_array
     YAML
 
     spec = Gem::SafeYAML.safe_load(yaml)
-    assert_kind_of Hash, spec.requirements
+    assert_equal [["foo", "bar"]], spec.requirements
   end
 end