chantier 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad91f24a7bd64070ce2d9943a1340a786348fa5
-  data.tar.gz: ae221e941dd3d8994644e4179d7684e60c9cf234
+  metadata.gz: df6ec380493c999c846abeb870e45720b428f35b
+  data.tar.gz: 354b14a6eab4824369ea8bc52e0c45ab1f034d2a
 SHA512:
-  metadata.gz: 0752ee267d03dbb4b9abfa5541d11faf302b0c549355b1ea1b0dc6a6d5dfaabf7f3f42beaf72705faada50c7bab2d8b30b9fbeaa1f59b8c6e50640d99833745a
-  data.tar.gz: 2249fe8959c9b8086e2c68960738e78bfd79b6cb78b3d7f3889df1a721fe75a996731cce407f1f29d7a326bf1adbb0931c02c926a07ca67c0489ec96a7a178a2
+  metadata.gz: 55d0986d79834e5c7efec3cf0f850a7da33915fd37471960cf921644a29c67436b3d4a39df62b973cbab8206cb635ac34ff9726fdb4d50a14e5e174ac9151fd5
+  data.tar.gz: 5b03b35c3161c98a8db5a23b3b83290b2d530182c39bcad262bef955089f99db645bd7ad1bf492cbb3cb14357fa71c5c877c10f23df30286c1ae22c39eafe378

data/chantier.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: chantier 2.0.0 ruby lib
+# stub: chantier 2.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chantier"
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-08-07"
+  s.date = "2015-10-29"
   s.description = " Process your jobs in parallel with a simple table of processes or threads "
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [

data/lib/chantier.rb

@@ -1,5 +1,5 @@
 module Chantier
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
   require_relative 'process_pool'
   require_relative 'process_pool_with_kill'
   require_relative 'thread_pool'

data/lib/failure_policies.rb

@@ -86,6 +86,7 @@ module Chantier::FailurePolicies
     end
   
     def limit_reached?
+      return false unless ((@failures + @successes) > 4)
       ratio = @failures.to_f / (@failures + @successes)
       (ratio * 100) >= @threshold
     end

data/lib/process_pool.rb

@@ -26,7 +26,6 @@
 #
 # Can be rewritten using Threads if operation on JVM/Rubinius will be feasible.
 class Chantier::ProcessPool
-  
   # The manager uses loops in a few places. By doing a little sleep()
   # in those loops we can yield process control back to the OS which brings
   # the CPU usage of the managing process to small numbers. If you just do
@@ -63,6 +62,11 @@ class Chantier::ProcessPool
     block_until_complete!
   end
   
+  # Launch copies of the given task in all available slots for this Pool.
+  def fork_task_in_all_slots(&blk)
+    @pids.times { fork_task(&blk) }
+  end
+  
   # Run the given block in a forked subprocess. This method will block
   # the thread it is called from until a slot in the process table
   # becomes free. Once that happens, the given block will be forked off

data/lib/thread_pool.rb

@@ -26,7 +26,6 @@
 #
 # Can be rewritten using Threads if operation on JVM/Rubinius will be feasible.
 class Chantier::ThreadPool
-  
   # The manager uses loops in a few places. By doing a little sleep()
   # in those loops we can yield process control back to the OS which brings
   # the CPU usage of the managing process to small numbers. If you just do
@@ -49,6 +48,11 @@ class Chantier::ThreadPool
     @last_representative_exception = nil
   end
   
+  # Launch copies of the given task in all available slots for this Pool.
+  def fork_task_in_all_slots(&blk)
+    @threads.times { fork_task(&blk) }
+  end
+  
   # Distributes the elements in the given Enumerable to parallel workers,
   # N workers at a time. The method will return once all the workers for all
   # the elements of the Enumerable have terminated.
@@ -71,7 +75,7 @@ class Chantier::ThreadPool
   # becomes free.
   def fork_task(&blk)
     if @failure_policy.limit_reached?
-      raise "Reached error limit (last error was #{@last_representative_exception.inspect})"
+      raise @last_representative_exception
     end
     
     destination_slot_idx = nil
@@ -103,7 +107,8 @@ class Chantier::ThreadPool
     @threads.any?{|e| e && e.respond_to?(:alive?) && e.alive? }
   end
   
-  # Analogous to Process.wait or wait_all - will block until all of the process slots have been freed.
+  # Analogous to Process.wait or wait_all - will block until all of the 
+  # threads have terminated
   def block_until_complete!
     @threads.map do |e| 
       if e.respond_to?(:join) && e.alive?

data/spec/failure_policy_by_percentage_spec.rb

@@ -24,4 +24,16 @@ describe Chantier::FailurePolicies::Percentage do
     policy.arm!
     expect(policy).not_to be_limit_reached
   end
+  
+  it 'does not trigger until it has been called at least 4 times' do
+    policy = described_class.new(50)
+    policy.arm!
+    
+    2.times { policy.failure! }
+    expect(policy).not_to be_limit_reached
+    2.times { policy.failure! }
+    expect(policy).not_to be_limit_reached
+    1.times { policy.failure! }
+    expect(policy).to be_limit_reached
+  end
 end

data/spec/thread_pool_spec.rb

@@ -46,15 +46,16 @@ describe Chantier::ThreadPool do
     end
   end
   
+  RandomError = Class.new(RuntimeError)
   context 'with failures' do
     it 'raises after 4 failures' do
       fp = Chantier::FailurePolicies::Count.new(4)
       under_test = described_class.new(num_workers=3, failure_policy: fp)
       expect {
         15.times do 
-          under_test.fork_task { raise "I am such a failure" }
+          under_test.fork_task { raise RandomError, "I am such a failure" }
         end
-      }.to raise_error('Reached error limit (last error was #<RuntimeError: I am such a failure>)')
+      }.to raise_error(RandomError, 'I am such a failure')
     end
     
     it 'runs through the jobs if max_failures is not given' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chantier
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec