team_effort 0.0.9 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267e445b9850df939f36b9458ed000f4889867bc3c686fb4410b5e6acf2d6f31
-  data.tar.gz: 0a6673448d5e06aa98d7e760c6df4e773008747241e7012a7217c37357e9fcee
+  metadata.gz: 2d7779d24f1c2aa78460778a38d505c106677eab6afe2c829ebd551b169ce551
+  data.tar.gz: 2f96281c9c5558d23d4bb49153d450bd8a4617b0ec551d93fcb6ebab5de13246
 SHA512:
-  metadata.gz: d60080c326dd3acbe4e2886d858919e92e01c94e9aa6fa629ffca35829d27868eb674d49bf572fae5bcf9c26939a1ed40047333eb5d122b01b51e864bcfd0b8c
-  data.tar.gz: d1c1a4f3f6ff5fd9b0539df97487d02d5576278c770cab598d26799d81185c61b852f013ada2963167953bf3391f1c675954fc6896d191d923cd73fd24a16b54
+  metadata.gz: 7090174299461bd8e9d50190c3b7d10cede4fcb918985d741c72e629860ee2b98f866daf0c512f3b5fe5c452ca07972c70e09bd39d8f858d671e74ffa9bd5e66
+  data.tar.gz: 24a64b1dbaf6b2b6f4d6718bd49cf208e9cb92f6c3d86ef0b5d3c28afc71eba4a65b0e72eb5707eecf09bfda6318de90be6dee044df69fc86e936444ddc7f629

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 1.0.0 (2019-01-07)
+
+ - Potential breaking change: In previous versions, a child process returning a non 0 exit status had no effect. With
+   this version, non 0 exit statuses raise an exception in the main process.
+

data/lib/team_effort/version.rb

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

data/lib/team_effort.rb

@@ -3,25 +3,44 @@ require_relative "team_effort/version"
 module TeamEffort
   def self.work(enumerable, max_process_count = 4, progress_proc: nil)
     pids = []
+    arg_sets = []
+
     max_count = enumerable.count
     completed_count = 0
 
-    enumerable.each do |args|
+    enumerable.each do |arg_set|
       while pids.size == max_process_count
-        finished_pid = Process.wait
-        pids.delete finished_pid
-        progress_proc.call(completed_count += 1, max_count) if progress_proc
+        pids, arg_sets, completed_count = wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc)
       end
 
       pids << fork do
-        yield args
+        begin
+          yield arg_set
+          exit! 0
+        rescue => e
+          $stderr.puts "TeamEffort child process error"
+          $stderr.puts e
+          $stderr.puts caller
+          exit! 1
+        end
       end
+      arg_sets << arg_set
     end
 
     while !pids.empty?
-      finished_pid = Process.wait
-      pids.delete finished_pid
-      progress_proc.call(completed_count += 1, max_count) if progress_proc
+      pids, arg_sets, completed_count = wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc)
+    end
+  end
+
+  def self.wait_for_completion(pids, arg_sets, completed_count, max_count, progress_proc)
+    pid, status = Process.wait2
+    pids_index = pids.index(pid)
+    if pids_index
+      pids.delete_at pids_index
+      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]
   end
 end

data/test/{test_team_effort.rb → team_effort_test.rb}

@@ -26,16 +26,32 @@ describe TeamEffort do
       lines = output.split(/\n/)
       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 = -> {
+        $stderr = File.open('/dev/null', 'w')
+        begin
+          TeamEffort.work(data, 1) do |item|
+            16 / item
+          end
+        ensure
+          $stderr.close
+          $stderr = STDERR
+        end
+      }.must_raise RuntimeError
+      err.message.must_match /TeamEffort child process failed when processing > 0 </
+    end
+
     it 'invokes an optional proc when it completes an item' do
       data = %w|one two three|
       proc_data = []
-      # proc = ->(item_index, max_items) {proc_data << [item_index, max_items]}
-      progress_proc = ->(index, max_index) { puts "#{ sprintf("%3i%", index.to_f / max_index * 100) }" }
-      TeamEffort.work(data, 1, progress_proc: progress_proc) {}
+      proc = ->(item_index, max_items) { proc_data << [item_index, max_items] }
+      TeamEffort.work(data, 1, progress_proc: proc) {}
 
       proc_data.must_equal [
                              [1, 3],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: team_effort
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.1
 platform: ruby
 authors:
 - Kelly Felkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,13 +49,14 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
 - lib/team_effort.rb
 - lib/team_effort/version.rb
 - team_effort.gemspec
-- test/test_team_effort.rb
+- test/team_effort_test.rb
 homepage: https://github.com/kellyfelkins/team_effort
 licenses:
 - MIT
@@ -81,4 +82,4 @@ signing_key:
 specification_version: 4
 summary: Use child processes to process a collection in parallel
 test_files:
-- test/test_team_effort.rb
+- test/team_effort_test.rb