restartable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGZhZTQzNTI5MDQxODAwNjA5YmM1NGYxMDhkODU3ZTczMWQ2ZGFhOQ==
+    N2YwNjQxOGVjNzBlNjE1NjM0NjcxMDkyMWJhMDEwMGQ2MDRhOWU1MQ==
   data.tar.gz: !binary |-
-    MTAwNzEyYWVjZjA2ODM4MWVhMTc3NGRjOTcwYTIwZWI0ZjQ0ZjdmMQ==
+    YmI0NmU2ZWQ3YTU4NzFlYzM0M2IzYmJiYjBlNGYxYjI0ZTNmZDI2Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTE4NjVlMTJiNjhiMzU1NzQ4ZjY3ZWJiOWQ4MjI5YzIxMTVlNGNmMDAwMTdh
-    NDI3YjIxYmYwMTlhYWQyMTcyYTU1ZWU1OWY1YTlkMmU2YTRhOGU2ZmViY2Nj
-    ZDJhZWFiNWFlYjdiZjI1MTM4OTAxNDJjM2MxNzA3MzZlZWM0Nzg=
+    ZTA3MmE2NzczZTY3NjkxMWVlOGYzOWU4Njc2OTFkNTcxYmExYzBjMTMwOTFm
+    YTQyOTkyN2NlZjJkMjk5Y2ZmYzJkYWUzOGUwYzc1NTU3YjQwMmRkZGFlN2Ew
+    Y2RhYTM2NWNmZmQ2YzUzYjJkZjU4OGJhODY3NmY3YmMwNGZjNzk=
   data.tar.gz: !binary |-
-    YzQ2Zjg5YzhiNTA4ZTBkNTRjNjUwNDEwYzQ5ZjQxM2FiMzA1MzJjOTA1YzYw
-    MWQ1YTIyNWMzOWQzNTY5ZjJiYzI2YWUxMzc2NDFhZDg2ZWEwYTFhZWRmYmFi
-    OGVmMmYxOGYyODZkZTAyNzM5NTVmN2MxMGViNjk5NWViMmM3M2I=
+    YTZmMWY2ZTM4MmViZTc1MGE5YTE4Yjg5ZDk3NmE3ZGY1YWMyNTdhNzYzMDA0
+    ODVhMjdjZmViNWQ0YmJlN2M5ZjFmMmU2Yjg0MTJhMmQxZmFlMmI1Zjk3YmIw
+    ZmM2YmZmODM0ZTVmNTBiYjAyYjg4YzgwYzMzMTJlZTQ0NDhmYTQ=

data/.travis.yml

@@ -4,7 +4,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - rbx-18mode
-  - rbx-19mode
   - ree
 script: bundle exec cucumber

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Ivan Kuchin
+Copyright (c) 2013-2014 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -6,4 +6,4 @@ Run code, Ctrl-C to restart, two Ctrl-C to stop.
 
 ## Copyright
 
-Copyright (c) 2012-2013 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2012-2014 Ivan Kuchin. See LICENSE.txt for details.

data/features/restarting.feature

@@ -14,17 +14,19 @@ Feature: Restarting
     When I have waited for 1 second
     Then I should see "^C to restart, double ^C to stop" in stderr
     And I should see "Hello world!" in stdout
-    And there should be inner process
+    And there should be an inner process
     When I interrupt restartable twice
-    Then I should see "Killing children…" and "Don't restart!" in last 3 lines of stderr
+    Then I should see "Killing children…" and "Don't restart!" in stderr
     And inner process should terminate
     And restartable should finish
 
     Examples:
