multi_timeout 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d71cc32b686a996440a80637e22c1da0f1f093
-  data.tar.gz: dcc94b0b6ba333df8602be27df16846b9ae532fc
+  metadata.gz: d5adcedd7acbe7bdc5e9bf80656b6155effc28ff
+  data.tar.gz: 6868dc91d8edd301604ae7e30364173348f9a178
 SHA512:
-  metadata.gz: 5ac3d8c8059beeddc9fd5f23d1bf797ba7786cf046c152a64a7b6e97785b0779e3e021c6352d1bc13b3d9d3de15742650a7440922794b862a508f5995fb24251
-  data.tar.gz: 2320339aedcf32b69cb3adf493c78a948bab3ada944f0fc88da9d1a912aed159cc626081d5f708c6f981f5b07faff7e13e55773762564bad7d8dce675f6494fe
+  metadata.gz: 0522ff701fd8f7733af8121cfb99aac8904b8fcdef470414f5dea742b30b4bbf2eec5b66c47609e37268c27cbb4c0f9faf7b2527f3cbe39b29268875e5ee47f1
+  data.tar.gz: 9f03c222e690f8fdf21866d174bea800a4a87bcef3ad3d3faf1c649cb2d3b3f732c2b9638dd856ff7fca0cbda158ca4b8e12d33fd9a8280863fa9cd88ac93241

data/lib/multi_timeout/version.rb

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

data/lib/multi_timeout.rb

@@ -19,7 +19,8 @@ module MultiTimeout
 
             options[:timeouts].each do |signal, t|
               if now >= t
-                puts "Killing #{command} with signal #{signal} after #{now} seconds"
+                options[:timeouts].delete([signal, t])
+                puts "Killing '#{command}' with signal #{signal} after #{now} seconds"
                 Process.kill(signal, pid)
               end
             end
@@ -43,7 +44,7 @@ module MultiTimeout
       def parse_options(argv)
         options = {:timeouts => []}
         options[:timeouts], argv = consume_signals(argv)
-
+        options[:command], argv = consume_command(argv)
 
         OptionParser.new do |opts|
           opts.banner = <<-BANNER.gsub(/^ {10}/, "")
@@ -60,11 +61,19 @@ module MultiTimeout
         end.parse!(argv)
 
         raise "No timeouts given" if options[:timeouts].empty?
-        options[:command] = Shellwords.shelljoin(argv)
 
         options
       end
 
+      def consume_command(argv)
+        argv = argv.dup
+        options = []
+        while argv.first =~ /^-/
+          options << argv.shift
+        end
+        return Shellwords.shelljoin(argv), options
+      end
+
       def consume_signals(argv)
         timeouts = []
         signal = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_timeout
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it