Dump plain objects as RDoc::Options

ruby · Sep 15, 2021 · d32d723 · d32d723
1 parent 0116ed0
commit d32d723
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 9 deletions.
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
@@ -585,14 +585,14 @@ def finish
   def finish_page_dir
     return unless @page_dir
 
-    @files << @page_dir.to_s
+    @files << @page_dir
 
-    page_dir = nil
+    page_dir = Pathname(@page_dir)
     begin
-      page_dir = @page_dir.expand_path.relative_path_from @root
+      page_dir = page_dir.expand_path.relative_path_from @root
     rescue ArgumentError
       # On Windows, sometimes crosses different drive letters.
-      page_dir = @page_dir.expand_path
+      page_dir = page_dir.expand_path
     end
 
     @page_dir = page_dir
@@ -847,7 +847,7 @@ def parse argv
              "such files at your project root.",
              "NOTE: Do not use the same file name in",
              "the page dir and the root of your project") do |page_dir|
-        @page_dir = Pathname(page_dir)
+        @page_dir = page_dir
       end
 
       opt.separator nil
@@ -1159,13 +1159,13 @@ def parse argv
 
     @files = argv.dup
 
-    finish
-
     if @write_options then
       write_options
       exit
     end
 
+    finish
+
     self
   end
 
@@ -1275,10 +1275,35 @@ def warn message
   def write_options
     RDoc.load_yaml
 
+    hash = {}
+    %w[
+      charset
+      exclude
+      generator_name
+      hyperlink_all
+      line_numbers
+      locale_name
+      locale_dir
+      main_page
+      markup
+      op_dir
+      page_dir
+      show_hash
+      tab_width
+      template_dir
+      title
+      visibility
+      webcvs
+      rdoc_include
+      static_path
+    ].each do |var|
+      hash[var] = instance_variable_get("@#{var}")
+    end
+
     File.open '.rdoc_options', 'w' do |io|
       io.set_encoding Encoding::UTF_8
 
-      YAML.dump self, io
+      YAML.dump hash, io
     end
   end
 

diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
@@ -673,6 +673,10 @@ def test_parse_write_options
       assert_equal 0, e.status
 
       assert File.exist? '.rdoc_options'
+
+      options = File.read('.rdoc_options')
+      options = YAML.safe_load(options, permitted_classes: [Symbol])
+      assert_equal @options, RDoc::Options.new(options)
     end
   ensure
     FileUtils.rm_rf tmpdir
@@ -764,7 +768,9 @@ def test_write_options
 
       assert File.exist? '.rdoc_options'
 
-      assert_equal @options, YAML.safe_load(File.read('.rdoc_options'), permitted_classes: [RDoc::Options, Symbol])
+      options = File.read('.rdoc_options')
+      options = YAML.safe_load(options, permitted_classes: [Symbol])
+      assert_equal @options, RDoc::Options.new(options)
     end
   end