blue-shell 0.2.0 → 0.2.1

data/lib/blue-shell/buffered_reader_expector.rb

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

data/lib/blue-shell/matchers.rb

@@ -4,10 +4,13 @@ module BlueShell
       OutputMatcher.new(expected_output, timeout)
     end
 
+    alias :have_output :say
+
     def have_exited_with(expected_code)
       ExitCodeMatcher.new(expected_code)
     end
 
+    alias :have_exit_code :have_exited_with
     alias :exit_with :have_exited_with
   end
 end

data/lib/blue-shell/runner.rb

@@ -32,6 +32,10 @@ module BlueShell
       end
     end
 
+    def send_up_arrow
+      @stdin.print("\e[A")
+    end
+
     def send_keys(text_to_send)
       @stdin.puts(text_to_send)
     end

data/lib/blue-shell/version.rb

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

data/spec/assets/unbuffered_input.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require 'io/wait'
+require_relative '../../spec/support/escaped_keys'
+
+class UnbufferedInput
+  $stdout.sync = true
+
+  def initialize(exit_on_character)
+    @exit_on_character = exit_on_character
+    puts "started"
+    result = read_input
+    puts %Q{received: #{result.inspect}} if result
+  end
+
+  class << self
+    alias_method :run, :new
+  end
+
+
+  def read_input
+    begin
+      system("stty raw -echo -icanon isig <&2")
+
+      line = ""
+      input_character = ""
+
+      escaped = false
+      exit_on = ""
+      while exit_on != @exit_on_character
+        input_character = $stdin.getc
+
+        exit_on << input_character if escaped
+
+        if input_character == "\e"
+          escaped = true
+        end
+
+        line << input_character
+      end
+      line
+    ensure
+      system "stty -raw echo" # turn raw input off
+    end
+  end
+end
+
+exit_on_character = ARGF.argv[0]
+UnbufferedInput.run(exit_on_character)

data/spec/buffered_reader_expector_spec.rb

@@ -21,47 +21,4 @@ describe BlueShell::BufferedReaderExpector do
       end
     end
   end
-
-  describe "output_ended?" 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.close
-      end
-      subject.send(:output_ended?, 10).should be_true
-      duration = Time.now - begin_time
-
-      duration.should <= 5
-    end
-
-    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/matchers_spec.rb

@@ -9,6 +9,10 @@ module BlueShell
         say("").should be_a(Matchers::OutputMatcher)
       end
 
+      it "has synonyms" do
+        have_output("").should be_a(Matchers::OutputMatcher)
+      end
+
       context "with an explicit timeout" do
         it "returns an ExpectOutputMatcher" do
           matcher = say("", 30)
@@ -25,6 +29,7 @@ module BlueShell
 
       it "has synonyms" do
         exit_with(1).should be_a(Matchers::ExitCodeMatcher)
+        have_exit_code(1).should be_a(Matchers::ExitCodeMatcher)
       end
     end
   end

data/spec/runner_spec.rb

@@ -119,7 +119,7 @@ module BlueShell
           end
 
           it "calls the matched callback" do
-            callback = mock!
+            callback = double(:callback)
             BlueShell::Runner.run("echo 1 3") do |runner|
               branches = {
                 "1" => proc { callback }
@@ -161,7 +161,7 @@ module BlueShell
     end
 
     describe "#send_return" do
-      it "sends a return and expects more output afterwards" do
+      it "sends a return and expects more output af`terwards" do
         BlueShell::Runner.run("ruby #{asset("input.rb")}") do |runner|
           expect(runner.expect("started")).to be_true
           runner.send_return
@@ -170,6 +170,16 @@ module BlueShell
       end
     end
 
+    describe "#send_up_arrow" do
+      it "sends an up arrow key press and expects more output afterwards" do
+        BlueShell::Runner.run("ruby #{asset("unbuffered_input.rb")} #{EscapedKeys::KEY_UP}") do |runner|
+          expect(runner.expect("started")).to be_true
+          runner.send_up_arrow
+          expect(runner.expect('received: "\e[A"')).to be_true
+        end
+      end
+    end
+
     context "#exit_code" do
       it "returns the exit code" do
         BlueShell::Runner.run("ruby -e 'exit 42'") do |runner|

data/spec/spec_helper.rb

@@ -1,13 +1,11 @@
 require 'blue-shell'
-require 'rr'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
   require file
 end
 
 RSpec.configure do |config|
-  config.mock_with :rr
-
   config.include BlueShell::Helpers
+  config.include EscapedKeys
 end
 

data/spec/support/escaped_keys.rb

@@ -0,0 +1,3 @@
+module EscapedKeys
+  KEY_UP = "[A"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blue-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,22 +44,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - cfpi-frontend@googlegroups.com
@@ -79,12 +63,14 @@ files:
 - lib/blue-shell.rb
 - spec/assets/input.rb
 - spec/assets/pause.rb
+- spec/assets/unbuffered_input.rb
 - spec/buffered_reader_expector_spec.rb
 - spec/matchers/exit_code_matcher_spec.rb
 - spec/matchers/output_matcher_spec.rb
 - spec/matchers_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
+- spec/support/escaped_keys.rb
 - spec/support/helpers.rb
 homepage: http://github.com/pivotal/blue-shell
 licenses:
@@ -107,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Friendly command-line test runner and matchers for shell scripting in ruby
@@ -115,10 +101,12 @@ summary: Friendly command-line test runner and matchers for shell scripting in r
 test_files:
 - spec/assets/input.rb
 - spec/assets/pause.rb
+- spec/assets/unbuffered_input.rb
 - spec/buffered_reader_expector_spec.rb
 - spec/matchers/exit_code_matcher_spec.rb
 - spec/matchers/output_matcher_spec.rb
 - spec/matchers_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
+- spec/support/escaped_keys.rb
 - spec/support/helpers.rb