blue_shell 0.0.2 → 0.5

data/lib/blue_shell/bash.rb

@@ -12,7 +12,7 @@ module BlueShell
     # Execute the given command. Will block until the command completes.
     # param [String] the command to execute in bash
     # param [Integer] the number of seconds to wait for it to complete
-    def execute!(command, timeout = 5)
+    def execute!(command, timeout = 30)
       # Executing via a file seems clunky, but it is the best way to
       # ensure everything happens exactly as we expect it to without 
       # trying to deal with escaping the world properly.
@@ -22,10 +22,19 @@ module BlueShell
         file.flush
 
         Timeout::timeout(timeout) do
-          @proc = runtime.exec("/bin/bash #{file.path}")
-          @out  = stream_to_string(@proc.getInputStream)
-          @err  = stream_to_string(@proc.getErrorStream)
-          @exit = @proc.exitValue
+          proc = runtime.exec("/bin/bash #{file.path}")
+
+          @out = ""
+          @err = ""
+
+          # Must have a sink for stdout for the proc to exit
+          out_thread = read_thread(proc.getInputStream, @out)
+          err_thread = read_thread(proc.getErrorStream, @err)
+
+          out_thread.join
+          err_thread.join
+
+          @exit = proc.exitValue
         end
       ensure
         file.close
@@ -33,18 +42,17 @@ module BlueShell
       end
     end
 
-    def stream_to_string(stream)
-      br = BufferedReader.new(InputStreamReader.new(stream))
-      line = nil
-      lines = []
+    def read_thread(stream, sink)
+      Thread.new(stream, sink) do |stream, sink|
+        line = nil
+        br   = BufferedReader.new(InputStreamReader.new(stream))
 
-      while(line = br.readLine) do 
-        lines << line
+        while(line = br.readLine) do 
+          sink << line
+        end
       end
-
-      lines.join("\n") 
     end
-    private :stream_to_string
+    private :read_thread
 
     def runtime
       @runtime ||= java.lang.Runtime.getRuntime 

data/lib/blue_shell/version.rb

@@ -1,3 +1,3 @@
 module BlueShell
-  VERSION = "0.0.2"
+  VERSION = "0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blue_shell
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: '0.5'
   prerelease:
 platform: ruby
 authors: