unicorn 1.1.7 → 2.0.0pre1

data/unicorn.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://unicorn.bogomips.org/}
 
   summary = %q{Rack HTTP server for fast clients and Unix}
-  s.rdoc_options = [ "-t", "Unicorn: #{summary}" ]
+  s.rdoc_options = [ "-Na", "-t", "Unicorn: #{summary}" ]
   s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{mongrel}
   s.summary = summary
@@ -48,8 +48,9 @@ Gem::Specification.new do |s|
   # commented out.  Nevertheless, upgrading to Rails 2.3.4 or later is
   # *strongly* recommended for security reasons.
   s.add_dependency(%q<rack>)
+  s.add_dependency(%q<kgio>, '~> 1.2.0')
 
-  s.add_development_dependency('isolate', '~> 3.0.0')
+  s.add_development_dependency('isolate', '~> 2.1.2')
 
   # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: -766259887
+  prerelease: true
   segments: 
-  - 1
-  - 1
-  - 7
-  version: 1.1.7
+  - 2
+  - 0
+  - 0pre1
+  version: 2.0.0pre1
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 Z
+date: 2010-10-06 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -32,21 +33,37 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: isolate
+  name: kgio
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 31
         segments: 
-        - 3
-        - 0
+        - 1
+        - 2
         - 0
-        version: 3.0.0
-  type: :development
+        version: 1.2.0
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: isolate
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :development
+  version_requirements: *id003
 description: |-
   Unicorn is an HTTP server for Rack applications designed to only serve
   fast clients on low-latency, high-bandwidth connections and take
@@ -83,11 +100,14 @@ extra_rdoc_files:
 - lib/unicorn/const.rb
 - lib/unicorn/http_request.rb
 - lib/unicorn/http_response.rb
+- lib/unicorn/http_server.rb
 - lib/unicorn/launcher.rb
 - lib/unicorn/oob_gc.rb
 - lib/unicorn/socket_helper.rb
 - lib/unicorn/tee_input.rb
+- lib/unicorn/tmpio.rb
 - lib/unicorn/util.rb
+- lib/unicorn/worker.rb
 - ext/unicorn_http/unicorn_http.c
 - ISSUES
 - Sandbox
@@ -150,14 +170,18 @@ files:
 - lib/unicorn/const.rb
 - lib/unicorn/http_request.rb
 - lib/unicorn/http_response.rb
+- lib/unicorn/http_server.rb
 - lib/unicorn/launcher.rb
 - lib/unicorn/oob_gc.rb
 - lib/unicorn/socket_helper.rb
 - lib/unicorn/tee_input.rb
+- lib/unicorn/tmpio.rb
 - lib/unicorn/util.rb
+- lib/unicorn/worker.rb
 - local.mk.sample
 - man/man1/unicorn.1
 - man/man1/unicorn_rails.1
+- script/isolate_for_tests
 - setup.rb
 - t/.gitignore
 - t/GNUmakefile
@@ -168,8 +192,6 @@ files:
 - t/bin/utee
 - t/env.ru
 - t/my-tap-lib.sh
-- t/oob_gc.ru
-- t/oob_gc_path.ru
 - t/pid.ru
 - t/rails3-app/.gitignore
 - t/rails3-app/Gemfile
@@ -213,19 +235,15 @@ files:
 - t/t0007-working_directory_no_embed_cli.sh
 - t/t0008-back_out_of_upgrade.sh
 - t/t0009-winch_ttin.sh
+- t/t0010-reap-logging.sh
 - t/t0011-active-unix-socket.sh
-- t/t0012-reload-empty-config.sh
-- t/t0018-write-on-close.sh
 - t/t0300-rails3-basic.sh
 - t/t0301-rails3-missing-config-ru.sh
 - t/t0302-rails3-alt-working_directory.sh
 - t/t0303-rails3-alt-working_directory_config.ru.sh
 - t/t0304-rails3-alt-working_directory_no_embed_cli.sh
-- t/t9001-oob_gc.sh
-- t/t9002-oob_gc-path.sh
 - t/test-lib.sh
 - t/test-rails3.sh
-- t/write-on-close.ru
 - test/aggregate.rb
 - test/benchmark/README
 - test/benchmark/dd.ru
@@ -321,11 +339,13 @@ files:
 - test/unit/test_upload.rb
 - test/unit/test_util.rb
 - unicorn.gemspec
+has_rdoc: true
 homepage: http://unicorn.bogomips.org/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
+- -Na
 - -t
 - "Unicorn: Rack HTTP server for fast clients and Unix"
 require_paths: 
@@ -343,16 +363,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: mongrel
-rubygems_version: 1.7.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server for fast clients and Unix

data/t/oob_gc.ru

@@ -1,21 +0,0 @@
-#\-E none
-require 'unicorn/oob_gc'
-use Rack::ContentLength
-use Rack::ContentType, "text/plain"
-use Unicorn::OobGC
-$gc_started = false
-
-# Mock GC.start
-def GC.start
-  ObjectSpace.each_object(BasicSocket) do |x|
-    next if Unicorn::HttpServer::LISTENERS.include?(x)
-    x.closed? or abort "not closed #{x}"
-  end
-  $gc_started = true
-end
-run lambda { |env|
-  if "/gc_reset" == env["PATH_INFO"] && "POST" == env["REQUEST_METHOD"]
-    $gc_started = false
-  end
-  [ 200, {}, [ "#$gc_started\n" ] ]
-}

data/t/oob_gc_path.ru

@@ -1,21 +0,0 @@
-#\-E none
-require 'unicorn/oob_gc'
-use Rack::ContentLength
-use Rack::ContentType, "text/plain"
-use Unicorn::OobGC, 5, /BAD/
-$gc_started = false
-
-# Mock GC.start
-def GC.start
-  ObjectSpace.each_object(BasicSocket) do |x|
-    next if Unicorn::HttpServer::LISTENERS.include?(x)
-    x.closed? or abort "not closed #{x}"
-  end
-  $gc_started = true
-end
-run lambda { |env|
-  if "/gc_reset" == env["PATH_INFO"] && "POST" == env["REQUEST_METHOD"]
-    $gc_started = false
-  end
-  [ 200, {}, [ "#$gc_started\n" ] ]
-}

data/t/t0012-reload-empty-config.sh

@@ -1,82 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 9 "reloading unset config resets defaults"
-
-t_begin "setup and start" && {
-	unicorn_setup
-	rtmpfiles unicorn_config_orig before_reload after_reload
-	cat $unicorn_config > $unicorn_config_orig
-	cat >> $unicorn_config <<EOF
-logger Logger.new(STDOUT)
-preload_app true
-timeout 0x7fffffff
-worker_processes 2
-after_fork { |s,w| }
-\$dump_cfg = lambda { |fp,srv|
-  defaults = Unicorn::Configurator::DEFAULTS
-  defaults.keys.map { |x| x.to_s }.sort.each do |key|
-    next if key =~ %r{\Astd(?:err|out)_path\z}
-    key = key.to_sym
-    def_value = defaults[key]
-    srv_value = srv.__send__(key)
-    fp << "#{key}|#{srv_value}|#{def_value}\\n"
-  end
-}
-before_fork { |s,w|
-  File.open("$before_reload", "a") { |fp| \$dump_cfg.call(fp, s) }
-}
-before_exec { |s| }
-EOF
-	unicorn -D -c $unicorn_config env.ru
-	unicorn_wait_start
-}
-
-t_begin "ensure worker is started" && {
-	curl -sSf http://$listen/ > $tmp
-}
-
-t_begin "replace config file with original(-ish)" && {
-	grep -v ^pid < $unicorn_config_orig > $unicorn_config
-	cat >> $unicorn_config <<EOF
-before_fork { |s,w|
-  File.open("$after_reload", "a") { |fp| \$dump_cfg.call(fp, s) }
-}
-EOF
-}
-
-t_begin "reload signal succeeds" && {
-	kill -HUP $unicorn_pid
-	while ! egrep '(done|error) reloading' $r_err >/dev/null
-	do
-		sleep 1
-	done
-
-	grep 'done reloading' $r_err >/dev/null
-}
-
-t_begin "ensure worker is started" && {
-	curl -sSf http://$listen/ > $tmp
-}
-
-t_begin "pid file no longer exists" && {
-	if test -f $pid
-	then
-		die "pid=$pid should not exist"
-	fi
-}
-
-t_begin "killing succeeds" && {
-	kill $unicorn_pid
-}
-
-t_begin "check stderr" && {
-	check_stderr
-}
-
-t_begin "ensure reloading restored settings" && {
-	awk < $after_reload -F'|' '
-$1 != "before_fork" && $2 != $3 { print $0; exit(1) }
-'
-}
-
-t_done

data/t/t0018-write-on-close.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 4 "write-on-close tests for funky response-bodies"
-
-t_begin "setup and start" && {
-	unicorn_setup
-	unicorn -D -c $unicorn_config write-on-close.ru
-	unicorn_wait_start
-}
-
-t_begin "write-on-close response body succeeds" && {
-	test xGoodbye = x"$(curl -sSf http://$listen/)"
-}
-
-t_begin "killing succeeds" && {
-	kill $unicorn_pid
-}
-
-t_begin "check stderr" && {
-	check_stderr
-}
-
-t_done

data/t/t9001-oob_gc.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 9 "OobGC test"
-
-t_begin "setup and start" && {
-	unicorn_setup
-	unicorn -D -c $unicorn_config oob_gc.ru
-	unicorn_wait_start
-}
-
-t_begin "test default interval (4 requests)" && {
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "GC starting-request returns immediately" && {
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "GC is started after 5 requests" && {
-	test xtrue = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "reset GC" && {
-	test xfalse = x$(curl -vsSf -X POST http://$listen/gc_reset 2>> $tmp)
-}
-
-t_begin "test default interval again (3 requests)" && {
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "GC is started after 5 requests" && {
-	test xtrue = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "killing succeeds" && {
-	kill -QUIT $unicorn_pid
-}
-
-t_begin "check_stderr" && check_stderr
-dbgcat r_err
-
-t_done

data/t/t9002-oob_gc-path.sh

@@ -1,75 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 12 "OobGC test with limited path"
-
-t_begin "setup and start" && {
-	unicorn_setup
-	unicorn -D -c $unicorn_config oob_gc_path.ru
-	unicorn_wait_start
-}
-
-t_begin "test default is noop" && {
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "4 bad requests to bump counter" && {
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-}
-
-t_begin "GC-starting request returns immediately" && {
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-}
-
-t_begin "GC was started after 5 requests" && {
-	test xtrue = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "reset GC" && {
-	test xfalse = x$(curl -vsSf -X POST http://$listen/gc_reset 2>> $tmp)
-}
-
-t_begin "test default is noop" && {
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "4 bad requests to bump counter" && {
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-}
-
-t_begin "GC-starting request returns immediately" && {
-	test xfalse = x$(curl -vsSf http://$listen/BAD 2>> $tmp)
-}
-
-t_begin "GC was started after 5 requests" && {
-	test xtrue = x$(curl -vsSf http://$listen/ 2>> $tmp)
-}
-
-t_begin "killing succeeds" && {
-	kill -QUIT $unicorn_pid
-}
-
-t_begin "check_stderr" && check_stderr
-
-t_done