diff options
| author | Ian Ownbey <imownbey@ian-ownbeys-macbook.local> | 2009-01-31 13:18:35 -0800 |
|---|---|---|
| committer | Ian Ownbey <imownbey@ian-ownbeys-macbook.local> | 2009-01-31 13:18:35 -0800 |
| commit | a62cccac0a10096991c8d00a86d73484de6e503d (patch) | |
| tree | 7a3becea0f92799899588f58fe1d2a04a7a7715c | |
| parent | df080f7fbcdc4866260d04385fd6388797d463a4 (diff) | |
| download | unicorn-a62cccac0a10096991c8d00a86d73484de6e503d.tar.gz | |
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | lib/mongrel.rb | 4 | ||||
| -rw-r--r-- | lib/mongrel/command.rb | 3 | ||||
| -rw-r--r-- | test/test_helper.rb | 4 |
4 files changed, 3 insertions, 9 deletions
@@ -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 |