From 816d4e840fca8606215a328beda90dd92153bcd7 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 1 Mar 2010 10:40:51 +0000
Subject: [PATCH] Zbatery 0.2.0 - Unicorn/Rainbows! resync

Eric Wong (7):
      use Unicorn.builder to parse config.ru switches
      import selected parts of test suite from Rainbows!
      gemspec: depend on newer Unicorn for Unicorn.builder
      support "user" directive outside of after_fork hook
      MRI 1.8 thread fix to avoid blocking accept()
      disable more Unicorn methods
      support Unicorn 0.96.0+ ready_pipe daemonization
---
 GIT-VERSION-GEN | 2 +-
 GNUmakefile     | 2 +-
 lib/zbatery.rb  | 2 +-
 zbatery.gemspec | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 8e53f75..e36125a 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.1.1.GIT
+DEF_VER=v0.2.0.GIT
 
 LF='
 '
diff --git a/GNUmakefile b/GNUmakefile
index 45b9bb2..201d6f3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -58,7 +58,7 @@ NEWS: GIT-VERSION-FILE
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 0.0.0
+SINCE = 0.1.1
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
diff --git a/lib/zbatery.rb b/lib/zbatery.rb
index 9704839..0b41906 100644
--- a/lib/zbatery.rb
+++ b/lib/zbatery.rb
@@ -4,7 +4,7 @@ require 'rainbows'
 module Zbatery
 
   # current version of Zbatery
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
   class << self
 
diff --git a/zbatery.gemspec b/zbatery.gemspec
index 4857e4e..5d84d9c 100644
--- a/zbatery.gemspec
+++ b/zbatery.gemspec
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   # unicorn 0.96.0 and before had a memory leak
   # that was only triggered in Rainbows!/Zbatery
   s.add_dependency(%q<unicorn>, ["~> 0.97.0"])
-  s.add_dependency(%q<rainbows>, [">= 0.90.2", "<= 1.0.0"])
+  s.add_dependency(%q<rainbows>, [">= 0.91.0", "<= 1.0.0"])
 
   # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems
 end
-- 
2.11.4.GIT