From a62cccac0a10096991c8d00a86d73484de6e503d Mon Sep 17 00:00:00 2001
From: Ian Ownbey <imownbey@ian-ownbeys-macbook.local>
Date: Sat, 31 Jan 2009 13:18:35 -0800
Subject: Got rake working took out trash

---
 .gitignore             | 1 +
 lib/mongrel.rb         | 4 ----
 lib/mongrel/command.rb | 3 ---
 test/test_helper.rb    | 4 ++--
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2658b88..59f325f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ lib/http11.bundle
 log/
 test_stderr.log
 test_stdout.log
+.DS_Store
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index e0c2b01..990a8eb 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -13,9 +13,6 @@ require 'fcntl'
 require 'http11'
 
 # Gem conditional loader
-require 'mongrel/gems'
-Mongrel::Gems.require 'cgi_multipart_eof_fix'
-Mongrel::Gems.require 'fastthread'
 require 'thread'
 require 'rack'
 
@@ -337,4 +334,3 @@ end
 # in regular Mongrel.
 
 $LOAD_PATH.unshift 'projects/mongrel_experimental/lib/'
-Mongrel::Gems.require 'mongrel_experimental', ">=#{Mongrel::Const::MONGREL_VERSION}"
diff --git a/lib/mongrel/command.rb b/lib/mongrel/command.rb
index a3ee57d..c1fcca1 100644
--- a/lib/mongrel/command.rb
+++ b/lib/mongrel/command.rb
@@ -7,9 +7,6 @@
 require 'singleton'
 require 'optparse'
 
-require 'mongrel/gems'
-Mongrel::Gems.require 'gem_plugin'
-
 module Mongrel
 
   # Contains all of the various commands that are used with 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7615fdd..e5f1a13 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,7 +5,7 @@
 # for more information.
 
 
-HERE = File.dirname(__FILE__)
+HERE = File.dirname(__FILE__) unless defined?(HERE)
 %w(lib ext bin test).each do |dir| 
   $LOAD_PATH.unshift "#{HERE}/../#{dir}"
 end
@@ -76,4 +76,4 @@ end
 # Platform check helper ;-)
 def windows?
   result = RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3-24-ge0c7