multi_timeout 1.0.1 → 1.0.2

data.tar.gz.sig

@@ -1,2 +1,3 @@
-t
��O_?X�#�]G
-Z|�v���qs�d��p#W�E#�-Ryҽ��RdV�J���Ȯ�䞜,��2�h�w΢|��o���H�)�l��j�W�
+J�#�*�ľ�YAA����i0��*�PJc
+*��,�n@~[�py���#��v�@=Q߽�d�_���^�v4Y��I���U���*]}���V�~�?J�tIĔ���6Yy��?���gW)�g�V@/���G]��/�����uM9 cja�4c�CT��At�<T^��^#yr�
+O��+	��P����vC�����j�./�2JB.�?D$��3y�bQ�L:�Ĵ���[���f3������i��̍�tN

data/lib/multi_timeout.rb

@@ -5,13 +5,14 @@ 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)
+        pid = fork { exec command }
         Thread.new do
           now = 0
           loop do
@@ -21,6 +22,7 @@ module MultiTimeout
               if now >= t
                 options[:timeouts].delete([signal, t])
                 puts "Killing '#{command}' with signal #{signal} after #{now} seconds"
+                STDOUT.flush # wait instantly terminates and sometimes hides puts
                 Process.kill(signal, pid)
               end
             end
@@ -78,12 +80,13 @@ module MultiTimeout
         timeouts = []
         signal = nil
         argv = argv.map do |item|
-          if !signal && item =~ /^(-\d+)$/
+          if !signal && item =~ VALID_SIGNAL
             signal = $1
             next
-          elsif signal && item =~ /^(\d+[smh]?)$/
-            time = $1
-            timeouts << [signal.sub("-", "").to_i, time.to_i * multi(time)]
+          elsif signal
+            signal = signal.sub("-", "")
+            signal = signal.to_i if signal =~ /^\d+$/
+            timeouts << [signal, item.to_i * multi(item)]
             signal = nil
             next
           else
@@ -96,10 +99,10 @@ module MultiTimeout
 
       def multi(t)
         case t
-        when /s/ then 1
-        when /m/ then 60
-        when /h/ then 60 * 60
-        when /^\d+$/ then 1
+        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

data/lib/multi_timeout/version.rb

@@ -1,3 +1,3 @@
 module MultiTimeout
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,13 +1,19 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: multi_timeout
-version: !ruby/object:Gem::Version
-  version: 1.0.1
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
-cert_chain:
+cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
@@ -30,41 +36,55 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-03-12 00:00:00.000000000 Z
+
+date: 2014-03-12 00:00:00 Z
 dependencies: []
+
 description: 
 email: michael@grosser.it
-executables:
+executables: 
 - multi-timeout
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - MIT-LICENSE
 - bin/multi-timeout
 - lib/multi_timeout.rb
 - lib/multi_timeout/version.rb
 homepage: https://github.com/grosser/multi_timeout
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.20
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Use multiple timeouts to soft and then hard kill a command
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d5adcedd7acbe7bdc5e9bf80656b6155effc28ff
-  data.tar.gz: 6868dc91d8edd301604ae7e30364173348f9a178
-SHA512:
-  metadata.gz: 0522ff701fd8f7733af8121cfb99aac8904b8fcdef470414f5dea742b30b4bbf2eec5b66c47609e37268c27cbb4c0f9faf7b2527f3cbe39b29268875e5ee47f1
-  data.tar.gz: 9f03c222e690f8fdf21866d174bea800a4a87bcef3ad3d3faf1c649cb2d3b3f732c2b9638dd856ff7fca0cbda158ca4b8e12d33fd9a8280863fa9cd88ac93241