rainbows 0.90.1 → 0.90.2

data/Documentation/comparison.haml

@@ -53,7 +53,7 @@
   %tr.comp_row
     %td.mod RevThreadSpawn
     %td.tee No
-    %td.r18 Slow*
+    %td.r18 Yes
     %td.r19 Yes
     %td.rbx No
     %td.slow Yes
@@ -88,7 +88,7 @@
   %tr.comp_row
     %td.mod RevThreadPool
     %td.tee No
-    %td.r18 Slow*
+    %td.r18 Yes
     %td.r19 Yes
     %td.rbx No
     %td.slow Yes
@@ -101,8 +101,7 @@
     %td.slow Yes
 %ul
   %li
-    RevThread* + 1.8 performance is bad with Rev <= 0.3.1.
-    Rev 0.3.2 (when it is released) should be much faster under 1.8.
+    RevThread* + 1.8 requires Rev >= 0.3.2 for reasonable performance
   %li
     waiting on Rubinius for better signal handling
   %li

data/GIT-VERSION-GEN

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

data/Rakefile

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+autoload :Gem, 'rubygems'
 
 # most tasks are in the GNUmakefile which offers better parallelism
 
@@ -89,8 +90,6 @@ end
 
 desc "print release notes for Rubyforge"
 task :release_notes do
-  require 'rubygems'
-
   spec = Gem::Specification.load('rainbows.gemspec')
   puts spec.description.strip
   puts ""
@@ -121,7 +120,6 @@ end
 
 desc "post to RAA"
 task :raa_update do
-  require 'rubygems'
   require 'net/http'
   require 'net/netrc'
   rc = Net::Netrc.locate('rainbows-raa') or abort "~/.netrc not found"

data/bin/rainbows

@@ -41,7 +41,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     require library
   end
 
-  opts.separator "Unicorn options:"
+  opts.separator "Rainbows!/Unicorn options:"
 
   # some of these switches exist for rackup command-line compatibility,
 
@@ -57,8 +57,8 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     set_listener = true
   end
 
-  opts.on("-E", "--env ENVIRONMENT",
-          "use ENVIRONMENT for defaults (default: development)") do |e|
+  opts.on("-E", "--env RACK_ENV",
+          "use RACK_ENV for defaults (default: development)") do |e|
     ENV["RACK_ENV"] = e
   end
 
@@ -67,8 +67,8 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on("-P", "--pid FILE", "DEPRECATED") do |f|
-    warn %q{Use of --pid/-P is strongly discouraged}
-    warn %q{Use the 'pid' directive in the Unicorn config file instead}
+    warn "Use of --pid/-P is strongly discouraged"
+    warn "Use the 'pid' directive in the Rainbows!/Unicorn config file instead"
     options[:pid] = f
   end
 
@@ -77,7 +77,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     warn "-s/--server only exists for compatibility with rackup"
   end
 
