restartable 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQ5YTBhNmJmNjQxOTdkZGRmZDlmOThhYWZmZmQ5MDY4OGJiMWM1Yw==
+    OGZhZTQzNTI5MDQxODAwNjA5YmM1NGYxMDhkODU3ZTczMWQ2ZGFhOQ==
   data.tar.gz: !binary |-
-    ZjMwMzEyMzBhYzQ0NzMyZjgyZjM3YTBhMmMzZDU5OWNhNjU2MGQ0ZA==
+    MTAwNzEyYWVjZjA2ODM4MWVhMTc3NGRjOTcwYTIwZWI0ZjQ0ZjdmMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzAwZmI4M2VkMzU4ZTE1ZmE5MjJiYWFmNTFjMTI3MGMyM2UzZjYxMWMxYzI1
-    ZDdmN2U4M2IwODdmYjYyMjJmMDUzZjc2OTkwZDk5ODY0ZWFjY2I2ZWU3NWY2
-    MDk0MDBiMjFkNGM0MGQ2YmUwZmYwZmZjYTNhMDk4MGE2NDM4MjM=
+    YTE4NjVlMTJiNjhiMzU1NzQ4ZjY3ZWJiOWQ4MjI5YzIxMTVlNGNmMDAwMTdh
+    NDI3YjIxYmYwMTlhYWQyMTcyYTU1ZWU1OWY1YTlkMmU2YTRhOGU2ZmViY2Nj
+    ZDJhZWFiNWFlYjdiZjI1MTM4OTAxNDJjM2MxNzA3MzZlZWM0Nzg=
   data.tar.gz: !binary |-
-    ZTczZDEwNzY1MDg3Y2VhOTI4OTVkNzA0NzlhM2FlMjYyN2VlYzhiODc4Yjlm
-    YmQ5NzFjYmMxNjA2N2ZjZTkzNzFkZTc0ODY4MTNlNGIzZGE5MDM3YjI2ZWVm
-    ZTM2ZDVhOGQxZmE2ZmZjODA4YTJiZDdiODVlMDcyZjY0MTE5ZTU=
+    YzQ2Zjg5YzhiNTA4ZTBkNTRjNjUwNDEwYzQ5ZjQxM2FiMzA1MzJjOTA1YzYw
+    MWQ1YTIyNWMzOWQzNTY5ZjJiYzI2YWUxMzc2NDFhZDg2ZWEwYTFhZWRmYmFi
+    OGVmMmYxOGYyODZkZTAyNzM5NTVmN2MxMGViNjk5NWViMmM3M2I=

data/.gitignore

@@ -6,6 +6,7 @@
 /.yardoc/
 /coverage/
 
+Gemfile.lock
 Makefile
 *.o
 *.bundle

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+script: bundle exec cucumber

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/README.markdown

@@ -2,6 +2,8 @@
 
 Run code, Ctrl-C to restart, two Ctrl-C to stop.
 
+[![Build Status](https://travis-ci.org/toy/restartable.png?branch=master)](https://travis-ci.org/toy/restartable)
+
 ## Copyright
 
 Copyright (c) 2012-2013 Ivan Kuchin. See LICENSE.txt for details.

data/bin/restartable

@@ -33,5 +33,5 @@ rescue OptionParser::ParseError => e
 end
 
 Restartable.new(options) do
-  system *ARGV
+  exec *ARGV
 end

data/features/restarting.feature

@@ -0,0 +1,30 @@
+Feature: Restarting
+
+  Scenario Outline: Restarting and terminating
+    Given I have invoked restartable with `<code>`
+
+    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 an inner process
+    When I interrupt restartable
+    Then I should see "Killing children…" and "Waiting ^C 0.5 second than restart…" in stderr
+    And inner process should terminate
+
+    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
+    When I interrupt restartable twice
+    Then I should see "Killing children…" and "Don't restart!" in last 3 lines of 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 } } } |

data/features/step_definitions/restartable_steps.rb

@@ -0,0 +1,67 @@
+require 'restartable'
+
+Given(/^I have invoked restartable with `(.*?)`$/) do |command|
+  @stdout = IO.pipe
+  @stderr = IO.pipe
+
+  @pid = fork do
+    Process.setpgrp
+
+    @stdout[0].close
+    STDOUT.reopen(@stdout[1])
+
+    @stderr[0].close
+    STDERR.reopen(@stderr[1])
+
+    Restartable.new do
+      Signal.trap('INT', 'EXIT')
+      eval(command)
+    end
+  end
+
+  @stdout[1].close
+  @stderr[1].close
+end
+
+When(/^I have waited for (\d+) second$/) do |seconds|
+  sleep seconds.to_i
+end
+
+Then(/^I should see "(.*?)" in stdout$/) do |string|
+  Timeout::timeout(5) do
+    @stdout[0].gets.should include(string)
+  end
+end
+
+Then(/^I should see "(.*?)" in (?:last (\d+) lines of )?stderr$/) do |arg, line_count|
+  Timeout::timeout(5) 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)
+    end
+  end
+end
+
+When(/^I interrupt restartable$/) do
+  Process.kill('INT', -@pid)
+end
+
+When(/^I interrupt restartable twice$/) do
+  Process.kill('INT', -@pid)
+  sleep 0.1
+  Process.kill('INT', -@pid)
+end
+
+Then(/^there should be an inner process$/) do
+  Sys::ProcTable.ps.any?{ |pe| pe.ppid == @cpid }
+end
+
+Then(/^inner process should terminate$/) do
+  Sys::ProcTable.ps.none?{ |pe| pe.ppid == @cpid }
+end
+
+Then(/^restartable should finish$/) do
+  Process.wait(@pid)
+end

data/lib/restartable.rb

@@ -9,7 +9,7 @@ class Restartable
     Gem.loaded_specs['restartable'].version.to_s rescue 'DEV'
   end
 
-  def initialize(options, &block)
+  def initialize(options = {}, &block)
     @options, @block = options, block
     run!
   end
@@ -17,94 +17,86 @@ class Restartable
 private
 
   def run!
-    @mutex = Mutex.new
-
-    receiver, sender = IO.pipe
-    @trap_sender = Process.fork do
-      receiver.close
-      Signal.trap('PIPE', 'EXIT')
-      synced_trap('INT'){ Marshal.dump(:int, sender) }
-      loop{ sleep }
+    Signal.trap('INT') do
+      interrupt!
+      if @cpid
+        Process.kill('INT', -@cpid) rescue nil
+      end
+    end
+    Signal.trap('TERM') do
+      terminate!
     end
-    sender.close
-
-    Signal.trap('INT', 'IGNORE')
-    synced_trap('TERM'){ terminate! }
 
-    int_receiver = Thread.new do
-      until receiver.eof?
-        Marshal.load(receiver) && interrupt!
+    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
+      end
+      sleep 0.1 until @interrupted
+      kill_children!
+      unless @stop
+        $stderr << "Waiting ^C 0.5 second than restart…\n".yellow.bold
+        sleep 0.5
       end
     end
-    cycle
   end
 
   def interrupt!
-    unless @interrupted
-      @interrupted = true
-      (Thread.list - [Thread.current]).each do |thread|
-        thread.raise SignalException.new('INT')
-      end
+    if @interrupted
+      @stop = true
+      $stderr << "Don't restart!\n".red.bold
     else
-      no_restart!
+      @interrupted = true
     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
+    interrupt!
   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
-        loop{ sleep } # wait ^C even if block finishes
-      rescue SignalException
-        kill_children!
-      end
-      unless @stop
-        puts 'Waiting ^C 0.5 second than restart…'.yellow.bold
-        sleep 0.5
-      end
-    end
-  end
-
   def kill_children!
-    unless children_pids.empty?
-      puts 'Killing children…'.yellow.bold
+    until (pids = children_pids).empty?
+      $stderr << "Killing children…\n".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)
+          $stderr << "…SIG#{signal}…\n".yellow
+          Process.kill('INT', -@cpid)
+        end
+      end
+      Process.waitall
+      pids.each do |pid|
+        begin
+          loop do
+            Process.kill(0, pid)
+            sleep 1
           end
+        rescue Errno::ESRCH
         end
       end
-      children_pids.each(&Process.method(:wait))
       ripper.terminate
     end
   end
 
   def children_pids
-    Sys::ProcTable.ps.select{ |pe| $$ == pe.ppid }.map(&:pid) - [@trap_sender]
+    Sys::ProcTable.ps.select do |pe|
+      @cpid == case
+      when pe.respond_to?(:pgid)
+        pe.pgid
+      when pe.respond_to?(:pgrp)
+        pe.pgrp
+      when pe.respond_to?(:ppid)
+        pe.ppid
+      else
+        raise 'Can\'t find process group id'
+      end
+    end.map(&:pid)
   end
 end

data/restartable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'restartable'
-  s.version     = '0.1.3'
+  s.version     = '0.2.0'
   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']
@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colored', '~> 1.2'
   s.add_dependency 'sys-proctable', '~> 0.9.3'
+  s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restartable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -38,6 +38,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables:
@@ -46,10 +74,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Gemfile
 - LICENSE.txt
 - README.markdown
 - TODO
 - bin/restartable
+- features/restarting.feature
+- features/step_definitions/restartable_steps.rb
 - lib/restartable.rb
 - restartable.gemspec
 homepage: http://github.com/toy/restartable
@@ -76,4 +108,6 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Run code, Ctrl-C to restart, once more Ctrl-C to stop
-test_files: []
+test_files:
+- features/restarting.feature
+- features/step_definitions/restartable_steps.rb