rainbows 0.5.0 → 0.6.0

data/t/t0100-rack-input-hammer.sh

@@ -2,6 +2,11 @@ nr_client=${nr_client-4}
 . ./test-lib.sh
 test -r random_blob || die "random_blob required, run with 'make $0'"
 
+# basically we don't trust our own implementation of content-md5-put
+# nor our Ruby 1.9 knowledge nor proper use of encodings in Ruby.
+# So we try to use things like curl and sha1sum that are implemented
+# without the Ruby interpreter to validate our own Ruby internals.
+
 t_plan 7 "concurrent rack.input hammer stress test"
 
 t_begin "setup and startup" && {
@@ -35,7 +40,7 @@ t_begin "all responses identical" && {
 }
 
 t_begin "sha1 matches on-disk sha1" && {
-	blob_sha1=$( expr "$(sha1sum < random_blob)" : '\([a-f0-9]\{40\}\)')
+	blob_sha1=$(rsha1 < random_blob)
 	t_info blob_sha1=$blob_sha1
 	test x"$blob_sha1" = x"$(sort < $curl_out | uniq)"
 }

data/t/t0102-rack-input-short.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+. ./test-lib.sh
+test -r random_blob || die "random_blob required, run with 'make $0'"
+
+t_plan 4 "rack.input short read tests"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out curl_err
+	rainbows_setup $model
+	rainbows -D sha1-random-size.ru -c $unicorn_config
+        blob_sha1=$(rsha1 random_blob)
+        t_info "blob_sha1=$blob_sha1"
+	rainbows_wait_start
+}
+
+t_begin "regular request" && {
+	curl -sSf -T random_blob http://$listen/ > $curl_out 2> $curl_err
+        test x$blob_sha1 = x$(cat $curl_out)
+        test ! -s $curl_err
+}
+
+t_begin "chunked request" && {
+	curl -sSf -T- < random_blob http://$listen/ > $curl_out 2> $curl_err
+        test x$blob_sha1 = x$(cat $curl_out)
+        test ! -s $curl_err
+}
+
+t_begin "shutdown" && {
+	kill $rainbows_pid
+}
+
+t_done

data/t/t9000-rack-app-pool.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 . ./test-lib.sh
 case $model in
-Thread*) ;;
+*Thread*) ;;
 *)
 	t_info "skipping $T since it's not compatible with $model"
 	exit 0

data/t/test-lib.sh

@@ -110,7 +110,7 @@ before_fork do |server, worker|
   # so notify the script on the first worker we spawn
   # by opening the FIFO
   if worker.nr == 0
-    File.open("$fifo", "wb").close
+    File.open("$fifo", "wb") { |fp| fp.syswrite "START" }
   end
 end
 EOF
@@ -130,10 +130,20 @@ EOF
 rainbows_wait_start () {
 	# "cat $fifo" will block until the before_fork hook is called in
 	# the Unicorn config file
-	test x = x"$(cat $fifo)"
+	test xSTART = x"$(cat $fifo)"
 	rainbows_pid=$(cat $pid)
 }
 
+rsha1 () {
+	_cmd="$(which sha1sum 2>/dev/null || :)"
+	test -n "$_cmd" || _cmd="$(which openssl 2>/dev/null || :) sha1"
+	test "$_cmd" != " sha1" || _cmd="$(which gsha1sum 2>/dev/null || :)"
+
+	# last resort, see comments in sha1sum.rb for reasoning
+	test -n "$_cmd" || _cmd=sha1sum.rb
+	expr "$($_cmd < random_blob)" : '\([a-f0-9]\{40\}\)'
+}
+
 case $model in
 Rev) require_check rev Rev::VERSION ;;
 Revactor) require_check revactor Revactor::VERSION ;;

data/t/worker-follows-master-to-death.ru

@@ -0,0 +1,17 @@
+use Rack::ContentLength
+headers = { 'Content-Type' => 'text/plain' }
+run lambda { |env|
+  /\A100-continue\z/i =~ env['HTTP_EXPECT'] and return [ 100, {}, [] ]
+  env['rack.input'].read
+
+  case env["PATH_INFO"]
+  when %r{/sleep/(\d+)}
+    (case env['rainbows.model']
+    when :Revactor
+      Actor
+    else
+      Kernel
+    end).sleep($1.to_i)
+  end
+  [ 200, headers, [ "#$$\n" ] ]
+}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
-- Rainbows! developers
+- Rainbows! hackers
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -08:00
+date: 2009-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.94.0
+        version: 0.95.0
     version: 
 description: |-
   Rainbows! is a HTTP server for sleepy Rack applications.  It is based on
@@ -43,11 +43,16 @@ extra_rdoc_files:
 - lib/rainbows/const.rb
 - lib/rainbows/dev_fd_response.rb
 - lib/rainbows/ev_core.rb
+- lib/rainbows/ev_thread_core.rb
 - lib/rainbows/event_machine.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
 - lib/rainbows/rev.rb
+- lib/rainbows/rev/client.rb
+- lib/rainbows/rev/core.rb
+- lib/rainbows/rev/deferred_response.rb
 - lib/rainbows/rev/heartbeat.rb
+- lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
 - lib/rainbows/revactor/tee_input.rb
 - lib/rainbows/thread_pool.rb
@@ -87,11 +92,16 @@ files:
 - lib/rainbows/const.rb
 - lib/rainbows/dev_fd_response.rb
 - lib/rainbows/ev_core.rb
+- lib/rainbows/ev_thread_core.rb
 - lib/rainbows/event_machine.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
 - lib/rainbows/rev.rb
+- lib/rainbows/rev/client.rb
+- lib/rainbows/rev/core.rb
+- lib/rainbows/rev/deferred_response.rb
 - lib/rainbows/rev/heartbeat.rb
+- lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
 - lib/rainbows/revactor/tee_input.rb
 - lib/rainbows/thread_pool.rb
@@ -107,6 +117,7 @@ files:
 - t/async-response.ru
 - t/async_sinatra.ru
 - t/bin/content-md5-put
+- t/bin/sha1sum.rb
 - t/bin/unused_listen
 - t/bin/utee
 - t/content-md5.ru
@@ -115,10 +126,12 @@ files:
 - t/heartbeat-timeout.ru
 - t/large-file-response.ru
 - t/my-tap-lib.sh
+- t/sha1-random-size.ru
 - t/sha1.ru
 - t/simple-http_Base.ru
 - t/simple-http_EventMachine.ru
 - t/simple-http_Rev.ru
+- t/simple-http_RevThreadSpawn.ru
 - t/simple-http_Revactor.ru
 - t/simple-http_ThreadPool.ru
 - t/simple-http_ThreadSpawn.ru
@@ -132,14 +145,18 @@ files:
 - t/t0004-heartbeat-timeout.sh
 - t/t0005-large-file-response.sh
 - t/t0006-process-rack-env.sh
+- t/t0007-worker-follows-master-to-death.sh
+- t/t0008-ensure-usable-after-limit.sh
 - t/t0100-rack-input-hammer.sh
 - t/t0101-rack-input-trailer.sh
+- t/t0102-rack-input-short.sh
 - t/t0200-async-response.sh
 - t/t0201-async-response-no-autochunk.sh
 - t/t0300-async_sinatra.sh
 - t/t9000-rack-app-pool.sh
 - t/t9000.ru
 - t/test-lib.sh
+- t/worker-follows-master-to-death.ru
 - vs_Unicorn
 has_rdoc: true
 homepage: http://rainbows.rubyforge.org/