ruby_expect 1.0 → 1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2368eec4ae38e8bb2ed58807f8099580f1422ae9
+  data.tar.gz: 451408b972605853384ff5a4b43f98fab07ab7c7
+SHA512:
+  metadata.gz: 39be417b404a55360e0a3a6e3c07cb6f98877087ca2c3d70984b2a3937d3fbe883070f3a60a8d027f96a01d3d022c905f3863bc8aedca029252dfdcb22ce4299
+  data.tar.gz: a3894950b06028cadef8dad7ba2d557d0baf3a953a398f720a30417c87182a6f43b975e913211a24fac08a66cd484ae3581a31750f4b15e823314056daee9ff3

data/lib/ruby_expect/expect.rb

@@ -90,8 +90,6 @@ module RubyExpect
       raise "Input file handle is not readable!" unless (@read_fh.stat.readable?)
       raise "Output file handle is not writable!" unless (@write_fh.stat.writable?)
 
-      @buffer_sem = Mutex.new
-      @buffer_cv = ConditionVariable.new
       @child_pid = options[:child_pid]
       @debug = options[:debug] || false
       @buffer = ''
@@ -99,8 +97,6 @@ module RubyExpect
       @match = ''
       @timeout = 0
 
-      read_loop # start the read thread
-
       unless (block.nil?)
         procedure(&block)
       end
@@ -238,18 +234,16 @@ module RubyExpect
       matched_index = nil
       while (@end_time == 0 || Time.now < @end_time)
         return nil if (@read_fh.closed?)
+        break unless (read_proc)
         @last_match = nil
-        @buffer_sem.synchronize do
-          patterns.each_index do |i|
-            if (match = patterns[i].match(@buffer))
-              @last_match = match
-              @before = @buffer.slice!(0...match.begin(0))
-              @match = @buffer.slice!(0...match.to_s.length)
-              matched_index = i
-              break
-            end
+        patterns.each_index do |i|
+          if (match = patterns[i].match(@buffer))
+            @last_match = match
+            @before = @buffer.slice!(0...match.begin(0))
+            @match = @buffer.slice!(0...match.to_s.length)
+            matched_index = i
+            break
           end
-          @buffer_cv.wait(@buffer_sem) if (@last_match.nil?)
         end
         unless (@last_match.nil?)
           unless (block.nil?)
@@ -262,10 +256,8 @@ module RubyExpect
     end
 
     def soft_close
-      while (! @read_fh.closed?)
-        @buffer_sem.synchronize do
-          @buffer_cv.wait(@buffer_sem)
-        end
+      while (! @read_fh.eof?)
+        read_proc
       end
       @read_fh.close unless (@read_fh.closed?)
       @write_fh.close unless (@write_fh.closed?)
@@ -275,6 +267,34 @@ module RubyExpect
     end
 
     private
+      def read_proc
+        begin
+          ready = IO.select([@read_fh], nil, nil, 1)
+          unless (ready.nil? || ready.size == 0)
+            if (@read_fh.eof?)
+              @read_fh.close
+              return false
+            else
+              input = @read_fh.readpartial(4096)
+              @buffer << input
+              if (@debug)
+                STDERR.print input
+                STDERR.flush
+              end
+            end
+          end
+        rescue EOFError => e
+        rescue Exception => e
+          unless (e.to_s == 'stream closed')
+            STDERR.puts "Exception in read_loop:"
+            STDERR.puts "#{e}"
+            STDERR.puts "\t#{e.backtrace.join("\n\t")}"
+          end
+          return false
+        end
+        return true
+      end
+
       #####
       # This method will convert any strings in the argument list to regular
       # expressions that search for the literal string
@@ -294,49 +314,6 @@ module RubyExpect
         end
         escaped_patterns
       end
-
-      #####
-      # The read loop is an internal method that constantly waits for input to
-      # arrive on the IO object.  When input arrives it is appended to an
-      # internal buffer for use by the expect method
-      #
-      def read_loop
-        Thread.abort_on_exception = true
-        Thread.new do
-          while (true)
-            begin
-              ready = IO.select([@read_fh], nil, nil, 1)
-              if (ready.nil? || ready.size == 0)
-                @buffer_cv.signal()
-              else
-                if (@read_fh.eof?)
-                  @read_fh.close
-                  @buffer_cv.signal()
-                  break
-                else
-                  input = @read_fh.readpartial(4096)
-                  @buffer_sem.synchronize do
-                    @buffer << input
-                    @buffer_cv.signal()
-                  end
-                  if (@debug)
-                    STDERR.print input
-                    STDERR.flush
-                  end
-                end
-              end
-            rescue EOFError => e
-            rescue Exception => e
-              unless (e.to_s == 'stream closed')
-                STDERR.puts "Exception in read_loop:"
-                STDERR.puts "#{e}"
-                STDERR.puts "\t#{e.backtrace.join("\n\t")}"
-              end
-              break
-            end
-          end
-        end
-      end
   end
 end
 

metadata

@@ -1,66 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby_expect
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+version: !ruby/object:Gem::Version
+  version: '1.2'
 platform: ruby
-authors: 
+authors:
 - Andrew Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-21 00:00:00 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby implementation for send/expect interaction
 email: abates@omeganetserv.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ruby_expect.rb
 - lib/ruby_expect/expect.rb
 - lib/ruby_expect/procedure.rb
 homepage: https://github.com/abates/ruby_expect
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: This is a simple expect implementation that provides interactive access to IO objects
+specification_version: 4
+summary: This is a simple expect implementation that provides interactive access to
+  IO objects
 test_files: []
-