cexpect 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edad159cd5db7b5838ff5f483242b93b0bdd20062e8d7b51c9f500a19e25b535
-  data.tar.gz: eac146a9da3b515f422aa0b1dee779362b802649f0cedfff5fa703a4e03ee2a6
+  metadata.gz: 7d6f51d1822901ccaef277fd26017749f6d65ed3eaea50836fa2fbe5b7e90410
+  data.tar.gz: 9eade35e51126e2ce00f99a02f3f1052f09314ecd19b516cb51f0d7ea4438139
 SHA512:
-  metadata.gz: 791c836396b9b0228dc79bd91f1f9467bd0846d344ae89d034ca87b910151307153da309239a0b17ee58deece2ad086bfa5b7b071c035c2105139ec172fa2bae
-  data.tar.gz: 5413b0e772416590c42436b2783aea05cbc2af41f20a35d8c0d4225b814c60c3a92cc173b5c1d51d42ecd324c0492f7204752f1b89648491574fc841d6f1c6d8
+  metadata.gz: 28a4cc9e4edfa0b18fa6d57f0c43f0fefae54b8872de8fe09c56595b31bf203a0aa5a24fe8005ebc737483c5a7d5e293fdd1d95276a57faccb717e786420ddc1
+  data.tar.gz: 180e097fe5134c7527264a9a464bb5d4c27a8317dd08aef3886a560e997a00f1836f6740987fe6ccf83e8f181be8e5509f6a0ad2849b5788f89d9ac60312c1d6

data/.github/workflows/ruby.yml

@@ -24,9 +24,9 @@ jobs:
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
     # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      uses: ruby/setup-ruby@v1.70.1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.0
     - name: Install dependencies
       run: bundle install
     - name: Run tests

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    cexpect (0.1.3)
+    cexpect (0.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    diff-lcs (1.3)
+    ast (2.4.2)
+    diff-lcs (1.4.4)
     jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (12.3.3)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -36,9 +36,9 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rspec (1.38.1)
+    rubocop-rspec (1.41.0)
       rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     unicode-display_width (1.7.0)
 
 PLATFORMS

data/README.md

@@ -69,6 +69,9 @@ rd = CExpect::Reader.new(orig_rd)
 
 wr.puts "Hello, World!\n"
 greeting = rd.fexpect("\n")
+
+# If you want logging
+
 ```
 
 ## Development

data/lib/cexpect.rb

@@ -15,11 +15,9 @@ module CExpect
   # expect method
   #
   class Reader < SimpleDelegator
-    include Observable
-
-    def initialize(_original)
-      @leftovers = ''
-      super
+    def initialize(io, observers = nil)
+      extend(LoggingReader) if observers
+      super(io)
     end
 
     def expect(pat, timeout = nil, match_method: :re_match)
@@ -45,22 +43,17 @@ module CExpect
     def expect_try(pat, buf, timeout, match_method)
       c = getc(timeout)
 
-      if c.nil?
-        @leftovers = buf
-        throw(:result, nil)
-      end
+      throw(:result, nil) if c.nil?
 
       buf << c
 
-      log(pat, buf)
+      log(pat, buf) if respond_to?(:log)
 
       result = send(match_method, buf, pat)
       throw(:result, result) if result
     end
 
     def getc(timeout)
-      return @leftovers.slice!(0).chr unless @leftovers.empty?
-
       rd = __getobj__
 
       return nil if !IO.select([rd], nil, nil, timeout) || eof?
@@ -68,13 +61,6 @@ module CExpect
       rd.getc.chr
     end
 
-    def log(pat, buf)
-      return if count_observers.zero?
-
-      changed
-      notify_observers(pat, buf)
-    end
-
     def re_match(buf, pat)
       buf.match(pat)
     end
@@ -83,4 +69,18 @@ module CExpect
       buf[0, buf.size - pat.size] if buf.end_with?(pat)
     end
   end
+
+  #
+  # Adds logging capability when observers are given to constructor
+  #
+  module LoggingReader
+    include Observable
+
+    def log(pat, buf)
+      return if count_observers.zero?
+
+      changed
+      notify_observers(pat, buf)
+    end
+  end
 end

data/lib/cexpect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CExpect
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cexpect
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Christer Jansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies: []
 description: An expect method with more reasonable return values and logging functionality
 email:
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An improved expect method