restartable 0.2.2 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGMyYTJiYTBhNTgxOGIzOWM5NzRlZWQ2YWFhNzNkNGIzOTQ1NTgwYQ==
+    OTU0NzIyODRhMDJlMDgzYmViODZmYTA3OGJkMDY4Y2I3YTA4YTgwZQ==
   data.tar.gz: !binary |-
-    ZDMwM2MwMDZmMWI5NGU4NmRhYjA5ZjQzZWIwYmI5MDI1ZjY3YjY0Yg==
-!binary "U0hBNTEy":
+    MWQyMDc2MTM2NWE1OTIwNDE4YjJmZTU3ZGNkYTljOGNmMjYwNWY2NQ==
+SHA512:
   metadata.gz: !binary |-
-    ZTMyMTEyODg1YmIzOGY0NWI3NWM3YjBlMThjY2Q5NzU4YjBmZjlmYWNkYzI1
-    ZDczN2JhZDFmNTRmMTk3OTY5NjE1YTBmMDM3NTljZWJhMDRjNjE4NjY5M2Ux
-    MjMzYzA3Y2NjYjI3MjgzMTY3MDBhMzMyYzg0YWVhM2E2M2JmMmE=
+    OGM0NTE3NWRkY2ViNWNmMzU1MjJmNTg2ZGFlOWE0YTBmMzQ1MDAwZTVkYjlj
+    ZDFjMjQxMDdjNTk4ZDllMDM5N2M2MGY1MDkyMGFjNTEyZTdjMzMzMDIyMDQ1
+    NGE5NDlkZDg2ZDFkZTdlNzgzNmZhYWVhZmUwYTg5OGNlZTIxZjI=
   data.tar.gz: !binary |-
-    NmFiZGFkNGZkYjNiN2Y0OWRlYmVjMThlOGY5YWVjODYxOGRiMDM5ZmRlZGRk
-    ZDFkMDNkZGI2NTY5MjkyODIxN2E4NGMwYzA0ODg3ODg4NDZlZGUxNzk5MDBl
-    OGM4ZWJiZGYwOWY3YWQyYmM1ZmQwYjkxN2M5NzBlMDc3Mzc1MmQ=
+    NjhjNGM3MjlhNDk0ZWJkMDBiZjJiMWNjNWYyY2I5N2NjYjY4YmZlOTBmNDdm
+    NjdhZTEwY2U1YWVjNTk2ZWQyMjg0ZGRjZDY1YzQzMWQyNGRlY2Q0YTc5ZjI2
+    ZWQyNjMyYTk0MTVhZmJjNDQ0YWJmN2Y4MDdhMmQ3M2Y5YzI1MDM=

data/.rubocop.yml

@@ -0,0 +1,59 @@
+AllCops:
+  Exclude:
+    - '*.gemspec'
+
+Lint/EndAlignment:
+  AlignWith: variable
+
+Lint/Eval:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/MethodLength:
+  Max: 20
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+Style/CaseIndentation:
+  IndentWhenRelativeTo: end
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/Encoding:
+  EnforcedStyle: when_needed
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/IfUnlessModifier:
+  MaxLineLength: 40
+
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%w': '[]'
+    '%W': '[]'
+
+Style/Semicolon:
+  AllowAsExpressionSeparator: true
+
+Style/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/TrailingComma:
+  EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,8 +1,17 @@
 language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
-  - ree
-script: bundle exec cucumber
+  - '2.0'
+  - '2.1'
+script:
+  if [ -n "$RUBOCOP" ]; then
+    bundle exec rubocop
+  ; else
+    bundle exec cucumber
+  ; fi
+matrix:
+  fast_finish: true
+  include:
+    - env: RUBOCOP=true
+      rvm: default

data/Gemfile

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

data/README.markdown

@@ -1,9 +1,12 @@
+[![Gem Version](https://img.shields.io/gem/v/restartable.svg?style=flat)](https://rubygems.org/gems/restartable)
+[![Build Status](https://img.shields.io/travis/toy/restartable/master.svg?style=flat)](https://travis-ci.org/toy/restartable)
+[![Code Climate](https://img.shields.io/codeclimate/github/toy/restartable.svg?style=flat)](https://codeclimate.com/github/toy/restartable)
+[![Dependency Status](https://img.shields.io/gemnasium/toy/restartable.svg?style=flat)](https://gemnasium.com/toy/restartable)
+
 # restartable
 
 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-2014 Ivan Kuchin. See LICENSE.txt for details.

data/bin/restartable

@@ -14,6 +14,12 @@ Usege:
 
   TEXT
 
+  op.on('-r', '--on-restart CMD', 'Run CMD on restart') do |cmd|
+    (options[:on_restart] ||= []) << proc{ system cmd }
+  end
+
+  op.separator nil
+
   op.on_tail('-h', '--help', 'Show full help') do
     puts option_parser.help
     exit
@@ -27,11 +33,11 @@ end
 
 begin
   option_parser.order!
-  raise OptionParser::ParseError, 'No command to run' if ARGV.empty?
+  fail OptionParser::ParseError, 'No command to run' if ARGV.empty?
 rescue OptionParser::ParseError => e
-  abort "#{e.to_s}\n\n#{option_parser.help}"
+  abort "#{e}\n\n#{option_parser.help}"
 end
 
 Restartable.new(options) do
-  exec *ARGV
+  exec(*ARGV)
 end

data/features/restarting.feature

@@ -1,32 +1,37 @@
 Feature: Restarting
 
   Scenario Outline: Restarting and terminating
+    Given I have set on restart to `$stdout.puts 'Restart!'`
     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
+    And there should be a child 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
+    Then I should see "Killing children…" in stderr
+    And I should see "Waiting ^C 0.5 second than restart…" in stderr within <timeout> seconds
+    And child process should terminate
 
     When I have waited for 1 second
-    Then I should see "^C to restart, double ^C to stop" in stderr
+    Then I should see "Restart!" in stdout
+    And 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
+    And there should be a child process
     When I interrupt restartable twice
     Then I should see "Killing children…" and "Don't restart!" in stderr
-    And inner process should terminate
+    And child process should terminate within <timeout> seconds
     And restartable should finish
+    And I should not see "Waiting ^C 0.5 second than restart…" in stderr
+    And I should not see "Restart!" in stdout
 
     Examples:
-      | 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 } |
+      | code                                                                                           | timeout |
+      | $stdout.puts "Hello world!"                                                                    | 5       |
+      | $stdout.puts "Hello world!"; 100.times{ sleep 1 }                                              | 5       |
+      | exec 'echo "Hello world!"; sleep 100'                                                          | 5       |
+      | system 'echo "Hello world!"; sleep 100'                                                        | 5       |
+      | fork{ $stdout.puts "Hello world!"; 100.times{ sleep 1 } }                                      | 5       |
+      | fork{ fork{ fork{ $stdout.puts "Hello world!"; 100.times{ sleep 1 } } } }                      | 5       |
+      | Signal.trap("INT"){}; $stdout.puts "Hello world!"; 100.times{ sleep 1 }                        | 15      |
+      | Signal.trap("INT"){}; Signal.trap("TERM"){}; $stdout.puts "Hello world!"; 100.times{ sleep 1 } | 25      |

data/features/step_definitions/restartable_steps.rb

@@ -1,5 +1,9 @@
 require 'restartable'
 
+Given(/^I have set on restart to `(.*?)`$/) do |command|
+  (@on_restart ||= []) << proc{ eval(command) }
+end
+
 Given(/^I have invoked restartable with `(.*?)`$/) do |command|
   @stdout = IO.pipe
   @stderr = IO.pipe
@@ -13,7 +17,7 @@ Given(/^I have invoked restartable with `(.*?)`$/) do |command|
     @stderr[0].close
     STDERR.reopen(@stderr[1])
 
-    Restartable.new do
+    Restartable.new(:on_restart => @on_restart) do
       Signal.trap('INT', 'EXIT')
       eval(command)
     end
@@ -27,17 +31,16 @@ 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 stderr$/) do |arg|
-  Timeout::timeout(60) do
+Then(/^
+  I\ should\ see\ "(.*?)"
+  \ in\ std(out|err)
+  (?:\ within\ (\d+)\ seconds)?
+$/x) do |arg, io_name, timeout|
+  io = (io_name == 'out' ? @stdout : @stderr)[0]
+  Timeout.timeout(timeout ? timeout.to_i : 5) do
     strings = arg.split(/".*?"/)
     until strings.empty?
-      line = @stderr[0].gets
+      line = io.gets
       strings.reject! do |string|
         line.include?(string)
       end
@@ -45,34 +48,40 @@ Then(/^I should see "(.*?)" in stderr$/) do |arg|
   end
 end
 
+Then(/^I should not see "(.*?)" in std(out|err)$/) do |arg, io_name|
+  io = (io_name == 'out' ? @stdout : @stderr)[0]
+  strings = arg.split(/".*?"/)
+  while (line = io.gets)
+    if strings.any?{ |string| line.include?(string) }
+      fail "Got #{line}"
+    end
+  end
+end
+
 When(/^I interrupt restartable$/) do
   Process.kill('INT', -@pid)
 end
 
 When(/^I interrupt restartable twice$/) do
-  Process.kill('INT', -@pid)
+  step 'I interrupt restartable'
   sleep 0.1
-  Process.kill('INT', -@pid)
+  step 'I interrupt restartable'
 end
 
-Then(/^there should be an inner process$/) do
-  Timeout::timeout(5) do
-    until Sys::ProcTable.ps.any?{ |pe| pe.ppid == @pid }
-      sleep 1
-    end
+Then(/^there should be a child process$/) do
+  Timeout.timeout(5) do
+    sleep 1 until Sys::ProcTable.ps.any?{ |pe| pe.ppid == @pid }
   end
 end
 
-Then(/^inner process should terminate$/) do
-  Timeout::timeout(100) do
-    until Sys::ProcTable.ps.none?{ |pe| pe.ppid == @pid }
-      sleep 1
-    end
+Then(/^child process should terminate(?: within (\d+) seconds)?$/) do |timeout|
+  Timeout.timeout(timeout ? timeout.to_i : 5) do
+    sleep 1 until Sys::ProcTable.ps.none?{ |pe| pe.ppid == @pid }
   end
 end
 
 Then(/^restartable should finish$/) do
-  Timeout::timeout(5) do
+  Timeout.timeout(5) do
     Process.wait(@pid)
   end
 end

data/lib/restartable.rb

@@ -3,26 +3,25 @@
 require 'sys/proctable'
 require 'colored'
 require 'thread'
+require 'English'
 
+# Main interface
 class Restartable
   def self.version
     Gem.loaded_specs['restartable'].version.to_s rescue 'DEV'
   end
 
   def initialize(options = {}, &block)
-    @options, @block = options, block
+    @on_restart = Array(options[:on_restart])
+    @block = block
     run!
   end
 
 private
 
   def run!
-    Signal.trap('INT') do
-      interrupt!
-    end
-    Signal.trap('TERM') do
-      terminate!
-    end
+    Signal.trap('INT'){ interrupt! }
+    Signal.trap('TERM'){ terminate! }
 
     until @stop
       @interrupted = nil
@@ -34,10 +33,11 @@ private
       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
+      break if @stop
+      $stderr << "Waiting ^C 0.5 second than restart…\n".yellow.bold
+      sleep 0.5
+      break if @stop
+      @on_restart.each(&:call)
     end
   end
 
@@ -58,26 +58,35 @@ private
   WAIT_SIGNALS = [[5, 'INT'], [3, 'INT'], [1, 'INT'], [3, 'TERM'], [5, 'KILL']]
 
   def kill_children!
-    until (pids = children_pids).empty?
+    until children_pids.empty?
       $stderr << "Killing children…\n".yellow.bold
-      ripper = Thread.new do
-        WAIT_SIGNALS.each do |time, signal|
-          sleep time
-          $stderr << "…SIG#{signal}…\n".yellow
-          signal_children!(signal)
+
+      signal_pair = 0
+
+      begin
+        time, signal = WAIT_SIGNALS[signal_pair]
+        Timeout.timeout(time) do
+          Process.waitall
+          wait_children
         end
+      rescue Timeout::Error
+        $stderr << "…SIG#{signal}…\n".yellow
+        signal_children!(signal)
+        retry if WAIT_SIGNALS[signal_pair += 1]
       end
-      Process.waitall
-      pids.each do |pid|
-        begin
-          loop do
-            Process.kill(0, pid)
-            sleep 1
-          end
-        rescue Errno::ESRCH
+    end
+  end
+
+  def wait_children
+    children_pids.each do |pid|
+      begin
+        loop do
+          Process.kill(0, pid)
+          sleep 1
         end
+      rescue Errno::ESRCH
+        next
       end
-      ripper.terminate
     end
   end
 
@@ -86,6 +95,7 @@ private
       begin
         Process.kill(signal, pid)
       rescue Errno::ESRCH
+        next
       end
     end
   end
@@ -94,15 +104,11 @@ private
     pgrp = Process.getpgrp
     Sys::ProcTable.ps.select do |pe|
       pgrp == 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'
+      when pe.respond_to?(:pgid) then pe.pgid
+      when pe.respond_to?(:pgrp) then pe.pgrp
+      when pe.respond_to?(:ppid) then pe.ppid
+      else fail 'Can\'t find process group id'
       end
-    end.map(&:pid) - [$$]
+    end.map(&:pid) - [$PROCESS_ID]
   end
 end

data/restartable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'restartable'
-  s.version     = '0.2.2'
+  s.version     = '1.0.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']
@@ -18,5 +18,8 @@ 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'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.3')
+    s.add_development_dependency 'rubocop', '~> 0.27'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restartable
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -56,16 +56,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.27'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.27'
 description: 
 email: 
 executables:
@@ -74,11 +88,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.markdown
-- TODO
 - bin/restartable
 - features/restarting.feature
 - features/step_definitions/restartable_steps.rb
@@ -104,10 +118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: restartable
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Run code, Ctrl-C to restart, once more Ctrl-C to stop
 test_files:
 - features/restarting.feature
 - features/step_definitions/restartable_steps.rb
+has_rdoc: 

data/TODO

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