yard 0.6.2 → 0.6.3

data/ChangeLog

@@ -1,3 +1,11 @@
+2010-11-21  Loren Segal <lsegal@soen.ca>
+
+  * ChangeLog, README.md, lib/yard.rb, yard.gemspec: Bump to version 0.6.3
+
+  * lib/yard/templates/helpers/markup_helper.rb,
+  spec/templates/helpers/markup_helper_spec.rb: Fix regression where markup
+  loading fails when generating HTML
+
 2010-11-15  Loren Segal <lsegal@soen.ca>
 
   * ChangeLog, README.md, lib/yard.rb, yard.gemspec: Bump to version 0.6.2

data/README.md

@@ -8,8 +8,8 @@ YARD: Yay! A Ruby Documentation Tool
 **Contributors**: See Contributors section below    
 **Copyright**:    2007-2010    
 **License**:      MIT License    
-**Latest Version**: 0.6.2 (codename "White Picket Fences")    
-**Release Date**: November 15th 2010    
+**Latest Version**: 0.6.3 (codename "Better White Picket Fences")    
+**Release Date**: November 21st 2010    
 
 Synopsis
 --------
@@ -289,6 +289,9 @@ More options can be seen by typing `yard-graph --help`, but here is an example:
 Changelog
 ---------
 
+- **November.21.10**: 0.6.3 release
+    - Fixed regression that caused `yardoc --markup` to silently exit
+
 - **November.15.10**: 0.6.2 release
     - **Plugins no longer automatically load, use `--plugin` to load a plugin**
     - Added YARD::Config and ~/.yard/config YAML configuration file

data/lib/yard.rb

@@ -1,5 +1,5 @@
 module YARD
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
   
   # The root path for YARD source libraries
   ROOT = File.expand_path(File.dirname(__FILE__))

data/lib/yard/templates/helpers/markup_helper.rb

@@ -81,7 +81,7 @@ module YARD
           begin require provider[:lib].to_s; rescue LoadError; next end
           @markup_cache[type][:provider] = provider[:lib] # Cache the provider
           @markup_cache[type][:class] = eval(provider[:const])
-          return false
+          return true
         end
         
         # Show error message telling user to install first potential provider

data/spec/templates/helpers/markup_helper_spec.rb

@@ -35,12 +35,14 @@ describe YARD::Templates::Helpers::MarkupHelper do
     end
   
     it "should search through available markup providers for the markup type if none is set" do
+      module YARD::Templates::Helpers::MarkupHelper::BlueCloth; end
       @gen.should_receive(:require).with('bluecloth').and_return(true)
+      @gen.should_not_receive(:require).with('maruku')
       @gen.stub!(:options).and_return({:markup => :markdown})
       # this only raises an exception because we mock out require to avoid 
       # loading any libraries but our implementation tries to return the library 
       # name as a constant
-      @gen.load_markup_provider.should rescue nil
+      @gen.load_markup_provider.should == true
       @gen.markup_provider.should == :bluecloth
     end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Loren Segal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -05:00
+date: 2010-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -464,7 +464,7 @@ files:
 - README.md
 - Rakefile
 - .yardopts
-has_rdoc: yard
+has_rdoc: true
 homepage: http://yardoc.org
 licenses: []