team_effort 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7779d24f1c2aa78460778a38d505c106677eab6afe2c829ebd551b169ce551
-  data.tar.gz: 2f96281c9c5558d23d4bb49153d450bd8a4617b0ec551d93fcb6ebab5de13246
+  metadata.gz: fd78f953296ae896e5e3c7adff6b079b04203376c2cddf7e57a0fdde2c7757ca
+  data.tar.gz: 97bbea07471ca7c8e84a53db5e25ce113f03d8c505bce7c73b6c0327c73f2b53
 SHA512:
-  metadata.gz: 7090174299461bd8e9d50190c3b7d10cede4fcb918985d741c72e629860ee2b98f866daf0c512f3b5fe5c452ca07972c70e09bd39d8f858d671e74ffa9bd5e66
-  data.tar.gz: 24a64b1dbaf6b2b6f4d6718bd49cf208e9cb92f6c3d86ef0b5d3c28afc71eba4a65b0e72eb5707eecf09bfda6318de90be6dee044df69fc86e936444ddc7f629
+  metadata.gz: 9fce2986ca5a3812d5d2e6af686ae8ab423c5f2c2cf80a55eff218a42fef43257e2cfe5e815bd49b1378f2393185b82b141eed3f76d0d3dfc8af9a8cd5fcc26c
+  data.tar.gz: 309b7f39b82f8cf0e4de1294f6742689c4fc85caa6d28ff904959d2517391a4c1fb4c8670f61a0afe571d0b40f4e3b65d0be1acb26d825fbd45d572f81a46965

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << 'test'
+  t.pattern = "test/*_test.rb"
 end
 
 desc 'Run tests'

data/lib/team_effort.rb

@@ -4,13 +4,14 @@ module TeamEffort
   def self.work(enumerable, max_process_count = 4, progress_proc: nil)
     pids = []
     arg_sets = []
+    previous_proc_result = nil
 
     max_count = enumerable.count
     completed_count = 0
 
     enumerable.each do |arg_set|
       while pids.size == max_process_count
-        pids, arg_sets, completed_count = wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc)
+        pids, arg_sets, completed_count, previous_proc_result = wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc, previous_proc_result)
       end
 
       pids << fork do
@@ -28,11 +29,11 @@ module TeamEffort
     end
 
     while !pids.empty?
-      pids, arg_sets, completed_count = wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc)
+      pids, arg_sets, completed_count, previous_proc_result = wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc, previous_proc_result)
     end
   end
 
-  def self.wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc)
+  def self.wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc, previous_proc_result)
     pid, status = Process.wait2
     pids_index = pids.index(pid)
     if pids_index
@@ -40,7 +41,13 @@ module TeamEffort
       arg_set = arg_sets.delete_at pids_index
       raise "TeamEffort child process failed when processing > #{arg_set} <" if !status.success?
     end
-    progress_proc.call(completed_count += 1, max_count) if progress_proc
-    [pids, arg_sets, completed_count]
+
+    if progress_proc
+      progress_proc_args = [completed_count += 1, max_count]
+      progress_proc_args << previous_proc_result if progress_proc.arity == 3
+      proc_result = progress_proc.call(*progress_proc_args)
+    end
+
+    [pids, arg_sets, completed_count, proc_result]
   end
 end

data/lib/team_effort/version.rb

@@ -1,3 +1,3 @@
 module TeamEffort
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/team_effort_test.rb

@@ -24,16 +24,16 @@ describe TeamEffort do
       end
 
       lines = output.split(/\n/)
-      lines.size.must_equal 3
+      _(lines.size).must_equal 3
       lines.each do |line|
-        line.must_match(/^\d+$/)
+        _(line).must_match(/^\d+$/)
       end
     end
 
     it 'exits when a child process fails' do
       data = [8, 4, 2, 0, 4, 8]
 
-      err = -> {
+      err = _(-> {
         $stderr = File.open('/dev/null', 'w')
         begin
           TeamEffort.work(data, 1) do |item|
@@ -43,8 +43,8 @@ describe TeamEffort do
           $stderr.close
           $stderr = STDERR
         end
-      }.must_raise RuntimeError
-      err.message.must_match /TeamEffort child process failed when processing > 0 </
+      }).must_raise RuntimeError
+      _(err.message).must_match %r/TeamEffort child process failed when processing > 0 </
     end
 
     it 'invokes an optional proc when it completes an item' do
@@ -53,13 +53,29 @@ describe TeamEffort do
       proc = ->(item_index, max_items) { proc_data << [item_index, max_items] }
       TeamEffort.work(data, 1, progress_proc: proc) {}
 
-      proc_data.must_equal [
+      _(proc_data).must_equal [
                              [1, 3],
                              [2, 3],
                              [3, 3],
                            ]
     end
 
+    it 'invokes an optional proc with the previous result of the optional proc when it completes an item' do
+      data = %w|one two three|
+      proc_data = []
+      proc = ->(item_index, max_items, previous_result) {
+        if previous_result == 2
+          proc_data << [item_index, max_items]
+        end
+        item_index
+      }
+      TeamEffort.work(data, 1, progress_proc: proc) {}
+
+      _(proc_data).must_equal [
+                                [3, 3]
+                              ]
+    end
+
     it 'ignores other child process completions' do
       output_io_class = Class.new do
         def initialize
@@ -112,7 +128,7 @@ describe TeamEffort do
 
       lines = output_io.lines
 
-      lines.must_equal [
+      _(lines).must_equal [
                          'unmanaged starting',
                          'unmanaged waiting for IO',
                          'task 1 starting',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: team_effort
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Kelly Felkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Use child processes to process a collection in parallel