blue_shell 0.6 → 0.7

data/lib/blue_shell/bash.rb

@@ -9,14 +9,33 @@ module BlueShell
 
     attr_reader :out, :err, :exit
 
+    def initialize
+      @hooks     = { stderr: [], stdout: [] }
+      @executing = false
+    end
+
+    # Add a lambda to execute on every line of stdout. The lambda 
+    # should accept one parameter, a string, the line of output.
+    # @example Pushing to the console
+    #   lambda { |line| puts line }
+    # @param [Symbol] the stream to hook into (:stderr or :stdout)
+    # @param [Lambda] the code to execute
+    def add_hook(type, lambda)
+      # TODO: This should be a custom error
+      raise "May not add hooks while executing." if @executing
+
+      @hooks[type] << lambda
+    end
+
     # 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 = 30)
-      # Executing via a file seems clunky, but it is the best way to
+      # Executing via a file seems clunky, but it is a good way to
       # ensure everything happens exactly as we expect it to without 
       # trying to deal with escaping the world properly.
       file = Tempfile.new('command')
+
       begin
         file << command
         file.flush
@@ -28,8 +47,8 @@ module BlueShell
           @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 = read_thread(:stdout, proc.getInputStream, @out)
+          err_thread = read_thread(:stderr, proc.getErrorStream, @err)
 
           out_thread.join
           err_thread.join
@@ -37,6 +56,9 @@ module BlueShell
           @out = @out.join("\n")
           @err = @err.join("\n")
 
+          # Noticed some cases where the join isn't good enough in the wild.
+          proc.waitFor
+
           @exit = proc.exitValue
         end
       ensure
@@ -45,13 +67,14 @@ module BlueShell
       end
     end
 
-    def read_thread(stream, sink)
-      Thread.new(stream, sink) do |stream, sink|
+    def read_thread(type, stream, sink)
+      Thread.new(@hooks[type], stream, sink) do |hooks, stream, sink|
         line = nil
         br   = BufferedReader.new(InputStreamReader.new(stream))
 
         while(line = br.readLine) do 
           sink << line
+          hooks.each { |hook| hook.call(line) }
         end
       end
     end

data/lib/blue_shell/version.rb

@@ -1,3 +1,3 @@
 module BlueShell
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

data/spec/blue_shell_spec.rb

@@ -25,4 +25,20 @@ describe BlueShell::Bash do
     @shell.execute!("ls -l /")
     @shell.out.must_include "\n"
   end
+
+  it "should execute stdout hooks" do
+    me = nil
+
+    @shell.add_hook(:stdout, lambda { |line| me = line })
+    @shell.execute!("echo hello")
+    me.must_equal "hello"
+  end
+
+  it "should execute stderr hooks" do
+    me = nil
+
+    @shell.add_hook(:stderr, lambda { |line| me = line })
+    @shell.execute!("omg")
+    me.must_include "omg: command not found"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blue_shell
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest