kommando 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9003ef03825d24dbed6e95661acc172cae3509a7
-  data.tar.gz: abc099820ae559c3c69554c632e8a81e3c0b017b
+  metadata.gz: 114c6d5e9933de3694419b769250a48d36f92c70
+  data.tar.gz: 50f77767dd71d6b195d72af7d3e4d2bd727a2e3f
 SHA512:
-  metadata.gz: 004d3ec64ecee487262b169b10421ec753965d96db4580e837d090ea8678bf0fe39d40f15ad876fd5e0076e11f36fecb66f6b3e02deba12dc8c49c82e300a768
-  data.tar.gz: 6f81c0dff25c9e21bfd0ddb15f14575c630936ce4d5e42c2c942660f5dc3e9b4e818832ebee7c66b40be10d85450aca4afab4a0db51523482d9dbc08e92f3e6a
+  metadata.gz: 4529a5e5c95b7fca83e13a2c1fe77dd5b5a0f5842171af8b0c3c1f1b15acfacc9dbe3e11406622b1e025e3143a5d407fc3e74ceb0bd4ca39f6edcdece7a06474
+  data.tar.gz: 362e3369d281e2ccfb222abcf51a781d057bbe5981a55601b00ee1287786957d3215b9c7b396e2d51f1e2f21835adc498ffdefcede597373754b61cb4269371f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.0.18
+Fixes thread leak and some hangs.
+
+- FIX: Fixes hang when reading stdout.
+- FIX: Thread leak.
+
 ## 0.0.17
 Fixes race condition and reduces the number of threads Kommando creates.
 

data/examples/thread_leak.rb

@@ -0,0 +1,10 @@
+require "./lib/kommando"
+
+100.times do
+  k = Kommando.run "uptime"
+  print "."
+end
+sleep 0.25
+
+raise "Thread leak" unless Thread.list.count == 1
+puts "ok"

data/lib/kommando.rb

@@ -52,6 +52,7 @@ class Kommando
 
     @code = nil
     @executed = false
+    @process_completed = false
 
     if opts[:retry]
       if opts[:retry][:times]
@@ -155,7 +156,12 @@ class Kommando
         thread_stdin = Thread.new do
           sleep 0.1 # allow program to start, do not write "in terminal"
           while true do
+            break if @process_completed
+            # c = nil
+            # Timeout.timeout(1) do
             c = @stdin.getc
+            #end
+
             unless c
               sleep 0.01
               next
@@ -170,15 +176,16 @@ class Kommando
         if @timeout
           begin
             Timeout.timeout(@timeout) do
-              process_stdout(stdout, stdout_file)
+              process_stdout(pid, stdout, stdout_file)
             end
           rescue Timeout::Error
             Process.kill('KILL', pid)
             @timeout_happened = true
           end
         else
-          process_stdout(stdout, stdout_file)
+          process_stdout(pid, stdout, stdout_file)
         end
+        @process_completed = true
 
         stdout_file.close if @output_file
       end
@@ -279,17 +286,17 @@ class Kommando
     PTY
   end
 
-  def process_stdout(stdout, stdout_file)
+  def process_stdout(pid, stdout, stdout_file)
+    flushing = false
     while true do
       begin
-        break if stdout.eof?
-      rescue Errno::EIO
-        # Linux http://stackoverflow.com/a/7263243
-        break
+        Process.getpgid(pid)
+      rescue Errno::ESRCH => ex
+        flushing = true
       end
 
       c = stdout.getc
-
+      break if flushing == true && c == nil
       next unless c
 
       @stdout.append c if c

data/lib/kommando/version.rb

@@ -1,3 +1,3 @@
 class Kommando
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Matti Paksula
@@ -132,6 +132,7 @@ files:
 - examples/shorthands.rb
 - examples/stderr_to_out.rb
 - examples/stdout_to_file.rb
+- examples/thread_leak.rb
 - examples/timeout.rb
 - examples/uptime.rb
 - examples/wait.rb