From 8bc2fddb9da38661e64220efdddf29723e95d918 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 25 Mar 2014 16:57:57 -0700
Subject: [PATCH] Remove static serving of non-Middleman folders

---
 CHANGELOG.md                                  | 1 +
 middleman-cli/lib/middleman-cli/server.rb     | 4 +---
 middleman-core/features/static_server.feature | 6 ------
 middleman-core/fixtures/plain-app/index.html  | 1 -
 4 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 middleman-core/features/static_server.feature
 delete mode 100644 middleman-core/fixtures/plain-app/index.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40fc0b49..2e157514 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 master
 ===
 
+* Removed ability to server folders of content statically (non-Middleman projects).
 * Prevent local templates being loaded when $HOME is not set
 * Removed "Implied Extension feature"
 * Remove 'upgrade' and 'install' CLI commands.
diff --git a/middleman-cli/lib/middleman-cli/server.rb b/middleman-cli/lib/middleman-cli/server.rb
index 782d9faf..18da26b1 100644
--- a/middleman-cli/lib/middleman-cli/server.rb
+++ b/middleman-cli/lib/middleman-cli/server.rb
@@ -58,9 +58,7 @@ module Middleman::Cli
 
       if !ENV['MM_ROOT']
         puts '== Could not find a Middleman project config.rb'
-        puts '== Treating directory as a static site to be served'
-        ENV['MM_ROOT'] = Dir.pwd
-        ENV['MM_SOURCE'] = ''
+        exit
       end
 
       params = {
diff --git a/middleman-core/features/static_server.feature b/middleman-core/features/static_server.feature
deleted file mode 100644
index 569b4cd1..00000000
--- a/middleman-core/features/static_server.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Middleman should serve plain directories without config
-
-  Scenario: Preview a folder of static pages
-    Given the Server is running at "plain-app"
-    When I go to "/index.html"
-    Then I should see "I am index"
\ No newline at end of file
diff --git a/middleman-core/fixtures/plain-app/index.html b/middleman-core/fixtures/plain-app/index.html
deleted file mode 100644
index 963a3e93..00000000
--- a/middleman-core/fixtures/plain-app/index.html
+++ /dev/null
@@ -1 +0,0 @@
-I am index
\ No newline at end of file