protobuf 1.4.1 → 1.4.2
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/rpc_server +9 -4
- data/lib/protobuf/message/field.rb +1 -6
- data/lib/protobuf/version.rb +1 -1
- metadata +28 -22
data/bin/rpc_server
CHANGED
@@ -22,7 +22,8 @@ server = OpenStruct.new({
|
|
22
22
|
:log => File.expand_path('./protobuf.log'),
|
23
23
|
:level => ::Logger::INFO,
|
24
24
|
:runner => ::Protobuf::Rpc::EventedRunner,
|
25
|
-
:debug => false
|
25
|
+
:debug => false,
|
26
|
+
:stopped_during_startup => false
|
26
27
|
})
|
27
28
|
|
28
29
|
class ClientServerParse
|
@@ -148,6 +149,7 @@ require 'protobuf'
|
|
148
149
|
|
149
150
|
[:INT, :QUIT, :TERM].each do |sig|
|
150
151
|
trap(sig) do
|
152
|
+
server.stopped_during_startup = true
|
151
153
|
server.runner.stop
|
152
154
|
end
|
153
155
|
end
|
@@ -173,10 +175,13 @@ begin
|
|
173
175
|
$0 = 'rpc_server %s:%d %s' % [server.host, server.port, server.app]
|
174
176
|
|
175
177
|
# Require the given application file
|
176
|
-
require server.app
|
178
|
+
require server.app unless server.stopped_during_startup
|
177
179
|
|
178
|
-
|
179
|
-
|
180
|
+
if server.pre_cache_definitions && !server.stopped_during_startup
|
181
|
+
::Protobuf::Message.pre_cache_class_definitions
|
182
|
+
end
|
183
|
+
|
184
|
+
server.runner.run(server) unless server.stopped_during_startup
|
180
185
|
rescue
|
181
186
|
msg = 'ERROR: RPC Server failed to start. %s' % $!.inspect
|
182
187
|
$stderr.puts(msg, *($!.backtrace))
|
@@ -181,12 +181,7 @@ module Protobuf
|
|
181
181
|
field = self
|
182
182
|
@message_class.class_eval do
|
183
183
|
define_method(field.name) do
|
184
|
-
@values
|
185
|
-
# if @values.has_key?(field.name)
|
186
|
-
# @values[field.name]
|
187
|
-
# else
|
188
|
-
# field.default_value
|
189
|
-
# end
|
184
|
+
@values.fetch(field.name, field.default_value)
|
190
185
|
end
|
191
186
|
end
|
192
187
|
end
|
data/lib/protobuf/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: protobuf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.
|
4
|
+
version: 1.4.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,11 +10,11 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2012-09-
|
13
|
+
date: 2012-09-20 00:00:00.000000000Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: eventmachine
|
17
|
-
requirement: &
|
17
|
+
requirement: &2156303880 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ! '>='
|
@@ -22,10 +22,10 @@ dependencies:
|
|
22
22
|
version: '0'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *2156303880
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: eventually
|
28
|
-
requirement: &
|
28
|
+
requirement: &2156292740 !ruby/object:Gem::Requirement
|
29
29
|
none: false
|
30
30
|
requirements:
|
31
31
|
- - ! '>='
|
@@ -33,10 +33,10 @@ dependencies:
|
|
33
33
|
version: '0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
|
-
version_requirements: *
|
36
|
+
version_requirements: *2156292740
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: json_pure
|
39
|
-
requirement: &
|
39
|
+
requirement: &2156290600 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
42
42
|
- - ! '>='
|
@@ -44,10 +44,10 @@ dependencies:
|
|
44
44
|
version: '0'
|
45
45
|
type: :runtime
|
46
46
|
prerelease: false
|
47
|
-
version_requirements: *
|
47
|
+
version_requirements: *2156290600
|
48
48
|
- !ruby/object:Gem::Dependency
|
49
49
|
name: ffi-rzmq
|
50
|
-
requirement: &
|
50
|
+
requirement: &2156289760 !ruby/object:Gem::Requirement
|
51
51
|
none: false
|
52
52
|
requirements:
|
53
53
|
- - ! '>='
|
@@ -55,10 +55,10 @@ dependencies:
|
|
55
55
|
version: '0'
|
56
56
|
type: :runtime
|
57
57
|
prerelease: false
|
58
|
-
version_requirements: *
|
58
|
+
version_requirements: *2156289760
|
59
59
|
- !ruby/object:Gem::Dependency
|
60
60
|
name: rake
|
61
|
-
requirement: &
|
61
|
+
requirement: &2156288320 !ruby/object:Gem::Requirement
|
62
62
|
none: false
|
63
63
|
requirements:
|
64
64
|
- - ! '>='
|
@@ -66,10 +66,10 @@ dependencies:
|
|
66
66
|
version: '0'
|
67
67
|
type: :development
|
68
68
|
prerelease: false
|
69
|
-
version_requirements: *
|
69
|
+
version_requirements: *2156288320
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: pry
|
72
|
-
requirement: &
|
72
|
+
requirement: &2156284840 !ruby/object:Gem::Requirement
|
73
73
|
none: false
|
74
74
|
requirements:
|
75
75
|
- - ! '>='
|
@@ -77,10 +77,10 @@ dependencies:
|
|
77
77
|
version: '0'
|
78
78
|
type: :development
|
79
79
|
prerelease: false
|
80
|
-
version_requirements: *
|
80
|
+
version_requirements: *2156284840
|
81
81
|
- !ruby/object:Gem::Dependency
|
82
82
|
name: pry-nav
|
83
|
-
requirement: &
|
83
|
+
requirement: &2156283540 !ruby/object:Gem::Requirement
|
84
84
|
none: false
|
85
85
|
requirements:
|
86
86
|
- - ! '>='
|
@@ -88,10 +88,10 @@ dependencies:
|
|
88
88
|
version: '0'
|
89
89
|
type: :development
|
90
90
|
prerelease: false
|
91
|
-
version_requirements: *
|
91
|
+
version_requirements: *2156283540
|
92
92
|
- !ruby/object:Gem::Dependency
|
93
93
|
name: rspec
|
94
|
-
requirement: &
|
94
|
+
requirement: &2156282220 !ruby/object:Gem::Requirement
|
95
95
|
none: false
|
96
96
|
requirements:
|
97
97
|
- - ! '>='
|
@@ -99,10 +99,10 @@ dependencies:
|
|
99
99
|
version: '0'
|
100
100
|
type: :development
|
101
101
|
prerelease: false
|
102
|
-
version_requirements: *
|
102
|
+
version_requirements: *2156282220
|
103
103
|
- !ruby/object:Gem::Dependency
|
104
104
|
name: yard
|
105
|
-
requirement: &
|
105
|
+
requirement: &2156281060 !ruby/object:Gem::Requirement
|
106
106
|
none: false
|
107
107
|
requirements:
|
108
108
|
- - ! '>='
|
@@ -110,10 +110,10 @@ dependencies:
|
|
110
110
|
version: '0'
|
111
111
|
type: :development
|
112
112
|
prerelease: false
|
113
|
-
version_requirements: *
|
113
|
+
version_requirements: *2156281060
|
114
114
|
- !ruby/object:Gem::Dependency
|
115
115
|
name: simplecov
|
116
|
-
requirement: &
|
116
|
+
requirement: &2156280200 !ruby/object:Gem::Requirement
|
117
117
|
none: false
|
118
118
|
requirements:
|
119
119
|
- - ! '>='
|
@@ -121,7 +121,7 @@ dependencies:
|
|
121
121
|
version: '0'
|
122
122
|
type: :development
|
123
123
|
prerelease: false
|
124
|
-
version_requirements: *
|
124
|
+
version_requirements: *2156280200
|
125
125
|
description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
|
126
126
|
rpc implementations (e.g. Java, Python, C++).
|
127
127
|
|
@@ -301,12 +301,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
301
301
|
- - ! '>='
|
302
302
|
- !ruby/object:Gem::Version
|
303
303
|
version: '0'
|
304
|
+
segments:
|
305
|
+
- 0
|
306
|
+
hash: -754579198838868280
|
304
307
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
305
308
|
none: false
|
306
309
|
requirements:
|
307
310
|
- - ! '>='
|
308
311
|
- !ruby/object:Gem::Version
|
309
312
|
version: '0'
|
313
|
+
segments:
|
314
|
+
- 0
|
315
|
+
hash: -754579198838868280
|
310
316
|
requirements: []
|
311
317
|
rubyforge_project:
|
312
318
|
rubygems_version: 1.8.15
|