rainbows 4.2.0 → 4.3.0

data/.document

@@ -1,7 +1,38 @@
 ChangeLog
 DEPLOY
 FAQ
-lib
+lib/rainbows.rb
+lib/rainbows/actor_spawn.rb
+lib/rainbows/app_pool.rb
+lib/rainbows/base.rb
+lib/rainbows/configurator.rb
+lib/rainbows/coolio.rb
+lib/rainbows/coolio_thread_pool.rb
+lib/rainbows/coolio_thread_spawn.rb
+lib/rainbows/dev_fd_response.rb
+lib/rainbows/epoll.rb
+lib/rainbows/event_machine.rb
+lib/rainbows/fiber_pool.rb
+lib/rainbows/fiber_spawn.rb
+lib/rainbows/max_body.rb
+lib/rainbows/never_block.rb
+lib/rainbows/rev.rb
+lib/rainbows/rev_fiber_spawn.rb
+lib/rainbows/rev_thread_pool.rb
+lib/rainbows/rev_thread_spawn.rb
+lib/rainbows/revactor.rb
+lib/rainbows/sendfile.rb
+lib/rainbows/server_token.rb
+lib/rainbows/stream_response_epoll.rb
+lib/rainbows/thread_pool.rb
+lib/rainbows/thread_spawn.rb
+lib/rainbows/thread_timeout.rb
+lib/rainbows/worker_yield.rb
+lib/rainbows/writer_thread_pool.rb
+lib/rainbows/writer_thread_spawn.rb
+lib/rainbows/xepoll.rb
+lib/rainbows/xepoll_thread_pool.rb
+lib/rainbows/xepoll_thread_spawn.rb
 LATEST
 LICENSE
 NEWS

data/.wrongdoc.yml

@@ -6,3 +6,5 @@ changelog_start: v0.97.0
 merge_html:
   rainbows_1: Documentation/rainbows.1.html
   Summary: Documentation/comparison.html
+public_email: rainbows-talk@rubyforge.org
+private_email: rainbows@bogomips.org

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.2.0.GIT
+DEF_VER=v4.3.0.GIT
 
 LF='
 '

data/TODO

@@ -7,9 +7,6 @@ care about.
 
 * documentation improvements
 
-* allow _OPTIONAL_ splice(2) with DevFdResponse under Linux
-  (splice is very broken under some older kernels)
-
 * Improve test suite coverage.  We won't waste cycles with puny
   unit tests, only integration tests that exercise externally
   visible parts.

data/lib/rainbows.rb

@@ -121,7 +121,6 @@ module Rainbows
 
   autoload :Fiber, 'rainbows/fiber' # core class
   autoload :StreamFile, 'rainbows/stream_file'
-  autoload :HttpResponse, 'rainbows/http_response' # deprecated
   autoload :ThreadTimeout, 'rainbows/thread_timeout'
   autoload :WorkerYield, 'rainbows/worker_yield'
   autoload :SyncClose, 'rainbows/sync_close'

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '4.2.0'
+  RAINBOWS_VERSION = '4.3.0'
 
   include Unicorn::Const
 

data/lib/rainbows/coolio/client.rb

@@ -164,7 +164,8 @@ class Rainbows::Coolio::Client < Coolio::IO
       begin
         @deferred.close if @deferred.respond_to?(:close)
       rescue => e
-        Rainbows.server.logger.error("closing #@deferred: #{e}")
+        Unicorn.log_error(Rainbows.server.logger,
+                          "closing deferred=#{@deferred.inspect}", e)
       end
       @deferred = nil
     end

data/lib/rainbows/dev_fd_response.rb

@@ -69,7 +69,7 @@ class Rainbows::DevFdResponse < Struct.new(:app)
     [ status, headers, Body.new(io, "/dev/fd/#{fileno}", body) ]
   end
 
-  class Body < Struct.new(:to_io, :to_path, :orig_body)
+  class Body < Struct.new(:to_io, :to_path, :orig_body) # :nodoc:
     # called by the webserver or other middlewares if they can't
     # handle #to_path
     def each

data/lib/rainbows/error.rb

@@ -12,15 +12,13 @@ module Rainbows::Error
   end
 
   def self.app(e)
-    Rainbows.server.logger.error "app error: #{e.inspect}"
-    Rainbows.server.logger.error e.backtrace.join("\n")
+    Unicorn.log_error(Rainbows.server.logger, "app error", e)
     rescue
   end
 
   def self.listen_loop(e)
     Rainbows.alive or return
-    Rainbows.server.logger.error "listen loop error: #{e.inspect}."
-    Rainbows.server.logger.error e.backtrace.join("\n")
+    Unicorn.log_error(Rainbows.server.logger, "listen loop error", e)
     rescue
   end
 

data/lib/rainbows/event_machine.rb

