wire 0.1.1 → 0.1.2

data/README.markdown

@@ -90,6 +90,8 @@ Ingoing arguments to `new`.
 - **vars** (Array) A list of arguments to the block.
 - **silent** (Boolean) The given block will not raise error if set to true. Default is false.
 - **timeout** (Integer) The maximum time to run *one* thread, default is *no limit*.
+- **retries** (Integer) How many times should we retry? Default is 0.
+- **delay** (Float) Time between each retry. Default is 0.
 
 ## How do install
 

data/lib/wire.rb

@@ -9,7 +9,7 @@ class Wire < Thread
   
   def initialize(args, &block)
     args.keys.each { |name| instance_variable_set "@" + name.to_s, args[name] }
-    
+
     if @max.to_i <= 0 or @wait.nil?
       warn "Both max and wait needs to be passed, where max > 0. Using default values"
       @max = 10 if @max.to_i <= 0
@@ -18,6 +18,9 @@ class Wire < Thread
     
     @block   = block
     @counter = Wire.counter
+    @retries ||= 0
+    @retry = 0
+    @delay ||= 0
     
     @counter.synchronize do
       @counter.cond.wait_until { @counter.i < @max }
@@ -33,7 +36,10 @@ class Wire < Thread
   
   def runner
     @timeout ? Timeout::timeout(@timeout) { @block.call(*@vars) } : @block.call(*@vars)
-  rescue => error
+  rescue StandardError => error
+    if (@retry += 1) < @retries
+      sleep @delay; retry
+    end
     report(error, "An error occurred: #{error.inspect}")
   ensure
     @counter.synchronize do

data/spec/wire_spec.rb

@@ -19,36 +19,36 @@ describe Wire do
     counter = Counter.new
     Wire.should_receive(:counter).any_number_of_times.and_return(counter)
   end
-  
+
   context "should be able to do run within the time limit" do
     it "< max threads" do
       start = time
       runner(10, {max: 10, wait: 1}) do
         sleep 0.1
       end
-  
+
       (time - start).should < 1.15
     end
-  
+
     it "> max threads" do
       start = time
       runner(11, {max: 10, wait: 1}) do
         sleep 0.1
       end
-  
+
       (time - start).should > 1.2
     end
   end
-  
+
   it "should run using one thread" do
     start = time
     runner(1, {max: 1, wait: 1}) do
       sleep 0.1
     end
-  
+
     (time - start).should < 0.2
   end
-  
+
   it "should run using one thread, using a high max value" do
     start = time
     runner(1, {max: 100, wait: 1}) do
@@ -57,16 +57,16 @@ describe Wire do
 
     (time - start).should < 0.2
   end
-  
+
   it "it should not wait" do
     start = time
     runner(11, {max: 10, wait: 0}) do
       sleep 0.1
     end
-  
+
     (time - start).should < 0.25
   end
-  
+
   context "error" do
     it "should use the default values if wrong arguments is being passed" do
       w = Wire.new(max: 0) {}.join
@@ -75,7 +75,7 @@ describe Wire do
         @wait.should == 1
       end
     end
-    
+
     it "should use the default values if nothing is being passed" do
       w = Wire.new({}) {}.join
       w.instance_eval do
@@ -83,7 +83,7 @@ describe Wire do
         @wait.should == 1
       end
     end
-    
+
     it "should use the default values if wrong arguments is being passed" do
       w = Wire.new(wait: 5) {}.join
       w.instance_eval do
@@ -91,7 +91,7 @@ describe Wire do
         @wait.should == 5
       end
     end
-    
+
     it "should be possible to raise an error" do
       lambda do
         Wire.new(wait: 5, max: 1) do
@@ -99,7 +99,7 @@ describe Wire do
         end.join
       end.should raise_error(StandardError)
     end
-    
+
     it "should be silent" do
       lambda do
         Wire.new(wait: 5, max: 1, silent: true) do
@@ -107,7 +107,7 @@ describe Wire do
         end.join
       end.should_not raise_error(StandardError)
     end
-    
+
     it "should raise timeout error" do
       lambda do
         Wire.new(wait: 5, max: 1, timeout: 1) do
@@ -115,7 +115,7 @@ describe Wire do
         end.join
       end.should raise_error(Timeout::Error)
     end
-    
+
     it "should not raise timeout error" do
       lambda do
         Wire.new(wait: 5, silent: true, max: 1, timeout: 1) do
@@ -123,13 +123,46 @@ describe Wire do
         end.join
       end.should_not raise_error(Timeout::Error)
     end
-    
-     it "should not raise timeout error" do
-        lambda do
-          Wire.new(wait: 5, silent: true, max: 1, timeout: 2) do
-            sleep 1
-          end.join
-        end.should_not raise_error(Timeout::Error)
-      end
+
+    it "should not raise timeout error" do
+      lambda do
+        Wire.new(wait: 5, silent: true, max: 1, timeout: 2) do
+          sleep 1
+        end.join
+      end.should_not raise_error(Timeout::Error)
+    end
+
+    it "should be able to retry - without raise an error" do
+      error = mock(Object.new)
+      error.should_receive(:new).exactly(10).times.and_return(StandardError)
+      lambda do
+        Wire.new(wait: 5, silent: true, max: 1, timeout: 2, vars: [error], retries: 10) do |e|
+          sleep 0.2
+          raise e.new
+        end.join
+      end.should_not raise_error(Timeout::Error)
+    end
+
+    it "should be able to retry" do
+      error = mock(Object.new)
+      error.should_receive(:new).exactly(10).times.and_return(StandardError)
+      lambda do
+        Wire.new(wait: 5, max: 1, timeout: 2, vars: [error], retries: 10) do |e|
+          sleep 0.2
+          raise e.new
+        end.join
+      end.should raise_error(StandardError)
+    end
+
+    it "should be able to retry with a delay" do
+      error = mock(Object.new)
+      error.should_receive(:new).exactly(10).times.and_return(StandardError)
+      lambda do
+        Wire.new(retries: 10, delay: 0.2, wait: 5, max: 1, timeout: 1, vars: [error]) do |e|
+          error.new
+          sleep 10
+        end.join
+      end.should raise_error(Timeout::Error)
+    end
   end
-end
+end

data/wire.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "wire"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]

metadata

@@ -2,7 +2,7 @@
 name: wire
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Linus Oleander
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-04-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency