From ef0b99600420e71955644d126c5d3f0378e9ea30 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 24 Dec 2014 11:38:54 -0800
Subject: [PATCH] blog compat

---
 middleman-cli/lib/middleman-cli/build.rb                 | 2 +-
 middleman-cli/lib/middleman-core/cli.rb                  | 2 ++
 middleman-core/lib/middleman-core/application.rb         | 6 +++---
 middleman-core/lib/middleman-core/renderers/redcarpet.rb | 6 +++++-
 middleman-core/lib/middleman-core/version.rb             | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 middleman-cli/lib/middleman-core/cli.rb

diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index b8744673..f69bd72e 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -11,7 +11,7 @@ module Middleman::Cli
     desc 'build [options]', 'Builds the static site for deployment'
     method_option :environment,
                   aliases: '-e',
-                  default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
+                  default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'production',
                   desc: 'The environment Middleman will run under'
     method_option :clean,
                   type: :boolean,
diff --git a/middleman-cli/lib/middleman-core/cli.rb b/middleman-cli/lib/middleman-core/cli.rb
new file mode 100644
index 00000000..6ae5fb51
--- /dev/null
+++ b/middleman-cli/lib/middleman-core/cli.rb
@@ -0,0 +1,2 @@
+# Backwards compat
+require 'middleman-cli'
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index c222123c..917da02a 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -80,7 +80,7 @@ module Middleman
 
     # Name of the source directory
     # @return [String]
-    config.define_setting :source,      'source', 'Name of the source directory'
+    config.define_setting :source, 'source', 'Name of the source directory'
 
     # Middleman mode. Defaults to :server, set to :build by the build process
     # @return [String]
@@ -255,12 +255,12 @@ module Middleman
           Tilt.mappings.delete(key)
         end
       end
+      
+      @extensions.activate_all
 
       run_hook :after_configuration
       config_context.execute_after_configuration_callbacks
 
-      @extensions.activate_all
-
       run_hook :ready
       @config_context.execute_ready_callbacks
     end
diff --git a/middleman-core/lib/middleman-core/renderers/redcarpet.rb b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
index 7f430e49..521073cf 100644
--- a/middleman-core/lib/middleman-core/renderers/redcarpet.rb
+++ b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
@@ -39,7 +39,11 @@ module Middleman
 
       def evaluate(scope, _)
         @output ||= begin
-          MiddlemanRedcarpetHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope
+          if defined?(::Middleman::Renderers::Haml)
+            MiddlemanRedcarpetHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope
+          else
+            MiddlemanRedcarpetHTML.scope = scope
+          end
 
           @engine.render(data)
         end
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 7f92da1d..efd6097d 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.0.0.alpha.3' unless const_defined?(:VERSION)
+  VERSION = '4.0.0.alpha.4' unless const_defined?(:VERSION)
 end