ruby_expect 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d6b318f81f84c817eed5c819a2be81f935eb267
-  data.tar.gz: f7cc87f01c9d49e2c81d451572c6c0b4805500d8
+  metadata.gz: 81ae9b14b956734e8da1670eddd7670fb9b56a1b
+  data.tar.gz: 9a66c895fc337a6aad9ffb262b0fd6789f9f0dcd
 SHA512:
-  metadata.gz: 5be3b823a48dbab9075936c9ed8a1fb38a4e789b8d4cf135e7538f99917ffc7a279e63daf76eb1abce1cfd4a069b04226a5f253e7a83aad443e47b73557c0fde
-  data.tar.gz: 7ffbd78c6b779042169e430a8732924b2dcc9ffc1685cb465fabbaa8143b773584ebff1b12d7b82d2278f93def350f1b03304177da179770c87452a405d51c25
+  metadata.gz: bded1369bd44f3ad4028ba6fad6e1238527ba04fa958a0f817c93ddadb8fdd59a5332ee24d2c5084f31ea5a1cb18bedea5626c1dd8439b0f2e0670c480cd5d68
+  data.tar.gz: b0e4f6871dca5d289277dd7acaea524908a711ae9f5d774babd369fb77e20bd816e8ca3ba492cf71217d5bdae2509b025bfa5bb9d63bfa318c5fe349e025c873

data/lib/ruby_expect/expect.rb

@@ -105,6 +105,7 @@ module RubyExpect
       end
 
       @buffer = ''
+      @log_buffer = ''
       @before = ''
       @match = ''
       @timeout = 0
@@ -257,7 +258,7 @@ module RubyExpect
     #    end 
     #
     def expect *patterns, &block
-      @logger.debug("Expecting #{patterns.inspect}") if @logger.debug?
+      @logger.debug("Expecting: #{patterns.inspect}") if @logger.debug?
       patterns = pattern_escape(*patterns)
       @end_time = 0
       if (@timeout != 0)
@@ -272,7 +273,8 @@ module RubyExpect
         @last_match = nil
         patterns.each_index do |i|
           if (match = patterns[i].match(@buffer))
-            @logger.debug("Matched #{match}") if @logger.debug?
+            log_buffer(true)
+            @logger.debug("  Matched: #{match}") if @logger.debug?
             @last_match = match
             @before = @buffer.slice!(0...match.begin(0))
             @match = @buffer.slice!(0...match.to_s.length)
@@ -323,6 +325,22 @@ module RubyExpect
     end
 
     private
+      def log_buffer incomplete_lines=false
+        return unless @logger.info?
+        if @log_buffer =~ /[\r\n]/
+          lines = @log_buffer.split(/[\r\n]+/, -1)
+          @log_buffer = lines.pop
+          lines.each do |line|
+            @logger.info(" Received: #{line.scan(/[[:print:]]/).join}")
+          end
+        end
+
+        if incomplete_lines and @log_buffer !~ /^\s*$/
+          @logger.info(" Received: #{@log_buffer.scan(/[[:print:]]/).join}")
+          @log_buffer = ''
+        end
+      end
+
       def interact_loop stdin
         done = false
         while (! done)
@@ -359,7 +377,10 @@ module RubyExpect
             else
               input = @read_fh.readpartial(4096)
               @buffer << input
-              @logger.info(input) if (@logger.info?)
+              if @logger.info?
+                @log_buffer << input
+                log_buffer
+              end
             end
           end
         rescue EOFError => e

data/lib/ruby_expect/version.rb

@@ -1,3 +1,3 @@
 module RubyExpect
-  VERSION = "1.7.3"
+  VERSION = "1.7.4"
 end

data/ruby_expect.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby_expect 1.7.3 ruby lib
+# stub: ruby_expect 1.7.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby_expect"
-  s.version = "1.7.3"
+  s.version = "1.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_expect
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Andrew Bates