Merge pull request #310 from bhollis/master

Load extension gems even when only using middleman-core

middleman-core/bin/middleman

@@ -46,9 +46,12 @@ rescue LoadError
   end
 end
 
+# Automatically discover extensions in RubyGems
+Middleman.load_extensions_in_path
+
 # Change directory to the root
 Dir.chdir(ENV["MM_ROOT"] || Dir.pwd) do
   
   # Start the CLI
   Middleman::Cli::Base.start
-end
+end

middleman-core/lib/middleman-core.rb

@@ -196,12 +196,16 @@ module Middleman
     #
     # @private
     def load_extensions_in_path
-      extensions = rubygems_latest_specs.select do |spec|
-        spec_has_file?(spec, EXTENSION_FILE)
-      end
+      if defined?(Bundler)
+        Bundler.require
+      else
+        extensions = rubygems_latest_specs.select do |spec|
+          spec_has_file?(spec, EXTENSION_FILE)
+        end
 
-      extensions.each do |spec|
-        require spec.name
+        extensions.each do |spec|
+          require spec.name
+        end
       end
     end
 

middleman/lib/middleman.rb

@@ -3,6 +3,3 @@ require "middleman-more"
 
 # Make the VERSION string available
 require "middleman-core/version"
-
-# Automatically discover extensions in RubyGems
-Middleman.load_extensions_in_path