droid 1.0.2 → 1.0.3

data/Rakefile

@@ -18,7 +18,6 @@ begin
     gem.add_dependency 'rest-client', '>= 1.2.0'
     gem.add_dependency 'amqp', '0.6.7'
     gem.add_dependency 'bunny', '~> 0.6.0'
-    gem.add_dependency 'SystemTimer', '~> 1.2.0'
     gem.add_dependency 'eventmachine_httpserver', '0.2.0'
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/droid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{droid}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ricardo Chimal, Jr."]
-  s.date = %q{2011-07-29}
+  s.date = %q{2011-08-25}
   s.default_executable = %q{bleedq}
   s.description = %q{Easy to use AMQP Library with constructs for typical usage patterns}
   s.email = %q{ricardo@heroku.com}
@@ -76,7 +76,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rest-client>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<amqp>, ["= 0.6.7"])
       s.add_runtime_dependency(%q<bunny>, ["~> 0.6.0"])
-      s.add_runtime_dependency(%q<SystemTimer>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<eventmachine_httpserver>, ["= 0.2.0"])
     else
       s.add_dependency(%q<baconmocha>, [">= 0"])
@@ -84,7 +83,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rest-client>, [">= 1.2.0"])
       s.add_dependency(%q<amqp>, ["= 0.6.7"])
       s.add_dependency(%q<bunny>, ["~> 0.6.0"])
-      s.add_dependency(%q<SystemTimer>, ["~> 1.2.0"])
       s.add_dependency(%q<eventmachine_httpserver>, ["= 0.2.0"])
     end
   else
@@ -93,7 +91,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rest-client>, [">= 1.2.0"])
     s.add_dependency(%q<amqp>, ["= 0.6.7"])
     s.add_dependency(%q<bunny>, ["~> 0.6.0"])
-    s.add_dependency(%q<SystemTimer>, ["~> 1.2.0"])
     s.add_dependency(%q<eventmachine_httpserver>, ["= 0.2.0"])
   end
 end

data/lib/droid.rb

@@ -2,6 +2,20 @@ require 'uri'
 require 'amqp'
 require 'mq'
 
+if RUBY_VERSION[0,3] == "1.8"
+  begin
+    require "system_timer"
+    DroidTimer = SystemTimer
+  rescue LoadError
+    # systemtimer wasn't available, fall back to Timeout
+    DroidTimer = Timeout
+  end
+else
+  DroidTimer = Timeout
+end
+
+
+
 if !defined?(JSON) && !defined?(JSON_LOADED)
   require 'json/pure'
 end
@@ -21,7 +35,7 @@ class Droid
   end
 
   def self.name
-    @@name
+    @@name ||= nil
   end
 
   def self.name=(name)
@@ -97,7 +111,6 @@ EORUBY
   end
 
   def self.wait_for_tcp_port(host, port, opts={})
-    require 'system_timer'
     require 'socket'
 
     opts[:retries] ||= 6
@@ -105,7 +118,7 @@ EORUBY
 
     opts[:retries].times do
       begin
-        SystemTimer::timeout(opts[:timeout]) do
+        DroidTimer::timeout(opts[:timeout]) do
           TCPSocket.new(host.to_s, port).close
         end
         return

data/lib/droid/sync.rb

@@ -1,6 +1,5 @@
 require 'droid'
 require 'bunny'
-require 'system_timer'
 
 class Droid
   class SyncException < RuntimeError; end
@@ -22,7 +21,7 @@ class Droid
   end
 
   def self.reconnect_on_error
-    SystemTimer::timeout(20) do
+    DroidTimer::timeout(20) do
       begin
         yield if block_given?
       rescue Bunny::ProtocolError

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 -07:00
+date: 2011-08-25 00:00:00 -07:00
 default_executable: bleedq
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,24 +85,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: SystemTimer
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: eventmachine_httpserver
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -112,7 +98,7 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 description: Easy to use AMQP Library with constructs for typical usage patterns
 email: ricardo@heroku.com
 executables: