rainbows 0.3.0 → 0.4.0

data/t/t9000-rack-app-pool.sh

@@ -1,36 +1,48 @@
 #!/bin/sh
 . ./test-lib.sh
+case $model in
+Thread*) ;;
+*)
+	t_info "skipping $T since it's not compatible with $model"
+	exit 0
+	;;
+esac
+nr_client=30 APP_POOL_SIZE=4
 
-eval $(unused_listen)
-rtmpfiles unicorn_config pid r_err r_out curl_out curl_err
-
-nr_client=30
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-pid "$pid"
-stderr_path "$r_err"
-stdout_path "$r_out"
-Rainbows! do
-  use :ThreadSpawn
-  worker_connections 50
-end
-EOF
-
-APP_POOL_SIZE=4
-APP_POOL_SIZE=$APP_POOL_SIZE rainbows -D t9000.ru -c $unicorn_config
-wait_for_pid $pid
-
-start=$(date +%s)
-for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
-do
-	( curl -sSf http://$listen/ >> $curl_out 2>> $curl_err ) &
-done
-wait
-echo elapsed=$(( $(date +%s) - $start ))
-kill $(cat $pid)
-
-test $APP_POOL_SIZE -eq $(sort < $curl_out | uniq | wc -l)
-test ! -s $curl_err
-
-check_stderr
+t_plan 6 "AppPool Rack middleware test for $model"
+
+t_begin "configure and start" && {
+	rtmpfiles curl_out curl_err
+	rainbows_setup $model 50
+	APP_POOL_SIZE=$APP_POOL_SIZE rainbows -D t9000.ru -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "launch $nr_client requests" && {
+	start=$(date +%s)
+	seq="$(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)"
+	for i in $seq
+	do
+		curl -sSf http://$listen/ >> $curl_out 2>> $curl_err &
+	done
+	wait
+	t_info elapsed=$(( $(date +%s) - $start ))
+}
+
+t_begin "kill server" && {
+	kill $rainbows_pid
+}
+
+t_begin "$APP_POOL_SIZE instances of app were used" && {
+	test $APP_POOL_SIZE -eq $(sort < $curl_out | uniq | wc -l)
+}
+
+t_begin "no errors in curl stderr" && {
+	test ! -s $curl_err
+}
+
+t_begin "no errors in Rainbows! stderr" && {
+	check_stderr
+}
+
+t_done

data/t/test-lib.sh

@@ -1,63 +1,21 @@
 #!/bin/sh
 # Copyright (c) 2009 Rainbows! developers
+. ./my-tap-lib.sh
 
-# pipefail is non-POSIX, but useful in ksh/bash
-(
-	set +e
-	set -o pipefail 2>/dev/null
-)
-if test $? -eq 0
-then
-	set -o pipefail
-else
-	echo >&2 "WARNING: your shell does not understand pipefail"
-fi
-
-set -e
-
-T=$(basename $0)
+set +u
 if test -z "$model"
 then
-	case $T in
-	t1???-thread-pool-*.sh) model=ThreadPool ;;
-	t2???-thread-spawn-*.sh) model=ThreadSpawn ;;
-	t3???-revactor-*.sh) model=Revactor ;;
-	t4???-rev-*.sh) model=Rev ;;
-	*) model=any ;;
-	esac
+	# defaulting to Base would unfortunately fail some concurrency tests
+	model=ThreadSpawn
+	t_info "model undefined, defaulting to $model"
 fi
 
-ruby="${ruby-'ruby'}"
-RUBY_VERSION=${RUBY_VERSION-$($ruby -e 'puts RUBY_VERSION')}
-t_pfx=$PWD/trash/$T-$RUBY_VERSION
+set -e
+RUBY="${RUBY-ruby}"
+RUBY_VERSION=${RUBY_VERSION-$($RUBY -e 'puts RUBY_VERSION')}
+t_pfx=$PWD/trash/$model.$T-$RUBY_VERSION
 set -u
 
-# ensure a sane environment
-TZ=UTC LC_ALL=C LANG=C
-export LANG LC_ALL TZ
-unset CDPATH
-
-die () {
-	echo >&2 "$@"
-	exit 1
-}
-
-_test_on_exit () {
-	code=$?
-	case $code in
-	0)
-		echo "ok $T"
-		rm -f $_TEST_OK_RM_LIST
-	;;
-	*) echo "not ok $T" ;;
-	esac
-	rm -f $_TEST_RM_LIST
-	exit $code
-}
-
-_TEST_RM_LIST=
-_TEST_OK_RM_LIST=
-trap _test_on_exit EXIT
 PATH=$PWD/bin:$PATH
 export PATH
 
@@ -73,12 +31,13 @@ wait_for_pid () {
 	done
 }
 
+# requires $1 and prints out the value of $2
 require_check () {
 	lib=$1
 	const=$2
-	if ! $ruby -r$lib -e "puts $const" >/dev/null 2>&1
+	if ! $RUBY -r$lib -e "puts $const" >/dev/null 2>&1
 	then
-		echo >&2 "skipping $T since we don't have $lib"
+		t_info "skipping $T since we don't have $lib"
 		exit 0
 	fi
 }
@@ -90,15 +49,21 @@ rtmpfiles () {
 	do
 		name=$id
 		_tmp=$t_pfx.$id
-		> $_tmp
 		eval "$id=$_tmp"
-		_TEST_OK_RM_LIST="$_TEST_OK_RM_LIST $_tmp"
 
 		case $name in
 		*fifo)
 			rm -f $_tmp
 			mkfifo $_tmp
-			_TEST_RM_LIST="$_TEST_RM_LIST $_tmp"
+			T_RM_LIST="$T_RM_LIST $_tmp"
+			;;
+		*socket)
+			rm -f $_tmp
+			T_RM_LIST="$T_RM_LIST $_tmp"
+			;;
+		*)
+			> $_tmp
+			T_OK_RM_LIST="$T_OK_RM_LIST $_tmp"
 			;;
 		esac
 	done
@@ -124,7 +89,53 @@ check_stderr () {
 	fi
 }
 
+# rainbows_setup [ MODEL [ WORKER_CONNECTIONS ] ]
+rainbows_setup () {
+	eval $(unused_listen)
+	rtmpfiles unicorn_config pid r_err r_out fifo tmp ok
+	cat > $unicorn_config <<EOF
+listen "$listen"
+pid "$pid"
+stderr_path "$r_err"
+stdout_path "$r_out"
+
+# close my-tap-lib.sh FDs
+unless ENV['UNICORN_FD']
+  IO.for_fd(3).close rescue nil
+  IO.for_fd(4).close rescue nil
+end
+
+before_fork do |server, worker|
+  # test script will block while reading from $fifo,
+  # so notify the script on the first worker we spawn
+  # by opening the FIFO
+  if worker.nr == 0
+    File.open("$fifo", "wb").close
+  end
+end
+EOF
+	{
+		if test $# -ge 1
+		then
+			echo 'Rainbows! do'
+			echo "  use :$1"
+			test $# -eq 2 && echo "  worker_connections $2"
+			echo end
+		else
+			echo "Rainbows! { use :$model }"
+		fi
+	} >> $unicorn_config
+}
+
+rainbows_wait_start () {
+	# "cat $fifo" will block until the before_fork hook is called in
+	# the Unicorn config file
+	test x = x"$(cat $fifo)"
+	rainbows_pid=$(cat $pid)
+}
+
 case $model in
 Rev) require_check rev Rev::VERSION ;;
 Revactor) require_check revactor Revactor::VERSION ;;
+EventMachine) require_check eventmachine EventMachine::VERSION ;;
 esac

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Rainbows! developers
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 -07:00
+date: 2009-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: unicorn
   type: :runtime
@@ -30,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.93.1
+        version: 0.93.4
     version: 
 description: |-
   Rainbows! is a HTTP server for sleepy Rack applications.  It is based on
@@ -52,6 +42,8 @@ extra_rdoc_files:
 - lib/rainbows/base.rb
 - lib/rainbows/const.rb
 - lib/rainbows/dev_fd_response.rb
+- lib/rainbows/ev_core.rb
+- lib/rainbows/event_machine.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
 - lib/rainbows/rev.rb
@@ -93,6 +85,8 @@ files:
 - lib/rainbows/base.rb
 - lib/rainbows/const.rb
 - lib/rainbows/dev_fd_response.rb
+- lib/rainbows/ev_core.rb
+- lib/rainbows/event_machine.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
 - lib/rainbows/rev.rb
@@ -109,62 +103,38 @@ files:
 - t/README
 - t/async-response-no-autochunk.ru
 - t/async-response.ru
+- t/async_sinatra.ru
 - t/bin/content-md5-put
 - t/bin/unused_listen
 - t/bin/utee
 - t/content-md5.ru
 - t/env.ru
 - t/large-file-response.ru
-- t/lib-async-response-no-autochunk.sh
-- t/lib-async-response.sh
-- t/lib-graceful.sh
-- t/lib-input-trailer.sh
-- t/lib-large-file-response.sh
-- t/lib-parser-error.sh
-- t/lib-rack-input-hammer.sh
-- t/lib-reopen-logs.sh
-- t/lib-simple-http.sh
+- t/my-tap-lib.sh
 - t/sha1.ru
+- t/simple-http_Base.ru
+- t/simple-http_EventMachine.ru
+- t/simple-http_Rev.ru
+- t/simple-http_Revactor.ru
+- t/simple-http_ThreadPool.ru
+- t/simple-http_ThreadSpawn.ru
 - t/sleep.ru
-- t/t0000-basic.sh
+- t/t0000-simple-http.sh
 - t/t0000.ru
-- t/t1000-thread-pool-basic.sh
+- t/t0001-unix-http.sh
+- t/t0002-graceful.sh
+- t/t0002-parser-error.sh
+- t/t0003-reopen-logs.sh
+- t/t0005-large-file-response.sh
+- t/t0100-rack-input-hammer.sh
+- t/t0101-rack-input-trailer.sh
+- t/t0200-async-response.sh
+- t/t0201-async-response-no-autochunk.sh
+- t/t0300-async_sinatra.sh
 - t/t1000.ru
