beetle 0.3.0.rc.4 → 0.3.0.rc.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/beetle.gemspec +7 -3
  2. data/lib/beetle/client.rb +1 -1
  3. data/lib/beetle/redis_configuration_client.rb +1 -1
  4. data/lib/beetle/version.rb +3 -0
  5. data/lib/beetle.rb +8 -0
  6. metadata +146 -233
  7. data/script/console~ +0 -2
data/beetle.gemspec CHANGED
@@ -1,13 +1,17 @@
1
+ # -*- encoding: utf-8 -*-
2
+ $:.push File.expand_path("../lib", __FILE__)
3
+ require "beetle/version"
4
+
1
5
  Gem::Specification.new do |s|
2
6
  s.name = "beetle"
3
- s.version = "0.3.0.rc.4"
7
+ s.version = Beetle::VERSION
4
8
  s.required_rubygems_version = ">= 1.3.7"
5
- s.authors = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
9
+ s.authors = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke", "Larry Baltz"]
6
10
  s.date = Time.now.strftime('%Y-%m-%d')
7
11
  s.default_executable = "beetle"
8
12
  s.description = "A highly available, reliable messaging infrastructure"
9
13
  s.summary = "High Availability AMQP Messaging with Redundant Queues"
10
- s.email = "developers@xing.com"
14
+ s.email = "opensource@xing.com"
11
15
  s.executables = ["beetle"]
12
16
  s.extra_rdoc_files = Dir['**/*.rdoc'] + %w(MIT-LICENSE)
13
17
  s.files = Dir['{examples,lib}/**/*.rb'] + Dir['{features,script}/**/*'] + %w(beetle.gemspec Rakefile)
data/lib/beetle/client.rb CHANGED
@@ -289,7 +289,7 @@ module Beetle
289
289
  end
290
290
 
291
291
  def queue_name_for_tracing(queue)
292
- "trace-#{queue}-#{`hostname`.chomp}-#{$$}"
292
+ "trace-#{queue}-#{Beetle.hostname}-#{$$}"
293
293
  end
294
294
  end
295
295
  end
data/lib/beetle/redis_configuration_client.rb CHANGED
@@ -25,7 +25,7 @@ module Beetle
25
25
 
26
26
  # Unique id for this instance (defaults to the fully qualified hostname)
27
27
  def id
28
- @id ||= `hostname -f`.chomp
28
+ @id ||= Beetle.hostname
29
29
  end
30
30
 
31
31
  def initialize #:nodoc:
data/lib/beetle/version.rb ADDED
@@ -0,0 +1,3 @@
1
+ module Beetle
2
+ VERSION = "0.3.0.rc.5"
3
+ end
data/lib/beetle.rb CHANGED
@@ -6,6 +6,7 @@ require 'redis'
6
6
  require 'active_support'
7
7
  require 'active_support/core_ext'
8
8
  require 'set'
9
+ require 'socket'
9
10
 
10
11
  module Beetle
11
12
  Timer = if RUBY_VERSION < "1.9"
@@ -46,6 +47,13 @@ module Beetle
46
47
  # AMQP options for subscribing to queues
47
48
  SUBSCRIPTION_KEYS = [:ack, :key]
48
49
 
50
+ # determine the fully qualified domainname of the host we're running on
51
+ def self.hostname
52
+ name = Socket.gethostname
53
+ parts = name.split('.')
54
+ parts.size > 1 ? name : Socket.gethostbyname(parts.first).first
55
+ end
56
+
49
57
  # use ruby's autoload mechanism for loading beetle classes
50
58
  lib_dir = File.expand_path(File.dirname(__FILE__) + '/beetle/')
51
59
  Dir["#{lib_dir}/*.rb"].each do |libfile|
metadata CHANGED
@@ -1,288 +1,209 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: beetle
3
- version: !ruby/object:Gem::Version
4
- hash: 15424045
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.3.0.rc.5
5
5
  prerelease: 6
6
- segments:
7
- - 0
8
- - 3
9
- - 0
10
- - rc
11
- - 4
12
- version: 0.3.0.rc.4
13
6
  platform: ruby
14
- authors:
7
+ authors:
15
8
  - Stefan Kaes
16
9
  - Pascal Friederich
17
10
  - Ali Jelveh
18
11
  - Sebastian Roebke
12
+ - Larry Baltz
19
13
  autorequire:
20
14
  bindir: bin
21
15
  cert_chain: []
22
-
23
- date: 2011-10-11 00:00:00 +02:00
24
- default_executable: beetle
25
- dependencies:
26
- - !ruby/object:Gem::Dependency
16
+ date: 2011-10-21 00:00:00.000000000Z
17
+ dependencies:
18
+ - !ruby/object:Gem::Dependency
27
19
  name: uuid4r
28
- prerelease: false
29
- requirement: &id001 !ruby/object:Gem::Requirement
20
+ requirement: &2156300280 !ruby/object:Gem::Requirement
30
21
  none: false
31
- requirements:
32
- - - ">="
33
- - !ruby/object:Gem::Version
34
- hash: 31
35
- segments:
36
- - 0
37
- - 1
38
- - 2
22
+ requirements:
23
+ - - ! '>='
24
+ - !ruby/object:Gem::Version
39
25
  version: 0.1.2
40
26
  type: :runtime
41
- version_requirements: *id001
42
- - !ruby/object:Gem::Dependency
43
- name: bunny
44
27
  prerelease: false
45
- requirement: &id002 !ruby/object:Gem::Requirement
28
+ version_requirements: *2156300280
29
+ - !ruby/object:Gem::Dependency
30
+ name: bunny
31
+ requirement: &2156298900 !ruby/object:Gem::Requirement
46
32
  none: false
47
- requirements:
48
- - - "="
49
- - !ruby/object:Gem::Version
50
- hash: 19
51
- segments:
52
- - 0
53
- - 7
54
- - 8
33
+ requirements:
34
+ - - =
35
+ - !ruby/object:Gem::Version
55
36
  version: 0.7.8
56
37
  type: :runtime
57
- version_requirements: *id002
58
- - !ruby/object:Gem::Dependency
59
- name: redis
60
38
  prerelease: false
61
- requirement: &id003 !ruby/object:Gem::Requirement
39
+ version_requirements: *2156298900
40
+ - !ruby/object:Gem::Dependency
41
+ name: redis
42
+ requirement: &2156289280 !ruby/object:Gem::Requirement
62
43
  none: false
63
- requirements:
64
- - - "="
65
- - !ruby/object:Gem::Version
66
- hash: 7
67
- segments:
68
- - 2
69
- - 2
70
- - 0
44
+ requirements:
45
+ - - =
46
+ - !ruby/object:Gem::Version
71
47
  version: 2.2.0
72
48
  type: :runtime
73
- version_requirements: *id003
74
- - !ruby/object:Gem::Dependency
75
- name: hiredis
76
49
  prerelease: false
77
- requirement: &id004 !ruby/object:Gem::Requirement
50
+ version_requirements: *2156289280
51
+ - !ruby/object:Gem::Dependency
52
+ name: hiredis
53
+ requirement: &2156282480 !ruby/object:Gem::Requirement
78
54
  none: false
79
- requirements:
80
- - - "="
81
- - !ruby/object:Gem::Version
82
- hash: 23
83
- segments:
84
- - 0
85
- - 3
86
- - 2
55
+ requirements:
56
+ - - =
57
+ - !ruby/object:Gem::Version
87
58
  version: 0.3.2
88
59
  type: :runtime
89
- version_requirements: *id004
90
- - !ruby/object:Gem::Dependency
91
- name: amq-client
92
60
  prerelease: false
93
- requirement: &id005 !ruby/object:Gem::Requirement
61
+ version_requirements: *2156282480
62
+ - !ruby/object:Gem::Dependency
63
+ name: amq-client
64
+ requirement: &2156280400 !ruby/object:Gem::Requirement
94
65
  none: false
95
- requirements:
96
- - - "="
97
- - !ruby/object:Gem::Version
98
- hash: 57
99
- segments:
100
- - 0
101
- - 8
102
- - 3
66
+ requirements:
67
+ - - =
68
+ - !ruby/object:Gem::Version
103
69
  version: 0.8.3
104
70
  type: :runtime
105
- version_requirements: *id005
106
- - !ruby/object:Gem::Dependency
107
- name: amq-protocol
108
71
  prerelease: false
109
- requirement: &id006 !ruby/object:Gem::Requirement
72
+ version_requirements: *2156280400
73
+ - !ruby/object:Gem::Dependency
74
+ name: amq-protocol
75
+ requirement: &2156276300 !ruby/object:Gem::Requirement
110
76
  none: false
111
- requirements:
112
- - - "="
113
- - !ruby/object:Gem::Version
114
- hash: 61
115
- segments:
116
- - 0
117
- - 8
118
- - 1
77
+ requirements:
78
+ - - =
79
+ - !ruby/object:Gem::Version
119
80
  version: 0.8.1
120
81
  type: :runtime
121
- version_requirements: *id006
122
- - !ruby/object:Gem::Dependency
123
- name: amqp
124
82
  prerelease: false
125
- requirement: &id007 !ruby/object:Gem::Requirement
83
+ version_requirements: *2156276300
84
+ - !ruby/object:Gem::Dependency
85
+ name: amqp
86
+ requirement: &2156268980 !ruby/object:Gem::Requirement
126
87
  none: false
127
- requirements:
128
- - - "="
129
- - !ruby/object:Gem::Version
130
- hash: 63
131
- segments:
132
- - 0
133
- - 8
134
- - 0
88
+ requirements:
89
+ - - =
90
+ - !ruby/object:Gem::Version
135
91
  version: 0.8.0
136
92
  type: :runtime
137
- version_requirements: *id007
138
- - !ruby/object:Gem::Dependency
139
- name: activesupport
140
93
  prerelease: false
141
- requirement: &id008 !ruby/object:Gem::Requirement
94
+ version_requirements: *2156268980
95
+ - !ruby/object:Gem::Dependency
96
+ name: activesupport
97
+ requirement: &2156253980 !ruby/object:Gem::Requirement
142
98
  none: false
143
- requirements:
144
- - - ">="
145
- - !ruby/object:Gem::Version
146
- hash: 11
147
- segments:
148
- - 2
149
- - 3
150
- - 4
99
+ requirements:
100
+ - - ! '>='
101
+ - !ruby/object:Gem::Version
151
102
  version: 2.3.4
152
103
  type: :runtime
153
- version_requirements: *id008
154
- - !ruby/object:Gem::Dependency
155
- name: daemons
156
104
  prerelease: false
157
- requirement: &id009 !ruby/object:Gem::Requirement
105
+ version_requirements: *2156253980
106
+ - !ruby/object:Gem::Dependency
107
+ name: daemons
108
+ requirement: &2156249880 !ruby/object:Gem::Requirement
158
109
  none: false
159
- requirements:
160
- - - ">="
161
- - !ruby/object:Gem::Version
162
- hash: 3
163
- segments:
164
- - 1
165
- - 0
166
- - 10
110
+ requirements:
111
+ - - ! '>='
112
+ - !ruby/object:Gem::Version
167
113
  version: 1.0.10
168
114
  type: :runtime
169
- version_requirements: *id009
170
- - !ruby/object:Gem::Dependency
171
- name: rake
172
115
  prerelease: false
173
- requirement: &id010 !ruby/object:Gem::Requirement
116
+ version_requirements: *2156249880
117
+ - !ruby/object:Gem::Dependency
118
+ name: rake
119
+ requirement: &2156225200 !ruby/object:Gem::Requirement
174
120
  none: false
175
- requirements:
176
- - - ">="
177
- - !ruby/object:Gem::Version
178
- hash: 49
179
- segments:
180
- - 0
181
- - 8
182
- - 7
121
+ requirements:
122
+ - - ! '>='
123
+ - !ruby/object:Gem::Version
183
124
  version: 0.8.7
184
125
  type: :development
185
- version_requirements: *id010
186
- - !ruby/object:Gem::Dependency
187
- name: mocha
188
126
  prerelease: false
189
- requirement: &id011 !ruby/object:Gem::Requirement
127
+ version_requirements: *2156225200
128
+ - !ruby/object:Gem::Dependency
129
+ name: mocha
130
+ requirement: &2156214080 !ruby/object:Gem::Requirement
190
131
  none: false
191
- requirements:
192
- - - ">="
193
- - !ruby/object:Gem::Version
194
- hash: 3
195
- segments:
196
- - 0
197
- version: "0"
132
+ requirements:
133
+ - - ! '>='
134
+ - !ruby/object:Gem::Version
135
+ version: '0'
198
136
  type: :development
199
- version_requirements: *id011
200
- - !ruby/object:Gem::Dependency
201
- name: rcov
202
137
  prerelease: false
203
- requirement: &id012 !ruby/object:Gem::Requirement
138
+ version_requirements: *2156214080
139
+ - !ruby/object:Gem::Dependency
140
+ name: rcov
141
+ requirement: &2156209740 !ruby/object:Gem::Requirement
204
142
  none: false
205
- requirements:
206
- - - ">="
207
- - !ruby/object:Gem::Version
208
- hash: 3
209
- segments:
210
- - 0
211
- version: "0"
143
+ requirements:
144
+ - - ! '>='
145
+ - !ruby/object:Gem::Version
146
+ version: '0'
212
147
  type: :development
213
- version_requirements: *id012
214
- - !ruby/object:Gem::Dependency
215
- name: redgreen
216
148
  prerelease: false
217
- requirement: &id013 !ruby/object:Gem::Requirement
149
+ version_requirements: *2156209740
150
+ - !ruby/object:Gem::Dependency
151
+ name: redgreen
152
+ requirement: &2156172620 !ruby/object:Gem::Requirement
218
153
  none: false
219
- requirements:
220
- - - ">="
221
- - !ruby/object:Gem::Version
222
- hash: 3
223
- segments:
224
- - 0
225
- version: "0"
154
+ requirements:
155
+ - - ! '>='
156
+ - !ruby/object:Gem::Version
157
+ version: '0'
226
158
  type: :development
227
- version_requirements: *id013
228
- - !ruby/object:Gem::Dependency
229
- name: wirble
230
159
  prerelease: false
231
- requirement: &id014 !ruby/object:Gem::Requirement
160
+ version_requirements: *2156172620
161
+ - !ruby/object:Gem::Dependency
162
+ name: wirble
163
+ requirement: &2156171940 !ruby/object:Gem::Requirement
232
164
  none: false
233
- requirements:
234
- - - ">="
235
- - !ruby/object:Gem::Version
236
- hash: 3
237
- segments:
238
- - 0
239
- version: "0"
165
+ requirements:
166
+ - - ! '>='
167
+ - !ruby/object:Gem::Version
168
+ version: '0'
240
169
  type: :development
241
- version_requirements: *id014
242
- - !ruby/object:Gem::Dependency
243
- name: cucumber
244
170
  prerelease: false
245
- requirement: &id015 !ruby/object:Gem::Requirement
171
+ version_requirements: *2156171940
172
+ - !ruby/object:Gem::Dependency
173
+ name: cucumber
174
+ requirement: &2156171120 !ruby/object:Gem::Requirement
246
175
  none: false
247
- requirements:
248
- - - ">="
249
- - !ruby/object:Gem::Version
250
- hash: 7
251
- segments:
252
- - 0
253
- - 7
254
- - 2
176
+ requirements:
177
+ - - ! '>='
178
+ - !ruby/object:Gem::Version
255
179
  version: 0.7.2
256
180
  type: :development
257
- version_requirements: *id015
258
- - !ruby/object:Gem::Dependency
259
- name: daemon_controller
260
181
  prerelease: false
261
- requirement: &id016 !ruby/object:Gem::Requirement
182
+ version_requirements: *2156171120
183
+ - !ruby/object:Gem::Dependency
184
+ name: daemon_controller
185
+ requirement: &2156167680 !ruby/object:Gem::Requirement
262
186
  none: false
263
- requirements:
264
- - - ">="
265
- - !ruby/object:Gem::Version
266
- hash: 3
267
- segments:
268
- - 0
269
- version: "0"
187
+ requirements:
188
+ - - ! '>='
189
+ - !ruby/object:Gem::Version
190
+ version: '0'
270
191
  type: :development
271
- version_requirements: *id016
192
+ prerelease: false
193
+ version_requirements: *2156167680
272
194
  description: A highly available, reliable messaging infrastructure
273
- email: developers@xing.com
274
- executables:
195
+ email: opensource@xing.com
196
+ executables:
275
197
  - beetle
276
198
  extensions: []
277
-
278
- extra_rdoc_files:
199
+ extra_rdoc_files:
279
200
  - examples/README.rdoc
280
201
  - features/README.rdoc
281
202
  - README.rdoc
282
203
  - REDIS_AUTO_FAILOVER.rdoc
283
204
  - RELEASE_NOTES.rdoc
284
205
  - MIT-LICENSE
285
- files:
206
+ files:
286
207
  - examples/attempts.rb
287
208
  - examples/handler_class.rb
288
209
  - examples/handling_exceptions.rb
@@ -311,6 +232,7 @@ files:
311
232
  - lib/beetle/redis_master_file.rb
312
233
  - lib/beetle/redis_server_info.rb
313
234
  - lib/beetle/subscriber.rb
235
+ - lib/beetle/version.rb
314
236
  - lib/beetle.rb
315
237
  - features/README.rdoc
316
238
  - features/redis_auto_failover.feature
@@ -323,7 +245,6 @@ files:
323
245
  - features/support/test_daemons/redis_configuration_client.rb
324
246
  - features/support/test_daemons/redis_configuration_server.rb
325
247
  - script/console
326
- - script/console~
327
248
  - script/start_rabbit
328
249
  - beetle.gemspec
329
250
  - Rakefile
@@ -350,43 +271,35 @@ files:
350
271
  - test/colorized_test_output.rb
351
272
  - test/test_helper.rb
352
273
  - bin/beetle
353
- has_rdoc: true
354
274
  homepage: http://xing.github.com/beetle/
355
275
  licenses: []
356
-
357
- post_install_message: " *********************************************************************************************\n\n Please install the SystemTimer gem if you're running a ruby version < 1.9:\n `gem install SystemTimer -v '=1.2.1'`\n See: http://ph7spot.com/musings/system-timer\n\n *********************************************************************************************\n"
358
- rdoc_options:
276
+ post_install_message: ! " *********************************************************************************************\n\n
277
+ \ Please install the SystemTimer gem if you're running a ruby version < 1.9:\n
278
+ \ `gem install SystemTimer -v '=1.2.1'`\n See: http://ph7spot.com/musings/system-timer\n\n
279
+ \ *********************************************************************************************\n"
280
+ rdoc_options:
359
281
  - --charset=UTF-8
360
- require_paths:
282
+ require_paths:
361
283
  - lib
362
- required_ruby_version: !ruby/object:Gem::Requirement
284
+ required_ruby_version: !ruby/object:Gem::Requirement
363
285
  none: false
364
- requirements:
365
- - - ">="
366
- - !ruby/object:Gem::Version
367
- hash: 3
368
- segments:
369
- - 0
370
- version: "0"
371
- required_rubygems_version: !ruby/object:Gem::Requirement
286
+ requirements:
287
+ - - ! '>='
288
+ - !ruby/object:Gem::Version
289
+ version: '0'
290
+ required_rubygems_version: !ruby/object:Gem::Requirement
372
291
  none: false
373
- requirements:
374
- - - ">="
375
- - !ruby/object:Gem::Version
376
- hash: 21
377
- segments:
378
- - 1
379
- - 3
380
- - 7
292
+ requirements:
293
+ - - ! '>='
294
+ - !ruby/object:Gem::Version
381
295
  version: 1.3.7
382
296
  requirements: []
383
-
384
297
  rubyforge_project:
385
- rubygems_version: 1.6.2
298
+ rubygems_version: 1.8.10
386
299
  signing_key:
387
300
  specification_version: 3
388
301
  summary: High Availability AMQP Messaging with Redundant Queues
389
- test_files:
302
+ test_files:
390
303
  - test/beetle/amqp_gem_behavior_test.rb
391
304
  - test/beetle/base_test.rb
392
305
  - test/beetle/client_test.rb
data/script/console~ DELETED
@@ -1,2 +0,0 @@
1
- #!/usr/bin/env ruby
2
- $:.unshift(File.expand_path("../lib",__FILE__))