rainbows 0.93.0 → 0.94.0

data/.document

@@ -11,3 +11,4 @@ TODO
 TUNING
 vs_Unicorn
 Summary
+Test_Suite

data/.gitignore

@@ -16,4 +16,3 @@ pkg/
 /.manifest
 /GIT-VERSION-FILE
 /man
-/tmp

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.93.0.GIT
+DEF_VER=v0.94.0.GIT
 
 LF='
 '

data/GNUmakefile

@@ -2,8 +2,8 @@
 all::
 RUBY = ruby
 RAKE = rake
+RSYNC = rsync
 GIT_URL = git://git.bogomips.org/rainbows.git
-ISOLATE_CONFIG = config/isolate.rb
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -16,12 +16,6 @@ ifeq ($(RUBY_VERSION),)
   RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 endif
 
-# rake takes forever to start
-isolate: tmp/isolate/ruby-$(RUBY_VERSION)/.isolate
-tmp/isolate/ruby-$(RUBY_VERSION)/.isolate: $(ISOLATE_CONFIG)
-	ISOLATE_CONFIG=$(ISOLATE_CONFIG) $(RAKE) isolate
-	> $@
-
 base_bins := rainbows
 bins := $(addprefix bin/, $(base_bins))
 man1_rdoc := $(addsuffix _1, $(base_bins))
@@ -112,6 +106,19 @@ doc: .document NEWS ChangeLog
 	cat Documentation/comparison.css >> doc/rdoc.css
 	$(RM) $(man1_rdoc)
 
+# publishes docs to http://rainbows.rubyforge.org
+publish_doc: NEWS
+	-git set-file-times
+	$(RM) -r doc ChangeLog NEWS
+	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
+	awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' \
+	 < NEWS > doc/LATEST
+	-find doc/images doc/js -type f | \
+		TZ=UTC xargs touch -d '1970-01-01 00:00:01' doc/rdoc.css
+	chmod 644 $$(find doc -type f)
+	$(RSYNC) -av doc/ rubyforge.org:/var/www/gforge-projects/rainbows/
+	git ls-files | xargs touch
+
 ifneq ($(VERSION),)
 rfproject := rainbows
 rfpackage := rainbows
@@ -172,6 +179,8 @@ release: verify package $(release_notes) $(release_changes)
 	# in case of gem downloads from RubyForge releases page
 	-rubyforge add_file \
 	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+	$(RAKE) raa_update VERSION=$(VERSION)
+	$(RAKE) fm_update VERSION=$(VERSION)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)

data/Rakefile

@@ -183,24 +183,3 @@ task :fm_update do
     p http.post(uri.path, req, {'Content-Type'=>'application/json'})
   end
 end
-
-desc 'isolate gems for development'
-task :isolate do
-  require 'isolate'
-  require 'rbconfig'
-
-  Isolate.now! :file => ENV['ISOLATE_CONFIG'], :system => false
-
-  # for Ruby 1.8 isolate uses "1.8" instead of "1.8.7" for paths,
-  # but we'll still try to support 1.8.6 for now even though isolate
-  # does not.
-  if Gem.ruby_engine == "ruby" &&
-     RbConfig::CONFIG["ruby_version"] != RUBY_VERSION
-    require 'fileutils'
-    Dir.chdir('tmp/isolate') do
-      FileUtils.rm_rf("ruby-#{RUBY_VERSION}")
-      File.symlink "ruby-#{RbConfig::CONFIG["ruby_version"]}",
-                   "ruby-#{RUBY_VERSION}"
-    end
-  end
-end

data/Test_Suite

