flatware 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3dfa03a78403cf9d0b10b97ac354baba9353a6847bcbbc9b150b7deaa8a4f68
-  data.tar.gz: e2181f1f91b2b313ab42d39c93ce209efc432b29192737f7b9d5e06d13f637ce
+  metadata.gz: e4e66ab27a1e76fc9ca919c9b9de35006f88317cb6b5bf6f1b136b1b7eabc368
+  data.tar.gz: d16310a202a40d0e1a4147d31e1c97c8cc590f5d1b009b2576cefb9e79e47735
 SHA512:
-  metadata.gz: 63b9c6f997e89382276b56797cf0e0b53155c30e11a5e22157c03a93da7cd616bffde249283a6ed7a29affc1b9da5baa211c2963e98402998068c7a9f856ed33
-  data.tar.gz: dba4525f41243955e2f0f3db5a8685031a38eb66192de319c110eae41450fcd55ad995d56c3025e01cb8ad61a50dce04dec4dcc1e45ed54f36dfe011554f5339
+  metadata.gz: 3e1b6e794216a3724966e1465990d89a6d8d33f2ef2d58248b7ccb35e16451ad3f675c9b4f630135b9d4fbc61a75e4be32b844ee8758f1e9975dc80ffd13b32a
+  data.tar.gz: 341abe2ae2e05e2105f3de801fb8e8bd044028bc75a21529d4f5b2d1aab20b943d0b4d860cfff432e1f234d91dbd662db23c664543e3dd2ad2b8b2b95d315738

data/README.md

@@ -40,13 +40,13 @@ $ flatware rspec
 
 The rspec runner can balance worker loads, making your suite even faster.
 
-It forms balaced groups of spec files according to their last run times, if you've set `example_status_persistence_file_path` [in your RSpec config](https://relishapp.com/rspec/rspec-core/v/3-8/docs/command-line/only-failures).
+It forms balanced groups of spec files according to their last run times, if you've set `example_status_persistence_file_path` [in your RSpec config](https://relishapp.com/rspec/rspec-core/v/3-8/docs/command-line/only-failures).
 
-For this to work the configuration option must be loaded before any specs are run. The `.rspec` file is one way to achive this:
+For this to work the configuration option must be loaded before any specs are run. The `.rspec` file is one way to achieve this:
 
     --require spec_helper
 
-But beware, if you're using ActiveRecord in your suite you'll need to avoid doing things that cause it to establish a database connection in `spec_helper.rb`. If ActiveRecord connects before flatware forks off workers, each will die messily. All of this will just work if you're following [the recomended pattern of splitting your helpers into `spec_helper` and `rails_helper`](https://github.com/rspec/rspec-rails/blob/v3.8.2/lib/generators/rspec/install/templates/spec/rails_helper.rb). Another option is to use [the configurable hooks](
+But beware, if you're using ActiveRecord in your suite you'll need to avoid doing things that cause it to establish a database connection in `spec_helper.rb`. If ActiveRecord connects before flatware forks off workers, each will die messily. All of this will just work if you're following [the recommended pattern of splitting your helpers into `spec_helper` and `rails_helper`](https://github.com/rspec/rspec-rails/blob/v3.8.2/lib/generators/rspec/install/templates/spec/rails_helper.rb). Another option is to use [the configurable hooks](
 #faster-startup-with-activerecord
 ).
 

data/lib/flatware/cli.rb

@@ -17,7 +17,7 @@ module Flatware
         aliases: '-w',
         type: :numeric,
         default: processors,
-        desc: 'Number of concurent processes to run'
+        desc: 'Number of concurrent processes to run'
       )
     end
 
@@ -90,6 +90,6 @@ if loaded_flatware_gem_count.zero?
   warn(
     format(<<~MESSAGE, gem_list: flatware_gems.join(' or ')))
       The flatware gem is a dependency of flatware runners for rspec and cucumber.
-      Install %<gem_list>s for more usefull commands.
+      Install %<gem_list>s for more useful commands.
     MESSAGE
 end

data/lib/flatware/sink/signal.rb

@@ -1,46 +1,77 @@
 module Flatware
   module Sink
     class Signal
-      def initialize(&on_interrupt)
+      Message = Struct.new(:message)
+
+      attr_reader :formatter
+
+      def initialize(formatter, &on_interrupt)
+        @formatter = formatter
         Thread.main[:signals] = Queue.new
 
         @on_interrupt = on_interrupt
       end
 
-      def interruped?
-        !signals.empty?
-      end
-
       def listen
         Thread.new(&method(:handle_signals))
 
         ::Signal.trap('INT') { signals << :int }
-        ::Signal.trap('CLD') { signals << :cld }
+        ::Signal.trap('CLD') do
+          signals << :cld if child_failed?
+        end
 
         self
       end
 
-      def self.listen(&block)
-        new(&block).listen
+      def self.listen(formatter, &block)
+        new(formatter, &block).listen
       end
 
       private
 
+      def child_status
+        _worker_pid, status = begin
+          Process.wait2(-1, Process::WNOHANG)
+        rescue Errno::ECHILD
+          []
+        end
+        status
+      end
+
+      def child_statuses
+        statuses = []
+        loop do
+          status = child_status
+          return statuses unless status
+
+          statuses << status
+        end
+      end
+
+      def child_failed?
+        child_statuses.any? { |status| !status.success? }
+      end
+
       def handle_signals
-        puts signal_message(signals.pop)
-        Process.waitall
-        @on_interrupt.call
-        puts 'done.'
+        signal_message(signals.pop) do
+          Process.waitall
+          @on_interrupt.call
+        end
+
         abort
       end
 
       def signal_message(signal)
-        format(<<~MESSAGE, { cld: 'A worker died', int: 'Interrupted' }.fetch(signal))
+        formatter.message(Message.new(format(<<~MESSAGE, { cld: 'A worker died', int: 'Interrupted' }.fetch(signal))))
 
           %s!
 
-          Cleaning up. Please wait...
+          Waiting for workers to finish their current jobs...
         MESSAGE
+
+        yield
+
+        formatter.message(Message.new('done.'))
       end
 
       def signals

data/lib/flatware/sink.rb

@@ -25,6 +25,7 @@ module Flatware
         @checkpoints = []
         @completed_jobs = []
         @formatter = formatter
+        @interrupted = false
         @jobs = group_jobs(jobs, worker_count).freeze
         @queue = @jobs.dup
         @sink = sink
@@ -32,16 +33,16 @@ module Flatware
       end
 
       def start
-        @signal = Signal.listen(&method(:summarize_remaining))
+        Signal.listen(formatter, &method(:on_interrupt))
         formatter.jobs jobs
         DRb.start_service(sink, self, verbose: Flatware.verbose?)
         DRb.thread.join
-        !failures?
+        !(failures? || interrupted?)
       end
 
       def ready(worker)
         job = queue.shift
-        if job && !(remaining_work.empty? || interruped?)
+        if job && !(remaining_work.empty? || interrupted?)
           workers << worker
           job
         else
@@ -73,8 +74,13 @@ module Flatware
 
       private
 
-      def interruped?
-        @signal&.interruped?
+      def on_interrupt
+        @interrupted = true
+        summarize_remaining
+      end
+
+      def interrupted?
+        @interrupted
       end
 
       def check_finished!

data/lib/flatware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flatware
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatware
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Brian Dunn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor