deputy 0.1.19 → 0.1.20

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/deputy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-06-07}
   s.default_executable = %q{deputy}
   s.email = %q{mirko@dawanda.com}
   s.executables = ["deputy"]

data/lib/deputy.rb

@@ -115,7 +115,9 @@ module Deputy
 
   def self.get(path)
     url = "#{sheriff_url}#{path}"
-    open(url).read
+    Timeout.timeout(1) do
+      open(url).read
+    end
   rescue => e
     e.message << url
     raise e
@@ -132,4 +134,26 @@ module Deputy
     end
     raise "No deputy.yml found in /etc or #{home}"
   end
+
+  # stolen from klarlack -- http://github.com/schoefmax/klarlack
+  # to get an reliable timeout that wont fail on other platforms
+  # or if sytem_timer is missing
+  Timeout = begin
+    # Try to use the SystemTimer gem instead of Ruby's timeout library
+    # when running on something that looks like Ruby 1.8.x. See:
+    # http://ph7spot.com/articles/system_timer
+    # We don't want to bother trying to load SystemTimer on jruby and
+    # ruby 1.9+.
+    if RUBY_VERSION =~ /^1\.8\./ and RUBY_PLATFORM !~ /java/
+      require 'system_timer'
+      SystemTimer
+    else
+      require 'timeout'
+      Timeout
+    end
+  rescue LoadError => e
+    $stderr.puts "Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}"
+    require 'timeout'
+    Timeout
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +02:00
+date: 2010-06-07 00:00:00 +02:00
 default_executable: deputy
 dependencies: []