shexecutor 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b5ff685f5736caeee4b7da6f4ffdc89df35f6f
-  data.tar.gz: 1adec7351ce61aab38684cd7eb42f61ca9f3c0a7
+  metadata.gz: b678ae7d3a2c936438a247ab6321e006993ca3d5
+  data.tar.gz: a3f122414398c3539f2736f571db00767c75f587
 SHA512:
-  metadata.gz: 211b5d32097888858bf38f4dba7344cc7bc4b1cd08edd2c6d183d797ef6af7869a5685ecb0723e75b8f7fd19027afcd207e709ef585c4abcba282a85a064d06f
-  data.tar.gz: 1021ef30c0a794c7f73ce021c8361057b843e3f53f44a14cff90900c7348f41776d3f877ed3779b4f6a4063916cf2a6ad44d529ddc6034849f148f11803db449
+  metadata.gz: 1c66a7fdda16715e38f22af6ad887e12b871c1ae764c2f58c7c30783001aa6467fca3d0c8372007088d05a0ca995da3619b7e6b84f4897363656d06b4e1005b6
+  data.tar.gz: 160022bdda265245738449777c2f63db01f4d25ad20b0dae7e9cef91ec04dd5065f67f72e2f7fa76db7975fefc5b1fdc78ba494ecdc81b3682a10954342c7ddd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shexecutor (0.0.12)
+    shexecutor (0.0.14)
 
 GEM
   remote: https://rubygems.org/

data/lib/shexecutor/version.rb

@@ -1,3 +1,3 @@
 module SHExecutor
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/shexecutor.rb

@@ -169,6 +169,8 @@ module SHExecutor
             IO.copy_stream(stderr, data_err)
           end
         end
+        m = Mutex.new
+        done = false
         # track timeout if required. Do this ourselves since the mechanism
         # is simple and Timeout struggles from multi-threading issues.
         # IO.copy_stream stop the Timeout exception from being thrown properly.
@@ -178,12 +180,29 @@ module SHExecutor
             sleep 0.1
             count = count + 1
           end
-          raise Timeout::Error.new("execution expired") if @t0.alive?
+          m.synchronize do
+            done = true
+            raise Timeout::Error.new("execution expired") if @t0.alive?
+          end
         end if should_timeout?
         stdin.close
         t3.abort_on_exception = true if should_timeout?
         t1.join if not should_timeout?
         t2.join if not should_timeout?
+        if should_timeout?
+          m.synchronize do
+            d = done
+          end
+          while not d do
+            sleep 0.1
+            m.synchronize do
+              d = done
+            end
+          end
+          t1.join if not @t0.alive?
+          t2.join if not @t0.alive? 
+          t3.join if not @t0.alive?
+        end
       end
       return data_out, data_err, @t0
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shexecutor
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Ernst van Graan