spud 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e82f5c891574a3fc3f13aa2b46005c7deafbf6720d378b4432726b3358e65dda
-  data.tar.gz: 9e46fcd73f03b45bc7bf8ff79a6f15aac02535ec02349112320fbf9003cae213
+  metadata.gz: ff2253281ad17fa26000da387d071fca88fe39e6c01913573bf1aa78148c9302
+  data.tar.gz: 449e2aead6ea9686659c8b928ca9f4fa07f582156d30e2ae24bbc5680382cd58
 SHA512:
-  metadata.gz: 0acce351760b00b50ca4ae4b0734143d1745aa5f2c81cc35c968b2e86186a5fa0a5f2138e6ca095ab7404220bd74b8abaa053a2985baa237e170164df71043f5
-  data.tar.gz: 075957df7f73c4cf6022ffc0c8c7f28acd31e94f4963e25c875534b3e72c965cf505af6c1bc74a58d0b54896b4b0451c10c3452e2fad252b66b2eeb1404d3920
+  metadata.gz: 3f29e51971b0f78eb223e0561bc28a641fa167d72a5e10f996752fffefe8ead8c8fbb09707a24b2192c72b341dd039711808cfe2d6b7dbe78e5cb416c71075a8
+  data.tar.gz: 244352f4d935f8f00bc307b88f810743358e1eed079c9f7ef8ffabaca55df1929e9eb7933c5ae76a29bdfa4f9037a519b1ee205e592e49ed3e49f1207a1d4f51

data/lib/shell.rb

@@ -1,25 +1,34 @@
+require 'stringio'
 require 'open3'
 
 module Spud
   class Shell < String
-    attr_accessor :status
-
-    def initialize(cmd, silent: false)
+    def initialize(cmd, silent: false, wait: false)
       output = StringIO.new
 
-      _, out, @thread = Open3.popen2e(cmd)
-      @status = @thread.value
-      while line = out.gets
-        puts line
-        output.puts line
+      stdin, out, @status = Open3.popen2e(cmd)
+      @thread = Thread.new do
+        while line = out.gets
+          puts line unless silent
+          output.puts line
+          super(output.string)
+        end
+
+        out.close
+        stdin.close
       end
 
-      super(output.string)
+      @thread.join if wait
+    end
+
+    def status
+      @status.value
     end
 
     def kill!
-      thread.kill
-      thread.join
+      Process.kill('KILL', @status.pid)
+      @thread.kill
+      @thread.join
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Spud
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Andrew Booth