rainbows 3.2.0 → 3.3.0

data/pkg.mk

@@ -167,5 +167,9 @@ doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+check-warnings:
+	@(for i in $$(git ls-files '*.rb'|grep -v '^setup\.rb$$'); \
+	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
 .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+.PHONY: check-warnings

data/rainbows.gemspec

@@ -24,8 +24,11 @@ Gem::Specification.new do |s|
   # we want a newer Rack for a valid HeaderHash#each
   s.add_dependency(%q<rack>, ['~> 1.1'])
 
+  # kgio has some fixes for MRI 1.9.3dev that affect us
+  s.add_dependency(%q<kgio>, ['~> 2.4'])
+
   # we need Unicorn for the HTTP parser and process management
-  s.add_dependency(%q<unicorn>, ["~> 3.5"])
+  s.add_dependency(%q<unicorn>, ["~> 3.6"])
   s.add_development_dependency(%q<isolate>, "~> 3.0.0")
   s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
 

data/t/GNUmakefile

@@ -21,6 +21,8 @@ export RUBY_VERSION RUBY_ENGINE
 
 ifeq (Linux,$(shell uname -s))
   models += XEpoll
+  models += XEpollThreadSpawn
+  models += XEpollThreadPool
   models += Epoll
 endif
 models += WriterThreadPool
@@ -35,7 +37,9 @@ ifeq ($(RUBY_ENGINE),ruby)
   rp := )
   ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac)
   ifeq ($(ONENINE),true)
-    models += Revactor
+    ifeq ($(RUBY_VERSION),1.9.2)
+      models += Revactor
+    endif
     models += FiberSpawn
     models += FiberPool
     models += CoolioThreadPool

data/t/client_header_buffer_size.ru

@@ -0,0 +1,5 @@
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+run lambda { |env|
+  [ 200, {}, [ "#{Rainbows.server.client_header_buffer_size}\n" ] ]
+}

data/t/simple-http_XEpollThreadPool.ru

@@ -0,0 +1,10 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  if env['rack.multithread'] == true &&
+    env['rainbows.model'] == :XEpollThreadPool
+    [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+  else
+    raise env.inspect
+  end
+}

data/t/simple-http_XEpollThreadSpawn.ru

@@ -0,0 +1,10 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  if env['rack.multithread'] == true &&
+    env['rainbows.model'] == :XEpollThreadSpawn
+    [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+  else
+    raise env.inspect
+  end
+}

data/t/t0022-copy_stream-byte-range.sh

@@ -1,21 +1,7 @@
 #!/bin/sh
 . ./test-lib.sh
 test -r random_blob || die "random_blob required, run with 'make $0'"
-case $RUBY_VERSION in
-1.9.*) ;;
-*)
-	t_info "skipping $T since it can't IO.copy_stream"
-	exit 0
-	;;
-esac
-
-case $model in
-ThreadSpawn|WriterThreadSpawn|ThreadPool|WriterThreadPool|Base) ;;
-*)
-	t_info "skipping $T since it doesn't use IO.copy_stream"
-	exit 0
-	;;
-esac
+check_copy_stream
 
 t_plan 13 "IO.copy_stream byte range response for $model"
 

data/t/t0026-splice-copy_stream-byte-range.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+. ./test-lib.sh
+test -r random_blob || die "random_blob required, run with 'make $0'"
+check_copy_stream
+check_splice
+
+t_plan 13 "IO::Splice.copy_stream byte range response for $model"
+
+t_begin "setup and startup" && {
+	rtmpfiles out err
+	rainbows_setup $model
+	cat >> $unicorn_config <<EOF
+require "io/splice"
+Rainbows! do
+  copy_stream IO::Splice
+end
+def (::IO).copy_stream(*x); abort "NO"; end
+EOF
+
+	# can't load Rack::Lint here since it clobbers body#to_path
+	rainbows -E none -D large-file-response.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+. ./byte-range-common.sh

data/t/t0027-nil-copy_stream.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+. ./test-lib.sh
+test -r random_blob || die "random_blob required, run with 'make $0'"
+check_copy_stream
+
+t_plan 7 "large file 'copy_stream nil' test for $model"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out
+	rainbows_setup $model
+	cat >> $unicorn_config <<EOF
+Rainbows! do
+  copy_stream nil
+end
+EOF
+	rainbows -E none -D large-file-response.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "read random blob sha1 and size" && {
+	random_blob_sha1=$(rsha1 < random_blob)
+	random_blob_size=$(wc -c < random_blob)
+}
+
+t_begin "send a series HTTP/1.1 requests sequentially" && {
+	for i in a b c
+	do
+		sha1=$( (curl -sSfv http://$listen/random_blob &&
+			 echo ok >$ok) | rsha1)
+		test $sha1 = $random_blob_sha1
+		test xok = x$(cat $ok)
+	done
+}
+
+# this was a problem during development
+t_begin "HTTP/1.0 test" && {
+	sha1=$( (curl -0 -sSfv http://$listen/random_blob &&
+	         echo ok >$ok) | rsha1)
+	test $sha1 = $random_blob_sha1
+	test xok = x$(cat $ok)
+}
+
+t_begin "HTTP/0.9 test" && {
+	(
+		printf 'GET /random_blob\r\n'
+		rsha1 < $fifo > $tmp &
+		wait
+		echo ok > $ok
+	) | socat - TCP:$listen > $fifo
+	test $(cat $tmp) = $random_blob_sha1
+	test xok = x$(cat $ok)
+}
+
+t_begin "shutdown server" && {
+	kill -QUIT $rainbows_pid
+}
+
+t_begin "check stderr" && check_stderr
+
+t_done

data/t/t0041-optional-pool-size.sh

@@ -2,9 +2,9 @@
 . ./test-lib.sh
 
 case $model in
-NeverBlock|CoolioThreadPool) ;;
+NeverBlock|CoolioThreadPool|XEpollThreadPool) ;;
 *)
-	t_info "skipping $T since it doesn't support :pool_size"
+	t_info "skipping $model.$T since it doesn't support :pool_size"
 	exit
 	;;
 esac

data/t/t0042-client_header_buffer_size.sh

@@ -0,0 +1,65 @@
+#!/bin/sh
+. ./test-lib.sh
+
+t_plan 8 "client_header_buffer_size tests for $model"
+
+t_begin "setup and startup" && {
+	rainbows_setup $model
+}
+
+t_begin "fails with zero buffer size" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_max_body_size.*/  client_header_buffer_size 0/
+w
+EOF
+	grep "client_header_buffer_size 0" $unicorn_config
+	rainbows -D client_header_buffer_size.ru -c $unicorn_config || \
+		echo err=$? > $ok
+	test x"$(cat $ok)" = "xerr=1"
+}
+
+t_begin "fails with negative value" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_header_buffer_size.*/  client_header_buffer_size -1/
+w
+EOF
+	grep "client_header_buffer_size -1" $unicorn_config
+	rainbows -D client_header_buffer_size.ru -c $unicorn_config || \
+		echo err=$? > $ok
+	test x"$(cat $ok)" = "xerr=1"
+}
+
+t_begin "fails with negative value" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_header_buffer_size.*/  client_header_buffer_size -1/
+w
+EOF
+	grep "client_header_buffer_size -1" $unicorn_config
+	rainbows -D client_header_buffer_size.ru -c $unicorn_config || \
+		echo err=$? > $ok
+	test x"$(cat $ok)" = "xerr=1"
+}
+
+t_begin "starts with correct value" && {
+	ed -s $unicorn_config <<EOF
+,s/^  client_header_buffer_size.*/  client_header_buffer_size 16399/
+w
+EOF
+	grep "client_header_buffer_size 16399" $unicorn_config
+	rainbows -D client_header_buffer_size.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "regular TCP request works right" && {
+	test x$(curl -sSfv http://$listen/) = x16399
+}
+
+t_begin "no errors in stderr" && {
+	check_stderr
+}
+
+t_begin "shutdown" && {
+	kill $rainbows_pid
+}
+
+t_done

data/t/t9100-thread-timeout.sh

@@ -1,11 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
-case $model in
-ThreadSpawn|ThreadPool) ;;
-RevThreadSpawn|RevThreadPool) ;;
-CoolioThreadSpawn|CoolioThreadPool) ;;
-*) t_info "$0 is only compatible with Thread*"; exit 0 ;;
-esac
+check_threaded_app_dispatch
 
 t_plan 6 "ThreadTimeout Rack middleware test for $model"
 

data/t/t9101-thread-timeout-threshold.sh

@@ -1,11 +1,6 @@
 #!/bin/sh
 . ./test-lib.sh
-case $model in
-ThreadSpawn|ThreadPool) ;;
-RevThreadSpawn|RevThreadPool) ;;
-CoolioThreadSpawn|CoolioThreadPool) ;;
-*) t_info "$0 is only compatible with Thread*"; exit 0 ;;
-esac
+check_threaded_app_dispatch
 
 t_plan 6 "ThreadTimeout Rack middleware test for $model"
 

data/t/test-lib.sh

@@ -198,6 +198,64 @@ req_curl_chunked_upload_err_check () {
 	fi
 }
 
+check_splice () {
+	case $(uname -s) in
+	Linux) ;;
+	*)
+		t_info "skipping $T since it's not Linux"
+		exit 0
+		;;
+	esac
+
+	# we only allow splice on 2.6.32+
+	min=32 uname_r=$(uname -r)
+	case $uname_r in
+	2.6.*)
+		sub=$(expr "$uname_r" : '2\.6\.\(.*\)$')
+		if test $sub -lt $min
+		then
+			t_info "skipping $T (Linux $(uname_r < 2.6.$min)"
+			exit 0
+		fi
+		;;
+	*)
+		t_info "skipping $T (Linux $uname_r < 2.6.$min)"
+		exit 0
+		;;
+	esac
+}
+
+check_threaded_app_dispatch () {
+	case $model in
+	ThreadSpawn|ThreadPool) ;;
+	RevThreadSpawn|RevThreadPool) ;;
+	CoolioThreadSpawn|CoolioThreadPool) ;;
+	XEpollThreadSpawn|XEpollThreadPool) ;;
+	*)
+		t_info "$0 is only compatible with threaded app dispatch"
+		exit 0 ;;
+	esac
+}
+
+check_copy_stream () {
+	case $RUBY_VERSION in
+	1.9.*) ;;
+	*)
+		t_info "skipping $T since it can't IO.copy_stream"
+		exit 0
+		;;
+	esac
+
+	case $model in
+	ThreadSpawn|WriterThreadSpawn|ThreadPool|WriterThreadPool|Base) ;;
+	XEpollThreadSpawn|XEpollThreadPool) ;;
+	*)
+		t_info "skipping $T since it doesn't use copy_stream"
+		exit 0
+		;;
+	esac
+}
+
 case $model in
 Rev) require_check rev Rev::VERSION ;;
 Coolio) require_check coolio Coolio::VERSION ;;

data/t/test_isolate.rb

@@ -16,9 +16,10 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'unicorn', '3.5.0'
+  gem 'kgio', '2.4.0'
+  gem 'unicorn', '3.6.2'
   gem 'kcar', '0.2.0'
-  gem 'raindrops', '0.4.1'
+  gem 'raindrops', '0.6.1'
 
   if engine == "ruby"
     gem 'sendfile', '1.1.0' # next Rubinius should support this
@@ -36,7 +37,12 @@ Isolate.now!(opts) do
     gem 'rack-fiber_pool', '0.9.1'
   end
 
-  gem 'sleepy_penguin', '2.0.0' if RUBY_PLATFORM =~ /linux/
+  if RUBY_PLATFORM =~ /linux/
+    gem 'sleepy_penguin', '2.0.0'
+
+    # is 2.6.32 new enough?
+    gem 'io_splice', '4.1.0' if `uname -r`.strip > '2.6.32'
+  end
 end
 
 $stdout.reopen(old_out)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 3
-  - 2
+  - 3
   - 0
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +00:00
-default_executable: 
+date: 2011-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -34,24 +33,39 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: unicorn
+  name: kgio
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
-        - 3
-        - 5
-        version: "3.5"
+        - 2
+        - 4
+        version: "2.4"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: isolate
+  name: unicorn
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 6
+        version: "3.6"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: isolate
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +77,11 @@ dependencies:
         - 0
         version: 3.0.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,7 +92,7 @@ dependencies:
         - 5
         version: "1.5"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: |-
   \Rainbows! is an HTTP server for sleepy Rack applications.  It is based on
   Unicorn, but designed to handle applications that expect long
