turbot-runner 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzI3NjZjMDc0NzI4Y2M5ZGRmMGY3YTQ2MzVkNWZhZTZkZDkwMjg5OQ==
+    OTU4OTExM2RjYzNhYjIwM2NiN2ZmYjU3NDc3YjY0OGRhOTE4NDIwNQ==
   data.tar.gz: !binary |-
-    NjBiNDk0Mzc1NzdmODdiYjAxNzg4MWFhN2FlOGY1MzRmYzQ3NzY2NA==
+    NGM0ODRjYmI0OWNhNGJjZjc4Y2Q5YTRlNGRmYjgzYzNiM2QyZWViYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWY4ZDlhNjBmZjNhNDBmMDU0OWQwYWIyOTEyYTc4NzdmMzczMzkwMTVmYTE4
-    NjUxMTRlOWNiNzlhZjc5ZGVjZmFhZjk4MzA4NjU3OThmZjU0ODViNzY2OGY3
-    ODk2NTg3NzYxYTliNzJkZmIwNzU3NmQxNzdjMzUyM2VkMTU4YWQ=
+    MTllYmUzMjgxMGE0Y2IyYjE0NzRiMDhlMzQzYzFkYzlkYjA3ZGMxODMyMDc1
+    M2YyMmJiZTY5ZTVhMDk3NDhlYTYxMjg4ZTM5Y2E2MTVlZTAzMmE1MzQ1NmJk
+    ODkwYzQ4YjgyM2FkZmNhN2M0MDk1MzNjZGEyNzQ3ZTAyN2FmOTA=
   data.tar.gz: !binary |-
-    YTIyYmIzZTI2NDkzODQxYjVmOTM2OTYwNGQ2ODQ5Y2QyMWZhZjE1MDZlZWJj
-    NmFmOWFhYzVkMTVkMmRjNjQyZGY4YzVkOGQ5YmE1MTE0ZDMxMTI1Zjg4MGZk
-    YTZhZWYzZGRmOWFjYWFmNTU1ZTNhNjdkYzhkNWQ0YWEzNTUxOTA=
+    ZTYxNGE5ZWQ0ZmU4MGI5M2Y2ZDZkYmJlMmIwNjllNmMwOGFkZTA2ODBjNzIz
+    ZDdmZGQ1MWJjZDY2N2QyZjMwNzc4ODgzODAyMDNkMDVkMGI2NjZmN2IzNzE5
+    NTQ3ZjQ1MjI4NjRhYjljNzFjNzZiZWQzZjIyZGRlNjdhNzNiMGQ=

data/lib/turbot_runner/script_runner.rb

@@ -1,5 +1,3 @@
-require 'timeout'
-
 # This is a useful blog post:
 # http://blog.robseaman.com/2008/12/12/sending-ctrl-c-to-a-subprocess-with-ruby
 
@@ -42,15 +40,23 @@ module TurbotRunner
       # then the incomplete line will be read, causing chaos down the line.
       line = ''
 
+      time_of_last_read = Time.now
+
       until @interrupted do
         byte = f.read(1)
         if byte.nil?
-          break unless script_thread.alive?
-          sleep 0.1
+          if script_thread.alive?
+            sleep 0.1
+            interrupt_and_mark_as_failed if (Time.now - time_of_last_read) > @timeout
+          else
+            break
+          end
         elsif byte == "\n"
           @processor.process(line)
+          time_of_last_read = Time.now
           line = ''
         else
+          time_of_last_read = Time.now
           line << byte
         end
       end
@@ -75,18 +81,11 @@ module TurbotRunner
 
     private
     def run_command(command)
-      begin
-        Timeout::timeout(@timeout) do
-          system(command)
+      system(command)
 
-          # A nil exitstatus indicates that the script was interrupted.  A
-          # termsig of 2 indicates that the script was interrupted by a SIGINT.
-          $?.exitstatus == 0 || ($?.exitstatus.nil? && $?.termsig == 2)
-        end
-      rescue Timeout::Error
-        kill_running_processes
-        false
-      end
+      # A nil exitstatus indicates that the script was interrupted.  A
+      # termsig of 2 indicates that the script was interrupted by a SIGINT.
+      $?.exitstatus == 0 || ($?.exitstatus.nil? && $?.termsig == 2)
     end
 
     def kill_running_processes

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema