multi_timeout 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f1f460fe210454f8a142a9e7ee4d4cf521263d8
-  data.tar.gz: 3fb809959c3166c36b2eb4e3bc1980bfb788941d
+  metadata.gz: 1f73598e7b2cfe2ee52aa0b1ca2382b0f43bc21b
+  data.tar.gz: bd63e10e7651ac2029614095c0e82565876d8c8e
 SHA512:
-  metadata.gz: 684524c40cb2667334c683fe4282a4bb9b03bddc3ad37fd5f5552b5eb0485d12366b2dcd071357e802d8986646795762ed13f2366c87e3c73c685cc475d17257
-  data.tar.gz: 5bbc4da08af8baa9de7c69ed7ec924bce96ab73fe4cbdb6e34f5bd6a5dbdc32ae280c84d1ad6a8d1cc5419d4128756dac4baf882603d19c4faa26744ca2f3eac
+  metadata.gz: 2d7bf1f3e6b09e6cc2bf5f3b9f2072e7e20401e0cb748ad8149821a3b525e7f46d307620aa840224e802f12593826d90a2ba090100c5dfd96608fb946b0610ad
+  data.tar.gz: 8b24614fcbf784f82473ab3bde7db719d0bb8ca2056beab592c1ac4579c79145d88848b1b996a247f4f2d53447a2774b1d8e611e977cc424afaf9474bf1bc319

data/lib/multi_timeout.rb

@@ -1,60 +1,64 @@
 require "multi_timeout/version"
-require "shellwords"
 require "optparse"
 
 module MultiTimeout
-  module CLI
-    TICK = 1
-    VALID_SIGNAL = /^(-(\d+|[A-Z\d]+))$/
-
-    class << self
-      def run(argv)
-        options = parse_options(argv)
-        command = options[:command]
-
-        pid = Process.spawn command, :pgroup => true
-        gid = Process.getpgid(pid)
-        Thread.new do
-          now = 0
-          loop do
-            break if dead?(pid)
-
-            options[:timeouts].each do |signal, t|
-              if now >= t
-                options[:timeouts].delete([signal, t])
-                puts "Killing '#{truncate(command, 30)}' with signal #{signal} after #{now} seconds"
-                Process.kill(signal, -gid)
-              end
+  TICK = 1
+  VALID_SIGNAL = /^(-(\d+|[A-Z\d]+))$/
+
+  class << self
+    def run(command, timeouts: nil)
+      # spawn process in a separate group so we can take it down completely and not leave any children
+      pid = Process.spawn({}, *command, pgroup: true)
+      gid = Process.getpgid(pid)
+
+      Thread.new do
+        elapsed = 0
+        loop do
+          break if dead?(pid)
+
+          timeouts.each do |signal, max|
+            if elapsed >= max
+              timeouts.delete(signal)
+              puts "Killing '#{truncate(Array(command).join(" "), 30)}' with signal #{signal} after #{elapsed} seconds"
+              Process.kill(signal, -gid)
             end
-            now += TICK
-            sleep TICK
           end
+          elapsed += TICK
+          sleep TICK
         end
-
-        Process.wait2.last.exitstatus || 1
       end
 
-      private
+      Process.wait2(pid).last.exitstatus || 1
+    end
 
-      def truncate(string, count)
-        if string.size > count
-          string.slice(0, count-3) + "..."
-        else
-          string
-        end
+    private
+
+    def truncate(string, count)
+      if string.size > count
+        string.slice(0, count-3) + "..."
+      else
+        string
       end
+    end
 
-      def dead?(pid)
-        Process.getpgid(pid)
-        false
-      rescue Errno::ESRCH
-        true
+    def dead?(pid)
+      Process.getpgid(pid)
+      false
+    rescue Errno::ESRCH
+      true
+    end
+  end
+
+  module CLI
+    class << self
+      def run(argv)
+        MultiTimeout.run(*parse_options(argv))
       end
 
       def parse_options(argv)
         options = {:timeouts => []}
         options[:timeouts], argv = consume_signals(argv)
-        options[:command], argv = consume_command(argv)
+        command, argv = consume_command(argv)
 
         OptionParser.new do |opts|
           opts.banner = <<-BANNER.gsub(/^ {10}/, "")
@@ -72,7 +76,7 @@ module MultiTimeout
 
         raise "No timeouts given" if options[:timeouts].empty?
 
-        options
+        [command, options]
       end
 
       def consume_command(argv)
@@ -81,11 +85,11 @@ module MultiTimeout
         while argv.first =~ /^-/
           options << argv.shift
         end
