From d643a8e041659dd3e99a08c071bd841f3bdd6ce3 Mon Sep 17 00:00:00 2001 From: tdreyno Date: Sun, 30 Jan 2011 14:23:29 -0800 Subject: [PATCH] Tests pass, long live Thor --- bin/mm-build | 4 ++-- lib/middleman/builder.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/mm-build b/bin/mm-build index 159cf2f0..b135c087 100755 --- a/bin/mm-build +++ b/bin/mm-build @@ -4,10 +4,10 @@ ENV['MM_ENV'] = "build" # Require app require File.join(File.dirname(__FILE__), "..", "lib", "middleman") -require 'middleman/thor_builder' +require 'middleman/builder' # Initialize server once so features are loaded Middleman::Server.new # Middleman::ThorBuilder.source_root(Dir.pwd) -Middleman::ThorBuilder.start +Middleman::Builder.start diff --git a/lib/middleman/builder.rb b/lib/middleman/builder.rb index 7d19cbac..cc7bc02c 100644 --- a/lib/middleman/builder.rb +++ b/lib/middleman/builder.rb @@ -23,7 +23,7 @@ module Middleman end end - class ThorBuilder < Thor::Group + class Builder < Thor::Group include Thor::Actions include Middleman::ThorActions