expectr 1.0.1 → 1.0.2

data/lib/expectr/version.rb

@@ -1,3 +1,3 @@
 class Expectr
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/expectr.rb

@@ -30,12 +30,14 @@ require 'expectr/error'
 class Expectr
   # Public: Gets/sets the number of seconds a call to Expectr#expect may last
   attr_accessor :timeout
+  # Public: Gets/sets whether to flush program output to STDOUT
+  attr_accessor :flush_buffer
   # Public: Gets/sets the number of bytes to use for the internal buffer
   attr_accessor :buffer_size
   # Public: Gets/sets whether to constrain the buffer to the buffer size
   attr_accessor :constrain
-  # Public: Gets/sets whether to flush program output to STDOUT
-  attr_accessor :flush_buffer
+  # Public: Whether to always attempt to match once on calls to Expectr#expect.
+  attr_accessor :force_match
   # Public: Returns the PID of the running process
   attr_reader :pid
   # Public: Returns the active buffer to match against
@@ -58,6 +60,12 @@ class Expectr
   #                        (default: 8192)
   #        :constrain    - Whether to constrain the internal buffer from the
   #                        sub-process to :buffer_size (default: false)
+  #        :force_match  - Whether to always attempt to match against the
+  #                        internal buffer on a call to Expectr#expect.  This
+  #                        is relevant following a failed call to
+  #                        Expectr#expect, which will leave the update status
+  #                        set to false, preventing further matches until more
+  #                        output is generated otherwise. (default: false)
   def initialize(cmd, args={})
     unless cmd.kind_of? String or cmd.kind_of? File
       raise ArgumentError, "String or File expected"
@@ -72,6 +80,7 @@ class Expectr
     @flush_buffer = args[:flush_buffer].nil? ? true : args[:flush_buffer]
     @buffer_size = args[:buffer_size] || 8192
     @constrain = args[:constrain] || false
+    @force_match = args[:force_match] || false
 
     @out_mutex = Mutex.new
     @out_update = false
@@ -232,6 +241,7 @@ class Expectr
   # Raises Timeout::Error if a match isn't found in time, unless recoverable
   def expect(pattern, recoverable = false)
     match = nil
+    @out_update = true if @force_match
 
     case pattern
     when String

data/test/test_core.rb

@@ -12,6 +12,7 @@ class CoreTests < Test::Unit::TestCase
     assert_equal(false, @exp.flush_buffer)
     assert_equal(1, @exp.timeout)
     assert_equal(4096, @exp.buffer_size)
+    assert_equal(false, @exp.force_match)
   end
 
   # POSIX specifies /dev/console, /dev/null and /dev/tty must exist.
@@ -21,8 +22,13 @@ class CoreTests < Test::Unit::TestCase
   end
 
   def test_match_failure
-    assert_raises(Timeout::Error) { @exp.expect(/ThisFileShouldNotExist/) }
+    @exp.force_match = true
     assert_nothing_raised { @exp.expect(/ThisFileShouldNotExist/, true) }
+    assert_nothing_raised { @exp.expect(/null/) }
+
+    @exp.force_match = false
+    assert_raises(Timeout::Error) { @exp.expect(/ThisFileShouldNotExist/) }
+    assert_raises(Timeout::Error) { @exp.expect(/tty/) }
   end
 
   def test_clear_buffer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expectr
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies: []
 description: Expectr is an interface to the functionality of Expect in Ruby
 email: chris@chriswuest.com