-  # Unicorn-specific stuff
+  # Rainbows!/Unicorn-specific stuff
   opts.on("-l", "--listen {HOST:PORT|PATH}",
           "listen on HOST:PORT or PATH",
           "this may be specified multiple times",
@@ -85,7 +85,8 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     listeners << address
   end
 
-  opts.on("-c", "--config-file FILE", "Unicorn-specific config file") do |f|
+  opts.on("-c", "--config-file FILE",
+          "Rainbows!/Unicorn-specific config file") do |f|
     options[:config_file] = f
   end
 
@@ -102,7 +103,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on_tail("-v", "--version", "Show version") do
-    puts "unicorn v#{Unicorn::Const::UNICORN_VERSION}"
+    puts "Rainbows! v#{Rainbows::Const::RAINBOWS_VERSION}"
     exit
   end
 

data/lib/rainbows/const.rb

@@ -3,7 +3,7 @@
 module Rainbows
 
   module Const
-    RAINBOWS_VERSION = '0.90.1'
+    RAINBOWS_VERSION = '0.90.2'
 
     include Unicorn::Const
 

data/lib/rainbows/http_response.rb

@@ -16,7 +16,8 @@ module Rainbows
           next if %r{\AX-Rainbows-}i =~ key
           next if SKIP.include?(key.downcase)
           if value =~ /\n/
-            out.concat(value.split(/\n/).map! { |v| "#{key}: #{v}\r\n" })
+            # avoiding blank, key-only cookies with /\n+/
+            out.concat(value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" })
           else
             out << "#{key}: #{value}\r\n"
           end

data/lib/rainbows/rev_thread_pool.rb

@@ -15,9 +15,8 @@ module Rainbows
   # slow clients and applications with medium-to-slow response times
   # (I/O bound), but less suitable for sleepy applications.
   #
-  # WARNING: this model does not currently perform well under 1.8 with
-  # Rev 0.3.1.  Rev 0.3.2 should include significant performance
-  # improvements under Ruby 1.8.
+  # Ruby 1.8 users are strongly advised to use Rev >= 0.3.2 to get
+  # usable performance.
 
   module RevThreadPool
 

data/lib/rainbows/rev_thread_spawn.rb

@@ -15,9 +15,8 @@ module Rainbows
   # slow clients and applications with medium-to-slow response times
   # (I/O bound), but less suitable for sleepy applications.
   #
-  # WARNING: this model does not currently perform well under 1.8 with
-  # Rev 0.3.1.  Rev 0.3.2 should include significant performance
-  # improvements under Ruby 1.8.
+  # Ruby 1.8 users are strongly advised to use Rev >= 0.3.2 to get
+  # usable performance.
 
   module RevThreadSpawn
 

data/local.mk.sample

@@ -6,14 +6,25 @@
 
 RSYNC = rsync
 DLEXT := so
-gems := rack-1.0.1
-# gems += unicorn-0.95.1 # installed via setup.rb
-gems += rev-0.3.1 # up to 0.3.2 once it's out for 1.8
+gems := rack-1.1.0
+# gems += unicorn-0.96.0 # installed via setup.rb
+gems += rev-0.3.2
 gems += iobuffer-0.1.3
 gems += eventmachine-0.12.10
 gems += async_sinatra-0.1.5 sinatra-0.9.4
 gems += espace-neverblock-0.1.6.1
 
+# Cramp isn't enabled by default since it depends on several prerelease gems
+ifdef CRAMP
+  gems += cramp-0.7
+  gems += activesupport-3.0.pre
+  gems += activemodel-3.0.pre
+  gems += arel-0.2.pre
+  gems += usher-0.6.2
+  gems += fuzzyhash-0.0.11
+  gems += mysqlplus-0.1.1
+endif
+
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 prefix = $(HOME)

data/rainbows.gemspec

@@ -41,7 +41,9 @@ Gem::Specification.new do |s|
   s.test_files = test_files
 
   # we need Unicorn for the HTTP parser and process management
-  s.add_dependency(%q<unicorn>, ["~> 0.95.0", "< 0.97.0"])
+  # The HTTP parser in Unicorn < 0.96.1 did not use the Ruby
+  # API correctly and resulted in a memory leak
+  s.add_dependency(%q<unicorn>, ["~> 0.96.1", "< 0.97.0"])
 
   # Unicorn already depends on Rack
   # s.add_dependency(%q<rack>)
@@ -53,7 +55,7 @@ Gem::Specification.new do |s|
   # s.add_dependency(%q<revactor>, [">= 0.1.5"])
   #
   # Revactor depends on Rev, too, 0.3.0 got the ability to attach IOs
-  # s.add_dependency(%q<rev>, [">= 0.3.1"])
+  # s.add_dependency(%q<rev>, [">= 0.3.2"])
   #
   # Rev depends on IOBuffer, which got faster in 0.1.3
   # s.add_dependency(%q<iobuffer>, [">= 0.1.3"])

data/t/GNUmakefile

@@ -22,7 +22,14 @@ else
 endif
 export RUBYLIB RUBY_VERSION
 
-models = ThreadPool ThreadSpawn Rev EventMachine NeverBlock
+models += ThreadPool
+models += ThreadSpawn
+models += Rev
+models += EventMachine
+models += NeverBlock
+models += RevThreadSpawn
+models += RevThreadPool
+
 rp := )
 ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac)
 ifeq ($(ONENINE),true)
@@ -30,10 +37,6 @@ ifeq ($(ONENINE),true)
   models += FiberSpawn
   models += RevFiberSpawn
   models += FiberPool
-
-  # technically this works under 1.8, but wait until rev 0.3.2
-  models += RevThreadSpawn
-  models += RevThreadPool
 endif
 all_models := $(models) Base
 

data/t/bin/content-md5-put

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
+# -*- encoding: binary -*-
 # simple chunked HTTP PUT request generator (and just that),
 # it reads stdin and writes to stdout so socat can write to a
 # UNIX or TCP socket (or to another filter or file) along with
 # a Content-MD5 trailer.
-# -*- encoding: binary -*-
 require 'digest/md5'
 $stdout.sync = $stderr.sync = true
 $stdout.binmode

data/t/bin/unused_listen

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- encoding: binary -*-
 # this is to remain compatible with the unused_port function in the
 # Unicorn test/test_helper.rb file
 require 'socket'

data/t/bin/utee

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
+# -*- encoding: binary -*-
 # tee(1) as distributed on most(all?) systems is buffered in luserspace
 # this only does unbuffered writes (with line-buffered input) to make
 # test output appear in real-time
-# -*- encoding: binary -*-
 $stdin.binmode
 $stdout.binmode
 fp = File.open(ARGV.shift, "wb")

data/t/cramp/README

@@ -0,0 +1,3 @@
+These examples in this directory are stolen from Cramp with only trivial
+changes.  All examples in this directory retain their original license
+(MIT) and copyrights.

data/t/cramp/streaming.ru

@@ -0,0 +1,28 @@
+# based on examples/streaming.rb in git://github.com/lifo/cramp
+# commit ca54f8a944ae582a0c858209daf3c74efea7d27c
+
+# Rack::Lint does not like async + EM stuff, so disable it:
+#\ -E deployment
+
+require 'cramp/controller'
+
+class StreamController < Cramp::Controller::Action
+  periodic_timer :send_data, :every => 1
+  periodic_timer :check_limit, :every => 2
+
+  def start
+    @limit = 0
+  end
+
+  def send_data
+    render ["Hello World", "\n"]
+  end
+
+  def check_limit
+    @limit += 1
+    finish if @limit > 1
+  end
+
+end
+
+run StreamController

data/t/t0500-cramp-streaming.sh

@@ -0,0 +1,77 @@
+#!/bin/sh
+. ./test-lib.sh
+case $model in
+EventMachine) ;;
+*)
+	t_info "skipping $T since it's not compatible with $model"
+	exit 0
+	;;
+esac
+require_check cramp Cramp::VERSION
+
+t_plan 7 "streaming test for Cramp"
+
+CONFIG_RU=cramp/streaming.ru
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rtmpfiles a b c curl_err expect
+
+	# requiring Rubygems for this test only since Cramp depends on
+	# pre versions of several gems
+	# Like the rest of the EM/async stuff, it's not Rack::Lint compatible
+	rainbows -E deployment -D $CONFIG_RU -c $unicorn_config
+	rainbows_wait_start
+}
+
+# this will spew any unexpected input to stdout and be silent on success
+check () {
+	(
+		t0=$(date +%s)
+		i=0
+		while read hello world
+		do
+			t1=$(date +%s)
+			diff=$(($t1 - $t0))
+			t_info "i=$i diff=$diff hello=$hello world=$world"
+			test $diff -ge 1 || echo "$i: diff: $diff < 1 second"
+			t0=$t1
+			test xHello = x"$hello" || echo "$i: Hello != $hello"
+			test xWorld = x"$world" || echo "$i: World != $world"
+			i=$(($i + 1))
+			test $i -le 3 || echo "$i: $i > 3"
+		done
+	)
+}
+
+t_begin "send async requests off in parallel" && {
+	t0=$(date +%s)
+	curl --no-buffer -sSf http://$listen/ 2>> $curl_err | check >$a 2>&1 &
+	curl --no-buffer -sSf http://$listen/ 2>> $curl_err | check >$b 2>&1 &
+	curl --no-buffer -sSf http://$listen/ 2>> $curl_err | check >$c 2>&1 &
+}
+
+t_begin "wait for curl terminations" && {
+	wait
+	t1=$(date +%s)
+	elapsed=$(( $t1 - $t0 ))
+	t_info "elapsed=$elapsed (should be 4-5s)"
+}
+
+t_begin "termination signal sent" && {
+	kill $rainbows_pid
+}
+
+t_begin "no errors from curl" && {
+	test ! -s $curl_err
+}
+
+t_begin "no errors in stderr" && check_stderr
+
+t_begin "silence is golden" && {
+	test ! -s $a
+	test ! -s $b
+	test ! -s $c
+}
+
+t_done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  version: 0.90.1
+  version: 0.90.2
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -08:00
+date: 2010-02-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.95.0
+        version: 0.96.1
     - - <
       - !ruby/object:Gem::Version 
         version: 0.97.0
@@ -77,6 +77,7 @@ extra_rdoc_files:
 - lib/rainbows/thread_spawn.rb
 - LICENSE
 - NEWS
+- rainbows.1
 - README
 - SIGNALS
 - TODO
@@ -161,6 +162,8 @@ files:
 - t/bin/unused_listen
 - t/bin/utee
 - t/content-md5.ru
+- t/cramp/README
+- t/cramp/streaming.ru
 - t/env.ru
 - t/env_rack_env.ru
 - t/fork-sleep.ru
@@ -207,11 +210,13 @@ files:
 - t/t0300-async_sinatra.sh
 - t/t0400-em-async-app.sh
 - t/t0401-em-async-tailer.sh
+- t/t0500-cramp-streaming.sh
 - t/t9000-rack-app-pool.sh
 - t/t9000.ru
 - t/test-lib.sh
 - t/worker-follows-master-to-death.ru
 - vs_Unicorn
+- rainbows.1
 has_rdoc: true
 homepage: http://rainbows.rubyforge.org/
 licenses: []