lib/yard/cli/yardoc.rb in yard-0.6.5 vs lib/yard/cli/yardoc.rb in yard-0.6.6

@@ -156,11 +156,11 @@
         super
         @options = SymbolHash.new(false)
         @options.update(
           :format => :html, 
           :template => :default, 
-          :markup => :rdoc,
+          :markup => nil, # default is :rdoc but falls back on :none
           :serializer => YARD::Serializers::FileSystemSerializer.new,
           :default_return => "Object",
           :hide_void_return => false,
           :no_highlight => false, 
           :files => [],
@@ -300,12 +300,23 @@
       # Verifies that the markup options are valid before parsing any code.
       # Failing early is better than failing late.
       # 
       # @return (see YARD::Templates::Helpers::MarkupHelper#load_markup_provider)
       def verify_markup_options
+        has_markup = options[:markup] ? true : false
+        options[:markup] ||= :rdoc
+        result, lvl = false, has_markup ? log.level : Logger::FATAL
         obj = Struct.new(:options).new(options)
         obj.extend(Templates::Helpers::MarkupHelper)
-        obj.load_markup_provider
+        log.enter_level(lvl) { result = obj.load_markup_provider }
+        if !result && !has_markup
+          log.warn "Could not load default RDoc formatter, " +
+            "ignoring any markup (install RDoc to get default formatting)."
+          options[:markup] = :none
+          true
+        else
+          result
+        end
       end
       
       # Copies any assets to the output directory
       # @return [void]
       # @since 0.6.0