restartable 1.0.1 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzVlYTM0OTk0MDIzZjFmODU5NjVmOWNkOTk2ZjBhNzA3ZDMzZjY0Zg==
-  data.tar.gz: !binary |-
-    NzcxMzhiM2E5YzY3ZWE0ZDMzOGRlZTVhMmI0MzIzODIwOTUzOGQxMw==
+SHA256:
+  metadata.gz: a28dc12572eb0bea21b5092610bc37735f80895e6cbf118dcdaf768afbb56b57
+  data.tar.gz: ab8a55f71bc27b21888d034fc242407358ab42145b644c4b54d7d94fc37da980
 SHA512:
-  metadata.gz: !binary |-
-    N2UwMTYxOGE1OTQ2Nzk5ZTMyMjRjNjAxOThiOWYxM2U5OTlkNGMzMzUzMDIw
-    ZGI3OTRlMzNhZjBmNmQzN2VjZDgzMmYxMTA2NDlmNzZlNjBmNDMxY2Q0MzM1
-    MzkzMzM1MDAwNTE3NTE1YWY3ZjdlZDc3ZmI1MmNlOGVmY2ZiMjE=
-  data.tar.gz: !binary |-
-    MzZiZDZkNDVhYjgyMTdkZDg2Mjg4MzY0Yjg1ODVkMjEyYzUxMTU5YmE5MjU0
-    MjFmN2FmNGM0Mzk3MzdiOTg2ZWIyNjEyMjA3OTI4NjJmNjFkYWE2ZDA3YjU3
-    OTk3MzI5M2Y1OWZhOGI5ZTAyYzk4N2Q0OWUwMDFkOTY5MGVjMDM=
+  metadata.gz: 4847e349cece0182822cc5282c6ad128b71b377d33e576fd12e43bf2dc18d546f946e55bb55e12c07c91612536717eb7844e6fe505310ad6a845cdf783e27874
+  data.tar.gz: 63c21a956b21f73d45a32067903434656edae876ffb51f35be7d8551aeeb9406196856cb02991fe1ab76df00ff3a2cc865fc2437be410213c4c4bea954be30c0

data/.rubocop.yml

@@ -2,58 +2,72 @@ AllCops:
   Exclude:
     - '*.gemspec'
 
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/IndentHeredoc:
+  Enabled: false
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 
-Lint/Eval:
+Lint/UnneededRequireStatement:
   Enabled: false
 
 Metrics/AbcSize:
   Max: 20
 
+Metrics/LineLength:
+  Max: 120
+
 Metrics/MethodLength:
   Max: 20
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
+Security/Eval:
+  Exclude:
+    - 'features/**/*_steps.rb'
 
 Style/BracesAroundHashParameters:
   Enabled: false
 
-Style/CaseIndentation:
-  IndentWhenRelativeTo: end
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
-Style/Encoding:
-  EnforcedStyle: when_needed
+Style/EmptyCaseCondition:
+  Enabled: false
 
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
+Style/Encoding:
+  Enabled: false
 
 Style/IfUnlessModifier:
-  MaxLineLength: 40
-
-Style/IndentHash:
-  EnforcedStyle: consistent
+  Enabled: false
 
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%w': '[]'
-    '%W': '[]'
+Style/RescueStandardError:
+  EnforcedStyle: implicit
 
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 
-Style/SpaceBeforeBlockBraces:
-  EnforcedStyle: no_space
+Style/SignalException:
+  EnforcedStyle: semantic
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: no_comma
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
 
-Style/TrailingComma:
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,17 +1,23 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - '2.0'
-  - '2.1'
-script:
-  if [ -n "$RUBOCOP" ]; then
-    bundle exec rubocop
-  ; else
-    bundle exec cucumber
-  ; fi
+  - '2.0.0-p648'
+  - '2.1.10'
+  - '2.2.10'
+  - '2.3.8'
+  - '2.4.5'
+  - '2.5.3'
+before_install:
+  - gem update --system
+  - gem update bundler
+script: bundle exec cucumber --expand
 matrix:
-  fast_finish: true
   include:
-    - env: RUBOCOP=true
+    - os: osx
       rvm: default
+    - env: RUBOCOP=✓
+      rvm: '2.5.3'
+      script: bundle exec rubocop
+    - env: CHECK_RUBIES=✓
+      rvm: '2.5.3'
+      script: bundle exec travis_check_rubies

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+if ENV['CHECK_RUBIES']
+  gem 'travis_check_rubies', '~> 0.2'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Ivan Kuchin
+Copyright (c) 2013-2018 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

@@ -1,7 +1,7 @@
 [![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)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/restartable.svg?style=flat)](https://codeclimate.com/github/toy/restartable)
+[![Depfu](https://badges.depfu.com/badges/726b551145c58c3fed9076c2c06361fa/overview.svg)](https://depfu.com/github/toy/restartable)
 
 # restartable
 
@@ -9,4 +9,4 @@ Run code, Ctrl-C to restart, two Ctrl-C to stop.
 
 ## Copyright
 
-Copyright (c) 2012-2014 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2012-2018 Ivan Kuchin. See LICENSE.txt for details.

data/features/restarting.feature

@@ -9,7 +9,6 @@ Feature: Restarting
     And I should see "Hello world!" in stdout
     And there should be a child process
     When I interrupt restartable
-    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
 
@@ -19,7 +18,7 @@ Feature: Restarting
     And I should see "Hello world!" in stdout
     And there should be a child process
     When I interrupt restartable twice
-    Then I should see "Killing children…" and "Don't restart!" in stderr
+    Then I should see "Don't restart!" in stderr
     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
@@ -27,7 +26,7 @@ Feature: Restarting
 
     Examples:
       | code                                                                                           | timeout |
-      | $stdout.puts "Hello world!"                                                                    | 5       |
+      | $stdout.puts "Hello world!"; sleep 100                                                         | 5       |
       | $stdout.puts "Hello world!"; 100.times{ sleep 1 }                                              | 5       |
       | exec 'echo "Hello world!"; sleep 100'                                                          | 5       |
       | system 'echo "Hello world!"; sleep 100'                                                        | 5       |

data/features/step_definitions/restartable_steps.rb

@@ -1,10 +1,23 @@
 require 'restartable'
 
-Given(/^I have set on restart to `(.*?)`$/) do |command|
+def children
+  Sys::ProcTable.ps.select do |pe|
+    next if pe.pid == @pid
+
+    @pid == case
+    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
+end
+
+Given(/^I have set on restart to `(.+)`$/) do |command|
   (@on_restart ||= []) << proc{ eval(command) }
 end
 
-Given(/^I have invoked restartable with `(.*?)`$/) do |command|
+Given(/^I have invoked restartable with `(.+)`$/) do |command|
   @stdout = IO.pipe
   @stderr = IO.pipe
 
@@ -17,7 +30,7 @@ Given(/^I have invoked restartable with `(.*?)`$/) do |command|
     @stderr[0].close
     STDERR.reopen(@stderr[1])
 
-    Restartable.new(:on_restart => @on_restart) do
+    Restartable.new(on_restart: @on_restart) do
       Signal.trap('INT', 'EXIT')
       eval(command)
     end
@@ -31,14 +44,13 @@ When(/^I have waited for (\d+) second$/) do |seconds|
   sleep seconds.to_i
 end
 
-Then(/^
-  I\ should\ see\ "(.*?)"
-  \ in\ std(out|err)
-  (?:\ within\ (\d+)\ seconds)?
-$/x) do |arg, io_name, timeout|
+Then(/^I should see "(.+)" in std(out|err)$/) do |arg, io_name|
+  step %(I should see "#{arg}" in std#{io_name} within 5 seconds)
+end
+Then(/^I should see "(.+)" in std(out|err) within (\d+) seconds$/) do |arg, io_name, timeout|
   io = (io_name == 'out' ? @stdout : @stderr)[0]
-  Timeout.timeout(timeout ? timeout.to_i : 5) do
-    strings = arg.split(/".*?"/)
+  Timeout.timeout(timeout.to_i) do
+    strings = arg.split(/".+?"/)
     until strings.empty?
       line = io.gets
       strings.reject! do |string|
@@ -48,9 +60,9 @@ $/x) do |arg, io_name, timeout|
   end
 end
 
-Then(/^I should not see "(.*?)" in std(out|err)$/) do |arg, io_name|
+Then(/^I should not see "(.+)" in std(out|err)$/) do |arg, io_name|
   io = (io_name == 'out' ? @stdout : @stderr)[0]
-  strings = arg.split(/".*?"/)
+  strings = arg.split(/".+?"/)
   while (line = io.gets)
     if strings.any?{ |string| line.include?(string) }
       fail "Got #{line}"
@@ -70,13 +82,16 @@ end
 
 Then(/^there should be a child process$/) do
   Timeout.timeout(5) do
-    sleep 1 until Sys::ProcTable.ps.any?{ |pe| pe.ppid == @pid }
+    sleep 0.3 while children.empty?
   end
 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 }
+Then(/^child process should terminate$/) do
+  step %(child process should terminate within 5 seconds)
+end
+Then(/^child process should terminate within (\d+) seconds$/) do |timeout|
+  Timeout.timeout(timeout.to_i) do
+    sleep 0.3 until children.empty?
   end
 end
 

data/lib/restartable.rb

@@ -9,7 +9,9 @@ require 'English'
 # Main interface
 class Restartable
   def self.version
-    Gem.loaded_specs['restartable'].version.to_s rescue 'DEV'
+    Gem.loaded_specs['restartable'].version.to_s
+  rescue
+    'DEV'
   end
 
   def initialize(options = {}, &block)
@@ -35,9 +37,11 @@ private
       sleep 0.1 until @interrupted
       kill_children!
       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
@@ -56,7 +60,13 @@ private
     interrupt!
   end
 
-  WAIT_SIGNALS = [[5, 'INT'], [3, 'INT'], [1, 'INT'], [3, 'TERM'], [5, 'KILL']]
+  WAIT_SIGNALS = [
+    [5, 'INT'],
+    [3, 'INT'],
+    [1, 'INT'],
+    [3, 'TERM'],
+    [5, 'KILL'],
+  ].freeze
 
   def kill_children!
     until children_pids.empty?

data/restartable.gemspec

@@ -2,24 +2,31 @@
 
 Gem::Specification.new do |s|
   s.name        = 'restartable'
-  s.version     = '1.0.1'
+  s.version     = '1.1.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']
   s.license     = 'MIT'
 
+  s.required_ruby_version = '>= 2.0'
+
   s.rubyforge_project = s.name
 
+  s.metadata = {
+    'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
+    'source_code_uri'   => "https://github.com/toy/#{s.name}",
+  }
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
   s.add_dependency 'colored', '~> 1.2'
-  s.add_dependency 'sys-proctable', '~> 0.9.3'
+  s.add_dependency 'sys-proctable', '>= 0.9.3', '<= 2.0'
   s.add_development_dependency 'cucumber'
-  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'
+  if RUBY_VERSION >= '2.1'
+    s.add_development_dependency 'rubocop', '~> 0.53'
   end
 end

metadata

@@ -1,85 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: restartable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2018-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.3
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.3
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !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: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.53'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.53'
 description: 
 email: 
 executables:
@@ -87,9 +79,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -101,28 +93,30 @@ files:
 homepage: http://github.com/toy/restartable
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/toy/restartable/issues
+  documentation_uri: https://www.rubydoc.info/gems/restartable/1.1.0
+  source_code_uri: https://github.com/toy/restartable
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: restartable
-rubygems_version: 2.4.5
+rubygems_version: 2.7.8
 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: