kommando 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e48c9ee88deb15984338770bcb3f88df16233c55
-  data.tar.gz: 1734e1fbce11cb305053d2a75c193a92ce71889d
+  metadata.gz: a4b7759e3a3f6c9980f7dc19353cdece83fafdca
+  data.tar.gz: 5c4ac9619d762838a4146a03fee7c5b314b7c920
 SHA512:
-  metadata.gz: 1fdc4301a64924c7bd60e2555a40c27a83849c47b674deb717017cb9c873aa2693cc790332545cf39a3e818af913190b59a4de903ee2869902ea1a6470bede89
-  data.tar.gz: b05437941a9ec740fe09a8aac78fa8b67ee3ed05f150b88e1ddb941e0308662c96fec308195146f33bac1f85fade218faad6ad3ac702eb21be9645fdc8061123
+  metadata.gz: 378367b00a5cf6febd212d611eb35622fe37a1b530d233757e25b54d11af818778145a1f0cab1c5722049dc26cd3e8f765d72a0a1d19e52013247edf9081b8dd
+  data.tar.gz: 1e2c26f31ade6e75cc68dd7a965566769f54cf46346c915d2863614d9185d52ff8c36f6cdfa944344e6ba7a33bc7dd5c3f31b007d38d190972179363adf6e193

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.0.6
+Fix Linux harder.
+
+ - FIX: Changed strategy.
+
 ## 0.0.5
 Fixes.
 

data/lib/kommando.rb

@@ -7,23 +7,6 @@ require_relative "kommando/buffer"
 
 class Kommando
 
-  # http://stackoverflow.com/a/7263243
-  module SafePTY
-    def self.spawn command, *args, &block
-
-      PTY.spawn(command, *args) do |r,w,p|
-        begin
-          yield r,w,p
-        rescue Errno::EIO
-        ensure
-          Process.wait p
-        end
-      end
-
-      $?.exitstatus
-    end
-  end
-
   def initialize(cmd, opts={})
     @cmd = cmd
     @stdout = Buffer.new
@@ -38,7 +21,7 @@ class Kommando
     elsif opts[:timeout].class == Fixnum
       opts[:timeout].to_f
     end
-    @thread_did_timeout = nil
+    @timeout_happened = false
 
     @code = nil
     @executed = false
@@ -52,7 +35,7 @@ class Kommando
 
     command, *args = @cmd.split " "
     begin
-      exitstatus = SafePTY.spawn(command, *args) do |stdout, stdin, pid|
+      PTY.spawn(command, *args) do |stdout, stdin, pid|
         if @retry && stdout.eof?
           @executed = false
           return run
@@ -66,7 +49,12 @@ class Kommando
         Thread.abort_on_exception = true
         thread_stdout = Thread.new do
           while true do
-            break if stdout.eof?
+            begin
+              break if stdout.eof?
+            rescue Errno::EIO
+              # Linux http://stackoverflow.com/a/7263243
+              break
+            end
 
             c = nil
             begin
@@ -90,7 +78,7 @@ class Kommando
             end
           rescue Timeout::Error
             Process.kill('KILL', pid)
-            @thread_did_timeout = true
+            @timeout_happened = true
           end
         else
           thread_stdout.join
@@ -99,10 +87,10 @@ class Kommando
         stdout_file.close if @output_file
       end
 
-      @code = if @thread_did_timeout
+      @code = if @timeout_happened
         1
       else
-        exitstatus
+        $?.exitstatus
       end
     rescue RuntimeError => ex
       if ex.message == "can't get Master/Slave device"

data/lib/kommando/version.rb

@@ -1,3 +1,3 @@
 class Kommando
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

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