diff options
| -rw-r--r-- | Rakefile | 5 | ||||
| -rw-r--r-- | lib/unicorn.rb | 2 | ||||
| -rw-r--r-- | test/test_helper.rb | 2 | ||||
| -rw-r--r-- | test/unit/test_server.rb | 5 |
4 files changed, 2 insertions, 12 deletions
@@ -11,17 +11,12 @@ Echoe.new("unicorn") do |p| p.rdoc_pattern = ['README', 'LICENSE', 'CONTRIBUTORS', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc'] p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/ p.extension_pattern = nil - p.dependencies = ['daemons', 'rack'] p.need_tar_gz = false p.need_tgz = true p.extension_pattern = ["ext/**/extconf.rb"] - p.eval = proc do - add_dependency('daemons', '>= 1.0.3') - end - end #### Ragel builder diff --git a/lib/unicorn.rb b/lib/unicorn.rb index 43e2db7..c95920d 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -13,8 +13,6 @@ require 'logger' # Compiled extension require 'http11' -require 'rack' - require 'unicorn/socket' require 'unicorn/const' require 'unicorn/http_request' diff --git a/test/test_helper.rb b/test/test_helper.rb index 21d9e81..ae4f178 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -20,8 +20,6 @@ require 'digest/sha1' require 'uri' require 'stringio' require 'pp' -require 'rubygems' - require 'unicorn' if ENV['DEBUG'] diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index ae8f5b8..e9bd487 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -22,10 +22,9 @@ class WebServerTest < Test::Unit::TestCase def setup @valid_request = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\n\r\n" @port = process_based_port - @tester = TestHandler.new - @app = Rack::URLMap.new('/test' => @tester) + @tester = TestHandler.new redirect_test_io do - @server = HttpServer.new(@app, :listeners => [ "127.0.0.1:#{@port}" ] ) + @server = HttpServer.new(@tester, :listeners => [ "127.0.0.1:#{@port}" ] ) end @server.start end |