flatware 2.2.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278612d774eb619a0548544e33650c8f73b4fa1b88de900027aba730a46c51bd
-  data.tar.gz: a1ac3e33ff822f2cac88fe24914d1034bffd40872ca0e10791e8019a60f64d68
+  metadata.gz: f3dfa03a78403cf9d0b10b97ac354baba9353a6847bcbbc9b150b7deaa8a4f68
+  data.tar.gz: e2181f1f91b2b313ab42d39c93ce209efc432b29192737f7b9d5e06d13f637ce
 SHA512:
-  metadata.gz: 48e11bc65e1e0423567b21175a313766aeb1949aa3f7f168e005c3657f9a189da5003aea4c8f50230969875dc6363fe5e8eacebb0c594d4fdea28c3775082791
-  data.tar.gz: 1f6abcc7d6b8d1e29e8c588e27dd077b8af754fb7c3b057f648d595974591c5069f147fe6b3f43768655add6553a090b240312180773f58db5d0b23f74e76cdc
+  metadata.gz: 63b9c6f997e89382276b56797cf0e0b53155c30e11a5e22157c03a93da7cd616bffde249283a6ed7a29affc1b9da5baa211c2963e98402998068c7a9f856ed33
+  data.tar.gz: dba4525f41243955e2f0f3db5a8685031a38eb66192de319c110eae41450fcd55ad995d56c3025e01cb8ad61a50dce04dec4dcc1e45ed54f36dfe011554f5339

data/lib/flatware/sink/signal.rb

@@ -0,0 +1,51 @@
+module Flatware
+  module Sink
+    class Signal
+      def initialize(&on_interrupt)
+        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 }
+
+        self
+      end
+
+      def self.listen(&block)
+        new(&block).listen
+      end
+
+      private
+
+      def handle_signals
+        puts signal_message(signals.pop)
+        Process.waitall
+        @on_interrupt.call
+        puts 'done.'
+        abort
+      end
+
+      def signal_message(signal)
+        format(<<~MESSAGE, { cld: 'A worker died', int: 'Interrupted' }.fetch(signal))
+
+          %s!
+
+          Cleaning up. Please wait...
+        MESSAGE
+      end
+
+      def signals
+        Thread.main[:signals]
+      end
+    end
+  end
+end

data/lib/flatware/sink.rb

@@ -1,5 +1,6 @@
 require 'drb/drb'
 require 'set'
+require 'flatware/sink/signal'
 
 module Flatware
   module Sink
@@ -31,7 +32,7 @@ module Flatware
       end
 
       def start
-        trap_interrupt
+        @signal = Signal.listen(&method(:summarize_remaining))
         formatter.jobs jobs
         DRb.start_service(sink, self, verbose: Flatware.verbose?)
         DRb.thread.join
@@ -72,29 +73,8 @@ module Flatware
 
       private
 
-      def trap_interrupt
-        Thread.main[:signals] = Queue.new
-
-        Thread.new(&method(:handle_interrupt))
-
-        trap 'INT' do
-          Thread.main[:signals] << :int
-        end
-      end
-
-      def handle_interrupt
-        Thread.main[:signals].pop
-        puts 'Interrupted!'
-        summarize_remaining
-        puts "\n\nCleaning up. Please wait...\n"
-        Process.waitall
-        puts 'done.'
-        abort
-      end
-
       def interruped?
-        signals = Thread.main[:signals]
-        signals && !signals.empty?
+        @signal&.interruped?
       end
 
       def check_finished!

data/lib/flatware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatware
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.1
 platform: ruby
 authors:
 - Brian Dunn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-02 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -45,6 +45,7 @@ files:
 - lib/flatware/serialized_exception.rb
 - lib/flatware/sink.rb
 - lib/flatware/sink/client.rb
+- lib/flatware/sink/signal.rb
 - lib/flatware/version.rb
 - lib/flatware/worker.rb
 homepage: http://github.com/briandunn/flatware