@@ -156,6 +170,7 @@ extra_rdoc_files:
 - lib/rainbows/never_block.rb
 - lib/rainbows/never_block/core.rb
 - lib/rainbows/never_block/event_machine.rb
+- lib/rainbows/pool_size.rb
 - lib/rainbows/process_client.rb
 - lib/rainbows/queue_pool.rb
 - lib/rainbows/response.rb
@@ -189,6 +204,10 @@ extra_rdoc_files:
 - lib/rainbows/writer_thread_spawn/client.rb
 - lib/rainbows/xepoll.rb
 - lib/rainbows/xepoll/client.rb
+- lib/rainbows/xepoll_thread_pool.rb
+- lib/rainbows/xepoll_thread_pool/client.rb
+- lib/rainbows/xepoll_thread_spawn.rb
+- lib/rainbows/xepoll_thread_spawn/client.rb
 - LATEST
 - LICENSE
 - NEWS
@@ -200,6 +219,7 @@ extra_rdoc_files:
 - Summary
 - Test_Suite
 - Static_Files
+- Sandbox
 files: 
 - .document
 - .gitignore
@@ -223,6 +243,7 @@ files:
 - README
 - Rakefile
 - SIGNALS
+- Sandbox
 - Static_Files
 - Summary
 - TODO
@@ -294,6 +315,7 @@ files:
 - lib/rainbows/never_block.rb
 - lib/rainbows/never_block/core.rb
 - lib/rainbows/never_block/event_machine.rb
+- lib/rainbows/pool_size.rb
 - lib/rainbows/process_client.rb
 - lib/rainbows/queue_pool.rb
 - lib/rainbows/response.rb
@@ -327,6 +349,10 @@ files:
 - lib/rainbows/writer_thread_spawn/client.rb
 - lib/rainbows/xepoll.rb
 - lib/rainbows/xepoll/client.rb
+- lib/rainbows/xepoll_thread_pool.rb
+- lib/rainbows/xepoll_thread_pool/client.rb
+- lib/rainbows/xepoll_thread_spawn.rb
+- lib/rainbows/xepoll_thread_spawn/client.rb
 - local.mk.sample
 - man/man1/rainbows.1
 - pkg.mk
@@ -348,6 +374,7 @@ files:
 - t/bin/unused_listen
 - t/bin/utee
 - t/byte-range-common.sh
+- t/client_header_buffer_size.ru
 - t/close-has-env.ru
 - t/close-pipe-response.ru
 - t/close-pipe-to_path-response.ru
@@ -388,6 +415,8 @@ files:
 - t/simple-http_WriterThreadPool.ru
 - t/simple-http_WriterThreadSpawn.ru
 - t/simple-http_XEpoll.ru
+- t/simple-http_XEpollThreadPool.ru
+- t/simple-http_XEpollThreadSpawn.ru
 - t/sleep.ru
 - t/t0000-simple-http.sh
 - t/t0000.ru
@@ -419,6 +448,8 @@ files:
 - t/t0023-sendfile-byte-range.sh
 - t/t0024-pipelined-sendfile-response.sh
 - t/t0025-write-on-close.sh
+- t/t0026-splice-copy_stream-byte-range.sh
+- t/t0027-nil-copy_stream.sh
 - t/t0030-fast-pipe-response.sh
 - t/t0031-close-pipe-response.sh
 - t/t0032-close-pipe-to_path-response.sh
@@ -426,6 +457,7 @@ files:
 - t/t0035-kgio-pipe-response.sh
 - t/t0040-keepalive_requests-setting.sh
 - t/t0041-optional-pool-size.sh
+- t/t0042-client_header_buffer_size.sh
 - t/t0050-response-body-close-has-env.sh
 - t/t0100-rack-input-hammer-chunked.sh
 - t/t0100-rack-input-hammer-content-length.sh
@@ -468,7 +500,6 @@ files:
 - t/worker-follows-master-to-death.ru
 - t/write-on-close.ru
 - vs_Unicorn
-has_rdoc: true
 homepage: http://rainbows.rubyforge.org/
 licenses: []
 
@@ -501,7 +532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.6.1
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: "- Unicorn for sleepy apps and slow clients"