restartable 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjBlMWMyMTgxZjllMGY4NTNkZGMzNTcxODY2ZjlmYTU5ZjA3MGNmMQ==
+    MWQ5YTBhNmJmNjQxOTdkZGRmZDlmOThhYWZmZmQ5MDY4OGJiMWM1Yw==
   data.tar.gz: !binary |-
-    ZWE5Nzc2YjgxYTY2MjBjMDA4OGE1ZDcxZTVkNzk2Y2VlMDVmN2Q5NA==
+    ZjMwMzEyMzBhYzQ0NzMyZjgyZjM3YTBhMmMzZDU5OWNhNjU2MGQ0ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDBkMmUxOTczOTQ5N2JlZDJjYzc1ZjMyOTc1YjgxYjNkMWMyMmEyMmJjODVl
-    OTlhMzA5ZTFiNmM5MWVjMjUwYzFiNDk1ZjA1ZTJiMGU0ZDQ3ZjI2ZWFlNWQx
-    MWYxNjRlZjZhN2Q3ZDU3YTliYjZjNjBjMTQ1YWEwMTNiMTcwYzQ=
+    NzAwZmI4M2VkMzU4ZTE1ZmE5MjJiYWFmNTFjMTI3MGMyM2UzZjYxMWMxYzI1
+    ZDdmN2U4M2IwODdmYjYyMjJmMDUzZjc2OTkwZDk5ODY0ZWFjY2I2ZWU3NWY2
+    MDk0MDBiMjFkNGM0MGQ2YmUwZmYwZmZjYTNhMDk4MGE2NDM4MjM=
   data.tar.gz: !binary |-
-    NDU2NTA2M2M3N2M1YjBjZWE2ZWE5MzY5NzQxNjViYWU2ZjM1MDU3NmM2N2Ez
-    MGRiZDE1YTE2MmM1N2MwYmQ0NTMwMTdjZTI0ZmVmNWY4NWFhNjU5NDM0ZGEz
-    YTJmYjlhYWRmOGM4MDliMTQzN2Y5MGJiOTg0NDQzMmIyY2E4YWQ=
+    ZTczZDEwNzY1MDg3Y2VhOTI4OTVkNzA0NzlhM2FlMjYyN2VlYzhiODc4Yjlm
+    YmQ5NzFjYmMxNjA2N2ZjZTkzNzFkZTc0ODY4MTNlNGIzZGE5MDM3YjI2ZWVm
+    ZTM2ZDVhOGQxZmE2ZmZjODA4YTJiZDdiODVlMDcyZjY0MTE5ZTU=

data/TODO

@@ -1,2 +1,3 @@
-run block on restart
+add option to run block on restart
 bin option to run command on restart
+option to auto restart when block finishes

data/lib/restartable.rb

@@ -2,82 +2,109 @@
 
 require 'sys/proctable'
 require 'colored'
+require 'thread'
 
 class Restartable
   def self.version
     Gem.loaded_specs['restartable'].version.to_s rescue 'DEV'
   end
 
-  WAIT_SIGNALS = [[1, 'INT'], [1, 'INT'], [1, 'INT'], [1, 'TERM'], [5, 'KILL']]
-
   def initialize(options, &block)
     @options, @block = options, block
+    run!
+  end
+
+private
+
+  def run!
     @mutex = Mutex.new
-    synced_trap('INT'){ interrupt! }
-    synced_trap('TERM'){ no_restart!; interrupt! }
+
+    receiver, sender = IO.pipe
+    @trap_sender = Process.fork do
+      receiver.close
+      Signal.trap('PIPE', 'EXIT')
+      synced_trap('INT'){ Marshal.dump(:int, sender) }
+      loop{ sleep }
+    end
+    sender.close
+
+    Signal.trap('INT', 'IGNORE')
+    synced_trap('TERM'){ terminate! }
+
+    int_receiver = Thread.new do
+      until receiver.eof?
+        Marshal.load(receiver) && interrupt!
+      end
+    end
     cycle
   end
 
   def interrupt!
     unless @interrupted
       @interrupted = true
-      Thread.list.each do |thread|
-        unless Thread.current == thread
-          thread.raise SignalException.new('INT')
-        end
+      (Thread.list - [Thread.current]).each do |thread|
+        thread.raise SignalException.new('INT')
       end
     else
       no_restart!
     end
   end
 
+  def terminate!
+    no_restart!
+    interrupt!
+  end
+
   def no_restart!
     @stop = true
     puts 'Don\'t restart!'.red.bold
   end
 
+  def synced_trap(signal, &block)
+    Signal.trap(signal) do
+      Thread.new do
+        @mutex.synchronize(&block)
+      end
+    end
+  end
+
+  WAIT_SIGNALS = [[5, 'INT'], [3, 'INT'], [1, 'INT'], [3, 'TERM'], [5, 'KILL']]
+
   def cycle
     until @stop
       @interrupted = false
       puts '^C to restart, double ^C to stop'.green
       begin
         @block.call
-        sleep # wait ^C even if block finishes
+        loop{ sleep } # wait ^C even if block finishes
       rescue SignalException
-        unless children.empty?
-          puts 'Killing children…'.yellow.bold
-          ripper = Thread.new do
-            WAIT_SIGNALS.each do |time, signal|
-              sleep time
-              puts "…SIG#{signal}…".yellow
-              children.each do |child|
-                Process.kill(signal, child.pid)
-              end
-            end
-          end
-          Process.waitall
-          ripper.terminate
-        end
-        unless @stop
-          puts 'Waiting ^C 0.5 second than restart…'.yellow.bold
-          sleep 0.5
-        end
+        kill_children!
+      end
+      unless @stop
+        puts 'Waiting ^C 0.5 second than restart…'.yellow.bold
+        sleep 0.5
       end
     end
   end
 
-private
-
-  def synced_trap(signal, &block)
-    Signal.trap(signal) do
-      Thread.new do
-        @mutex.synchronize(&block)
+  def kill_children!
+    unless children_pids.empty?
+      puts 'Killing children…'.yellow.bold
+      ripper = Thread.new do
+        WAIT_SIGNALS.each do |time, signal|
+          sleep time
+          puts "…SIG#{signal}…".yellow
+          children_pids.each do |child_pid|
+            Process.kill(signal, child_pid)
+          end
+        end
       end
+      children_pids.each(&Process.method(:wait))
+      ripper.terminate
     end
   end
 
-  def children
-    pid = Process.pid
-    Sys::ProcTable.ps.select{ |pe| pid == pe.ppid }
+  def children_pids
+    Sys::ProcTable.ps.select{ |pe| $$ == pe.ppid }.map(&:pid) - [@trap_sender]
   end
 end

data/restartable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'restartable'
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   s.summary     = %q{Run code, Ctrl-C to restart, once more Ctrl-C to stop}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restartable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored