zbatery 3.4.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  #!/bin/sh
2
2
 
3
3
  GVF=GIT-VERSION-FILE
4
- DEF_VER=v3.4.0.GIT
4
+ DEF_VER=v4.0.0.GIT
5
5
 
6
6
  LF='
7
7
  '
@@ -118,4 +118,4 @@ if $DEBUG
118
118
  end
119
119
 
120
120
  Unicorn::Launcher.daemonize!(options) if rackup_opts[:daemonize]
121
- Zbatery.run(app, options)
121
+ Rainbows::HttpServer.new(app, options).start.join
@@ -4,16 +4,7 @@ require 'rainbows'
4
4
  Rainbows.forked = true
5
5
  module Zbatery
6
6
 
7
- VERSION = "3.4.0"
8
-
9
- class << self
10
-
11
- # runs the Zbatery HttpServer with +app+ and +options+ and does
12
- # not return until the server has exited.
13
- def run(app, options = {})
14
- Rainbows::HttpServer.new(app, options).start.join
15
- end
16
- end
7
+ VERSION = "4.0.0"
17
8
 
18
9
  Rainbows::Const::RACK_DEFAULTS["SERVER_SOFTWARE"] = "Zbatery #{VERSION}"
19
10
 
@@ -33,7 +24,7 @@ module Rainbows
33
24
  after_fork.call(self, worker)
34
25
  worker.user(*user) if user.kind_of?(Array) && ! worker.switched
35
26
  build_app! unless preload_app
36
- Rainbows::Response.setup(self.class)
27
+ Rainbows::Response.setup
37
28
  Rainbows::MaxBody.setup
38
29
  Rainbows::ProcessClient.const_set(:APP, @app)
39
30
 
@@ -48,12 +39,6 @@ module Rainbows
48
39
 
49
40
  class HttpServer
50
41
 
51
- # this class is only used to avoid breaking Unicorn user switching
52
- class DeadIO
53
- def chown(*args); end
54
- alias fcntl chown
55
- end
56
-
57
42
  # only used if no concurrency model is specified
58
43
  def worker_loop(worker)
59
44
  init_worker_process(worker)
@@ -72,6 +57,7 @@ module Rainbows
72
57
 
73
58
  # no-op
74
59
  def maintain_worker_count; end
60
+ def spawn_missing_workers; end
75
61
  def init_self_pipe!; end
76
62
 
77
63
  # can't just do a graceful exit if reopening logs fails, so we just
@@ -107,7 +93,7 @@ module Rainbows
107
93
  self.ready_pipe = nil
108
94
  end
109
95
  extend(Rainbows.const_get(@use))
110
- worker = Worker.new(0, DeadIO.new)
96
+ worker = Worker.new(0)
111
97
  before_fork.call(self, worker)
112
98
  worker_loop(worker) # runs forever
113
99
  end
data/pkg.mk CHANGED
@@ -69,7 +69,7 @@ doc:: .document .wrongdoc.yml $(pkg_extra)
69
69
  $(RM) -r doc
70
70
  $(WRONGDOC) all
71
71
  install -m644 COPYING doc/COPYING
72
- install -m644 $(shell grep '^[A-Z]' .document) doc/
72
+ install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
73
73
 
74
74
  ifneq ($(VERSION),)
75
75
  pkggem := pkg/$(rfpackage)-$(VERSION).gem
@@ -167,5 +167,9 @@ doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
167
167
  doc_gz:
168
168
  for i in $(docs); do \
169
169
  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
170
+ check-warnings:
171
+ @(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
172
+ do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
170
173
 
171
174
  .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
175
+ .PHONY: check-warnings
@@ -14,8 +14,8 @@ old_out = $stdout.dup
14
14
  $stdout.reopen($stderr)
15
15
 
16
16
  Isolate.now!(opts) do
17
- gem 'rainbows', '3.4.0'
18
- gem 'raindrops', '0.6.1'
17
+ gem 'rainbows', '4.0.0'
18
+ gem 'raindrops', '0.7.0'
19
19
 
20
20
  if engine == "ruby"
21
21
  gem 'sendfile', '1.1.0' # next Rubinius should support this
@@ -34,7 +34,7 @@ Isolate.now!(opts) do
34
34
  end
35
35
 
36
36
  if RUBY_PLATFORM =~ /linux/
37
- gem 'sleepy_penguin', '3.0.0'
37
+ gem 'sleepy_penguin', '3.0.1'
38
38
 
39
39
  # is 2.6.32 new enough?
40
40
  gem 'io_splice', '4.1.1' if `uname -r`.strip > '2.6.32'
@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
32
32
  # espace-neverblock + eventmachine
33
33
  # async_sinatra + sinatra + eventmachine
34
34
  #
35
- s.add_dependency(%q<rainbows>, ["~> 3.4.0"])
35
+ s.add_dependency(%q<rainbows>, ["~> 4.0"])
36
36
  s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
37
- s.add_development_dependency(%q<isolate>, "~> 3.0.0")
37
+ s.add_development_dependency(%q<isolate>, "~> 3.1")
38
38
 
39
39
  # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems
40
40
  end
metadata CHANGED
@@ -1,8 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zbatery
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 63
4
5
  prerelease:
5
- version: 3.4.0
6
+ segments:
7
+ - 4
8
+ - 0
9
+ - 0
10
+ version: 4.0.0
6
11
  platform: ruby
7
12
  authors:
8
13
  - Zbatery hackers
@@ -10,7 +15,7 @@ autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
17
 
13
- date: 2011-05-21 00:00:00 Z
18
+ date: 2011-06-27 00:00:00 Z
14
19
  dependencies:
15
20
  - !ruby/object:Gem::Dependency
16
21
  name: rainbows
@@ -20,7 +25,11 @@ dependencies:
20
25
  requirements:
21
26
  - - ~>
22
27
  - !ruby/object:Gem::Version
23
- version: 3.4.0
28
+ hash: 27
29
+ segments:
30
+ - 4
31
+ - 0
32
+ version: "4.0"
24
33
  type: :runtime
25
34
  version_requirements: *id001
26
35
  - !ruby/object:Gem::Dependency
@@ -31,6 +40,10 @@ dependencies:
31
40
  requirements:
32
41
  - - ~>
33
42
  - !ruby/object:Gem::Version
43
+ hash: 5
44
+ segments:
45
+ - 1
46
+ - 5
34
47
  version: "1.5"
35
48
  type: :development
36
49
  version_requirements: *id002
@@ -42,7 +55,11 @@ dependencies:
42
55
  requirements:
43
56
  - - ~>
44
57
  - !ruby/object:Gem::Version
45
- version: 3.0.0
58
+ hash: 5
59
+ segments:
60
+ - 3
61
+ - 1
62
+ version: "3.1"
46
63
  type: :development
47
64
  version_requirements: *id003
48
65
  description: |-
@@ -124,17 +141,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
124
141
  requirements:
125
142
  - - ">="
126
143
  - !ruby/object:Gem::Version
144
+ hash: 3
145
+ segments:
146
+ - 0
127
147
  version: "0"
128
148
  required_rubygems_version: !ruby/object:Gem::Requirement
129
149
  none: false
130
150
  requirements:
131
151
  - - ">="
132
152
  - !ruby/object:Gem::Version
153
+ hash: 3
154
+ segments:
155
+ - 0
133
156
  version: "0"
134
157
  requirements: []
135
158
 
136
159
  rubyforge_project: rainbows
137
- rubygems_version: 1.8.2
160
+ rubygems_version: 1.8.5
138
161
  signing_key:
139
162
  specification_version: 3
140
163
  summary: Rack HTTP server without a fork stuck in it