zbatery 3.4.0 → 4.0.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v3.4.0.GIT
+DEF_VER=v4.0.0.GIT
 
 LF='
 '

data/bin/zbatery

@@ -118,4 +118,4 @@ if $DEBUG
 end
 
 Unicorn::Launcher.daemonize!(options) if rackup_opts[:daemonize]
-Zbatery.run(app, options)
+Rainbows::HttpServer.new(app, options).start.join

data/lib/zbatery.rb

@@ -4,16 +4,7 @@ require 'rainbows'
 Rainbows.forked = true
 module Zbatery
 
-  VERSION = "3.4.0"
-
-  class << self
-
-    # runs the Zbatery HttpServer with +app+ and +options+ and does
-    # not return until the server has exited.
-    def run(app, options = {})
-      Rainbows::HttpServer.new(app, options).start.join
-    end
-  end
+  VERSION = "4.0.0"
 
   Rainbows::Const::RACK_DEFAULTS["SERVER_SOFTWARE"] = "Zbatery #{VERSION}"
 
@@ -33,7 +24,7 @@ module Rainbows
       after_fork.call(self, worker)
       worker.user(*user) if user.kind_of?(Array) && ! worker.switched
       build_app! unless preload_app
-      Rainbows::Response.setup(self.class)
+      Rainbows::Response.setup
       Rainbows::MaxBody.setup
       Rainbows::ProcessClient.const_set(:APP, @app)
 
@@ -48,12 +39,6 @@ module Rainbows
 
   class HttpServer
 
-    # this class is only used to avoid breaking Unicorn user switching
-    class DeadIO
-      def chown(*args); end
-      alias fcntl chown
-    end
-
     # only used if no concurrency model is specified
     def worker_loop(worker)
       init_worker_process(worker)
@@ -72,6 +57,7 @@ module Rainbows
 
     # no-op
     def maintain_worker_count; end
+    def spawn_missing_workers; end
     def init_self_pipe!; end
 
     # can't just do a graceful exit if reopening logs fails, so we just
@@ -107,7 +93,7 @@ module Rainbows
         self.ready_pipe = nil
       end
       extend(Rainbows.const_get(@use))
-      worker = Worker.new(0, DeadIO.new)
+      worker = Worker.new(0)
       before_fork.call(self, worker)
       worker_loop(worker) # runs forever
     end

data/pkg.mk

@@ -69,7 +69,7 @@ doc:: .document .wrongdoc.yml $(pkg_extra)
 	$(RM) -r doc
 	$(WRONGDOC) all
 	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
+	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
@@ -167,5 +167,9 @@ doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+check-warnings:
+	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
+	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
 .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+.PHONY: check-warnings

data/t/test_isolate.rb

@@ -14,8 +14,8 @@ old_out = $stdout.dup
 $stdout.reopen($stderr)
 
 Isolate.now!(opts) do
-  gem 'rainbows', '3.4.0'
-  gem 'raindrops', '0.6.1'
+  gem 'rainbows', '4.0.0'
+  gem 'raindrops', '0.7.0'
 
   if engine == "ruby"
     gem 'sendfile', '1.1.0' # next Rubinius should support this
@@ -34,7 +34,7 @@ Isolate.now!(opts) do
   end
 
   if RUBY_PLATFORM =~ /linux/
-    gem 'sleepy_penguin', '3.0.0'
+    gem 'sleepy_penguin', '3.0.1'
 
     # is 2.6.32 new enough?
     gem 'io_splice', '4.1.1' if `uname -r`.strip > '2.6.32'

data/zbatery.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
   #   espace-neverblock + eventmachine
   #   async_sinatra + sinatra + eventmachine
   #
-  s.add_dependency(%q<rainbows>, ["~> 3.4.0"])
+  s.add_dependency(%q<rainbows>, ["~> 4.0"])
   s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
-  s.add_development_dependency(%q<isolate>, "~> 3.0.0")
+  s.add_development_dependency(%q<isolate>, "~> 3.1")
 
   # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbatery
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
-  version: 3.4.0
+  segments: 
+  - 4
+  - 0
+  - 0
+  version: 4.0.0
 platform: ruby
 authors: 
 - Zbatery hackers
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rainbows
@@ -20,7 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.4.0
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,6 +40,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
         version: "1.5"
   type: :development
   version_requirements: *id002
@@ -42,7 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :development
   version_requirements: *id003
 description: |-
@@ -124,17 +141,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server without a fork stuck in it