From 4cecac01518c6d48f749a34d4f56842429c2ccbc Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 15 Aug 2009 02:43:49 -0700
Subject: Remove explicit requires for Rack things

Rack is autoload-based and so are we.
---
 bin/unicorn                         | 1 -
 bin/unicorn_rails                   | 1 -
 lib/unicorn/app/exec_cgi.rb         | 1 -
 lib/unicorn/app/old_rails/static.rb | 2 --
 test/unit/test_request.rb           | 7 -------
 5 files changed, 12 deletions(-)

diff --git a/bin/unicorn b/bin/unicorn
index cfc81da..8847e81 100755
--- a/bin/unicorn
+++ b/bin/unicorn
@@ -120,7 +120,6 @@ require 'pp' if $DEBUG
 app = lambda do ||
   # require Rack as late as possible in case $LOAD_PATH is modified
   # in config.ru or command-line
-  require 'rack'
   inner_app = case config
   when /\.ru$/
     raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
diff --git a/bin/unicorn_rails b/bin/unicorn_rails
index a0035f4..1fbc0e2 100755
--- a/bin/unicorn_rails
+++ b/bin/unicorn_rails
@@ -140,7 +140,6 @@ app = lambda do ||
     end
 
     if old_rails
-      require 'rack'
       require 'unicorn/app/old_rails'
       Unicorn::App::OldRails.new
     else
diff --git a/lib/unicorn/app/exec_cgi.rb b/lib/unicorn/app/exec_cgi.rb
index d0b31f8..138545e 100644
--- a/lib/unicorn/app/exec_cgi.rb
+++ b/lib/unicorn/app/exec_cgi.rb
@@ -1,5 +1,4 @@
 require 'unicorn'
-require 'rack'
 
 module Unicorn::App
 
diff --git a/lib/unicorn/app/old_rails/static.rb b/lib/unicorn/app/old_rails/static.rb
index 51a0017..e3f40bf 100644
--- a/lib/unicorn/app/old_rails/static.rb
+++ b/lib/unicorn/app/old_rails/static.rb
@@ -3,8 +3,6 @@
 # Copyright (c) 2009 Eric Wong
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require 'rack/file'
-
 # Static file handler for Rails < 2.3.  This handler is only provided
 # as a convenience for developers.  Performance-minded deployments should
 # use nginx (or similar) for serving static files.
diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb
index edd4c55..6e648c2 100644
--- a/test/unit/test_request.rb
+++ b/test/unit/test_request.rb
@@ -2,13 +2,6 @@
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
 require 'test/test_helper'
-begin
-  require 'rack'
-  require 'rack/lint'
-rescue LoadError
-  warn "Unable to load rack, skipping test"
-  exit 0
-end
 
 include Unicorn
 
-- 
cgit v1.2.3-24-ge0c7