-        return Shellwords.shelljoin(argv), options
+        return argv, options
       end
 
       def consume_signals(argv)
-        timeouts = []
+        timeouts = {}
         signal = nil
         argv = argv.map do |item|
           if !signal && item =~ VALID_SIGNAL
@@ -94,7 +98,7 @@ module MultiTimeout
           elsif signal
             signal = signal.sub("-", "")
             signal = signal.to_i if signal =~ /^\d+$/
-            timeouts << [signal, item.to_i * multi(item)]
+            timeouts[signal] = human_value_to_seconds(item)
             signal = nil
             next
           else
@@ -105,15 +109,16 @@ module MultiTimeout
         return timeouts, argv
       end
 
-      def multi(t)
-        case t
-        when /^\d+s$/ then 1
-        when /^\d+m$/ then 60
-        when /^\d+h$/ then 60 * 60
-        when /^\d+$/  then 1
-        else
-          raise "Unknown format for time #{t}"
-        end
+      def human_value_to_seconds(t)
+        unit =
+          case t
+          when /^\d+s$/ then 1
+          when /^\d+m$/ then 60
+          when /^\d+h$/ then 60 * 60
+          when /^\d+$/  then 1
+          else raise "Unknown format for time #{t}"
+          end
+        t.to_i * unit
       end
     end
   end

data/lib/multi_timeout/version.rb

@@ -1,3 +1,3 @@
 module MultiTimeout
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_timeout
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
-  YWVsMRcwFQYKCZImiZPyLGQBGRYHZ3Jvc3NlcjESMBAGCgmSJomT8ixkARkWAml0
-  MB4XDTE0MDIwNDIwMjk0MVoXDTE1MDIwNDIwMjk0MVowPzEQMA4GA1UEAwwHbWlj
-  aGFlbDEXMBUGCgmSJomT8ixkARkWB2dyb3NzZXIxEjAQBgoJkiaJk/IsZAEZFgJp
-  dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMorXo/hgbUq97+kII9H
-  MsQcLdC/7wQ1ZP2OshVHPkeP0qH8MBHGg6eYisOX2ubNagF9YTCZWnhrdKrwpLOO
-  cPLaZbjUjljJ3cQR3B8Yn1veV5IhG86QseTBjymzJWsLpqJ1UZGpfB9tXcsFtuxO
-  6vHvcIHdzvc/OUkICttLbH+1qb6rsHUceqh+JrH4GrsJ5H4hAfIdyS2XMK7YRKbh
-  h+IBu6dFWJJByzFsYmV1PDXln3UBmgAt65cmCu4qPfThioCGDzbSJrGDGLmw/pFX
-  FPpVCm1zgYSb1v6Qnf3cgXa2f2wYGm17+zAVyIDpwryFru9yF/jJxE38z/DRsd9R
-  /88CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFLIj
-  Z1x7SnjGGHK+MiVZkFjjS/iMMB0GA1UdEQQWMBSBEm1pY2hhZWxAZ3Jvc3Nlci5p
-  dDAdBgNVHRIEFjAUgRJtaWNoYWVsQGdyb3NzZXIuaXQwDQYJKoZIhvcNAQEFBQAD
-  ggEBAExBcUWfGuamYn+IddOA0Ws8jUKwB14RXoZRDrTiTAlMm3Bkg2OKyxS3uJXa
-  6Z+LwFiZwVYk62yHXqNzEJycQk4SEmY+xDWLj0p7X6qEeU4QZKwR1TwJ5z3PTrZ6
-  irJgM3q7NIBRvmTzRaAghWcQn+Eyr5YLOfMksjVBMUMnzh5/ZDgq53LphgJbGwvz
-  ScJAgfNclLHnjk9q1mT1s0e1FPWbiAL3siBIR5HpH8qtSEiivTf2ntciebOqS93f
-  F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
-  /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
-  -----END CERTIFICATE-----
-date: 2014-03-12 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -53,17 +31,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Use multiple timeouts to soft and then hard kill a command

data.tar.gz.sig

@@ -1 +0,0 @@
-�K�r%H��w|.1�S�'6�_��-�$_e��&����W������gH���� �F{�Gk�	�����@�������1��-� ������*�Ğ%#P�wX�m
�lx�w���х��[���FD����g�Z��\ �O–��X��?���:�V�Vڒ�z��bd
İYE�N�x�����M���EP08gU��S��.�B3���	���I�N�tk���[rY�a/T��ۦ��s��* ��9�o�T_Ԅ