wire 0.1.0 → 0.1.1

data/README.markdown

@@ -26,7 +26,7 @@ Time to run: ~ *1.2 seconds*.
 
 This is how it works.
 
-- 11 threads is created, done at time 0
+- 11 threads is created, done at time 0.
 - Running 10 threads, done at time 0.1
 - Wait 1 second, done at time 1.1
 - Start the 11th thread, done at time 1.2
@@ -88,7 +88,9 @@ Ingoing arguments to `new`.
 - **max** (Integer) The maximum amount of threads to run a the same time. The value 10 will be used if `max` is nil or zero.
 - **wait** (Integer) The time to wait before starting a new thread.
 - **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*.
+
 ## How do install
 
     [sudo] gem install wire

data/lib/wire.rb

@@ -1,5 +1,6 @@
 require "thread"
 require "monitor"
+require "timeout"
 
 class Wire < Thread  
   def self.counter
@@ -31,9 +32,9 @@ class Wire < Thread
   end
   
   def runner
-    @block.call(*@vars)
+    @timeout ? Timeout::timeout(@timeout) { @block.call(*@vars) } : @block.call(*@vars)
   rescue => error
-    raise error
+    report(error, "An error occurred: #{error.inspect}")
   ensure
     @counter.synchronize do
       if @max == @counter.i or @counter.last
@@ -43,6 +44,10 @@ class Wire < Thread
       @counter.cond.signal
     end
   end
+  
+  def report(error, message)
+    @silent ? warn(message) : (raise error)
+  end
 end
 
 class Counter

data/spec/wire_spec.rb

@@ -99,5 +99,37 @@ 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
+          raise StandardError.new
+        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
+          sleep 5
+        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
+          sleep 5
+        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
   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.0"
+  s.version     = "0.1.1"
   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.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Linus Oleander
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 23:00:00 +01:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wire
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Run a strict amount of threads during a time interval