blue-shell 0.1.0 → 0.2.0

data/lib/blue-shell/buffered_reader_expector.rb

@@ -50,7 +50,8 @@ module BlueShell
 
         STDOUT.putc c if @debug
 
-        # wear your flip flops
+        # evaluate true when \e is read and continue to
+        # until m is read
         unless (c == "\e") .. (c == "m")
           if c == "\b"
             if position > 0 && buffer[position - 1] && buffer[position - 1].chr != "\n"
@@ -77,10 +78,12 @@ module BlueShell
     end
 
     def output_ended?(timeout)
-      timeout.to_i.times do
-        return true if (@out.is_a?(IO) && !IO.select([@out], nil, nil, 1)) || @out.eof?
+      [timeout.to_i, 1].max.times do
+        if(@out.is_a?(IO) && IO.select([@out], nil, nil, 1))
+          return @out.eof?
+        end
       end
-      false
+      true
     end
   end
 end

data/lib/blue-shell/errors.rb

@@ -1,12 +1,5 @@
 module BlueShell
   module Errors
     class InvalidInputError < StandardError; end
-
-    class NonZeroExitCodeError < StandardError
-      attr_reader :exit_code
-      def initialize(exit_code)
-        @exit_code = exit_code
-      end
-    end
   end
 end

data/lib/blue-shell/runner.rb

@@ -15,8 +15,7 @@ module BlueShell
       if block_given?
         yield self
       else
-        code = exit_code
-        raise Errors::NonZeroExitCodeError.new(code) unless code == 0
+        wait_for_exit()
       end
     end
 

data/lib/blue-shell/version.rb

@@ -1,3 +1,3 @@
 module BlueShell
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/buffered_reader_expector_spec.rb

@@ -23,20 +23,45 @@ describe BlueShell::BufferedReaderExpector do
   end
 
   describe "output_ended?" do
-    it "should not wait the full timeout if the command has already exited" do
+    it "does not wait the full timeout if the command has already exited" do
       begin_time = Time.now
       Thread.new() do
         sleep(2)
-        write.puts Net::EOF
+        write.close
       end
-      subject.send(:output_ended?, 10)
+      subject.send(:output_ended?, 10).should be_true
       duration = Time.now - begin_time
 
       duration.should <= 5
     end
 
-    it "should handle non-integer timeouts" do
+    it "handles non-integer timeouts" do
       expect { subject.send(:output_ended?, 0.1) }.to_not raise_error
     end
+
+    it "waits the full timeout when no output is arriving" do
+      begin_time = Time.now
+      Thread.new() do
+        sleep(3)
+        write.puts("not done")
+      end
+      subject.send(:output_ended?, 2).should be_true
+      duration = Time.now - begin_time
+
+      duration.should < 3
+      duration.should >= 1.9
+    end
+
+    it "returns false if the output is readable" do
+      begin_time = Time.now
+      Thread.new() do
+        sleep(1)
+        write.puts("not done")
+      end
+      subject.send(:output_ended?, 4).should be_false
+      duration = Time.now - begin_time
+
+      duration.should <= 2
+    end
   end
 end

data/spec/runner_spec.rb

@@ -8,25 +8,15 @@ module BlueShell
     describe "running a command" do
       let(:file) do
         file = Tempfile.new('blue-shell-runner')
-        sleep 1  # wait one second to make sure touching the file does something measurable
+        sleep 1 # wait one second to make sure touching the file does something measurable
         file
       end
 
       after { file.unlink }
 
-      context "with an invalid command" do
-        it "raises an exception" do
-          expect {
-            BlueShell::Runner.run("false")
-          }.to raise_error(Errors::NonZeroExitCodeError) { |error| error.exit_code.should == 1 }
-        end
-      end
-
-      context "with a valid command" do
-        it "runs a command" do
-          BlueShell::Runner.run("touch -a #{file.path}")
-          file.stat.atime.should > file.stat.mtime
-        end
+      it "runs a command" do
+        BlueShell::Runner.run("touch -a #{file.path}")
+        file.stat.atime.should > file.stat.mtime
       end
     end
 
@@ -38,6 +28,10 @@ module BlueShell
           }
           runner.should_not be_success
           runner.should_not be_successful
+
+          runner = BlueShell::Runner.run("false")
+          runner.should_not be_success
+          runner.should_not be_successful
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blue-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: