From dd8391be9399d86e01c5ab7b529c40e260a4375e Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 24 Dec 2011 16:09:07 -0800
Subject: [PATCH] Remove jRuby hacks

---
 .travis.yml            |  2 +-
 lib/middleman.rb       | 13 +++++--------
 lib/middleman/base.rb  |  1 +
 lib/middleman/guard.rb | 16 ++++------------
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a20771c..64b0693b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-script: "bundle exec rake test"
\ No newline at end of file
+script: "bundle exec rake test"
diff --git a/lib/middleman.rb b/lib/middleman.rb
index fb94a503..a01ee367 100755
--- a/lib/middleman.rb
+++ b/lib/middleman.rb
@@ -226,14 +226,11 @@ module Middleman
     
       app_class = options[:app] ||= ::Middleman.server.inst
       opts[:app] = app_class
-      opts[:server] = if ::Middleman::JRUBY
-        'webrick' # Maybe Kirk?
-      else
-        require "thin"
-        ::Thin::Logging.silent = !options[:logging]
-        'thin'
-      end
-
+    
+      require "thin"
+      ::Thin::Logging.silent = !options[:logging]
+      opts[:server] = 'thin'
+      
       server = ::Rack::Server.new(opts)
       server.start
       server
diff --git a/lib/middleman/base.rb b/lib/middleman/base.rb
index 4eaf2f3a..c50e7aac 100644
--- a/lib/middleman/base.rb
+++ b/lib/middleman/base.rb
@@ -1,5 +1,6 @@
 # Built on Rack
 require "rack"
+require "rack/file"
 
 # Using Tilt for templating
 require "tilt"
diff --git a/lib/middleman/guard.rb b/lib/middleman/guard.rb
index 1023520d..cbaed0a3 100644
--- a/lib/middleman/guard.rb
+++ b/lib/middleman/guard.rb
@@ -45,12 +45,7 @@ module Guard
     
     # Start Middleman in a fork
     def start
-      if ::Middleman::JRUBY
-        thread = Thread.new { bootup }
-        thread.join
-      else
-        @server_job = fork { bootup }
-      end
+      @server_job = fork { bootup }
     end
     
     def bootup
@@ -73,12 +68,9 @@ module Guard
     # Stop the forked Middleman
     def stop
       puts "== The Middleman is shutting down"
-      if ::Middleman::JRUBY
-      else
-        Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
-        Process.wait @server_job
-        @server_job = nil
-      end
+      Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
+      Process.wait @server_job
+      @server_job = nil
     end
     
     # Simply stop, then start