diff options
author | Eric Wong <normalperson@yhbt.net> | 2011-01-11 16:49:55 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2011-01-11 17:27:12 -0800 |
commit | b0bd7a531a2816fbcd20ee982d52f236f8fa9af3 (patch) | |
tree | af1b1535ea23871844277655eaa316f53089f018 | |
parent | 2549a23a1a6b18097292acf7dff8e40b6f59ed91 (diff) | |
download | zbatery-b0bd7a531a2816fbcd20ee982d52f236f8fa9af3.tar.gz |
Zbatery 3.0.0 - Rainbows! 3.0.0 resync v3.0.0
The ugly "Rainbows::G" constant is no longer.
-rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
-rw-r--r-- | lib/zbatery.rb | 10 | ||||
-rw-r--r-- | t/test_isolate.rb | 4 | ||||
-rw-r--r-- | zbatery.gemspec | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 6eb2f70..017ae4b 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v0.6.0.GIT +DEF_VER=v3.0.0.GIT LF=' ' diff --git a/lib/zbatery.rb b/lib/zbatery.rb index d056ddd..ac29533 100644 --- a/lib/zbatery.rb +++ b/lib/zbatery.rb @@ -4,8 +4,8 @@ require 'rainbows' module Zbatery - # version of Zbatery, currently 0.6.0 - VERSION = "0.6.0" + # version of Zbatery, currently 3.0.0 + VERSION = "3.0.0" class << self @@ -44,7 +44,7 @@ module Rainbows end # we can't/don't need to do the fchmod heartbeat Unicorn/Rainbows! does - def G.tick + def self.tick alive end @@ -69,7 +69,7 @@ module Rainbows break rescue => e Rainbows::Error.listen_loop(e) - end while G.alive + end while Rainbows.alive end # no-op @@ -115,7 +115,7 @@ module Rainbows end def stop(graceful = true) - Rainbows::G.quit! + Rainbows.quit! exit!(0) unless graceful end diff --git a/t/test_isolate.rb b/t/test_isolate.rb index 06ba667..0aac762 100644 --- a/t/test_isolate.rb +++ b/t/test_isolate.rb @@ -14,9 +14,7 @@ old_out = $stdout.dup $stdout.reopen($stderr) Isolate.now!(opts) do - gem 'rack', '1.2.1' - gem 'unicorn', '3.2.1' - gem 'rainbows', '2.1.0' + gem 'rainbows', '3.0.0' if engine == "ruby" gem 'sendfile', '1.0.0' # next Rubinius should support this diff --git a/zbatery.gemspec b/zbatery.gemspec index ce48272..2cc7e68 100644 --- a/zbatery.gemspec +++ b/zbatery.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| # espace-neverblock + eventmachine # async_sinatra + sinatra + eventmachine # - s.add_dependency(%q<rainbows>, ["~> 2.1.0"]) + s.add_dependency(%q<rainbows>, ["~> 3.0.0"]) s.add_development_dependency(%q<wrongdoc>, "~> 1.1") s.add_development_dependency(%q<isolate>, "~> 3.0.0") |