Skip to content

Commit 0c8cb25

Browse files
committed
Allow empty .rdoc_options
1 parent e148008 commit 0c8cb25

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

lib/rdoc/rdoc.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ def load_options
166166
rescue Psych::SyntaxError
167167
end
168168

169+
return RDoc::Options.new if options == false # Allow empty file.
170+
169171
raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless
170172
RDoc::Options === options or Hash === options
171173

test/rdoc/test_rdoc_rdoc.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,17 @@ def test_load_options_invalid
133133
end
134134
end
135135

136+
def test_load_options_empty_file
137+
temp_dir do
138+
File.open '.rdoc_options', 'w' do |io|
139+
end
140+
141+
options = @rdoc.load_options
142+
143+
assert_equal 'rdoc', options.markup
144+
end
145+
end
146+
136147
def test_load_options_partial_override
137148
temp_dir do
138149
File.open '.rdoc_options', 'w' do |io|

0 commit comments

Comments
 (0)