expectr 1.0.0 → 1.0.1

data/lib/expectr/version.rb

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

data/lib/expectr.rb

@@ -60,7 +60,7 @@ class Expectr
   #                        sub-process to :buffer_size (default: false)
   def initialize(cmd, args={})
     unless cmd.kind_of? String or cmd.kind_of? File
-     raise ArgumentError, "String or File expected"
+      raise ArgumentError, "String or File expected"
     end
 
     cmd = cmd.path if cmd.kind_of? File
@@ -91,6 +91,7 @@ class Expectr
             break
           end
 
+          force_utf8(buf) unless buf.valid_encoding?
           print_buffer(buf)
 
           @out_mutex.synchronize do
@@ -284,4 +285,14 @@ class Expectr
     print buf if @flush_buffer
     STDOUT.flush unless STDOUT.sync
   end
+
+  # Internal: Encode a String twice to force UTF-8 encoding, dropping           
+  # problematic characters in the process.                                      
+  #                                                                             
+  # buf  - String to be encoded.                                                
+  #                                                                             
+  # Returns the encoded String.                                                 
+  def force_utf8(buf)                                                           
+    buf.force_encoding('ISO-8859-1').encode('UTF-8', 'UTF-8', replace: nil)     
+  end                                                                           
 end

data/test/test_core.rb

@@ -4,20 +4,20 @@ class CoreTests < Test::Unit::TestCase
   # For the purpose of testing, we will assume we are working within a POSIX
   # environment.
   def setup
-    @exp = Expectr.new("ls /dev", :flush_buffer => false, :timeout => 1,
-                       :buffer_size => 4096)
+    @exp = Expectr.new("ls /dev", flush_buffer: false, timeout: 1,
+                       buffer_size: 4096)
   end
 
   def test_object_consistency
-    assert_equal false, @exp.flush_buffer
-    assert_equal 1, @exp.timeout
-    assert_equal 4096, @exp.buffer_size
+    assert_equal(false, @exp.flush_buffer)
+    assert_equal(1, @exp.timeout)
+    assert_equal(4096, @exp.buffer_size)
   end
 
   # POSIX specifies /dev/console, /dev/null and /dev/tty must exist.
   def test_match_sets_discard
-    assert_not_equal nil, @exp.expect(/null/)
-    assert_not_equal '', @exp.discard
+    assert_not_equal(nil, @exp.expect(/null/))
+    assert_not_equal('', @exp.discard)
   end
 
   def test_match_failure
@@ -27,9 +27,15 @@ class CoreTests < Test::Unit::TestCase
 
   def test_clear_buffer
     sleep 1
-    assert_not_equal @exp.buffer, ''
+    assert_not_equal(@exp.buffer, '')
     @exp.clear_buffer!
-    assert_equal '', @exp.buffer
+    assert_equal('', @exp.buffer)
+  end
+
+  def test_garbage_output
+    @exp = Expectr.new("dd if=/dev/urandom bs=1024 count=1",
+                       flush_buffer:false, timeout: 1, buffer_size: 1024)
+    assert_nothing_raised { @exp.expect(/probablyNotThere/, true) }
   end
 
   def test_pid_set

data/test/test_initialization.rb

@@ -2,16 +2,16 @@ require 'helper'
 
 class InitializationTests < Test::Unit::TestCase
   def test_spawn_with_file
-    assert_nothing_raised { exp = Expectr.new(File.new("/bin/ls"), :flush_buffer => false) }
+    assert_nothing_raised { exp = Expectr.new(File.new("/bin/ls"), flush_buffer: false) }
   end
 
   def test_spawn_with_string
-    assert_nothing_raised { exp = Expectr.new(File.new("/bin/ls"), :flush_buffer => false) }
+    assert_nothing_raised { exp = Expectr.new(File.new("/bin/ls"), flush_buffer: false) }
   end
 
   # lib/expectr.rb's permissions should hopefully be set to 0644
   def test_spawn_failures
-    assert_raises(Errno::ENOENT) { exp = Expectr.new("lib/ThisFileShouldNotExist", :flush_buffer => false) }
-    assert_raises(Errno::EACCES) { exp = Expectr.new("lib/expectr.rb", :flush_buffer => false) }
+    assert_raises(Errno::ENOENT) { exp = Expectr.new("lib/ThisFileShouldNotExist", flush_buffer: false) }
+    assert_raises(Errno::EACCES) { exp = Expectr.new("lib/expectr.rb", flush_buffer: false) }
   end
 end

data/test/test_interaction.rb

@@ -3,7 +3,7 @@ require 'helper'
 class InteractionTest < Test::Unit::TestCase
   # Assume that bc(1) exists on the system for these tests
   def setup
-    @exp = Expectr.new("bc", :flush_buffer => false, :timeout => 1)
+    @exp = Expectr.new("bc", flush_buffer: false, timeout: 1)
   end
 
   def test_send_and_expect

metadata

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