-- t/t1002-thread-pool-graceful.sh
-- t/t1003-thread-pool-reopen-logs.sh
-- t/t1004-thread-pool-async-response.sh
-- t/t1005-thread-pool-large-file-response.sh
-- t/t1006-thread-pool-async-response-no-autochunk.sh
-- t/t1100-thread-pool-rack-input.sh
-- t/t1101-thread-pool-input-trailer.sh
-- t/t2000-thread-spawn-basic.sh
 - t/t2000.ru
-- t/t2002-thread-spawn-graceful.sh
-- t/t2003-thread-spawn-reopen-logs.sh
-- t/t2004-thread-spawn-async-response.sh
-- t/t2005-thread-spawn-large-file-response.sh
-- t/t2006-thread-spawn-async-response-no-autochunk.sh
-- t/t2100-thread-spawn-rack-input.sh
-- t/t2101-thread-spawn-input-trailer.sh
-- t/t3000-revactor-basic.sh
 - t/t3000.ru
-- t/t3002-revactor-graceful.sh
-- t/t3003-revactor-reopen-logs.sh
-- t/t3004-revactor-async-response.sh
-- t/t3005-revactor-large-file-response.sh
-- t/t3006-revactor-async-response-no-autochunk.sh
-- t/t3100-revactor-rack-input.sh
-- t/t3101-revactor-rack-input-trailer.sh
-- t/t4000-rev-basic.sh
 - t/t4000.ru
-- t/t4002-rev-graceful.sh
-- t/t4003-rev-parser-error.sh
-- t/t4003-rev-reopen-logs.sh
-- t/t4004-rev-async-response.sh
-- t/t4005-rev-large-file-response.sh
-- t/t4006-rev-async-response-no-autochunk.sh
-- t/t4100-rev-rack-input.sh
-- t/t4101-rev-rack-input-trailer.sh
 - t/t9000-rack-app-pool.sh
 - t/t9000.ru
 - t/test-lib.sh

data/t/lib-async-response-no-autochunk.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-CONFIG_RU=async-response-no-autochunk.ru
-. ./lib-async-response.sh
-test x"$(cat $a)" = x0123456789
-test x"$(cat $b)" = x0123456789
-test x"$(cat $c)" = x0123456789

data/t/lib-async-response.sh

@@ -1,45 +0,0 @@
-CONFIG_RU=${CONFIG_RU-'async-response.ru'}
-. ./test-lib.sh
-echo "async response for model=$model"
-eval $(unused_listen)
-rtmpfiles unicorn_config a b c r_err r_out pid curl_err
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-stderr_path "$r_err"
-stdout_path "$r_out"
-pid "$pid"
-Rainbows! { use :$model }
-EOF
-
-# can't load Rack::Lint here since it'll cause Rev to slurp
-rainbows -E none -D $CONFIG_RU -c $unicorn_config
-wait_for_pid $pid
-
-t0=$(date +%s)
-( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $a) &
-( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $b) &
-( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $c) &
-wait
-t1=$(date +%s)
-
-rainbows_pid=$(cat $pid)
-kill -QUIT $rainbows_pid
-elapsed=$(( $t1 - $t0 ))
-echo "elapsed=$elapsed < 30"
-test $elapsed -lt 30
-
-dbgcat a
-dbgcat b
-dbgcat c
-dbgcat r_err
-dbgcat curl_err
-test ! -s $curl_err
-check_stderr
-
-while kill -0 $rainbows_pid >/dev/null 2>&1
-do
-	sleep 1
-done
-
-dbgcat r_err

data/t/lib-graceful.sh

@@ -1,40 +0,0 @@
-. ./test-lib.sh
-echo "graceful test for model=$model"
-
-eval $(unused_listen)
-rtmpfiles unicorn_config curl_out pid r_err r_out fifo
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-stderr_path "$r_err"
-stdout_path "$r_out"
-pid "$pid"
-Rainbows! { use :$model }
-EOF
-
-rainbows -D sleep.ru -c $unicorn_config
-wait_for_pid $pid
-rainbows_pid=$(cat $pid)
-
-curl -sSfv -T- </dev/null http://$listen/5 > $curl_out 2> $fifo &
-
-awk -v rainbows_pid=$rainbows_pid '
-{ print $0 }
-/100 Continue/ {
-	print "awk: sending SIGQUIT to", rainbows_pid
-	system("kill -QUIT "rainbows_pid)
-}' $fifo
-wait
-
-dbgcat r_err
-
-test x"$(wc -l < $curl_out)" = x1
-nr=$(sort < $curl_out | uniq | wc -l)
-
-test "$nr" -eq 1
-test x$(sort < $curl_out | uniq) = xHello
-check_stderr
-while kill -0 $rainbows_pid >/dev/null 2>&1
-do
-	sleep 1
-done