From 58616ce4866d899c9e5916afb411cf777bca5732 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Mon, 3 Mar 2014 23:07:32 -0800 Subject: [PATCH 1/2] pry-debugger is not available on Ruby 2.1 --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index a055afd7..8f6a7402 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,6 @@ platforms :ruby do gem 'therubyracer' gem 'redcarpet', '~> 3.1' gem 'pry', :require => false, :group => :development - gem 'pry-debugger', :require => false, :group => :development end platforms :jruby do From a88f12a2623563e928fa50b5e7daac5ae714dcd4 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Thu, 13 Mar 2014 20:32:25 -0700 Subject: [PATCH 2/2] Apply fix from 32716f37293cb2ddeeb939d81648a30b2221cd92 - avoid loading middleman-core unless needed. Fixes #1203 --- middleman-core/lib/middleman-core/cli/build.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb index dde2a1b2..d2f300ec 100644 --- a/middleman-core/lib/middleman-core/cli/build.rb +++ b/middleman-core/lib/middleman-core/cli/build.rb @@ -1,6 +1,3 @@ -require 'middleman-core' -require 'middleman-core/logger' - require 'fileutils' require 'set' @@ -50,6 +47,9 @@ module Middleman::Cli raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?' end + require 'middleman-core' + require 'middleman-core/logger' + # Use Rack::Test for inspecting a running server for output require 'rack' require 'rack/test'