kommando 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4177fe69b2dda93641ad54157d9c917cbcd322
-  data.tar.gz: a2c071b228bc3c5b48749d42a5fd5af0be41e2b1
+  metadata.gz: 9003ef03825d24dbed6e95661acc172cae3509a7
+  data.tar.gz: abc099820ae559c3c69554c632e8a81e3c0b017b
 SHA512:
-  metadata.gz: d52dc37e74ee347302f53a8f320898eb2470afe68588cd67988544142286928b0bf8f880e3a21302c2a7c41f61faf80e53a512caaad0fd244f2af93e98aa0362
-  data.tar.gz: 2aaff338413e4dedbe9ecd44e3c5507e24a24e8274e38de22ff2ba82ddc967a6b230fa1a833723ba5fac0fa5eec3d59bebe5ff7a19663f8b31b0e5afb6c0fed7
+  metadata.gz: 004d3ec64ecee487262b169b10421ec753965d96db4580e837d090ea8678bf0fe39d40f15ad876fd5e0076e11f36fecb66f6b3e02deba12dc8c49c82e300a768
+  data.tar.gz: 6f81c0dff25c9e21bfd0ddb15f14575c630936ce4d5e42c2c942660f5dc3e9b4e818832ebee7c66b40be10d85450aca4afab4a0db51523482d9dbc08e92f3e6a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.0.17
+Fixes race condition and reduces the number of threads Kommando creates.
+
+- FIX: Race condition when accessing stdout.
+- FIX: Do not start thousands of threads with timeout (above)
+- FIX: More reliable exit status
+
 ## 0.0.16
 Error callback, optional retry running.
 

data/bin/release

@@ -9,7 +9,7 @@ set -e
 
 rake; rake; rake
 bin/e2e
-bin/stress 2 10
+#bin/stress 2 10
 
 echo
 head CHANGELOG.md

data/lib/kommando.rb

@@ -28,6 +28,8 @@ class Kommando
   end
 
   def initialize(cmd, opts={})
+    Thread.abort_on_exception=true
+
     @cmd = cmd
     @stdout = Buffer.new
     @stdin = Buffer.new
@@ -82,10 +84,20 @@ class Kommando
   end
 
   def kill
-    Process.kill('KILL', @pid)
-    @kill_happened = true
+    begin
+      Process.kill('KILL', @pid)
+    rescue Errno::ESRCH => ex
+      raise ex # see if happens
+    end
 
-    sleep 0.001 until @code # let finalize
+    @kill_happened = true
+    begin
+      Timeout.timeout(1) do
+        sleep 0.001 until @code # let finalize
+      end
+    rescue Timeout::Error => ex
+      raise ex # let's see if happens
+    end
   end
 
   def run
@@ -140,43 +152,6 @@ class Kommando
           stdout_file.sync = true
         end
 
-        Thread.abort_on_exception = true
-        thread_stdout = Thread.new do
-          while true do
-            begin
-              break if stdout.eof?
-            rescue Errno::EIO
-              # Linux http://stackoverflow.com/a/7263243
-              break
-            end
-
-            c = nil
-            begin
-              Timeout.timeout(0.1) do
-                c = stdout.getc
-              end
-            rescue Timeout::Error
-              # sometimes it just hangs.
-            end
-
-            @stdout.append c if c
-            print c if @output_stdout
-            stdout_file.write c if @output_file
-
-            if c
-              @matcher_buffer << c
-
-              matchers_copy = @matchers.clone # blocks can insert to @matchers while iteration is undergoing
-              matchers_copy.each_pair do |matcher,block|
-                if @matcher_buffer.match matcher
-                  block.call
-                  @matchers.delete matcher # do not match again  TODO: is this safe?
-                end
-              end
-            end
-          end
-        end
-
         thread_stdin = Thread.new do
           sleep 0.1 # allow program to start, do not write "in terminal"
           while true do
@@ -195,35 +170,19 @@ class Kommando
         if @timeout
           begin
             Timeout.timeout(@timeout) do
-              thread_stdout.join
+              process_stdout(stdout, stdout_file)
             end
           rescue Timeout::Error
             Process.kill('KILL', pid)
             @timeout_happened = true
           end
         else
-          thread_stdout.join
+          process_stdout(stdout, stdout_file)
         end
 
         stdout_file.close if @output_file
       end
 
-      @code = if @timeout_happened
-        1
-      elsif @kill_happened
-        137
-      else
-        unless $?
-          begin
-            Timeout.timeout(0.1) do
-              Process.wait #WIP: trying to fix weird linux stuff when $? is nil
-            end
-          rescue Timeout::Error
-          end
-        end
-
-        $?.exitstatus
-      end
     rescue RuntimeError => ex
       if ex.message == "can't get Master/Slave device"
         #suppress, weird stuff.
@@ -249,6 +208,24 @@ class Kommando
       @when.fire :error
       raise Kommando::Error, "Command '#{command}' not found"
     ensure
+      @code = if @timeout_happened
+        1
+      elsif @kill_happened
+        137
+      else
+        begin
+          Timeout.timeout(0.1) do
+            Process.wait @pid if @pid
+          end
+        rescue Errno::ECHILD => ex
+          # safe to supress, I guess
+        rescue Timeout::Error => ex
+          # seems to be okay...
+        end
+
+        $?.exitstatus
+      end
+
       @when.fire :error if @rescue_happened
     end
 
@@ -301,4 +278,36 @@ class Kommando
   def make_pty_testable
     PTY
   end
+
+  def process_stdout(stdout, stdout_file)
+    while true do
+      begin
+        break if stdout.eof?
+      rescue Errno::EIO
+        # Linux http://stackoverflow.com/a/7263243
+        break
+      end
+
+      c = stdout.getc
+
+      next unless c
+
+      @stdout.append c if c
+      print c if @output_stdout
+      stdout_file.write c if @output_file
+
+      if c
+        @matcher_buffer << c
+
+        matchers_copy = @matchers.clone # blocks can insert to @matchers while iteration is undergoing
+        matchers_copy.each_pair do |matcher,block|
+          if @matcher_buffer.match matcher
+            block.call
+            @matchers.delete matcher # do not match again  TODO: is this safe?
+          end
+        end
+      end
+    end
+  end
+
 end

data/lib/kommando/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Matti Paksula