rainbows 3.0.0 → 3.1.0

data/.wrongdoc.yml

@@ -1,6 +1,6 @@
 ---
-cgit_url: http://git.bogomips.org/cgit/rainbows.git
-git_url: git://git.bogomips.org/rainbows.git
+cgit_url: http://bogomips.org/rainbows.git
+git_url: git://bogomips.org/rainbows.git
 rdoc_url: http://rainbows.rubyforge.org/
 changelog_start: v0.97.0
 merge_html:

data/Documentation/comparison.haml

@@ -278,14 +278,14 @@
     %td.app_pool Yes
     %td.lock No!
     %td.async Revactor itself
-    %td.ws Sunshowers
+    %td.ws no
   %tr.comp_row
     %td.mod ThreadPool
     %td.devfd Yes
     %td.app_pool Yes
     %td.lock Yes
     %td.async standard Ruby
-    %td.ws Sunshowers
+    %td.ws no
   %tr.comp_row
     %td.mod Coolio
     %td.devfd Yes
@@ -299,7 +299,7 @@
     %td.app_pool Yes
     %td.lock Yes
     %td.async standard Ruby
-    %td.ws Sunshowers
+    %td.ws no
   %tr.comp_row
     %td.mod EventMachine
     %td.devfd Yes
@@ -320,21 +320,21 @@
     %td.app_pool Yes
     %td.lock No!
     %td.async Rainbows::Fiber::IO, Rainbows.sleep
-    %td.ws Sunshowers
+    %td.ws no
   %tr.comp_row
     %td.mod FiberPool
     %td.devfd Yes
     %td.app_pool Yes
     %td.lock No!
     %td.async Rainbows::Fiber::IO, Rainbows.sleep
-    %td.ws Sunshowers
+    %td.ws no
   %tr.comp_row
     %td.mod ActorSpawn
     %td.devfd no-op
     %td.app_pool Yes
     %td.lock Yes
     %td.async standard Ruby
-    %td.ws Sunshowers
+    %td.ws no
   %tr.comp_row
     %td.mod NeverBlock
     %td.devfd Yes

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,18 +1,20 @@
 # use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
-MRI = ruby
-RUBY = ruby
-RAKE = rake
-RSYNC = rsync
+RSYNC_DEST := rubyforge.org:/var/www/gforge-projects/rainbows
+rfproject := rainbows
+rfpackage := rainbows
 
-GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
-	@./GIT-VERSION-GEN
--include GIT-VERSION-FILE
--include local.mk
-ifeq ($(RUBY_VERSION),)
-  RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
+man-rdoc: man html
+	$(MAKE) -C Documentation comparison.html
+	for i in $(man1_rdoc); do echo > $$i; done
+doc:: man-rdoc
+include pkg.mk
+ifneq ($(VERSION),)
+release::
+	$(RAKE) raa_update VERSION=$(VERSION)
+	$(RAKE) publish_news VERSION=$(VERSION)
+	$(RAKE) fm_update VERSION=$(VERSION)
 endif
-RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 
 base_bins := rainbows
 bins := $(addprefix bin/, $(base_bins))
@@ -20,134 +22,20 @@ man1_rdoc := $(addsuffix _1, $(base_bins))
 man1_bins := $(addsuffix .1, $(base_bins))
 man1_paths := $(addprefix man/man1/, $(man1_bins))
 
-install: $(bins)
-	$(prep_setup_rb)
-	$(RM) -r .install-tmp
-	mkdir .install-tmp
-	cp -p bin/* .install-tmp
-	$(RUBY) setup.rb all
-	$(RM) $^
-	mv .install-tmp/* bin/
-	$(RM) -r .install-tmp
-	$(prep_setup_rb)
-
-setup_rb_files := .config InstalledFiles
-prep_setup_rb := @-$(RM) $(setup_rb_files);$(MAKE) -C $(ext) clean
-
 clean:
-	-$(MAKE) -C $(ext) clean
 	-$(MAKE) -C Documentation clean
-	$(RM) $(setup_rb_files) $(t_log)
 
 man html:
 	$(MAKE) -C Documentation install-$@
 
-pkg_extra := GIT-VERSION-FILE ChangeLog LATEST NEWS $(man1_paths)
-
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	wrongdoc prepare
-
-manifest: ChangeLog GIT-VERSION-FILE
-	$(RM) -f .manifest
-	$(MAKE) .manifest
-
-.manifest:
-	(git ls-files && for i in $@ $(pkg_extra) ; do echo $$i; done) | \
-	  LC_ALL=C sort > $@+
-	cmp $@+ $@ || mv $@+ $@
-	$(RM) $@+
+pkg_extra += $(man1_paths)
 
-doc: .document man html .wrongdoc.yml
-	$(MAKE) -C Documentation comparison.html
-	for i in $(man1_rdoc); do echo > $$i; done
-	find bin lib -type f -name '*.rbc' -exec rm -f '{}' ';'
-	$(RM) -r doc
-	wrongdoc all
-	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
-	install -m644 $(man1_paths) doc/
+doc::
 	cat Documentation/comparison.css >> doc/rdoc.css
 	$(RM) $(man1_rdoc)
 
-publish_doc:
-	-git set-file-times
-	$(MAKE) doc
-	-find doc/images -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:02' 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
-pkggem := pkg/$(rfpackage)-$(VERSION).gem
-pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-	wrongdoc release_changes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(release_notes):
-	wrongdoc release_notes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-
-# ensures we're actually on the tagged $(VERSION), only used for release
-verify:
-	test x"$(shell umask)" = x0022
-	git rev-parse --verify refs/tags/v$(VERSION)^{}
-	git diff-index --quiet HEAD^0
-	test `git rev-parse --verify HEAD^0` = \
-	     `git rev-parse --verify refs/tags/v$(VERSION)^{}`
-
-fix-perms:
-	-git ls-tree -r HEAD | awk '/^100644 / {print $$NF}' | xargs chmod 644
-	-git ls-tree -r HEAD | awk '/^100755 / {print $$NF}' | xargs chmod 755
-
-gem: $(pkggem)
-
-install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
-
-$(pkggem): manifest fix-perms
-	gem build $(rfpackage).gemspec
-	mkdir -p pkg
-	mv $(@F) $@
-
-$(pkgtgz): distdir = $(basename $@)
-$(pkgtgz): HEAD = v$(VERSION)
-$(pkgtgz): manifest fix-perms
-	@test -n "$(distdir)"
-	$(RM) -r $(distdir)
-	mkdir -p $(distdir)
-	tar cf - $$(cat .manifest) | (cd $(distdir) && tar xf -)
-	cd pkg && tar cf - $(basename $(@F)) | gzip -9 > $(@F)+
-	mv $@+ $@
-
-package: $(pkgtgz) $(pkggem)
-
-release: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	# push gem to RubyGems.org
-	gem push $(pkggem)
-	# 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)
-	$(RAKE) publish_news VERSION=$(VERSION)
-else
-gem install-gem: GIT-VERSION-FILE
-	$(MAKE) $@ VERSION=$(GIT_VERSION)
-endif
-
 all:: test
 test:
 	$(MAKE) -C t
 
-.PHONY: .FORCE-GIT-VERSION-FILE doc manifest man test html
+.PHONY: man html

data/README

@@ -69,7 +69,6 @@ network concurrency.
 
 \Rainbows! is mainly designed for the odd things Unicorn sucks at:
 
-* Web Sockets (via {Sunshowers}[http://rainbows.rubyforge.org/sunshowers/])
 * 3rd-party APIs (to services outside your control/LAN)
 * OpenID consumers (to providers outside your control/LAN)
 * Reverse proxy implementations with editing/censoring
@@ -142,13 +141,13 @@ for more details.
 You can get the latest source via git from the following locations
 (these versions may not be stable):
 
-  git://git.bogomips.org/rainbows.git
+  git://bogomips.org/rainbows.git
   git://repo.or.cz/rainbows.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
-* http://git.bogomips.org/cgit/rainbows.git (cgit)
+* http://bogomips.org/rainbows.git (cgit)
 * http://repo.or.cz/w/rainbows.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are

data/Rakefile

@@ -1,10 +1,10 @@
 # -*- encoding: binary -*-
 autoload :Gem, 'rubygems'
 autoload :Tempfile, 'tempfile'
+require 'wrongdoc'
 
-# most tasks are in the GNUmakefile which offers better parallelism
-cgit_url = "http://git.bogomips.org/cgit/rainbows.git"
-git_url = 'git://git.bogomips.org/rainbows.git'
+cgit_url = Wrongdoc.config[:cgit_url]
+git_url = Wrongdoc.config[:git_url]
 
 desc "read news article from STDIN and post to rubyforge"
 task :publish_news do

data/examples/reverse_proxy.ru

@@ -0,0 +1,9 @@
+# see Rainbows::ReverseProxy RDoc
+cfg = {
+  :upstreams => [
+    "/tmp/.r.sock",
+    "http://bogomips.org/",
+    [ "http://10.6.6.6:666/", { :weight => 666 } ],
+  ]
+}
+run Rainbows::ReverseProxy.new(cfg)

data/lib/rainbows.rb

@@ -9,12 +9,15 @@ Unicorn::SocketHelper::DEFAULTS.merge!({
   # write(headers)-write(body)-read
   # because we always write headers and bodies with two calls
   :tcp_nodelay => true,
+
+  # we always want to send our headers out ASAP since Rainbows!
+  # is designed for apps that could trickle out the body slowly
+  :tcp_nopush => false,
 })
 
 module Rainbows
 
   O = {} # :nodoc:
-  class Response416 < RangeError; end
 
   # map of numeric file descriptors to IO objects to avoid using IO.new
   # and potentially causing race conditions when using /dev/fd/
@@ -26,7 +29,6 @@ module Rainbows
   require 'rainbows/const'
   require 'rainbows/http_parser'
   require 'rainbows/http_server'
-  autoload :RackInput, 'rainbows/rack_input'
   autoload :Response, 'rainbows/response'
   autoload :ProcessClient, 'rainbows/process_client'
   autoload :Client, 'rainbows/client'
@@ -96,10 +98,12 @@ module Rainbows
   end
 
   def self.quit!
-    @alive = false
-    Rainbows::HttpParser.quit
-    @expire ||= Time.now + (@server.timeout * 2.0)
-    @server.class.const_get(:LISTENERS).map! { |s| s.close rescue nil }
+    unless @expire
+      @alive = false
+      Rainbows::HttpParser.quit
+      @expire = Time.now + (@server.timeout * 2.0)
+      @server.class.const_get(:LISTENERS).map! { |s| s.close rescue nil }.clear
+    end
     false
   end
 
@@ -121,6 +125,8 @@ module Rainbows
     :CoolioThreadSpawn => 50,
     :CoolioThreadPool => 50,
     :CoolioFiberSpawn => 50,
+    :Epoll => 50,
+    :XEpoll => 50,
     :EventMachine => 50,
     :FiberSpawn => 50,
     :FiberPool => 50,
@@ -137,6 +143,8 @@ module Rainbows
   autoload :ThreadTimeout, 'rainbows/thread_timeout'
   autoload :WorkerYield, 'rainbows/worker_yield'
   autoload :SyncClose, 'rainbows/sync_close'
+  autoload :ReverseProxy, 'rainbows/reverse_proxy'
+  autoload :JoinThreads, 'rainbows/join_threads'
 end
 
 require 'rainbows/error'

data/lib/rainbows/base.rb

@@ -13,7 +13,6 @@ module Rainbows::Base
     super(worker)
     Rainbows::Response.setup(self.class)
     Rainbows::MaxBody.setup
-    Rainbows::RackInput.setup
     Rainbows.tick_io = worker.tmp
 
     listeners = Rainbows::HttpServer::LISTENERS

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '3.0.0'
+  RAINBOWS_VERSION = '3.1.0'
 
   include Unicorn::Const
 
@@ -14,15 +14,6 @@ module Rainbows::Const
     # "rainbows.autochunk" => false,
   })
 
-  # client IO object that supports reading and writing directly
-  # without filtering it through the HTTP chunk parser.
-  # Maybe we can get this renamed to "rack.io" if it becomes part
-  # of the official spec, but for now it is "hack.io"
-  CLIENT_IO = "hack.io".freeze
-
-  ERROR_413_RESPONSE = "HTTP/1.1 413 Request Entity Too Large\r\n\r\n"
-  ERROR_416_RESPONSE = "HTTP/1.1 416 Requested Range Not Satisfiable\r\n\r\n"
-
   RACK_INPUT = Unicorn::HttpRequest::RACK_INPUT
   REMOTE_ADDR = Unicorn::HttpRequest::REMOTE_ADDR
 end

data/lib/rainbows/coolio/client.rb

@@ -2,6 +2,7 @@
 # :enddoc:
 class Rainbows::Coolio::Client < Coolio::IO
   include Rainbows::EvCore
+  APP = Rainbows.server.app
   CONN = Rainbows::Coolio::CONN
   KATO = Rainbows::Coolio::KATO
   LOOP = Coolio::Loop.default
@@ -44,7 +45,7 @@ class Rainbows::Coolio::Client < Coolio::IO
   end
 
   def on_readable
-    buf = @_io.kgio_tryread(16384)
+    buf = @_io.kgio_tryread(16384, RBUF)
     case buf
     when :wait_readable
     when nil # eof
@@ -105,10 +106,10 @@ class Rainbows::Coolio::Client < Coolio::IO
     @state = :headers
   end
 
-  def app_call
+  def app_call input
     KATO.delete(self)
     disable if enabled?
-    @env[RACK_INPUT] = @input
+    @env[RACK_INPUT] = input
     @env[REMOTE_ADDR] = @_io.kgio_addr
     @env[ASYNC_CALLBACK] = method(:write_async_response)
     status, headers, body = catch(:async) {
@@ -136,12 +137,15 @@ class Rainbows::Coolio::Client < Coolio::IO
       close if @_write_buffer.empty?
     when :headers
       if @buf.empty?
+        buf = @_io.kgio_tryread(16384, RBUF) or return close
+        String === buf and return on_read(buf)
+        # buf == :wait_readable
         unless enabled?
           enable
           KATO[self] = Time.now
         end
       else
-        on_read("")
+        on_read(Z)
       end
     end
     rescue => e

data/lib/rainbows/coolio/core.rb

@@ -7,14 +7,11 @@ module Rainbows::Coolio::Core
   # for connections and doesn't die until the parent dies (or is
   # given a INT, QUIT, or TERM signal)
   def worker_loop(worker)
-    Rainbows::Response.setup(Rainbows::Coolio::Client)
     init_worker_process(worker)
     mod = Rainbows.const_get(@use)
     rloop = Rainbows::Coolio::Server.const_set(:LOOP, Coolio::Loop.default)
     Rainbows::Coolio::Server.const_set(:MAX, @worker_connections)
     Rainbows::Coolio::Server.const_set(:CL, mod.const_get(:Client))
-    Rainbows::EvCore.const_set(:APP, Rainbows.server.app)
-    Rainbows::EvCore.setup
     Rainbows::Coolio::Heartbeat.new(1, true).attach(rloop)
     LISTENERS.map! { |s| Rainbows::Coolio::Server.new(s).attach(rloop) }
     rloop.run

data/lib/rainbows/coolio/thread_client.rb

@@ -5,10 +5,10 @@ RUBY_VERSION =~ %r{\A1\.8} and
   warn "Coolio and Threads do not mix well under Ruby 1.8"
 
 class Rainbows::Coolio::ThreadClient < Rainbows::Coolio::Client
-  def app_call
+  def app_call input
     KATO.delete(self)
     disable if enabled?
-    @env[RACK_INPUT] = @input
+    @env[RACK_INPUT] = input
     app_dispatch # must be implemented by subclass
   end