droid 1.0.2 → 1.0.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +0 -1
- data/VERSION +1 -1
- data/droid.gemspec +2 -5
- data/lib/droid.rb +16 -3
- data/lib/droid/sync.rb +1 -2
- metadata +5 -19
data/Rakefile
CHANGED
@@ -18,7 +18,6 @@ begin
|
|
18
18
|
gem.add_dependency 'rest-client', '>= 1.2.0'
|
19
19
|
gem.add_dependency 'amqp', '0.6.7'
|
20
20
|
gem.add_dependency 'bunny', '~> 0.6.0'
|
21
|
-
gem.add_dependency 'SystemTimer', '~> 1.2.0'
|
22
21
|
gem.add_dependency 'eventmachine_httpserver', '0.2.0'
|
23
22
|
end
|
24
23
|
Jeweler::GemcutterTasks.new
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.0.
|
1
|
+
1.0.3
|
data/droid.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{droid}
|
8
|
-
s.version = "1.0.
|
8
|
+
s.version = "1.0.3"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Ricardo Chimal, Jr."]
|
12
|
-
s.date = %q{2011-
|
12
|
+
s.date = %q{2011-08-25}
|
13
13
|
s.default_executable = %q{bleedq}
|
14
14
|
s.description = %q{Easy to use AMQP Library with constructs for typical usage patterns}
|
15
15
|
s.email = %q{ricardo@heroku.com}
|
@@ -76,7 +76,6 @@ Gem::Specification.new do |s|
|
|
76
76
|
s.add_runtime_dependency(%q<rest-client>, [">= 1.2.0"])
|
77
77
|
s.add_runtime_dependency(%q<amqp>, ["= 0.6.7"])
|
78
78
|
s.add_runtime_dependency(%q<bunny>, ["~> 0.6.0"])
|
79
|
-
s.add_runtime_dependency(%q<SystemTimer>, ["~> 1.2.0"])
|
80
79
|
s.add_runtime_dependency(%q<eventmachine_httpserver>, ["= 0.2.0"])
|
81
80
|
else
|
82
81
|
s.add_dependency(%q<baconmocha>, [">= 0"])
|
@@ -84,7 +83,6 @@ Gem::Specification.new do |s|
|
|
84
83
|
s.add_dependency(%q<rest-client>, [">= 1.2.0"])
|
85
84
|
s.add_dependency(%q<amqp>, ["= 0.6.7"])
|
86
85
|
s.add_dependency(%q<bunny>, ["~> 0.6.0"])
|
87
|
-
s.add_dependency(%q<SystemTimer>, ["~> 1.2.0"])
|
88
86
|
s.add_dependency(%q<eventmachine_httpserver>, ["= 0.2.0"])
|
89
87
|
end
|
90
88
|
else
|
@@ -93,7 +91,6 @@ Gem::Specification.new do |s|
|
|
93
91
|
s.add_dependency(%q<rest-client>, [">= 1.2.0"])
|
94
92
|
s.add_dependency(%q<amqp>, ["= 0.6.7"])
|
95
93
|
s.add_dependency(%q<bunny>, ["~> 0.6.0"])
|
96
|
-
s.add_dependency(%q<SystemTimer>, ["~> 1.2.0"])
|
97
94
|
s.add_dependency(%q<eventmachine_httpserver>, ["= 0.2.0"])
|
98
95
|
end
|
99
96
|
end
|
data/lib/droid.rb
CHANGED
@@ -2,6 +2,20 @@ require 'uri'
|
|
2
2
|
require 'amqp'
|
3
3
|
require 'mq'
|
4
4
|
|
5
|
+
if RUBY_VERSION[0,3] == "1.8"
|
6
|
+
begin
|
7
|
+
require "system_timer"
|
8
|
+
DroidTimer = SystemTimer
|
9
|
+
rescue LoadError
|
10
|
+
# systemtimer wasn't available, fall back to Timeout
|
11
|
+
DroidTimer = Timeout
|
12
|
+
end
|
13
|
+
else
|
14
|
+
DroidTimer = Timeout
|
15
|
+
end
|
16
|
+
|
17
|
+
|
18
|
+
|
5
19
|
if !defined?(JSON) && !defined?(JSON_LOADED)
|
6
20
|
require 'json/pure'
|
7
21
|
end
|
@@ -21,7 +35,7 @@ class Droid
|
|
21
35
|
end
|
22
36
|
|
23
37
|
def self.name
|
24
|
-
@@name
|
38
|
+
@@name ||= nil
|
25
39
|
end
|
26
40
|
|
27
41
|
def self.name=(name)
|
@@ -97,7 +111,6 @@ EORUBY
|
|
97
111
|
end
|
98
112
|
|
99
113
|
def self.wait_for_tcp_port(host, port, opts={})
|
100
|
-
require 'system_timer'
|
101
114
|
require 'socket'
|
102
115
|
|
103
116
|
opts[:retries] ||= 6
|
@@ -105,7 +118,7 @@ EORUBY
|
|
105
118
|
|
106
119
|
opts[:retries].times do
|
107
120
|
begin
|
108
|
-
|
121
|
+
DroidTimer::timeout(opts[:timeout]) do
|
109
122
|
TCPSocket.new(host.to_s, port).close
|
110
123
|
end
|
111
124
|
return
|
data/lib/droid/sync.rb
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
require 'droid'
|
2
2
|
require 'bunny'
|
3
|
-
require 'system_timer'
|
4
3
|
|
5
4
|
class Droid
|
6
5
|
class SyncException < RuntimeError; end
|
@@ -22,7 +21,7 @@ class Droid
|
|
22
21
|
end
|
23
22
|
|
24
23
|
def self.reconnect_on_error
|
25
|
-
|
24
|
+
DroidTimer::timeout(20) do
|
26
25
|
begin
|
27
26
|
yield if block_given?
|
28
27
|
rescue Bunny::ProtocolError
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 1
|
7
7
|
- 0
|
8
|
-
-
|
9
|
-
version: 1.0.
|
8
|
+
- 3
|
9
|
+
version: 1.0.3
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Ricardo Chimal, Jr.
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2011-
|
17
|
+
date: 2011-08-25 00:00:00 -07:00
|
18
18
|
default_executable: bleedq
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|
@@ -85,24 +85,10 @@ dependencies:
|
|
85
85
|
version: 0.6.0
|
86
86
|
type: :runtime
|
87
87
|
version_requirements: *id005
|
88
|
-
- !ruby/object:Gem::Dependency
|
89
|
-
name: SystemTimer
|
90
|
-
prerelease: false
|
91
|
-
requirement: &id006 !ruby/object:Gem::Requirement
|
92
|
-
requirements:
|
93
|
-
- - ~>
|
94
|
-
- !ruby/object:Gem::Version
|
95
|
-
segments:
|
96
|
-
- 1
|
97
|
-
- 2
|
98
|
-
- 0
|
99
|
-
version: 1.2.0
|
100
|
-
type: :runtime
|
101
|
-
version_requirements: *id006
|
102
88
|
- !ruby/object:Gem::Dependency
|
103
89
|
name: eventmachine_httpserver
|
104
90
|
prerelease: false
|
105
|
-
requirement: &
|
91
|
+
requirement: &id006 !ruby/object:Gem::Requirement
|
106
92
|
requirements:
|
107
93
|
- - "="
|
108
94
|
- !ruby/object:Gem::Version
|
@@ -112,7 +98,7 @@ dependencies:
|
|
112
98
|
- 0
|
113
99
|
version: 0.2.0
|
114
100
|
type: :runtime
|
115
|
-
version_requirements: *
|
101
|
+
version_requirements: *id006
|
116
102
|
description: Easy to use AMQP Library with constructs for typical usage patterns
|
117
103
|
email: ricardo@heroku.com
|
118
104
|
executables:
|