rainbows 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e4607c3566fdb21ae23f5a82f632f4cbbdbc43f
-  data.tar.gz: 9cecf17a6fd35957c43d61b4ec45bca1ccc6332f
+SHA256:
+  metadata.gz: c32acc2fd11a17dd204cc22e7d8aedab4c0e14d1b07013d6ee1c0c35d6a2018d
+  data.tar.gz: a63584f7b9b1622c292d1dde98d9c70c45a9fce1d5b550fafae42d24c80aff4d
 SHA512:
-  metadata.gz: 9b5e8042be5d1ee2400cfdf208a7324be36eba075d7833bd2fee64871245ac1ab20061265df43aeca553c643dd86e375f03f7a8b78bb5fdd2c2b6a1e5077edbc
-  data.tar.gz: 83ae9288e342e841dd66a3218fcd9925b8fcf4bbd926c4ba3a77dd09127d7d6be5e5769c9c05db7dc9da1759f0bb6e05161eb0ea8ccf0741456ca14fca4b1cf4
+  metadata.gz: 8e2b64730662047ddb95b124e4c88816129e0a7fc12e92d38763eb09da69ebdc7baa1a7bf6f9ed9b6c162ab513a77a49a641e6afacb6421ccb15bc4bb6be314f
+  data.tar.gz: 9af900df457b11b8e7f35ef423e5814265fd31494c3d7e097567b043acaa7c92ba245f9b87432529e40ddff9f166e6e2fe91d45931570caebf95a28577de9b62

data/.olddoc.yml

@@ -1,6 +1,6 @@
 ---
 cgit_url: https://bogomips.org/rainbows.git
-git_url: git://bogomips.org/rainbows.git
+git_url: https://bogomips.org/rainbows.git
 rdoc_url: https://bogomips.org/rainbows/
 merge_html:
   rainbows_1: Documentation/rainbows.1.html

data/GIT-VERSION-GEN

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

data/HACKING

@@ -44,12 +44,12 @@ Please Cc: everyone on replies, as not everyone is subscribed.
 
 == Building a Gem
 
-In order to build the gem, you must install the following components:
+In order to build the gem, you must install the following components
+for documentation:
 
- * olddoc (RubyGem)
  * pandoc
 
-You can build the Unicorn gem with the following command:
+You can build the Rainbows! gem with the following command:
 
   gmake gem
 

data/README

@@ -1,4 +1,4 @@
-= Rainbows! - unicorn for sleepy apps and slow clients
+= Rainbows! - Rack app server 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
@@ -51,7 +51,7 @@ network concurrency.
 * Designed for {Rack}[http://rack.github.io/], the standard for
   modern Ruby HTTP applications.
 
-* Built on {Unicorn}[https://bogomips.org/unicorn/], inheriting its
+* Built on {unicorn}[https://bogomips.org/unicorn/], inheriting its
   process/socket management features such as transparent upgrades and
   Ruby configuration DSL.
 
@@ -81,7 +81,6 @@ network concurrency.
 * HTTP server push
 * Long polling
 * Reverse AJAX
-* real-time upload processing (via {upr}[http://upr.bogomips.org/])
 
 \Rainbows! can also be used to service slow clients directly even with
 fast applications.
@@ -123,7 +122,7 @@ config file:
 
     worker_processes 4 # assuming four CPU cores
     Rainbows! do
-      use :FiberSpawn
+      use :ThreadSpawn
       worker_connections 100
     end
 
@@ -136,23 +135,24 @@ for more details.
 You can get the latest source via git from the following locations
 (these versions may not be stable):
 
-  git://bogomips.org/rainbows.git
-  git://repo.or.cz/rainbows.git (mirror)
+  https://bogomips.org/rainbows.git
+  https://repo.or.cz/rainbows.git (mirror)
 
 You may browse the code from the web and download the latest snapshot
 tarballs here:
 
 * https://bogomips.org/rainbows.git
-* http://repo.or.cz/w/rainbows.git (gitweb)
+* https://repo.or.cz/rainbows.git (gitweb)
 
 Inline patches (from "git format-patch") to the mailing list are
 preferred because they allow code review and comments in the reply to
 the patch.
 
 We will adhere to mostly the same conventions for patch submissions as
-git itself.  See the Documentation/SubmittingPatches document
-distributed with git on on patch submission guidelines to follow.  Just
-don't email the git mailing list or maintainer with \Rainbows! patches.
+git itself.  See the
+https://80x24.org/mirrors/git.git/tree/Documentation/SubmittingPatches?h=v2.20.1
+document distributed with git on on patch submission guidelines to follow.
+Just don't email the git mailing list or maintainer with \Rainbows! patches.
 
 == Disclaimer
 

data/lib/rainbows/app_pool.rb

@@ -97,7 +97,7 @@ def call(env) # :nodoc:
 
     app = pool.shift
     app.call(env)
-    ensure
-      pool << app
+  ensure
+    pool << app
   end
 end

data/lib/rainbows/base.rb

@@ -49,8 +49,8 @@ def reopen_worker_logs(worker_nr)
     logger.info "worker=#{worker_nr} reopening logs..."
     Unicorn::Util.reopen_logs
     logger.info "worker=#{worker_nr} done reopening logs"
-    rescue
-      Rainbows.quit! # let the master reopen and refork us
+  rescue
+    Rainbows.quit! # let the master reopen and refork us
   end
   # :startdoc:
 end

data/lib/rainbows/configurator.rb

@@ -46,8 +46,8 @@ def Rainbows!(&block)
     block_given? or raise ArgumentError, "Rainbows! requires a block"
     @block = true
     instance_eval(&block)
-    ensure
-      @block = false
+  ensure
+    @block = false
   end
 
   def check! # :nodoc:

data/lib/rainbows/coolio/client.rb

@@ -160,8 +160,8 @@ def on_write_complete
         on_read(''.freeze)
       end
     end
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   def handle_error(e)
@@ -170,8 +170,8 @@ def handle_error(e)
       @_io.kgio_trywrite(msg) rescue nil
     end
     @_write_buffer.clear
-    ensure
-      quit
+  ensure
+    quit
   end
 
   def close_deferred

data/lib/rainbows/coolio/thread_client.rb

@@ -16,8 +16,8 @@ def app_call input
   def response_write(response)
     return hijacked if @hp.hijacked?
     ev_write_response(*response, @hp.next?)
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   # fails-safe application dispatch, we absolutely cannot

data/lib/rainbows/epoll/client.rb

@@ -39,8 +39,8 @@ def epoll_once
     @wr_queue = [] # may contain String, ResponsePipe, and StreamFile objects
     post_init
     on_readable
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   def on_readable
@@ -56,9 +56,9 @@ def on_readable
       break
     end until :close == @state
     close unless closed?
-    rescue Errno::ECONNRESET
-      close
-    rescue IOError
+  rescue Errno::ECONNRESET
+    close
+  rescue IOError
   end
 
   def app_call input # called by on_read()
@@ -146,8 +146,8 @@ def on_deferred_write_complete
 
   def handle_error(e)
     msg = Rainbows::Error.response(e) and kgio_trywrite(msg) rescue nil
-    ensure
-      close
+  ensure
+    close
   end
 
   def write_deferred(obj)
@@ -171,8 +171,8 @@ def on_writable
     when :deferred
       return
     end while true
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   def write(buf)
@@ -227,9 +227,9 @@ def stream_file(sf) # +sf+ is a Rainbows::StreamFile object
     else
       return n # :wait_writable or nil
     end while true
-    rescue
-      sf.close
-      raise
+  rescue
+    sf.close
+    raise
   end
 
   def defer_file_stream(offset, count, io, body)
@@ -263,8 +263,8 @@ def stream_pipe(pipe)
     else # nil => EOF
       return pipe.close # nil
     end while true
-    rescue
-      pipe.close
-      raise
+  rescue
+    pipe.close
+    raise
   end
 end

data/lib/rainbows/epoll/response_pipe.rb

@@ -14,9 +14,9 @@ def initialize(io, client, body)
   def epoll_run
     return close if @client.closed?
     @client.stream_pipe(self) or @client.on_deferred_write_complete
-    rescue => e
-      close
-      @client.handle_error(e)
+  rescue => e
+    close
+    @client.handle_error(e)
   end
 
   def close

data/lib/rainbows/error.rb

@@ -8,18 +8,18 @@ module Rainbows::Error
   # the socket is closed at the end of this function
   def self.write(io, e)
     msg = response(e) and Kgio.trywrite(io, msg)
-    rescue
+  rescue
   end
 
   def self.app(e)
     Unicorn.log_error(Rainbows.server.logger, "app error", e)
-    rescue
+  rescue
   end
 
   def self.listen_loop(e)
     Rainbows.alive or return
     Unicorn.log_error(Rainbows.server.logger, "listen loop error", e)
-    rescue
+  rescue
   end
 
   def self.response(e)

data/lib/rainbows/ev_core.rb

@@ -43,8 +43,8 @@ def want_more
 
   def handle_error(e)
     msg = Rainbows::Error.response(e) and write(msg)
-    ensure
-      quit
+  ensure
+    quit
   end
 
   # returns whether to enable response chunking for autochunk models
@@ -119,8 +119,8 @@ def on_read(data)
         want_more
       end
     end
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   def err_413(msg)

data/lib/rainbows/fiber/body.rb

@@ -19,8 +19,8 @@ def write_body_file(body, range)
       else # nil
         return
       end while true
-      ensure
-        close_if_private(body)
+    ensure
+      close_if_private(body)
     end
   end
 

data/lib/rainbows/fiber/io.rb

@@ -37,8 +37,8 @@ def each
     buf = readpartial(16384)
     yield buf
     yield buf while readpartial(16384, buf)
-    rescue EOFError
-      self
+  rescue EOFError
+    self
   end
 
   def closed?

data/lib/rainbows/http_server.rb

@@ -71,10 +71,10 @@ def trysetrlimit(resource, want)
       @logger.warn "#{svc} may monopolize resources dictated by #{resource}" \
                    " and leave none for your app"
     end
-    rescue => e
-      @logger.error e.message
-      @logger.error "#{resource} needs to be increased to >=#{want} before" \
-                    " starting #{svc}"
+  rescue => e
+    @logger.error e.message
+    @logger.error "#{resource} needs to be increased to >=#{want} before" \
+                  " starting #{svc}"
   end
 
   def svc

data/lib/rainbows/process_client.rb

@@ -83,8 +83,8 @@ def process_pipeline(env, hp)
       write_response(status, headers, body, alive = hp.next?) or return
     end while alive && pipeline_ready(hp)
     alive or close
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   # override this in subclass/module

data/lib/rainbows/response.rb

@@ -91,8 +91,8 @@ def write_response(status, headers, body, alive)
       body = write_headers(status, headers, alive, body)
       write_body_each(body) if body
       body
-      ensure
-        body.close if body.respond_to?(:close)
+    ensure
+      body.close if body.respond_to?(:close)
     end
   end
   include Each
@@ -102,8 +102,8 @@ module Sendfile
       def write_body_file(body, range)
         io = body_to_io(body)
         range ? sendfile(io, range[0], range[1]) : sendfile(io, 0)
-        ensure
-          close_if_private(io)
+      ensure
+        close_if_private(io)
       end
     end
     include Sendfile
@@ -129,8 +129,8 @@ def write_body_file(body, range)
     # isn't used or available.
     def write_body_stream(body)
       COPY_STREAM.copy_stream(io = body_to_io(body), self)
-      ensure
-        close_if_private(io)
+    ensure
+      close_if_private(io)
     end
   else # ! COPY_STREAM
     alias write_body_stream write_body_each
@@ -199,8 +199,8 @@ def write_response_path(status, headers, body, alive)
         write_body_stream(body) if body
       end
       body
-      ensure
-        body.close if body.respond_to?(:close)
+    ensure
+      body.close if body.respond_to?(:close)
     end
 
     module ToPath

data/lib/rainbows/revactor.rb

@@ -75,8 +75,8 @@ def worker_loop(worker) #:nodoc:
     end
 
     Actor.sleep 1 while Rainbows.tick || nr > 0
-    rescue Errno::EMFILE
-      # ignore, let another worker process take it
+  rescue Errno::EMFILE
+    # ignore, let another worker process take it
   end
 
   def revactorize_listeners #:nodoc:

data/lib/rainbows/revactor/client/methods.rb

@@ -26,8 +26,8 @@ def write_body_file(body, range)
       else # nil
         return
       end while true
-      ensure
-        close_if_private(body)
+    ensure
+      close_if_private(body)
     end
   end
 

data/lib/rainbows/revactor/client/tee_socket.rb

@@ -34,7 +34,7 @@ def kgio_read(length, dst = "")
     # ugh, read returned too much
     @rbuf << tmp[length, tmp.size]
     dst.replace(tmp[0, length])
-    rescue EOFError
+  rescue EOFError
   end
 
   # just proxy any remaining methods TeeInput may use

data/lib/rainbows/reverse_proxy/coolio.rb

@@ -36,17 +36,17 @@ def on_readable
         return close
       end while true # we always read until EAGAIN or EOF
 
-      rescue => e
-        case e
-        when Errno::ECONNRESET
-          @env['async.callback'].call(@response)
-          return close
-        when SystemCallError
-        else
-          Unicorn.log_error(@env["rack.logger"], "on_readable", e)
-        end
-        @env['async.callback'].call(Rainbows::ReverseProxy::E502)
-        close
+    rescue => e
+      case e
+      when Errno::ECONNRESET
+        @env['async.callback'].call(@response)
+        return close
+      when SystemCallError
+      else
+        Unicorn.log_error(@env["rack.logger"], "on_readable", e)
+      end
+      @env['async.callback'].call(Rainbows::ReverseProxy::E502)
+      close
     end
   end
 

data/lib/rainbows/stream_response_epoll/client.rb

@@ -47,9 +47,9 @@ def epoll_run
     when :wait_writable
       return @wr_queue.unshift(buf)
     end while true
-    rescue => err
-      @to_io.close
-      N.decr(0, 1)
+  rescue
+    @to_io.close
+    N.decr(0, 1)
   end
 
   def on_write_complete

data/lib/rainbows/thread_timeout.rb

@@ -134,11 +134,11 @@ def call(env)
       @lock.synchronize { @active.delete(Thread.current) }
       # Thread#raise no longer possible here
     end
-    rescue ExecutionExpired
-      # If we got here, it's because the watchdog thread raised an exception
-      # here to kill us.  The watchdog uses @active.delete_if with a lock,
-      # so we guaranteed it's
-      [ 408, { 'Content-Type' => 'text/plain', 'Content-Length' => '0' }, [] ]
+  rescue ExecutionExpired
+    # If we got here, it's because the watchdog thread raised an exception
+    # here to kill us.  The watchdog uses @active.delete_if with a lock,
+    # so we guaranteed it's
+    [ 408, { 'Content-Type' => 'text/plain', 'Content-Length' => '0' }, [] ]
   end
 
   # The watchdog thread is the one that does the job of killing threads

data/lib/rainbows/xepoll/client.rb

@@ -40,8 +40,8 @@ def epoll_once
     @wr_queue = [] # may contain String, ResponsePipe, and StreamFile objects
     post_init
     EP.set(self, IN) # wake up the main thread
-    rescue => e
-      Rainbows::Error.write(self, e)
+  rescue => e
+    Rainbows::Error.write(self, e)
   end
 
   def on_close

data/lib/rainbows/xepoll_thread_pool/client.rb

@@ -95,8 +95,8 @@ def close
 
   def handle_error(e)
     super
-    ensure
-      closed? or close
+  ensure
+    closed? or close
   end
 
   def queue!
@@ -114,8 +114,8 @@ def epoll_run(buf)
     else
       return close
     end while true
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   def run

data/lib/rainbows/xepoll_thread_spawn/client.rb

@@ -84,8 +84,8 @@ def close
 
   def handle_error(e)
     super
-    ensure
-      closed? or close
+  ensure
+    closed? or close
   end
 
   def epoll_run(buf)
@@ -98,8 +98,8 @@ def epoll_run(buf)
     else
       return close
     end while true
-    rescue => e
-      handle_error(e)
+  rescue => e
+    handle_error(e)
   end
 
   def spawn(env, hp)

data/rainbows.gemspec

@@ -1,22 +1,21 @@
 # -*- encoding: binary -*-
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'olddoc'
-extend Olddoc::Gemspec
-name, summary, title = readme_metadata
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 
 Gem::Specification.new do |s|
   s.name = %q{rainbows}
-  s.version = ENV["VERSION"].dup
+  s.version = (ENV["VERSION"] || '5.1.1').dup
 
-  s.authors = ["#{name} hackers"]
-  s.description = readme_description
+  s.authors = ['Rainbows! hackers']
+  s.description = File.read('README').split("\n\n")[1]
   s.email = %q{rainbows-public@bogomips.org}
   s.executables = %w(rainbows)
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.homepage = Olddoc.config['rdoc_url']
-  s.summary = summary
+  s.homepage = 'https://bogomips.org/rainbows/'
+  s.summary = 'Rack app server for sleepy apps and slow clients'
 
   # we want a newer Rack for a valid HeaderHash#each
   s.add_dependency(%q<rack>, ['>= 1.1', '< 3.0'])
@@ -29,7 +28,6 @@
   s.add_dependency(%q<unicorn>, ["~> 5.1"])
 
   s.add_development_dependency(%q<isolate>, "~> 3.1")
-  s.add_development_dependency(%q<olddoc>, "~> 1.2")
 
   # optional runtime dependencies depending on configuration
   # see t/test_isolate.rb for the exact versions we've tested with
@@ -58,5 +56,14 @@
   # 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'
+  ruby_1_8 = 'Nonstandard'
+  s.licenses = [ 'GPL-2.0+', ruby_1_8 ]
+  s.metadata = {
+    'bug_tracker_uri' => 'https://bogomips.org/rainbows/#label-Contact',
+    'changelog_uri' => 'https://bogomips.org/rainbows/NEWS.html',
+    'documentation_uri' => 'https://bogomips.org/rainbows/',
+    'homepage_uri' => 'https://bogomips.org/rainbows/',
+    'mailing_list_uri' => 'https://bogomips.org/rainbows-public/',
+    'source_code_uri' => 'https://bogomips.org/rainbows.git',
+  }
 end

data/t/bin/unused_listen

@@ -31,7 +31,7 @@ begin
   # when running tests in parallel with gmake.  Create a lock file while
   # we have the port here to ensure that does not happen.
   lock_path = "#{Dir::tmpdir}/unicorn_test.#{addr}:#{port}.lock"
-  lock = File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
+  File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
 rescue Errno::EEXIST
   sock.close rescue nil
   retry

data/t/hijack.ru

@@ -45,9 +45,9 @@ def lazy_close(io)
     [ 200,
       {
         "Content-Length" => r.bytesize.to_s,
-        "rack.hijack" => proc do |io|
-          io.write(r)
-          lazy_close(io)
+        "rack.hijack" => proc do |sock|
+          sock.write(r)
+          lazy_close(sock)
         end
       },
       DieIfUsed.new

data/t/sha1-random-size.ru

@@ -18,7 +18,7 @@
       end while input.read(rand(cap), buf)
     end
   when "/each"
-    input.each { |buf| digest.update(buf) }
+    input.each { |chunk| digest.update(chunk) }
   else
     if buf = input.read(rand(cap))
       begin

data/t/test_isolate.rb

@@ -16,11 +16,11 @@
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.11.0'
-  gem 'rack', '2.0.1'
+  gem 'kgio', '2.11.2'
+  gem 'rack', '2.0.6'
   gem 'kcar', '0.6.0'
-  gem 'raindrops', '0.18.0'
-  gem 'unicorn', '5.3.0'
+  gem 'raindrops', '0.19.0'
+  gem 'unicorn', '5.4.1'
 
   if engine == "ruby"
     gem 'sendfile', '1.2.2'
@@ -43,7 +43,7 @@
   end
 
   if RUBY_PLATFORM =~ /linux/
-    gem 'sleepy_penguin', '3.4.1'
+    gem 'sleepy_penguin', '3.5.1'
 
     # is 2.6.32 new enough?
     gem 'io_splice', '4.4.0' if `uname -r`.strip > '2.6.32'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rainbows
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Rainbows! hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -72,20 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: olddoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 description: |-
   \Rainbows! is an HTTP server for sleepy Rack applications.  It is based on
   unicorn, but designed to handle applications that expect long
@@ -436,7 +422,13 @@ homepage: https://bogomips.org/rainbows/
 licenses:
 - GPL-2.0+
 - Nonstandard
-metadata: {}
+metadata:
+  bug_tracker_uri: https://bogomips.org/rainbows/#label-Contact
+  changelog_uri: https://bogomips.org/rainbows/NEWS.html
+  documentation_uri: https://bogomips.org/rainbows/
+  homepage_uri: https://bogomips.org/rainbows/
+  mailing_list_uri: https://bogomips.org/rainbows-public/
+  source_code_uri: https://bogomips.org/rainbows.git
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -452,9 +444,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: "- unicorn for sleepy apps and slow clients"
+summary: Rack app server for sleepy apps and slow clients
 test_files: []