@@ -0,0 +1,63 @@
+= \Rainbows! test suite - YES OUR TEST SUITE IS CONCURRENT!
+
+These are all integration tests that start the server on random, unused
+TCP ports or Unix domain sockets.  They're all designed to run
+concurrently with other tests to minimize test time, but tests may be
+run independently as well.
+
+We write our tests primarily in Bourne shell because that's what we're
+comfortable writing integration tests with.  This test suite is also
+easily portable to non-Ruby web servers.
+
+== Requirements
+
+* {Ruby 1.8 or 1.9}[http://www.ruby-lang.org/] (duh!)
+* {isolate ~> 2.0.2}[http://github.com/jbarnette/isolate] - for dependencies
+* {GNU make}[http://www.gnu.org/software/make/]
+* {socat}[http://www.dest-unreach.org/socat/]
+* {curl >= 7.18.0}[http://curl.haxx.se/]
+* standard UNIX shell utilities (Bourne sh, awk, sed, grep, ...)
+
+We do not use bashisms or any non-portable, non-POSIX constructs
+in our shell code.  We use the "pipefail" option if available and
+mainly test with {ksh}[http://kornshell.com/], but occasionally
+with {dash}[http://gondor.apana.org.au/~herbert/dash/] and
+{bash}[http://www.gnu.org/software/bash/], too.
+
+== Running Tests
+
+*BSD users: use "gmake" instead of "make"
+
+To run the entire test suite with 8 tests running at once:
+
+  make -j8
+
+To run one individual test for all concurrency models:
+
+  make t0000-simple-http.sh
+
+To run one individual test for one concurrency model:
+
+  make Revactor.t0000-simple-http.sh
+
+To run all tests for one concurrency model:
+
+  make EventMachine
+
+You may also increase verbosity by setting the "V" variable for
+GNU make.  To disable trapping of stdout/stderr:
+
+  make V=1
+
+To enable the "set -x" option in shell scripts to trace execution
+
+  make V=2
+
+== Performance
+
+Some of the tests are rather I/O intensive due to the rewindability
+requirement of "rack.input" in the Rack specification and the somewhat
+complicated (but awesome!) nature of the TeeInput class leading us to
+test it very heavily.  If you have lots of RAM and a large tmpfs
+partition, it is advisable to set your TMPDIR and also make the t/trash/
+directory a symlink to a directory inside in your TMPDIR.

data/lib/rainbows.rb

@@ -32,6 +32,7 @@ module Rainbows
   require 'rainbows/http_response'
   require 'rainbows/base'
   require 'rainbows/tee_input'
+  autoload :Sendfile, 'rainbows/sendfile'
   autoload :AppPool, 'rainbows/app_pool'
   autoload :DevFdResponse, 'rainbows/dev_fd_response'
   autoload :MaxBody, 'rainbows/max_body'

data/lib/rainbows/const.rb

@@ -3,7 +3,7 @@
 module Rainbows
 
   module Const
-    RAINBOWS_VERSION = '0.93.0'
+    RAINBOWS_VERSION = '0.94.0'
 
     include Unicorn::Const
 

data/lib/rainbows/sendfile.rb

@@ -0,0 +1,100 @@
+# -*- encoding: binary -*-
+module Rainbows
+
+# This middleware handles X-\Sendfile headers generated by applications
+# or middlewares down the stack.  It should be placed at the top
+# (outermost layer) of the middleware stack to avoid having its
+# +to_path+ method clobbered by another middleware.
+#
+# This converts X-\Sendfile responses to bodies which respond to the
+# +to_path+ method which allows certain concurrency models to serve
+# efficiently using sendfile() or similar.  With multithreaded models
+# under Ruby 1.9, IO.copy_stream will be used.
+#
+# This middleware is the opposite of Rack::Contrib::Sendfile as it
+# reverses the effect of Rack::Contrib::Sendfile.  Unlike many Ruby
+# web servers, some configurations of \Rainbows! are capable of
+# serving static files efficiently.
+#
+# === Compatibility (via IO.copy_stream in Ruby 1.9):
+# * ThreadSpawn
+# * ThreadPool
+# * WriterThreadPool
+# * WriterThreadSpawn
+#
+# === Compatibility (Ruby 1.8 and 1.9)
+# * EventMachine
+# * NeverBlock (using EventMachine)
+#
+# DO NOT use this middleware if you're proxying to \Rainbows! with a
+# server that understands X-\Sendfile (e.g. Apache, Lighttpd) natively.
+#
+# This does NOT understand X-Accel-Redirect headers intended for nginx.
+# X-Accel-Redirect requires the application to be highly coupled with
+# the corresponding nginx configuration, and is thus too complicated to
+# be worth supporting.
+#
+# Example config.ru:
+#
+#    use Rainbows::Sendfile
+#    run lambda { |env|
+#      path = "#{Dir.pwd}/random_blob"
+#      [ 200,
+#        {
+#          'X-Sendfile' => path,
+#          'Content-Type' => 'application/octet-stream'
+#        },
+#        []
+#      ]
+#    }
+
+class Sendfile < Struct.new(:app)
+
+  # :stopdoc:
+  HH = Rack::Utils::HeaderHash
+  # :startdoc:
+
+  # Body wrapper, this allows us to fall back gracefully to
+  # +each+ in case a given concurrency model does not optimize
+  # +to_path+ calls.
+  class Body < Struct.new(:to_io)
+
+    def initialize(path, headers)
+      # Rainbows! will try #to_io if #to_path exists to avoid unnecessary
+      # open() calls.
+      self.to_io = File.open(path, 'rb')
+
+      unless headers['Content-Length']
+        stat = to_io.stat
+        headers['Content-Length'] = stat.size.to_s if stat.file?
+      end
+    end
+
+    def to_path
+      to_io.path
+    end
+
+    # fallback in case our +to_path+ doesn't get handled for whatever reason
+    def each(&block)
+      buf = ''
+      while to_io.read(0x4000, buf)
+        yield buf
+      end
+    end
+
+    def close
+      to_io.close
+    end
+  end
+
+  def call(env)
+    status, headers, body = app.call(env)
+    headers = HH.new(headers)
+    if path = headers.delete('X-Sendfile')
+      body = Body.new(path, headers) unless body.respond_to?(:to_path)
+    end
+    [ status, headers, body ]
+  end
+end
+
+end

data/lib/rainbows/writer_thread_pool.rb

@@ -46,13 +46,8 @@ module Rainbows
       end
     end
 
-    alias base_write_body write_body
-    if IO.respond_to?(:copy_stream)
-      undef_method :write_body
-
-      def write_body(qclient, body)
-        qclient.q << [ qclient.to_io, :body, body ]
-      end
+    def write_body(qclient, body)
+      qclient.q << [ qclient.to_io, :body, body ]
     end
 
     @@nr = 0
@@ -71,7 +66,7 @@ module Rainbows
           begin
             io, arg1, arg2 = response
             case arg1
-            when :body then base_write_body(io, arg2)
+            when :body then Base.write_body(io, arg2)
             when :close then io.close unless io.closed?
             else
               io.write(arg1)

data/lib/rainbows/writer_thread_spawn.rb

@@ -88,12 +88,8 @@ module Rainbows
       end
     end
 
-    if IO.respond_to?(:copy_stream)
-      undef_method :write_body
-
-      def write_body(my_sock, body)
-        my_sock.write_body(body)
-      end
+    def write_body(my_sock, body)
+      my_sock.write_body(body)
     end
 
     def process_client(client)

data/local.mk.sample

@@ -4,37 +4,32 @@
 #
 # This is depends on a bunch of GNU-isms from bash, sed, touch.
 
-RSYNC = rsync
 DLEXT := so
 
+# if you have a decent amount of RAM, setting TMPDIR to be on tmpfs
+# can significantly improve performance because uploads take a lot
+# of disk I/O due to the rewindability requirement in Rack.
+# TMPDIR := /dev/shm
+# export TMPDIR
+
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 prefix = $(HOME)
 
-ifeq ($(r19),)
-  RUBY := $(prefix)/bin/ruby
+ifeq ($(r192),)
+  ifeq ($(r19),)
+    RUBY := $(prefix)/bin/ruby
+  else
+    prefix := $(prefix)/ruby-1.9
+    export PATH := $(prefix)/bin:$(PATH)
+    RUBY := $(prefix)/bin/ruby --disable-gems
+  endif
 else
-  prefix := $(prefix)/ruby-1.9
+  prefix := $(prefix)/ruby-1.9.2
   export PATH := $(prefix)/bin:$(PATH)
   RUBY := $(prefix)/bin/ruby --disable-gems
 endif
 
-ifndef NO_ISOLATE
-  x := $(shell test -d t/ && \
-         PATH=$(PATH) NO_ISOLATE=T $(MAKE) -s isolate RUBY:="$(RUBY)")
-endif
-
-RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
-
-updir := $(shell git rev-parse --show-cdup)
-gem_paths := $(wildcard $(updir)tmp/isolate/ruby-$(RUBY_VERSION)/gems/*-*)
-
-ifdef gem_paths
-  sp :=
-  sp +=
-  export RUBYLIB := $(subst $(sp),:,$(addsuffix /lib,$(gem_paths)))
-endif
-
 # pipefail is THE reason to use bash (v3+) or never revisions of ksh93
 # SHELL := /bin/bash -e -o pipefail
 SHELL := /bin/ksh93 -e -o pipefail
@@ -43,37 +38,10 @@ SHELL := /bin/ksh93 -e -o pipefail
 # TRACER = strace -f -o $(t_pfx).strace -s 100000
 TRACER = /usr/bin/time -v -o $(t_pfx).time
 
-full-test: test-18 test-19
+full-test: test-18 test-191 test-192
 test-18:
 	$(MAKE) test 2>&1 | sed -e 's!^!1.8 !'
-test-19:
-	$(MAKE) test r19=T 2>&1 | sed -e 's!^!1.9 !'
-
-latest: NEWS
-	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' < $<
-
-# publishes docs to http://rainbows.rubyforge.org
-publish_doc:
-	-git set-file-times
-	$(RM) -r doc ChangeLog NEWS
-	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
-	$(MAKE) -s latest > doc/LATEST
-	find doc/images doc/js -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
-	$(MAKE) doc_gz
-	chmod 644 $$(find doc -type f)
-	$(RSYNC) -av doc/ rubyforge.org:/var/www/gforge-projects/rainbows/
-	$(RSYNC) -av doc/ dcvr:/srv/rainbows/
-	git ls-files | xargs touch
-
-# Create gzip variants of the same timestamp as the original so nginx
-# "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
-doc_gz:
-	touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"
-	for i in $(docs); do \
-	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
-
-# launches any of the following shells with RUBYLIB set
-irb sh bash ksh:
-	$@
+test-191:
+	$(MAKE) test r19=T 2>&1 | sed -e 's!^!1.9.1 !'
+test-192:
+	$(MAKE) test r192=T 2>&1 | sed -e 's!^!1.9.2 !'

data/rainbows.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
   # The HTTP parser in Unicorn <= 0.97.0 was vulnerable to a remote DoS
   # when exposed directly to untrusted clients.
   s.add_dependency(%q<unicorn>, [">= 0.97.1", "< 2.0.0"])
+  s.add_development_dependency(%q<isolate>, "~> 2.0.2")
 
   # Unicorn already depends on Rack
   # s.add_dependency(%q<rack>)

data/t/.gitignore

@@ -3,3 +3,4 @@
 /random_blob
 /.dep+*
 /trash
+/tmp

data/t/GNUmakefile

@@ -15,12 +15,7 @@ ifeq ($(RUBY_VERSION),)
   $(error unable to detect RUBY_VERSION)
 endif
 
-ifeq ($(RUBYLIB),)
-  RUBYLIB := $(rainbows_lib)
-else
-  RUBYLIB := $(rainbows_lib):$(RUBYLIB)
-endif
-export RUBYLIB RUBY_VERSION
+export RUBY_VERSION
 
 models += WriterThreadPool
 models += WriterThreadSpawn
@@ -99,15 +94,22 @@ $(deps):
 	@test -s $@.$(pid) || \
 	  { echo >&2 "E '$(dep_bin)' not found in PATH=$(PATH)"; exit 1; }
 	@mv $@.$(pid) $@
-dep: $(deps)
+
+libs := tmp/isolate/ruby-$(RUBY_VERSION)/.libs
+$(libs): test_isolate.rb
+	mkdir -p $(@D)
+	$(RUBY) $< > $@+
+	mv $@+ $@
+t_deps := $(libs) $(deps) test-bin-$(RUBY_VERSION)/rainbows trash/.gitignore
+$(T): $(t_deps)
 
 $(MODEL_T): export model = $(firstword $(subst ., ,$@))
 $(MODEL_T): script = $(subst $(model).,,$@)
-$(MODEL_T): trash/.gitignore
 $(MODEL_T): export RUBY := $(RUBY)
 $(MODEL_T): export PATH := $(CURDIR)/test-bin-$(RUBY_VERSION):$(PATH)
-$(MODEL_T): test-bin-$(RUBY_VERSION)/rainbows dep
-	$(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS)
+$(MODEL_T): $(t_deps)
+	RUBYLIB=$(rainbows_lib):$$(cat $(libs)) \
+	   $(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS)
 
 trash/.gitignore:
 	mkdir -p $(@D)

data/t/README

@@ -1,19 +1,21 @@
-= Rainbows! test suite
+= \Rainbows! test suite - YES OUR TEST SUITE IS CONCURRENT!
 
 These are all integration tests that start the server on random, unused
 TCP ports or Unix domain sockets.  They're all designed to run
 concurrently with other tests to minimize test time, but tests may be
 run independently as well.
 
-We write our tests in Bourne shell because that's what we're
-comfortable writing integration tests with.
+We write our tests primarily in Bourne shell because that's what we're
+comfortable writing integration tests with.  This test suite is also
+easily portable to non-Ruby web servers.
 
 == Requirements
 
 * {Ruby 1.8 or 1.9}[http://www.ruby-lang.org/] (duh!)
+* {isolate ~> 2.0.2}[http://github.com/jbarnette/isolate] - for dependencies
 * {GNU make}[http://www.gnu.org/software/make/]
 * {socat}[http://www.dest-unreach.org/socat/]
-* {curl}[http://curl.haxx.se/]
+* {curl >= 7.18.0}[http://curl.haxx.se/]
 * standard UNIX shell utilities (Bourne sh, awk, sed, grep, ...)
 
 We do not use bashisms or any non-portable, non-POSIX constructs
@@ -24,6 +26,8 @@ with {dash}[http://gondor.apana.org.au/~herbert/dash/] and
 
 == Running Tests
 
+*BSD users: use "gmake" instead of "make"
+
 To run the entire test suite with 8 tests running at once:
 
   make -j8
@@ -36,6 +40,10 @@ To run one individual test for one concurrency model:
 
   make Revactor.t0000-simple-http.sh
 
+To run all tests for one concurrency model:
+
+  make EventMachine
+
 You may also increase verbosity by setting the "V" variable for
 GNU make.  To disable trapping of stdout/stderr:
 
@@ -44,3 +52,12 @@ GNU make.  To disable trapping of stdout/stderr:
 To enable the "set -x" option in shell scripts to trace execution
 
   make V=2
+
+== Performance
+
+Some of the tests are rather I/O intensive due to the rewindability
+requirement of "rack.input" in the Rack specification and the somewhat
+complicated (but awesome!) nature of the TeeInput class leading us to
+test it very heavily.  If you have lots of RAM and a large tmpfs
+partition, it is advisable to set your TMPDIR and also make the t/trash/
+directory a symlink to a directory inside in your TMPDIR.

data/t/t0005-large-file-response.sh

@@ -18,7 +18,8 @@ t_begin "setup and startup" && {
 	rainbows_wait_start
 }
 
-t_begin "read random blob size" && {
+t_begin "read random blob sha1 and size" && {
+	random_blob_sha1=$(rsha1 < random_blob)
 	random_blob_size=$(wc -c < random_blob)
 }
 
@@ -32,18 +33,18 @@ t_begin "read current RSS" && {
 t_begin "send a series HTTP/1.1 requests sequentially" && {
 	for i in a b c
 	do
-		size=$( (curl -sSfv http://$listen/random_blob &&
-			 echo ok >$ok) |wc -c)
-		test $size -eq $random_blob_size
+		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" && {
-	size=$( (curl -0 -sSfv http://$listen/random_blob &&
-	         echo ok >$ok) |wc -c)
-	test $size -eq $random_blob_size
+	sha1=$( (curl -0 -sSfv http://$listen/random_blob &&
+	         echo ok >$ok) | rsha1)
+	test $sha1 = $random_blob_sha1
 	test xok = x$(cat $ok)
 }
 
@@ -54,7 +55,7 @@ t_begin "HTTP/0.9 test" && {
 		wait
 		echo ok > $ok
 	) | socat - TCP:$listen > $fifo
-	test $(cat $tmp) = $(rsha1 < random_blob)
+	test $(cat $tmp) = $random_blob_sha1
 	test xok = x$(cat $ok)
 }
 

data/t/t0300-async_sinatra.sh

@@ -1,5 +1,11 @@
 #!/bin/sh
 . ./test-lib.sh
+case $RUBY_VERSION in
+1.9.2)
+	t_info "RUBY_VERSION=$RUBY_VERSION not supported with async_sinatra"
+	exit 0
+	;;
+esac
 
 # n - number of seconds to sleep
 n=10

data/t/t9001-sendfile-to-path.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+. ./test-lib.sh
+
+t_plan 7 "Sendfile middleware test for $model"
+
+t_begin "configure and start" && {
+	rtmpfiles curl_out curl_err
+	rainbows_setup
+
+	# do not allow default middleware to be loaded since it may
+	# kill body#to_path
+	rainbows -E none -D t9001.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "hit with curl" && {
+	curl -sSfv http://$listen/ > $curl_out 2> $curl_err
+}
+
+t_begin "kill server" && {
+	kill $rainbows_pid
+}
+
+t_begin "file matches source" && {
+	cmp $curl_out random_blob
+}
+
+t_begin "no errors in Rainbows! stderr" && {
+	check_stderr
+}
+
+t_begin "X-Sendfile does not show up in headers" && {
+	dbgcat curl_err
+	if grep -i x-sendfile $curl_err
+	then
+		die "X-Sendfile did show up!"
+	fi
+}
+
+t_begin "Content-Length is set correctly in headers" && {
+	expect=$(wc -c < random_blob)
+	grep "^< Content-Length: $expect" $curl_err
+}
+
+t_done

data/t/t9001.ru

@@ -0,0 +1,11 @@
+use Rainbows::Sendfile
+run lambda { |env|
+  path = "#{Dir.pwd}/random_blob"
+  [ 200,
+    {
+      'X-Sendfile' => path,
+      'Content-Type' => 'application/octet-stream'
+    },
+    []
+  ]
+}

data/t/test-lib.sh

@@ -3,6 +3,12 @@
 . ./my-tap-lib.sh
 
 set +u
+
+# sometimes we rely on http_proxy to avoid wasting bandwidth with Isolate
+# and multiple Ruby versions
+NO_PROXY=${UNICORN_TEST_ADDR-127.0.0.1}
+export NO_PROXY
+
 if test -z "$model"
 then
 	# defaulting to Base would unfortunately fail some concurrency tests
@@ -21,16 +27,6 @@ export PATH
 
 test -x $PWD/bin/unused_listen || die "must be run in 't' directory"
 
-wait_for_pid () {
-	path="$1"
-	nr=30
-	while ! test -s "$path" && test $nr -gt 0
-	do
-		nr=$(($nr - 1))
-		sleep 1
-	done
-}
-
 # requires $1 and prints out the value of $2
 require_check () {
 	lib=$1

data/t/test_isolate.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'isolate'
+
+path = "tmp/isolate/ruby-#{RUBY_VERSION}"
+opts = {
+  :system => false,
+  # we want "ruby-1.8.7" and not "ruby-1.8", so disable multiruby
+  :multiruby => false,
+  :path => path,
+}
+
+old_out = $stdout.dup
+$stdout.reopen($stderr)
+
+Isolate.now!(opts) do
+  gem 'rack', '1.1.0'
+  gem 'unicorn', '0.99.0'
+
+  gem 'iobuffer', '0.1.3'
+  gem 'rev', '0.3.2'
+
+  gem 'eventmachine', '0.12.10'
+
+  gem 'sinatra', '0.9.4'
+  gem 'async_sinatra', '0.1.5'
+
+  gem 'neverblock', '0.1.6.2'
+
+  if defined?(::Fiber)
+    gem 'case', '0.5'
+    gem 'revactor', '0.1.5'
+    gem 'rack-fiber_pool', '0.9.0'
+  end
+
+  gem 'cramp', '0.11'
+end
+
+$stdout.reopen(old_out)
+puts Dir["#{path}/gems/*-*/lib"].map { |x| File.expand_path(x) }.join(':')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  version: 0.93.0
+  version: 0.94.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 +00:00
+date: 2010-06-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: isolate
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
 description: |-
   \Rainbows! is an HTTP server for sleepy Rack applications.  It is based on
   Unicorn, but designed to handle applications that expect long
@@ -73,6 +83,7 @@ extra_rdoc_files:
 - lib/rainbows/rev_thread_pool.rb
 - lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
+- lib/rainbows/sendfile.rb
 - lib/rainbows/tee_input.rb
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
@@ -86,6 +97,7 @@ extra_rdoc_files:
 - TUNING
 - vs_Unicorn
 - Summary
+- Test_Suite
 files: 
 - .document
 - .gitignore
@@ -110,9 +122,8 @@ files:
 - Summary
 - TODO
 - TUNING
+- Test_Suite
 - bin/rainbows
-- config/.gitignore
-- config/isolate.rb
 - lib/rainbows.rb
 - lib/rainbows/actor_spawn.rb
 - lib/rainbows/app_pool.rb
@@ -146,6 +157,7 @@ files:
 - lib/rainbows/rev_thread_pool.rb
 - lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
+- lib/rainbows/sendfile.rb
 - lib/rainbows/tee_input.rb
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
@@ -231,7 +243,10 @@ files:
 - t/t0700-app-deferred.sh
 - t/t9000-rack-app-pool.sh
 - t/t9000.ru
+- t/t9001-sendfile-to-path.sh
+- t/t9001.ru
 - t/test-lib.sh
+- t/test_isolate.rb
 - t/worker-follows-master-to-death.ru
 - vs_Unicorn
 has_rdoc: true

data/config/.gitignore

@@ -1 +0,0 @@
-/isolate_*.rb

data/config/isolate.rb

@@ -1,25 +0,0 @@
-# this the default config file used by John Barnette's isolate gem
-# you can create a config/isolate_local.rb file to override this
-# See the corresponding tasks in Rakefile and GNUmakefile
-# `rake isolate' or (faster in the unmodified case, `make isolate')
-
-gem 'rack', '1.1.0'
-gem 'unicorn', '0.99.0'
-
-gem 'iobuffer', '0.1.3'
-gem 'rev', '0.3.2'
-
-gem 'eventmachine', '0.12.10'
-
-gem 'sinatra', '0.9.4'
-gem 'async_sinatra', '0.1.5'
-
-gem 'neverblock', '0.1.6.2'
-
-if defined?(::Fiber)
-  gem 'case', '0.5'
-  gem 'revactor', '0.1.5'
-  gem 'rack-fiber_pool', '0.9.0'
-end
-
-gem 'cramp', '0.11'