rainbows 0.1.0 → 0.1.1

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -153,4 +153,8 @@ gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)
 endif
 
-.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man
+all:: test
+test:
+	$(MAKE) -C t
+
+.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test

data/LICENSE

@@ -1,5 +1,5 @@
-\Rainbows! is copyrighted free software by Eric Wong
-(mailto:normalperson@yhbt.net) and contributors. You can redistribute it
+\Rainbows! is copyrighted Free Software by all contributors, see the
+logs in revision control for all of them.  You can redistribute it
 and/or modify it under either the terms of the
 {GPL2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING) or
 the conditions below:

data/README

@@ -1,11 +1,10 @@
-= Rainbows! Unicorn for slow apps and slow clients
+= Rainbows! Unicorn for sleepy apps and slow clients
 
-\Rainbows! is a HTTP server for {Rack}[http://rack.rubyforge.org/]
-applications.  It is based on {Unicorn}[http://unicorn.bogomips.org/],
-but designed to handle applications that expect long request/response
-times and/or slow clients.  For Rack applications not heavily bound by
-slow external dependencies, consider Unicorn instead as it simpler and
-easier to debug.
+Rainbows! is a HTTP server for sleepy Rack applications.  It is based on
+Unicorn, but designed to handle applications that expect long
+request/response times and/or slow clients.  For Rack applications not
+heavily bound by slow external network dependencies, consider Unicorn
+instead as it simpler and easier to debug.
 
 == \Rainbows! is about Diversity
 
@@ -24,9 +23,11 @@ CPU/memory/disk concurrency.
 
 == Features
 
-* Designed for Rack, the standard for modern Ruby HTTP applications.
+* Designed for {Rack}[http://rack.rubyforge.org/], the standard for
+  modern Ruby HTTP applications.
 
-* Built on Unicorn, inheriting its process/socket management features
+* Built on {Unicorn}[http://unicorn.bogomips.org/], inheriting its
+  process/socket management features
   such as transparent upgrades and Ruby configuration DSL.
 
 * As with Unicorn, it is able to stream large request bodies off the
@@ -55,8 +56,8 @@ CPU/memory/disk concurrency.
 
 == License
 
-\Rainbows! is copyright 2009 Eric Wong and contributors.  It is based on
-Mongrel and Unicorn and carries the same license.
+\Rainbows! is copyright 2009 by all contributors (see logs in git).
+It is based on Mongrel and Unicorn and carries the same license.
 
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed
 under the Ruby license and the GPL2. See the included LICENSE file for
@@ -64,6 +65,17 @@ details.
 
 \Rainbows! is 100% Free Software.
 
+== Install
+
+You may download the tarball from the Rainbows project page on Rubyforge
+and run setup.rb after unpacking it:
+
+http://rubyforge.org/frs/?group_id=8977
+
+You may also install it via Rubygems on Rubyforge:
+
+  gem install rainbows
+
 == Usage
 
 === for Rack applications

data/Rakefile

@@ -33,7 +33,7 @@ task :news_atom do
     feed :xmlns => "http://www.w3.org/2005/Atom" do
       id! "http://rainbows.rubyforge.org/NEWS.atom.xml"
       title "Rainbows! news"
-      subtitle "Unicorn for slow apps and slow clients"
+      subtitle "Unicorn for sleepy apps and slow clients"
       link! :rel => 'alternate', :type => 'text/html',
             :href => 'http://rainbows.rubyforge.org/NEWS.html'
       updated(new_tags.empty? ? "1970-01-01T00:00:00Z" : new_tags.first[:time])
@@ -64,7 +64,7 @@ task :news_rdoc do
     puts ""
 
     body = tag[:body]
-    puts tag[:body].gsub(/^/sm, "  ").gsub!(/[ \t]+$/sm, "")
+    puts tag[:body].gsub(/^/sm, "  ").gsub(/[ \t]+$/sm, "")
     puts ""
   end
 end
@@ -101,3 +101,19 @@ task :release_notes do
   print "\nChanges:\n\n"
   puts body
 end
+
+desc "read news article from STDIN and post to rubyforge"
+task :publish_news do
+  require 'rubyforge'
+  IO.select([STDIN], nil, nil, 1) or abort "E: news must be read from stdin"
+  msg = STDIN.readlines
+  subject = msg.shift
+  blank = msg.shift
+  blank == "\n" or abort "no newline after subject!"
+  subject.strip!
+  body = msg.join("").strip!
+
+  rf = RubyForge.new.configure
+  rf.login
+  rf.post_news('rainbows', subject, body)
+end

data/lib/rainbows/base.rb

@@ -24,7 +24,8 @@ module Rainbows
       env = {}
       remote_addr = TCPSocket === client ? client.peeraddr.last : LOCALHOST
 
-      begin
+      begin # loop
+        Thread.current[:t] = Time.now
         while ! hp.headers(env, buf)
           buf << client.readpartial(CHUNK_SIZE)
         end
@@ -60,9 +61,7 @@ module Rainbows
     end
 
     def self.included(klass)
-      HttpServer.constants.each do |x|
-        klass.const_set(x, HttpServer.const_get(x))
-      end
+      klass.const_set :LISTENERS, HttpServer::LISTENERS
     end
 
   end

data/lib/rainbows/const.rb

@@ -3,7 +3,7 @@
 module Rainbows
 
   module Const
-    RAINBOWS_VERSION = '0.1.0'
+    RAINBOWS_VERSION = '0.1.1'
 
     include Unicorn::Const
 

data/lib/rainbows/thread_pool.rb

@@ -26,11 +26,11 @@ module Rainbows
 
       # closing anything we IO.select on will raise EBADF
       trap(:USR1) { reopen_worker_logs(worker.nr) rescue nil }
-      trap(:QUIT) { alive = false; LISTENERS.map! { |s| s.close rescue nil } }
+      trap(:QUIT) { LISTENERS.map! { |s| s.close rescue nil } }
       [:TERM, :INT].each { |sig| trap(sig) { exit(0) } } # instant shutdown
       logger.info "worker=#{worker.nr} ready with ThreadPool"
 
-      while alive && master_pid == Process.ppid
+      while LISTENERS.first && master_pid == Process.ppid
         maintain_thread_count(threads)
         threads.list.each do |thr|
           alive.chmod(nr += 1)
@@ -65,11 +65,9 @@ module Rainbows
 
     def new_worker_thread
       Thread.new {
-        alive = true
-        thr = Thread.current
         begin
           ret = begin
-            thr[:t] = Time.now
+            Thread.current[:t] = Time.now
             IO.select(LISTENERS, nil, nil, timeout/2.0) or next
           rescue Errno::EINTR
             retry
@@ -79,16 +77,15 @@ module Rainbows
           ret.first.each do |sock|
             begin
               process_client(sock.accept_nonblock)
-              thr[:t] = Time.now
             rescue Errno::EAGAIN, Errno::ECONNABORTED
             end
           end
         rescue Object => e
-          if alive
+          if LISTENERS.first
             logger.error "Unhandled listen loop exception #{e.inspect}."
             logger.error e.backtrace.join("\n")
           end
-        end while alive = LISTENERS.first
+        end while LISTENERS.first
       }
     end
 

data/lib/rainbows/thread_spawn.rb

@@ -22,12 +22,13 @@ module Rainbows
 
       # closing anything we IO.select on will raise EBADF
       trap(:USR1) { reopen_worker_logs(worker.nr) rescue nil }
-      trap(:QUIT) { alive = false; LISTENERS.map! { |s| s.close rescue nil } }
+      trap(:QUIT) { LISTENERS.map! { |s| s.close rescue nil } }
       [:TERM, :INT].each { |sig| trap(sig) { exit(0) } } # instant shutdown
       logger.info "worker=#{worker.nr} ready with ThreadSpawn"
 
       while alive && master_pid == Process.ppid
         ret = begin
+          alive.chmod(nr += 1)
           IO.select(LISTENERS, nil, nil, timeout/2.0) or next
         rescue Errno::EINTR
           retry
@@ -44,10 +45,7 @@ module Rainbows
           rescue Errno::EINTR, Errno::ECONNABORTED
             next
           end
-          threads.add(Thread.new(c) { |c|
-            Thread.current[:t] = Time.now
-            process_client(c)
-          })
+          threads.add(Thread.new(c) { |c| process_client(c) })
         end
       end
       join_spawned_threads(threads)

data/local.mk.sample

@@ -5,17 +5,24 @@
 # This is depends on a bunch of GNU-isms from bash, sed, touch.
 
 DLEXT := so
-rack_ver := 1.0.0
+gems := rev-0.3.0 rack-1.0.0 iobuffer-0.1.1
 
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 ifeq ($(r19),)
   ruby := $(HOME)/bin/ruby
-  RUBYLIB := $(HOME)/lib/ruby/gems/1.8/gems/rack-$(rack_ver)/lib
+  gem_paths := $(addprefix $(HOME)/lib/ruby/gems/1.8/gems/,$(gems))
 else
   export PATH := $(HOME)/ruby-1.9/bin:$(PATH)
   ruby := $(HOME)/ruby-1.9/bin/ruby --disable-gems
-  RUBYLIB := $(HOME)/ruby-1.9/lib/ruby/gems/1.9.1/gems/rack-$(rack_ver)/lib
+  gems := $(gems) case-0.5 revactor-0.1.4
+  gem_paths := $(addprefix $(HOME)/ruby-1.9/lib/ruby/gems/1.9.1/gems/,$(gems))
+endif
+
+ifdef gem_paths
+  sp :=
+  sp +=
+  RUBYLIB := $(subst $(sp),:,$(addsuffix /lib,$(gem_paths)))
 endif
 
 # pipefail is THE reason to use bash (v3+)
@@ -23,9 +30,9 @@ SHELL := /bin/bash -e -o pipefail
 
 full-test: test-18 test-19
 test-18:
-	$(MAKE) test test-rails 2>&1 | sed -u -e 's!^!1.8 !'
+	$(MAKE) test 2>&1 | sed -u -e 's!^!1.8 !'
 test-19:
-	$(MAKE) test test-rails r19=1 2>&1 | sed -u -e 's!^!1.9 !'
+	$(MAKE) test r19=t 2>&1 | sed -u -e 's!^!1.9 !'
 
 latest: NEWS
 	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' < $<

data/rainbows.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.name = %q{rainbows}
   s.version = ENV["VERSION"]
 
-  s.authors = ["Eric Wong"]
+  s.authors = ["Rainbows! developers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = File.read("README").split(/\n\n/)[1]
   s.email = %q{rainbows-talk@rubyforge.org}
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
 
   s.files = manifest
   s.homepage = %q{http://rainbows.rubyforge.org/}
-  s.summary = %q{Unicorn for slow apps and slow clients}
+  s.summary = %q{Unicorn for sleepy apps and slow clients}
   s.rdoc_options = [ "-Na", "-t", "Rainbows! #{s.summary}" ]
   s.require_paths = %w(lib)
   s.rubyforge_project = %q{rainbows}

data/t/GNUmakefile

@@ -37,6 +37,9 @@ ifndef V
   quiet_post = > $(t_log) 2>&1; exit $$(cat $(t_code))
   pfx =
 else
+  ifeq ($(V),2)
+    TEST_OPTS += -x
+  endif
   quiet_pre = @echo '* $@';
   quiet_post = 2>&1 | tee $(t_log); exit $$(cat $(t_code))
   pfx = $@
@@ -50,7 +53,7 @@ test-bin-$(RUBY_VERSION)/rainbows: ../bin/rainbows
 	mkdir -p $(@D)
 	install -m 755 $^ $@+
 	$(ruby) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $@+
-	cmp $@+ $@ || mv $@+ $@
+	cmp $@+ $@ 2>/dev/null || mv $@+ $@
 	$(RM) $@+
 
 $(T): export ruby := $(ruby)

data/t/t0000-basic.sh

@@ -2,17 +2,10 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $lock_path"
+pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
+TEST_RM_LIST="$TEST_RM_LIST $lock_path $pid"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env| [ 200, {}, [ env.inspect << "\n" ] ] }
-EOF
-
-rainbows $config_ru -l $listen --pid $pid &
+rainbows t0000.ru -l $listen --pid $pid &
 wait_for_pid $pid
 curl -sSfv http://$listen/
 kill $(cat $pid)

data/t/t0000.ru

@@ -0,0 +1,3 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env| [ 200, {}, [ env.inspect << "\n" ] ] }

data/t/t1000-thread-pool-basic.sh

@@ -2,23 +2,13 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-unicorn_config=$(mktemp -t rainbows.$$.XXXXXXXX.unicorn.rb)
-curl_out=$(mktemp -t rainbows.$$.XXXXXXXX.curl.out)
-curl_err=$(mktemp -t rainbows.$$.XXXXXXXX.curl.err)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $unicorn_config $lock_path"
+unicorn_config=$(mktemp -t rainbows.$$.unicorn.rb.XXXXXXXX)
+curl_out=$(mktemp -t rainbows.$$.curl.out.XXXXXXXX)
+curl_err=$(mktemp -t rainbows.$$.curl.err.XXXXXXXX)
+pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
+TEST_RM_LIST="$TEST_RM_LIST $unicorn_config $lock_path $pid"
 TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env|
-  sleep 1
-  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
-}
-EOF
-
 nr_client=30
 nr_thread=10
 
@@ -31,7 +21,7 @@ Rainbows! do
 end
 EOF
 
-rainbows -D $config_ru -c $unicorn_config
+rainbows -D t1000.ru -c $unicorn_config
 wait_for_pid $pid
 
 start=$(date +%s)

data/t/t1000.ru

@@ -0,0 +1,6 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  sleep 1
+  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+}

data/t/t2000-thread-spawn-basic.sh

@@ -2,23 +2,13 @@
 . ./test-lib.sh
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-unicorn_config=$(mktemp -t rainbows.$$.XXXXXXXX.unicorn.rb)
-curl_out=$(mktemp -t rainbows.$$.XXXXXXXX.curl.out)
-curl_err=$(mktemp -t rainbows.$$.XXXXXXXX.curl.err)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $unicorn_config $lock_path"
+unicorn_config=$(mktemp -t rainbows.$$.unicorn.rb.XXXXXXXX)
+curl_out=$(mktemp -t rainbows.$$.curl.out.XXXXXXXX)
+curl_err=$(mktemp -t rainbows.$$.curl.err.XXXXXXXX)
+pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
+TEST_RM_LIST="$TEST_RM_LIST $unicorn_config $lock_path $pid"
 TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env|
-  sleep 1
-  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
-}
-EOF
-
 nr_client=30
 nr_thread=10
 
@@ -31,7 +21,7 @@ Rainbows! do
 end
 EOF
 
-rainbows -D $config_ru -c $unicorn_config
+rainbows -D t2000.ru -c $unicorn_config
 wait_for_pid $pid
 
 start=$(date +%s)

data/t/t2000.ru

@@ -0,0 +1,6 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  sleep 1
+  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+}

data/t/t3000-revactor-basic.sh

@@ -3,23 +3,13 @@
 require_revactor
 
 eval $(unused_listen)
-config_ru=$(mktemp -t rainbows.$$.XXXXXXXX.config.ru)
-unicorn_config=$(mktemp -t rainbows.$$.XXXXXXXX.unicorn.rb)
-curl_out=$(mktemp -t rainbows.$$.XXXXXXXX.curl.out)
-curl_err=$(mktemp -t rainbows.$$.XXXXXXXX.curl.err)
-pid=$(mktemp -t rainbows.$$.XXXXXXXX.pid)
-TEST_RM_LIST="$TEST_RM_LIST $config_ru $unicorn_config $lock_path"
+unicorn_config=$(mktemp -t rainbows.$$.unicorn.rb.XXXXXXXX)
+curl_out=$(mktemp -t rainbows.$$.curl.out.XXXXXXXX)
+curl_err=$(mktemp -t rainbows.$$.curl.err.XXXXXXXX)
+pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
+TEST_RM_LIST="$TEST_RM_LIST $pid $unicorn_config $lock_path"
 TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err"
 
-cat > $config_ru <<\EOF
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env|
-  Actor.sleep 1
-  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
-}
-EOF
-
 nr_client=30
 nr_actor=10
 
@@ -32,7 +22,7 @@ Rainbows! do
 end
 EOF
 
-rainbows -D $config_ru -c $unicorn_config
+rainbows -D t3000.ru -c $unicorn_config
 wait_for_pid $pid
 
 start=$(date +%s)

data/t/t3000.ru

@@ -0,0 +1,6 @@
+use Rack::ContentLength
+use Rack::ContentType
+run lambda { |env|
+  Actor.sleep 1
+  [ 200, {}, [ Thread.current.inspect << "\n" ] ]
+}

data/t/t3100-revactor-tee-input.sh

@@ -14,7 +14,7 @@ r_out=$(mktemp -t rainbows.$$.r.out.XXXXXXXX)
 pid=$(mktemp -t rainbows.$$.pid.XXXXXXXX)
 blob=$(mktemp -t rainbows.$$.blob.XXXXXXXX)
 TEST_RM_LIST="$TEST_RM_LIST $unicorn_config $lock_path $r_err $r_out"
-TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err $blob"
+TEST_RM_LIST="$TEST_RM_LIST $curl_out $curl_err $blob $pid"
 
 cat > $unicorn_config <<EOF
 listen "$listen"

data/t/test-lib.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2009 Eric Wong
+# Copyright (c) 2009 Rainbows! developers
 set -e
 set -u
 T=$(basename $0)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
-- Eric Wong
+- Rainbows! developers
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -07:00
+date: 2009-10-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.93.1
     version: 
-description: \Rainbows! is a HTTP server for {Rack}[http://rack.rubyforge.org/] applications.  It is based on {Unicorn}[http://unicorn.bogomips.org/], but designed to handle applications that expect long request/response times and/or slow clients.  For Rack applications not heavily bound by slow external dependencies, consider Unicorn instead as it simpler and easier to debug.
+description: |-
+  Rainbows! is a HTTP server for sleepy Rack applications.  It is based on
+  Unicorn, but designed to handle applications that expect long
+  request/response times and/or slow clients.  For Rack applications not
+  heavily bound by slow external network dependencies, consider Unicorn
+  instead as it simpler and easier to debug.
 email: rainbows-talk@rubyforge.org
 executables: 
 - rainbows
@@ -97,19 +102,25 @@ files:
 - t/bin/unused_listen
 - t/sha1.ru
 - t/t0000-basic.sh
+- t/t0000.ru
 - t/t1000-thread-pool-basic.sh
+- t/t1000.ru
 - t/t2000-thread-spawn-basic.sh
+- t/t2000.ru
 - t/t3000-revactor-basic.sh
+- t/t3000.ru
 - t/t3100-revactor-tee-input.sh
 - t/test-lib.sh
 - vs_Unicorn
-has_rdoc: false
+has_rdoc: true
 homepage: http://rainbows.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - -Na
 - -t
-- Rainbows! Unicorn for slow apps and slow clients
+- Rainbows! Unicorn for sleepy apps and slow clients
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -127,9 +138,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Unicorn for slow apps and slow clients
+specification_version: 3
+summary: Unicorn for sleepy apps and slow clients
 test_files: []