maruku is abandonware, default to rdiscount

fixtures/test-app/config.rb

@@ -1,4 +1,3 @@
-require "maruku"
 require "slim"
 require "liquid"
 require "coffee-filter"

lib/middleman/base.rb

@@ -251,7 +251,7 @@ class Middleman::Base
     self.class.superclass.defaults.each { |k,v| set(k,v) }
     
     # Evaluate a passed block if given
-    yield if block_given?
+    instance_exec(&block) if block_given?
     
     # Build expanded source path once paths have been parsed
     set :source_dir, File.join(root, source)

lib/middleman/renderers/markdown.rb

@@ -3,15 +3,11 @@ module Middleman::Renderers::Markdown
     def registered(app)
       app.set :markdown_engine, nil
     
+      # TODO: Switch to Redcarpet once Haml 3.2.0 ships
       begin
-        require "maruku"
-        app.set :markdown_engine, :maruku
+        require "rdiscount"
+        app.set :markdown_engine, :rdiscount
       rescue LoadError
-        begin
-          require "rdiscount"
-          app.set :markdown_engine, :rdiscount
-        rescue LoadError
-        end
       end
 
       app.set :markdown_engine_prefix, ::Tilt

middleman.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   
   # Development and test
   s.add_development_dependency("slim")
-  s.add_development_dependency("maruku")
+  s.add_development_dependency("rdiscount")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("liquid", ["~> 2.2.0"])
   s.add_development_dependency("cucumber", ["~> 1.1.0"])