blue-shell 0.0.2 → 0.0.3

data/lib/blue-shell/buffered_reader_expector.rb

@@ -10,8 +10,6 @@ module BlueShell
     end
 
     def expect(pattern, timeout = 5)
-      buffer = ''
-
       case pattern
         when String
           pattern = Regexp.new(Regexp.quote(pattern))
@@ -20,6 +18,22 @@ module BlueShell
           raise TypeError, "unsupported pattern class: #{pattern.class}"
       end
 
+      result, buffer = read_pipe(timeout, pattern)
+
+      @output << buffer
+
+      result
+    end
+
+    def read_to_end
+      _, buffer = read_pipe(0.01)
+      @output << buffer
+    end
+
+    private
+
+    def read_pipe(timeout, pattern = nil)
+      buffer = ""
       result = nil
       position = 0
       @unused ||= ""
@@ -53,19 +67,15 @@ module BlueShell
           end
         end
 
-        if matches = pattern.match(buffer)
+        if pattern && matches = pattern.match(buffer)
           result = [buffer, *matches.to_a[1..-1]]
           break
         end
       end
 
-      @output << buffer
-
-      result
+      return result, buffer
     end
 
-    private
-
     def output_ended?(timeout)
       (@out.is_a?(IO) && !IO.select([@out], nil, nil, timeout)) || @out.eof?
     end

data/lib/blue-shell/runner.rb

@@ -41,12 +41,16 @@ module BlueShell
       @stdin.puts
     end
 
-    def exit_code
+    def exit_code(timeout = 5)
       return @code if @code
 
       code = nil
-      Timeout.timeout(5) do
-        _, code = Process.waitpid2(@pid)
+      begin
+        Timeout.timeout(timeout) do
+          _, code = Process.waitpid2(@pid)
+        end
+      rescue Timeout::Error
+        raise ::Timeout::Error.new("execution expired, output was:\n#{@expector.read_to_end}")
       end
 
       @code = numeric_exit_code(code)

data/lib/blue-shell/version.rb

@@ -1,3 +1,3 @@
 module BlueShell
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

data/spec/buffered_reader_expector_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe BlueShell::BufferedReaderExpector do
+  let(:pipe) { IO::pipe }
+  let(:read) { pipe[0] }
+  let(:write) { pipe[1] }
+
+  subject { BlueShell::BufferedReaderExpector.new(read) }
+
+  describe "#read_to_end" do
+    it "captures the output" do
+      hash = %w|the never ending story|
+      hash.each do |thing|
+        write.puts thing
+      end
+
+      subject.read_to_end.should include(hash.last)
+
+      hash.each do |thing|
+        subject.output.should include(thing)
+      end
+    end
+  end
+end

data/spec/runner_spec.rb

@@ -191,6 +191,26 @@ module BlueShell
           end
         end
       end
+
+      context "when the command doesn't finish within the timeout" do
+        it "raises a timeout error" do
+          BlueShell::Runner.run("sleep 10") do |runner|
+            expect { runner.exit_code }.to raise_error(Timeout::Error)
+          end
+        end
+
+        it "prints the output so far" do
+          BlueShell::Runner.run("echo 'everything is coming up wankershim' && sleep 10") do |runner|
+            expect { runner.exit_code }.to raise_error(Timeout::Error, /everything is coming up wankershim/)
+          end
+        end
+      end
+
+      it "uses the given timeout" do
+        BlueShell::Runner.run("sleep 2") do |runner|
+          expect { runner.exit_code(1) }.to raise_error(Timeout::Error)
+        end
+      end
     end
 
     context "#exited?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blue-shell
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -79,6 +79,7 @@ files:
 - lib/blue-shell.rb
 - spec/assets/input.rb
 - spec/assets/pause.rb
+- spec/buffered_reader_expector_spec.rb
 - spec/matchers/exit_code_matcher_spec.rb
 - spec/matchers/output_matcher_spec.rb
 - spec/matchers_spec.rb
@@ -114,6 +115,7 @@ summary: Friendly command-line test runner and matchers for shell scripting in r
 test_files:
 - spec/assets/input.rb
 - spec/assets/pause.rb
+- spec/buffered_reader_expector_spec.rb
 - spec/matchers/exit_code_matcher_spec.rb
 - spec/matchers/output_matcher_spec.rb
 - spec/matchers_spec.rb