@@ -8,7 +8,7 @@ EM::VERSION >= '0.12.10' or abort 'eventmachine 0.12.10 is required'
 # a single-threaded app dispatch.  It is suited for slow clients,
 # and can work with slow applications via asynchronous libraries such as
 # {async_sinatra}[http://github.com/raggi/async_sinatra],
-# {Cramp}[http://m.onkey.org/2010/1/7/introducing-cramp],
+# {Cramp}[http://cramp.in/],
 # and {rack-fiber_pool}[http://github.com/mperham/rack-fiber_pool].
 #
 # It does not require your Rack application to be thread-safe,
@@ -23,7 +23,7 @@ EM::VERSION >= '0.12.10' or abort 'eventmachine 0.12.10 is required'
 # {async_sinatra}[http://github.com/raggi/async_sinatra].
 #
 # For a complete asynchronous framework,
-# {Cramp}[http://m.onkey.org/2010/1/7/introducing-cramp] is fully
+# {Cramp}[http://cramp.in/] is fully
 # supported when using this concurrency model.
 #
 # This model is fully-compatible with

data/lib/rainbows/reverse_proxy/coolio.rb

@@ -43,9 +43,7 @@ module Rainbows::ReverseProxy::Coolio
           return close
         when SystemCallError
         else
-          logger = @env["rack.logger"]
-          logger.error "#{e} #{e.message}"
-          e.backtrace.each { |m| logger.error m }
+          Unicorn.log_error(@env["rack.logger"], "on_readable", e)
         end
         @env[AsyncCallback].call(Rainbows::ReverseProxy::E502)
         close

data/rainbows.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<kgio>, ['~> 2.5'])
 
   # we need Unicorn for the HTTP parser and process management
-  s.add_dependency(%q<unicorn>, ["~> 4.0"])
+  s.add_dependency(%q<unicorn>, ["~> 4.1"])
   s.add_development_dependency(%q<isolate>, "~> 3.1")
-  s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
+  s.add_development_dependency(%q<wrongdoc>, "~> 1.6")
 
   # optional runtime dependencies depending on configuration
   # see t/test_isolate.rb for the exact versions we've tested with

data/t/test_isolate.rb

@@ -16,14 +16,14 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.5.0'
+  gem 'kgio', '2.6.0'
   gem 'kcar', '0.3.0'
   gem 'raindrops', '0.7.0'
-  gem 'unicorn', '4.0.0'
+  gem 'unicorn', '4.1.0'
 
   if engine == "ruby"
     gem 'sendfile', '1.1.0'
-    gem 'cool.io', '1.0.0'
+    gem 'cool.io', '1.1.0'
 
     gem 'eventmachine', '0.12.10'
     gem 'sinatra', '1.2.0'

data/t/test_isolate_cramp.rb

@@ -17,7 +17,7 @@ lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
   if engine == "ruby"
-    gem 'cramp', '0.14'
+    gem 'cramp', '0.15'
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: 
   segments: 
   - 4
-  - 2
+  - 3
   - 0
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 Z
+date: 2011-08-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -55,11 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 4
-        - 0
-        version: "4.0"
+        - 1
+        version: "4.1"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -85,11 +85,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 1
-        - 5
-        version: "1.5"
+        - 6
+        version: "1.6"
   type: :development
   version_requirements: *id005
 description: |-
@@ -109,106 +109,34 @@ extra_rdoc_files:
 - lib/rainbows/actor_spawn.rb
 - lib/rainbows/app_pool.rb
 - lib/rainbows/base.rb
-- lib/rainbows/client.rb
 - lib/rainbows/configurator.rb
-- lib/rainbows/const.rb
 - lib/rainbows/coolio.rb
-- lib/rainbows/coolio/client.rb
-- lib/rainbows/coolio/core.rb
-- lib/rainbows/coolio/heartbeat.rb
-- lib/rainbows/coolio/master.rb
-- lib/rainbows/coolio/response_chunk_pipe.rb
-- lib/rainbows/coolio/response_pipe.rb
-- lib/rainbows/coolio/server.rb
-- lib/rainbows/coolio/thread_client.rb
-- lib/rainbows/coolio_fiber_spawn.rb
-- lib/rainbows/coolio_support.rb
 - lib/rainbows/coolio_thread_pool.rb
-- lib/rainbows/coolio_thread_pool/client.rb
-- lib/rainbows/coolio_thread_pool/watcher.rb
 - lib/rainbows/coolio_thread_spawn.rb
-- lib/rainbows/coolio_thread_spawn/client.rb
 - lib/rainbows/dev_fd_response.rb
 - lib/rainbows/epoll.rb
-- lib/rainbows/epoll/client.rb
-- lib/rainbows/epoll/response_chunk_pipe.rb
-- lib/rainbows/epoll/response_pipe.rb
-- lib/rainbows/epoll/server.rb
-- lib/rainbows/error.rb
-- lib/rainbows/ev_core.rb
-- lib/rainbows/ev_core/cap_input.rb
 - lib/rainbows/event_machine.rb
-- lib/rainbows/event_machine/client.rb
-- lib/rainbows/event_machine/response_chunk_pipe.rb
-- lib/rainbows/event_machine/response_pipe.rb
-- lib/rainbows/event_machine/server.rb
-- lib/rainbows/event_machine/try_defer.rb
-- lib/rainbows/fiber.rb
-- lib/rainbows/fiber/base.rb
-- lib/rainbows/fiber/body.rb
-- lib/rainbows/fiber/coolio.rb
-- lib/rainbows/fiber/coolio/heartbeat.rb
-- lib/rainbows/fiber/coolio/methods.rb
-- lib/rainbows/fiber/coolio/server.rb
-- lib/rainbows/fiber/coolio/sleeper.rb
-- lib/rainbows/fiber/io.rb
-- lib/rainbows/fiber/io/compat.rb
-- lib/rainbows/fiber/io/methods.rb
-- lib/rainbows/fiber/io/pipe.rb
-- lib/rainbows/fiber/io/socket.rb
-- lib/rainbows/fiber/queue.rb
 - lib/rainbows/fiber_pool.rb
 - lib/rainbows/fiber_spawn.rb
-- lib/rainbows/http_parser.rb
-- lib/rainbows/http_response.rb
-- lib/rainbows/http_server.rb
-- lib/rainbows/join_threads.rb
 - lib/rainbows/max_body.rb
-- lib/rainbows/max_body/rewindable_wrapper.rb
-- lib/rainbows/max_body/wrapper.rb
 - lib/rainbows/never_block.rb
-- lib/rainbows/never_block/core.rb
-- lib/rainbows/never_block/event_machine.rb
-- lib/rainbows/pool_size.rb
-- lib/rainbows/process_client.rb
-- lib/rainbows/queue_pool.rb
-- lib/rainbows/response.rb
 - lib/rainbows/rev.rb
 - lib/rainbows/rev_fiber_spawn.rb
 - lib/rainbows/rev_thread_pool.rb
 - lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
-- lib/rainbows/revactor/client.rb
-- lib/rainbows/revactor/client/methods.rb
-- lib/rainbows/revactor/client/tee_socket.rb
-- lib/rainbows/revactor/proxy.rb
-- lib/rainbows/reverse_proxy.rb
-- lib/rainbows/reverse_proxy/coolio.rb
-- lib/rainbows/reverse_proxy/ev_client.rb
-- lib/rainbows/reverse_proxy/event_machine.rb
-- lib/rainbows/reverse_proxy/multi_thread.rb
-- lib/rainbows/reverse_proxy/synchronous.rb
 - lib/rainbows/sendfile.rb
 - lib/rainbows/server_token.rb
-- lib/rainbows/socket_proxy.rb
-- lib/rainbows/stream_file.rb
 - lib/rainbows/stream_response_epoll.rb
-- lib/rainbows/stream_response_epoll/client.rb
-- lib/rainbows/sync_close.rb
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
 - lib/rainbows/thread_timeout.rb
 - lib/rainbows/worker_yield.rb
 - lib/rainbows/writer_thread_pool.rb
-- lib/rainbows/writer_thread_pool/client.rb
 - lib/rainbows/writer_thread_spawn.rb
-- lib/rainbows/writer_thread_spawn/client.rb
 - lib/rainbows/xepoll.rb
-- lib/rainbows/xepoll/client.rb
 - lib/rainbows/xepoll_thread_pool.rb
-- lib/rainbows/xepoll_thread_pool/client.rb
 - lib/rainbows/xepoll_thread_spawn.rb
-- lib/rainbows/xepoll_thread_spawn/client.rb
 - LATEST
 - LICENSE
 - NEWS
@@ -307,7 +235,6 @@ files:
 - lib/rainbows/fiber_pool.rb
 - lib/rainbows/fiber_spawn.rb
 - lib/rainbows/http_parser.rb
-- lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
 - lib/rainbows/join_threads.rb
 - lib/rainbows/max_body.rb

data/lib/rainbows/http_response.rb

@@ -1,26 +0,0 @@
-# -*- encoding: binary -*-
-# :enddoc:
-# deprecated, use Rainbows::Response instead
-# Cramp 0.11 relies on this, and is only activated by Cramp
-if defined?(Cramp) && defined?(Rainbows::EventMachine::Client)
-  class Rainbows::HttpResponse
-    # dummy method for Cramp to alias_method_chain
-    def self.write(client, response, out)
-    end
-  end
-
-  module Rainbows::EventMachine::CrampSocket
-    def em_write_response(response, alive = false)
-      if websocket?
-        write web_socket_upgrade_data
-        web_socket_handshake!
-        response[1] = nil # disable response headers
-      end
-      super
-    end
-  end
-
-  class Rainbows::EventMachine::Client
-    include Rainbows::EventMachine::CrampSocket
-  end
-end