-      | code                        |
-      | $stdout.puts "Hello world!" |
-      | $stdout.puts "Hello world!"; sleep 30 |
-      | exec 'echo "Hello world!"; sleep 30' |
-      | system 'echo "Hello world!"; sleep 30' |
-      | fork{ $stdout.puts "Hello world!"; sleep 30 } |
-      | fork{ fork{ fork{ $stdout.puts "Hello world!"; sleep 30 } } } |
+      | code                                                                                           |
+      | $stdout.puts "Hello world!"                                                                    |
+      | $stdout.puts "Hello world!"; 100.times{ sleep 1 }                                              |
+      | exec 'echo "Hello world!"; sleep 100'                                                          |
+      | system 'echo "Hello world!"; sleep 100'                                                        |
+      | fork{ $stdout.puts "Hello world!"; 100.times{ sleep 1 } }                                      |
+      | fork{ fork{ fork{ $stdout.puts "Hello world!"; 100.times{ sleep 1 } } } }                      |
+      | Signal.trap("INT"){}; $stdout.puts "Hello world!"; 100.times{ sleep 1 }                        |
+      | Signal.trap("INT"){}; Signal.trap("TERM"){}; $stdout.puts "Hello world!"; 100.times{ sleep 1 } |

data/features/step_definitions/restartable_steps.rb

@@ -33,13 +33,14 @@ Then(/^I should see "(.*?)" in stdout$/) do |string|
   end
 end
 
-Then(/^I should see "(.*?)" in (?:last (\d+) lines of )?stderr$/) do |arg, line_count|
-  Timeout::timeout(5) do
+Then(/^I should see "(.*?)" in stderr$/) do |arg|
+  Timeout::timeout(60) do
     strings = arg.split(/".*?"/)
-    line_count = line_count ? line_count.to_i : strings.length
-    got = line_count.times.map{ @stderr[0].gets }.join
-    strings.each do |string|
-      got.should include(string)
+    until strings.empty?
+      line = @stderr[0].gets
+      strings.reject! do |string|
+        line.include?(string)
+      end
     end
   end
 end
@@ -55,13 +56,23 @@ When(/^I interrupt restartable twice$/) do
 end
 
 Then(/^there should be an inner process$/) do
-  Sys::ProcTable.ps.any?{ |pe| pe.ppid == @cpid }
+  Timeout::timeout(5) do
+    until Sys::ProcTable.ps.any?{ |pe| pe.ppid == @pid }
+      sleep 1
+    end
+  end
 end
 
 Then(/^inner process should terminate$/) do
-  Sys::ProcTable.ps.none?{ |pe| pe.ppid == @cpid }
+  Timeout::timeout(100) do
+    until Sys::ProcTable.ps.none?{ |pe| pe.ppid == @pid }
+      sleep 1
+    end
+  end
 end
 
 Then(/^restartable should finish$/) do
-  Process.wait(@pid)
+  Timeout::timeout(5) do
+    Process.wait(@pid)
+  end
 end

data/lib/restartable.rb

@@ -19,19 +19,17 @@ private
   def run!
     Signal.trap('INT') do
       interrupt!
-      if @cpid
-        Process.kill('INT', -@cpid) rescue nil
-      end
+      signal_children!('INT') if @cpid
     end
     Signal.trap('TERM') do
       terminate!
+      signal_children!('TERM') if @cpid
     end
 
     until @stop
       @interrupted = nil
       $stderr << "^C to restart, double ^C to stop\n".green
       @cpid = fork do
-        Process.setpgrp
         Signal.trap('INT', 'DEFAULT')
         Signal.trap('TERM', 'DEFAULT')
         @block.call
@@ -68,7 +66,7 @@ private
         WAIT_SIGNALS.each do |time, signal|
           sleep time
           $stderr << "…SIG#{signal}…\n".yellow
-          Process.kill('INT', -@cpid)
+          signal_children!(signal)
         end
       end
       Process.waitall
@@ -85,9 +83,19 @@ private
     end
   end
 
+  def signal_children!(signal)
+    children_pids.each do |pid|
+      begin
+        Process.kill(signal, pid)
+      rescue Errno::ESRCH
+      end
+    end
+  end
+
   def children_pids
+    pgrp = Process.getpgrp
     Sys::ProcTable.ps.select do |pe|
-      @cpid == case
+      pgrp == case
       when pe.respond_to?(:pgid)
         pe.pgid
       when pe.respond_to?(:pgrp)
@@ -97,6 +105,6 @@ private
       else
         raise 'Can\'t find process group id'
       end
-    end.map(&:pid)
+    end.map(&:pid) - [$$]
   end
 end

data/restartable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'restartable'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   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.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored