rainbows 4.6.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18b464dce48ebcb62061b4bc42c1863d36ae9640
-  data.tar.gz: fb5949f53907773edd0780220ff6cb4370eaa980
+  metadata.gz: 696829a7735d042f66084bbbf36e17658edd8a78
+  data.tar.gz: 8ca5eb73b0c23373c9ac41a23866506de6b6b649
 SHA512:
-  metadata.gz: 8edf76b627694e71e09a147a7ed493cfd8441075f850ea95365c967a7c078de4a75f34997d8abc36f318317016e76e71b369bcd297911f8ff1cdfc971a38470b
-  data.tar.gz: 0b4f40e1e1e3416aac356bca4886955ec72ecc31b8b73060314533603ca522781bd5c68443a06c00a68b73af350175dca893d33ee197e737e034163000bb9759
+  metadata.gz: cb200f3630bf46e0a3be33a6dcd132f3f555eb72cdfd65145781d2488ccbfa3fc8f7b35db3c3d5e9ab4aa8707ddd373b80efe5129b4a13e54df2483939bd4ad4
+  data.tar.gz: b08b512c0fc0f71f78efa8000cb150cbc7a5ece957b1f1a51bc7dda11e73f488d4f865752932b94b1b07fb66b93d08093fc8780620347a516b389af1964d46ad

data/.document

@@ -1,4 +1,3 @@
-ChangeLog
 DEPLOY
 FAQ
 lib/rainbows.rb

data/.gitignore

@@ -11,7 +11,7 @@
 log/
 pkg/
 /vendor
-/NEWS
+/NEWS*
 /ChangeLog
 /.manifest
 /GIT-VERSION-FILE
@@ -19,4 +19,6 @@ pkg/
 /LATEST
 tags
 TAGS
+/Summary
+/rainbows_1
 /lib/rainbows/version.rb

data/{.wrongdoc.yml → .olddoc.yml}

@@ -2,10 +2,17 @@
 cgit_url: http://bogomips.org/rainbows.git
 git_url: git://bogomips.org/rainbows.git
 rdoc_url: http://rainbows.bogomips.org/
-changelog_start: v0.97.0
 merge_html:
   rainbows_1: Documentation/rainbows.1.html
   Summary: Documentation/comparison.html
 public_email: rainbows-public@bogomips.org
 private_email: rainbows@bogomips.org
+noindex:
+- TODO
+- LATEST
+- Unicorn
+- Unicorn::Configurator
+- Unicorn::SocketHelper
+- EM
+- Revactor
 ml_url: http://bogomips.org/rainbows-public/

data/DEPLOY

@@ -13,26 +13,26 @@ processing of the request body as it is being uploaded.
 In this case, haproxy or any similar (non-request-body-buffering) load
 balancer should be used to balance requests between different machines.
 
-== nginx proxying to \Rainbows! or Unicorn
+== nginx proxying to \Rainbows! or unicorn
 
 For high-traffic applications, routing slow actions to \Rainbows! with
 nginx is recommended as nginx can serve static files faster and nginx
-can forward fast actions to Unicorn.
+can forward fast actions to unicorn.
 
           static files
             |
       nginx |--> slow actions --> Rainbows!
             |
-            `--> fast actions --> Unicorn
+            `--> fast actions --> unicorn
 
 Be sure to set <tt>proxy_buffering off</tt> in nginx for "slow actions"
-if you have Comet applications (but not for Unicorn).
+if you have Comet applications (but not for unicorn).
 
 == Denial-of-Service Concerns
 
 Since \Rainbows! is designed to talk to slow clients with long-held
 connections, it may be subject to brute force denial-of-service attacks.
-In Unicorn and Mongrel, we've already enabled the "httpready" accept
+In unicorn and Mongrel, we've already enabled the "httpready" accept
 filter for FreeBSD and the TCP_DEFER_ACCEPT option in Linux; but it is
 still possible to build clients that work around and fool these
 mechanisms.

data/FAQ

@@ -1,10 +1,10 @@
 = Frequently Asked Questions about \Rainbows!
 
-=== Why is \Rainbows! a separate project from Unicorn?
+=== Why is \Rainbows! a separate project from unicorn?
 
-\Rainbows! is for the odd, corner-case requests that Unicorn is poorly
+\Rainbows! is for the odd, corner-case requests that unicorn is poorly
 suited for.  More scalable concurrency models introduce additional
-complexity that Unicorn users and developers are uncomfortable with for
+complexity that unicorn users and developers are uncomfortable with for
 the common cases.
 
 
@@ -15,7 +15,7 @@ models, or are just too lazy to deal with them for the majority of
 requests we service.
 
 
-=== Isn't "rainbows" a branch of Unicorn?
+=== Isn't "rainbows" a branch of unicorn?
 
 That functionality is now in the Revactor model of \Rainbows!
 However, \Revactor is not recommended since it is dormant
@@ -23,7 +23,7 @@ upstream and requires your application (and all its libraries)
 to cooperate with \Revactor for concurrency.
 
 
-=== What happened to the "gossamer" branch of Unicorn?
+=== What happened to the "gossamer" branch of unicorn?
 
 It became the ThreadPool model of \Rainbows!
 
@@ -39,7 +39,7 @@ ease-of-debugging, compatibility, performance, and memory usage.
 === Should I put \Rainbows! behind nginx to serve slow clients?
 
 It is optional.  You can still use nginx to route certain requests to
-Unicorn and others to \Rainbows!  nginx will always outperform
+unicorn and others to \Rainbows!  nginx will always outperform
 \Rainbows! in both pure reverse proxy applications and for serving
 static files,  but \Rainbows! is for hosting applications that are more
 easily-implemented in Ruby than C.
@@ -64,7 +64,7 @@ requires a extra {patch}[http://haproxy.1wt.eu/download/patches/].
 If you don't need streaming "rack.input", then nginx is a great HTTPS
 reverse proxy.
 
-Refer to the {Unicorn FAQ}[http://unicorn.bogomips.org/FAQ.html] on how
+Refer to the {unicorn FAQ}[http://unicorn.bogomips.org/FAQ.html] on how
 to ensure redirects go to "https://" URLs.
 
 

data/GIT-VERSION-GEN

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-DEF_VER = "v4.6.2"
+DEF_VER = "v4.7.0"
 CONSTANT = "Rainbows::Const::RAINBOWS_VERSION"
 RVF = "lib/rainbows/version.rb"
 GVF = "GIT-VERSION-FILE"

data/GNUmakefile

@@ -2,23 +2,16 @@
 all::
 # RSYNC_DEST := rubyforge.org:/var/www/gforge-projects/rainbows
 RSYNC_DEST := rainbows.bogomips.org:/srv/rainbows
-rfproject := rainbows
 rfpackage := rainbows
+PLACEHOLDERS := rainbows_1 Summary
 
 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) publish_news VERSION=$(VERSION)
-	$(RAKE) fm_update VERSION=$(VERSION)
-endif
 
 base_bins := rainbows
 bins := $(addprefix bin/, $(base_bins))
-man1_rdoc := $(addsuffix _1, $(base_bins))
 man1_bins := $(addsuffix .1, $(base_bins))
 man1_paths := $(addprefix man/man1/, $(man1_bins))
 
@@ -30,10 +23,6 @@ man html:
 
 pkg_extra += $(man1_paths) lib/rainbows/version.rb
 
-doc::
-	cat Documentation/comparison.css >> doc/rdoc.css
-	$(RM) $(man1_rdoc)
-
 lib/rainbows/version.rb: GIT-VERSION-FILE
 
 all:: test

data/HACKING

@@ -6,10 +6,8 @@ All tests are written in POSIX shell.  See README file in the t/ directory.
 
 === Documentation
 
-We use RDoc 3.9.x with Darkfish for documentation as much as possible,
-if you're on Ruby 1.8 you want to install the latest "rdoc" gem.  Due to
-the lack of RDoc-to-manpage converters we know about, we're writing
-manpages in Markdown and converting to troff/HTML with Pandoc.
+Due to the lack of RDoc-to-manpage converters we know about, we're
+writing manpages in Markdown and converting to troff/HTML with Pandoc.
 
 Please wrap documentation at 72 characters-per-line or less (long URLs
 are exempt) so it is comfortably readable from terminals.
@@ -48,7 +46,7 @@ Please Cc: everyone on replies, as not everyone is subscribed.
 
 In order to build the gem, you must install the following components:
 
- * wrongdoc
+ * olddoc (RubyGem)
  * pandoc
 
 You can build the Unicorn gem with the following command:

data/README

@@ -1,11 +1,15 @@
-= Rainbows! - Unicorn for sleepy apps and slow clients
+= Rainbows! - unicorn for sleepy apps and slow clients
 
 \Rainbows! is an HTTP server for sleepy Rack applications.  It is based on
-Unicorn, but designed to handle applications that expect long
+unicorn, but designed to handle applications that expect long
 request/response times and/or slow clients.
 
+If you're on GNU/Linux and overwhelmed by options in \Rainbows!,
+consider {yahns}[http://yahns.yhbt.net/] as it has fewer options
+and more energy-efficient during non-peak traffic.
+
 For Rack applications not heavily bound by slow external network
-dependencies, consider Unicorn instead as it simpler and easier to
+dependencies, consider unicorn instead as it simpler and easier to
 debug.
 
 If you're on a small system, or write extremely tight and reliable code

data/SIGNALS

@@ -5,7 +5,7 @@ the signals Rainbows! uses internally to communicate with the worker
 processes are documented here as well.  With the exception of TTIN/TTOU,
 signal handling matches the behavior of and {nginx}[http://nginx.net/]
 so it should be possible to easily share process management scripts
-between \Rainbows!, Unicorn and nginx.
+between \Rainbows!, unicorn and nginx.
 
 === Master Process
 
@@ -60,7 +60,7 @@ automatically respawned.
 
 * USR1 - Reopen all logs owned by the worker process.
   See Unicorn::Util.reopen_logs for what is considered a log.
-  Unlike Unicorn, log files are reopened immediately in \Rainbows!
+  Unlike unicorn, log files are reopened immediately in \Rainbows!
   since worker processes are likely to be serving multiple clients
   simutaneously, we can't wait for all of them to finish.
 
@@ -68,7 +68,7 @@ automatically respawned.
 
 You may replace a running instance of rainbows with a new one without
 losing any incoming connections.  Doing so will reload all of your
-application code, Unicorn/Rainbows! config, Ruby executable, and all
+application code, unicorn/Rainbows! config, Ruby executable, and all
 libraries.  The only things that will not change (due to OS limitations)
 are:
 

data/Sandbox

@@ -1,6 +1,6 @@
 = Tips for using \Rainbows! with Sandbox installation tools
 
-Most {tips for Unicorn}[http://unicorn.bogomips.org/Sandbox.html]
+Most {tips for unicorn}[http://unicorn.bogomips.org/Sandbox.html]
 for Bundler and Isolate apply to \Rainbows! as well.
 
 == TLDR (Bundler)

data/Static_Files

@@ -10,7 +10,7 @@ to simplify your deployments and only deploy one server?
 == {sendfile}[http://rubygems.org/gems/sendfile] RubyGem
 
 To enable the "sendfile" gem, just make sure you have 1.1.0 or later and
-"require" it in your \Rainbows!/Unicorn config file (not your Rack
+"require" it in your \Rainbows!/unicorn config file (not your Rack
 config.ru):
 
     require 'sendfile' # that's it! nothing else to do

data/Summary

@@ -0,0 +1 @@
+olddoc_placeholder

data/Test_Suite

@@ -0,0 +1 @@
+t/README

data/lib/rainbows.rb

@@ -93,6 +93,9 @@ module Rainbows
       @readers.clear
       tmp.each { |s| s.close rescue nil }.clear
       @at_quit.each { |task| task.call }
+
+      # XXX hack to break out of IO.select in worker_loop for some models
+      Process.kill(:QUIT, $$)
     end
     false
   end

data/lib/rainbows/response.rb

@@ -128,8 +128,13 @@ module Rainbows::Response
     unless IO.method_defined?(:trysendfile)
       module CopyStream
         def write_body_file(body, range)
+          # ensure sendfile gets used for SyncClose objects:
+          if !body.kind_of?(IO) && body.respond_to?(:to_path)
+            body = body.to_path
+          end
+
           range ? COPY_STREAM.copy_stream(body, self, range[1], range[0]) :
-                  COPY_STREAM.copy_stream(body, self, nil, 0)
+                  COPY_STREAM.copy_stream(body, self)
         end
       end
       include CopyStream

data/lib/rainbows/sync_close.rb

@@ -31,7 +31,7 @@ class Rainbows::SyncClose
   # called by the writer thread to wake up the original thread (in #initialize)
   def close
     @body.close
-    ensure
-      @mutex.synchronize { @cv.signal }
+  ensure
+    @mutex.synchronize { @cv.signal }
   end
 end

data/pkg.mk

@@ -1,7 +1,8 @@
 RUBY = ruby
 RAKE = rake
 RSYNC = rsync
-WRONGDOC = wrongdoc
+OLDDOC = olddoc
+RDOC = rdoc
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -48,10 +49,10 @@ else
 build:
 endif
 
-pkg_extra += GIT-VERSION-FILE NEWS ChangeLog LATEST
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	$(WRONGDOC) prepare
-NEWS LATEST: ChangeLog
+pkg_extra += GIT-VERSION-FILE NEWS LATEST
+NEWS: GIT-VERSION-FILE .olddoc.yml
+	$(OLDDOC) prepare
+LATEST: NEWS
 
 manifest:
 	$(RM) .manifest
@@ -63,28 +64,20 @@ manifest:
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-doc:: .document .wrongdoc.yml $(pkg_extra)
+doc:: .document .olddoc.yml $(pkg_extra) $(PLACEHOLDERS)
 	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
 	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	$(WRONGDOC) all
+	$(RDOC) -f oldweb
+	$(OLDDOC) merge
 	install -m644 COPYING doc/COPYING
+	install -m644 NEWS doc/NEWS
+	install -m644 NEWS.atom.xml doc/NEWS.atom.xml
 	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 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:
@@ -120,23 +113,9 @@ $(pkgtgz): manifest fix-perms
 
 package: $(pkgtgz) $(pkggem)
 
-test-release:: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	@echo rubyforge add_release -f \
-	  -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	@echo gem push $(pkggem)
-	@echo rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(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)
+release:: verify package
 	# push gem to RubyGems.org
 	gem push $(pkggem)
-	# in case of gem downloads from RubyForge releases page
-	rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)
@@ -154,8 +133,6 @@ ifneq ($(RSYNC_DEST),)
 publish_doc:
 	-git set-file-times
 	$(MAKE) doc
-	find doc/images -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:06' doc/rdoc.css
 	$(MAKE) doc_gz
 	$(RSYNC) -av doc/ $(RSYNC_DEST)/
 	git ls-files | xargs touch
@@ -163,7 +140,7 @@ endif
 
 # 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: docs = $(shell find doc -type f ! -regex '^.*\.gz$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
@@ -171,5 +148,10 @@ check-warnings:
 	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
 	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
+ifneq ($(PLACEHOLDERS),)
+$(PLACEHOLDERS):
+	echo olddoc_placeholder > $@
+endif
+
 .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
 .PHONY: check-warnings

data/rainbows.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: binary -*-
 ENV["VERSION"] or abort "VERSION= must be specified"
 manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'wrongdoc'
-extend Wrongdoc::Gemspec
+require 'olddoc'
+extend Olddoc::Gemspec
 name, summary, title = readme_metadata
 
 Gem::Specification.new do |s|
@@ -10,16 +10,13 @@ Gem::Specification.new do |s|
   s.version = ENV["VERSION"].dup
 
   s.authors = ["#{name} hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
   s.email = %q{rainbows-public@bogomips.org}
   s.executables = %w(rainbows)
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest
-  s.homepage = Wrongdoc.config[:rdoc_url]
+  s.homepage = Olddoc.config['rdoc_url']
   s.summary = summary
-  s.rdoc_options = rdoc_options
-  s.rubyforge_project = %q{rainbows}
 
   # we want a newer Rack for a valid HeaderHash#each
   s.add_dependency(%q<rack>, ['~> 1.1'])
@@ -27,13 +24,13 @@ Gem::Specification.new do |s|
   # kgio 2.5 has kgio_wait_* methods that take optional timeout args
   s.add_dependency(%q<kgio>, ['~> 2.5'])
 
-  # we need Unicorn for the HTTP parser and process management
+  # we need unicorn for the HTTP parser and process management
   # we need unicorn 4.8.0+ since we depend on undocumented/unsupported
   # unicorn internals.
   s.add_dependency(%q<unicorn>, ["~> 4.8"])
 
   s.add_development_dependency(%q<isolate>, "~> 3.1")
-  s.add_development_dependency(%q<wrongdoc>, "~> 1.8")
+  s.add_development_dependency(%q<olddoc>, "~> 1.0")
 
   # optional runtime dependencies depending on configuration
   # see t/test_isolate.rb for the exact versions we've tested with
@@ -56,7 +53,11 @@ Gem::Specification.new do |s|
   # NeverBlock, currently only available on http://gems.github.com/
   # s.add_dependency(%q<espace-neverblock>, ["~> 0.1.6.1"])
 
-  # We inherited the Ruby 1.8 license from Mongrel, so we're stuck with it.
-  # GPLv3 is preferred.
-  s.licenses = ["GPLv2+", "Ruby 1.8"]
+  # Note: To avoid ambiguity, we intentionally avoid the SPDX-compatible
+  # 'Ruby' here since Ruby 1.9.3 switched to BSD-2-Clause license while
+  # we already inherited our license from Mongrel during Ruby 1.8.
+  # We cannot automatically switch licenses when Ruby changes their license,
+  # so we remain optionally-licensed under the terms of Ruby 1.8 despite
+  # not having a good way to specify this in an SPDX-compatible way...
+  s.licenses = ['GPL-2.0+', 'Nonstandard'] # Nonstandard = 'Ruby 1.8'
 end

data/t/GNUmakefile

@@ -29,7 +29,6 @@ models += WriterThreadPool
 models += WriterThreadSpawn
 models += ThreadPool
 models += ThreadSpawn
-models += Coolio
 
 models += StreamResponseEpoll
 
@@ -42,12 +41,16 @@ ifeq ($(RUBY_ENGINE),ruby)
     endif
     models += FiberSpawn
     models += FiberPool
-    models += CoolioThreadPool
-    models += CoolioThreadSpawn
-    models += CoolioFiberSpawn
 
-    models += EventMachine
-    models += NeverBlock
+    RUBY_LE_2_1 := $(shell $(RUBY) -e 'puts(RUBY_VERSION.to_f <= 2.1)')
+    ifeq ($(RUBY_LE_2_1), true)
+      models += Coolio
+      models += CoolioThreadPool
+      models += CoolioThreadSpawn
+      models += CoolioFiberSpawn
+      models += EventMachine
+      models += NeverBlock
+    endif
   endif
 endif
 

data/t/close-has-env.ru

@@ -10,6 +10,7 @@ class ClosablePipe < ::IO
   end
 
   def close
+    return if closed? # idempotent for Ruby 2.3.0 compatibility
     super
     $stdout.syswrite "path_info=#{@env['PATH_INFO']}\n"
   end

data/t/test_isolate.rb

@@ -16,32 +16,34 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.9.2'
-  gem 'rack', '1.5.2'
-  gem 'kcar', '0.4.0'
+  gem 'kgio', '2.10.0'
+  gem 'rack', '1.6.4'
+  gem 'kcar', '0.5.0'
   gem 'raindrops', '0.13.0'
-  gem 'unicorn', '4.8.3'
+  gem 'unicorn', '4.9.0'
 
   if engine == "ruby"
-    gem 'sendfile', '1.2.1'
-    gem 'cool.io', '1.1.0'
-
-    gem 'eventmachine', '1.0.3'
-    gem 'async_sinatra', '1.0.0'
-
-    gem 'neverblock', '0.1.6.2'
+    gem 'sendfile', '1.2.2'
+    gem 'eventmachine', '1.0.8'
+    gem 'async_sinatra', '1.2.0'
+    if RUBY_VERSION.to_f < 2.2
+      gem 'cool.io', '1.1.0'
+      gem 'neverblock', '0.1.6.2'
+    end
   end
 
   if defined?(::Fiber) && engine == "ruby"
-    gem 'revactor', '0.1.5'
-    gem 'rack-fiber_pool', '0.9.2'
+    if RUBY_VERSION.to_f < 2.2
+      gem 'revactor', '0.1.5'
+      gem 'rack-fiber_pool', '0.9.2' # depends on EM
+    end
   end
 
   if RUBY_PLATFORM =~ /linux/
-    gem 'sleepy_penguin', '3.3.0'
+    gem 'sleepy_penguin', '3.4.1'
 
     # is 2.6.32 new enough?
-    gem 'io_splice', '4.2.0' if `uname -r`.strip > '2.6.32'
+    gem 'io_splice', '4.4.0' if `uname -r`.strip > '2.6.32'
   end
 end
 

data/vs_Unicorn

@@ -1,11 +1,11 @@
-= \Rainbows! is like Unicorn, but Different...
+= \Rainbows! is like unicorn, but Different...
 
-While \Rainbows! depends on Unicorn for its process/socket management,
+While \Rainbows! depends on unicorn for its process/socket management,
 HTTP parser and configuration language; \Rainbows! is more ambitious.
 
 == Architectural Diagrams
 
-=== Unicorn uses a 1:1 mapping of processes to clients
+=== unicorn uses a 1:1 mapping of processes to clients
 
      unicorn master
      \_ unicorn worker[0]
@@ -52,16 +52,16 @@ In both cases, workers share common listen sockets with the master and
 pull connections off the listen queue only if the worker has resources
 available.
 
-== Differences from Unicorn
+== Differences from unicorn
 
-* log rotation is handled immediately in \Rainbows! whereas Unicorn has
+* log rotation is handled immediately in \Rainbows! whereas unicorn has
   the luxury of delaying it until the current request is finished
   processing to prevent log entries for one request to be split across
   files.
 
 * load balancing between workers is imperfect, certain worker processes
   may be servicing more requests than others so it is important to not
-  set +worker_connections+ too high.  Unicorn worker processes can never
+  set +worker_connections+ too high.  unicorn worker processes can never
   be servicing more than one request at once.
 
 * speculative, non-blocking accept() is not used, this is to help
@@ -72,10 +72,10 @@ available.
 * Less heavily-tested and inherently more complex.
 
 
-== Similarities with Unicorn
+== Similarities with unicorn
 
 While some similarities are obvious (we depend on and subclass off
-Unicorn code), some things are not:
+unicorn code), some things are not:
 
 * Does not attempt to accept() connections when pre-configured limits
   are hit (+worker_connections+).  This will first help balance load

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rainbows
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.7.0
 platform: ruby
 authors:
 - Rainbows! hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -67,29 +67,28 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: wrongdoc
+  name: olddoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
 description: |-
   \Rainbows! is an HTTP server for sleepy Rack applications.  It is based on
-  Unicorn, but designed to handle applications that expect long
+  unicorn, but designed to handle applications that expect long
   request/response times and/or slow clients.
 email: rainbows-public@bogomips.org
 executables:
 - rainbows
 extensions: []
 extra_rdoc_files:
-- ChangeLog
 - DEPLOY
 - FAQ
 - lib/rainbows.rb
@@ -127,6 +126,7 @@ extra_rdoc_files:
 - LATEST
 - LICENSE
 - NEWS
+- rainbows_1
 - README
 - SIGNALS
 - TODO
@@ -141,13 +141,11 @@ files:
 - ".document"
 - ".gitignore"
 - ".manifest"
-- ".wrongdoc.yml"
+- ".olddoc.yml"
 - COPYING
-- ChangeLog
 - DEPLOY
 - Documentation/.gitignore
 - Documentation/GNUmakefile
-- Documentation/comparison.css
 - Documentation/comparison.haml
 - Documentation/rainbows.1.txt
 - FAQ
@@ -159,7 +157,6 @@ files:
 - LICENSE
 - NEWS
 - README
-- Rakefile
 - SIGNALS
 - Sandbox
 - Static_Files
@@ -280,6 +277,7 @@ files:
 - man/man1/rainbows.1
 - pkg.mk
 - rainbows.gemspec
+- rainbows_1
 - setup.rb
 - t/.gitignore
 - t/GNUmakefile
@@ -382,7 +380,6 @@ files:
 - t/t0041-optional-pool-size.sh
 - t/t0042-client_header_buffer_size.sh
 - t/t0043-quit-keepalive-disconnect.sh
-- t/t0044-autopush.sh
 - t/t0045-client_max_header_size.sh
 - t/t0050-response-body-close-has-env.sh
 - t/t0100-rack-input-hammer-chunked.sh
@@ -429,15 +426,11 @@ files:
 - vs_Unicorn
 homepage: http://rainbows.bogomips.org/
 licenses:
-- GPLv2+
-- Ruby 1.8
+- GPL-2.0+
+- Nonstandard
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "-t"
-- Rainbows! - Unicorn for sleepy apps and slow clients
-- "-W"
-- http://bogomips.org/rainbows.git/tree/%s
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -451,9 +444,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rainbows
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
-summary: "- Unicorn for sleepy apps and slow clients"
+summary: "- unicorn for sleepy apps and slow clients"
 test_files: []

data/Documentation/comparison.css

@@ -1,6 +0,0 @@
-/* help to make this look nice would be greatly appreciated */
-.comparison {
-	margin: 1em;
-	border: 1px solid;
-	width: 100%;
-}

data/Rakefile

@@ -1,71 +0,0 @@
-# -*- encoding: binary -*-
-autoload :Gem, 'rubygems'
-autoload :Tempfile, 'tempfile'
-require 'wrongdoc'
-
-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
-  require 'rubyforge'
-  spec = Gem::Specification.load('rainbows.gemspec')
-  tmp = Tempfile.new('rf-news')
-  _, subject, body = `git cat-file tag v#{spec.version}`.split(/\n\n/, 3)
-  tmp.puts subject
-  tmp.puts
-  tmp.puts spec.description.strip
-  tmp.puts ""
-  tmp.puts "* #{spec.homepage}"
-  tmp.puts "* #{spec.email}"
-  tmp.puts "* #{git_url}"
-  tmp.print "\nChanges:\n\n"
-  tmp.puts body
-  tmp.flush
-  system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
-  msg = File.readlines(tmp.path)
-  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
-
-desc "post to FM"
-task :fm_update do
-  require 'net/http'
-  require 'net/netrc'
-  require 'json'
-  version = ENV['VERSION'] or abort "VERSION= needed"
-  uri = URI.parse('https://freecode.com/projects/rainbows/releases.json')
-  rc = Net::Netrc.locate('rainbows-fm') or abort "~/.netrc not found"
-  api_token = rc.password
-  _, subject, body = `git cat-file tag v#{version}`.split(/\n\n/, 3)
-  tmp = Tempfile.new('fm-changelog')
-  tmp.puts subject
-  tmp.puts
-  tmp.puts body
-  tmp.flush
-  system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
-  changelog = File.read(tmp.path).strip
-
-  req = {
-    "auth_code" => api_token,
-    "release" => {
-      "tag_list" => "Stable",
-      "version" => version,
-      "changelog" => changelog,
-    },
-  }.to_json
-  if ! changelog.strip.empty? && version =~ %r{\A[\d\.]+\d+\z}
-    Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-      p http.post(uri.path, req, {'Content-Type'=>'application/json'})
-    end
-  else
-    warn "not updating freshmeat for v#{version}"
-  end
-end

data/Test_Suite

@@ -1,63 +0,0 @@
-= \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.1.0}[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/t/t0044-autopush.sh

@@ -1,121 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-STRACE=$(which strace 2>/dev/null || :)
-if ! test -x "$STRACE"
-then
-	t_info "strace not found, skipping $T"
-	exit 0
-fi
-if test x"$(uname -s)" != xLinux
-then
-	t_info "Linux is the only supported OS for $T"
-	exit 0
-fi
-
-# these buffer internally in external libraries, so we can't detect when
-# to use TCP_CORK
-skip_models EventMachine NeverBlock
-skip_models StreamResponseEpoll
-skip_models Coolio CoolioThreadPool CoolioThreadSpawn
-skip_models Revactor Rev RevThreadPool RevThreadSpawn
-
-# not sure why, but we don't have time to care about Ruby 1.8 too much
-case $RUBY_VERSION in
-1.8.*) skip_models WriterThreadSpawn WriterThreadPool ;;
-esac
-
-t_plan 13 "Kgio autopush tests"
-
-start_strace () {
-	# dbgcat strace_out
-	> $strace_out
-	sleep 1
-	strace -p $worker_pid -e '!futex' -f -o $strace_out &
-	strace_pid=$!
-	while ! test -s $strace_out; do sleep 1; done
-}
-
-check_TCP_CORK () {
-	nr=0
-	while test 2 -gt $(grep TCP_CORK $strace_out | count_lines)
-	do
-		nr=$(( $nr + 1 ))
-		if test $nr -gt 30
-		then
-			dbgcat strace_out
-			die "waited too long ($nr seconds) for TCP_CORK"
-		fi
-		sleep 1
-	done
-
-	test 2 -eq $(grep TCP_CORK $strace_out | count_lines)
-	fgrep 'SOL_TCP, TCP_CORK, [0],' $strace_out
-	fgrep 'SOL_TCP, TCP_CORK, [1],' $strace_out
-}
-
-t_begin "setup and start" && {
-	rainbows_setup $model 1 1
-	rtmpfiles strace_out
-	ed -s $unicorn_config <<EOF
-,s/^listen.*/listen "$listen", :tcp_nodelay => true, :tcp_nopush => true/
-w
-EOF
-	rainbows -D large-file-response.ru -c $unicorn_config -E none
-	rainbows_wait_start
-}
-
-t_begin "read worker pid" && {
-	worker_pid=$(curl -sSf http://$listen/pid)
-	kill -0 $worker_pid
-}
-
-t_begin "start strace on worker" && start_strace
-
-t_begin "reading RSS uncorks" && {
-	curl -sSf http://$listen/rss >/dev/null
-}
-
-t_begin "restart strace on worker" && {
-	kill $strace_pid
-	wait
-	start_strace
-}
-
-t_begin "reading static file uncorks" && {
-	curl -sSf http://$listen/random_blob >/dev/null
-	check_TCP_CORK
-}
-
-t_begin "stop strace on worker" && {
-	kill $strace_pid
-	wait
-}
-
-t_begin "enable sendfile" && {
-	echo >> $unicorn_config 'require "sendfile"'
-	kill -HUP $rainbows_pid
-	test xSTART = x"$(cat $fifo)"
-}
-
-t_begin "reread worker pid" && {
-	worker_pid=$(curl -sSf http://$listen/pid)
-	kill -0 $worker_pid
-}
-
-t_begin "restart strace on the worker" && start_strace
-
-t_begin "HTTP/1.x GET on static file with sendfile uncorks" && {
-	curl -sSf http://$listen/random_blob >/dev/null
-	check_TCP_CORK
-}
-
-t_begin "killing succeeds" && {
-	kill $strace_pid
-	wait
-	# dbgcat strace_out
-	kill $rainbows_pid
-}
-
-t_begin "check stderr" && check_stderr
-
-t_done