Ensure option_parser is there present even if we're not using it

Author: drbrain

lib/rdoc/options.rb

@@ -745,7 +745,10 @@ def setup_generator generator_name = @generator_name
     @generator_name = generator_name
     @generator_options << @generator
 
-    @generator.setup_options self if @generator.respond_to? :setup_options
+    if @generator.respond_to? :setup_options then
+      @option_parser ||= OptionParser.new
+      @generator.setup_options self 
+    end
   end
 
   ##

test/test_rdoc_options.rb

@@ -345,16 +345,38 @@ def self.setup_options op
       def self.op() @op end
     end
 
-    RDoc::RDoc::GENERATORS['TestGenerator'] = test_generator
+    RDoc::RDoc::GENERATORS['test'] = test_generator
 
-    @options.setup_generator 'TestGenerator'
+    @options.setup_generator 'test'
 
     assert_equal test_generator, @options.generator
     assert_equal [test_generator], @options.generator_options
 
     assert_equal @options, test_generator.op
   ensure
-    RDoc::RDoc::GENERATORS.delete 'TestGenerator'
+    RDoc::RDoc::GENERATORS.delete 'test'
+  end
+
+  def test_setup_generator_no_option_parser
+    test_generator = Class.new do
+      def self.setup_options op
+        op.option_parser.separator nil
+        @op = op
+      end
+
+      def self.op() @op end
+    end
+
+    RDoc::RDoc::GENERATORS['test'] = test_generator
+
+    @options.setup_generator 'test'
+
+    assert_equal test_generator, @options.generator
+    assert_equal [test_generator], @options.generator_options
+
+    assert_equal @options, test_generator.op
+  ensure
+    RDoc::RDoc::GENERATORS.delete 'test'
   end
 
   def test_update_output_dir