cexpect 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6bc730347682ee7cb83f6397e57cdbd97441469bcdd23a45762ead541fa65b
-  data.tar.gz: ddb67b29b21e989a3f885a25464166c9f641bd72c7bc8546cfe7bf695fdcd7b9
+  metadata.gz: beaafefd8da9cc27f26ca3ec0e6aa72c5d74e7c693d1fbd47fec019975636511
+  data.tar.gz: 468e494c7a35350c51f629ba486888f107c69f009bbec7be43a388c8d94992a1
 SHA512:
-  metadata.gz: 5eac45f42370b2bd9bd373f064330b45d7ad325d0c2cdd278b1901969bd30e0aef3f906ac4602a152736868c13cf2af6b204c3e8a787439c1863f4be40acc9b5
-  data.tar.gz: d1c3f35a437e74295bbfe7aecd2334439e849ea2cbabec7f78d0a31a2d28760f04ca80f859448b6a2cc82e5a2ad35ce3719e77f994e256a03d5875ef133dbad0
+  metadata.gz: 81abfc895b814481b8cb1c261696f597f93833212eed8120f53ace4d16f7ed521f6533db05f23fad9c482a9494751a6b3b80984954898c515582d3618e0137be
+  data.tar.gz: 939d84e0607b7bb23546cbdd9c8898b2fe9f6710613417e960128ef198cf173043acae2c150943c3dffc9d7f9bda93e1859dc4482cf3745bff2901bcf844b8cb

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # 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@v1.70.1
+      with:
+        ruby-version: 3.0
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    cexpect (0.1.1)
+    cexpect (0.3.0)
 
 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/cexpect.gemspec

@@ -4,7 +4,7 @@ require_relative 'lib/cexpect/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cexpect'
-  spec.version       = Cexpect::VERSION
+  spec.version       = CExpect::VERSION
   spec.authors       = ['Christer Jansson']
   spec.email         = ['christer@janssons.org']
 

data/lib/cexpect.rb

@@ -1,33 +1,26 @@
 # frozen_string_literal: true
 
+require 'cexpect/module_methods'
 require 'delegate'
 require 'observer'
-require 'pty'
 
 #
 # A module for supplying a different expect method
 #
 module CExpect
-  def self.spawn(*args)
-    original_rd, wr, pid = PTY.spawn(*args)
-    rd = CExpect::Reader.new(original_rd)
-    if block_given?
-      yield(rd, wr, pid)
-    else
-      [rd, wr, pid]
-    end
-  end
+  extend CExpect::ModuleMethods
 
   #
-  # A class delegating normal operations to a wrapped IO, adding an
-  # expect method
+  # A class delegating normal operations to a wrapped IO, adding
+  # expect methods
   #
   class Reader < SimpleDelegator
-    include Observable
+    def add_observer(*args)
+      extend Observable # overwrites this method with Observable#add_observer
+      # Call the new add_observer method
+      add_observer(*args)
 
-    def initialize(_original)
-      @leftovers = ''
-      super
+      extend LoggingReader
     end
 
     def expect(pat, timeout = nil, match_method: :re_match)
@@ -53,22 +46,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?
@@ -76,13 +64,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
@@ -91,4 +72,16 @@ module CExpect
       buf[0, buf.size - pat.size] if buf.end_with?(pat)
     end
   end
+
+  #
+  # Adds logging capability
+  #
+  module LoggingReader
+    def log(pat, buf)
+      return if count_observers.zero?
+
+      changed
+      notify_observers(pat, buf)
+    end
+  end
 end

data/lib/cexpect/module_methods.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'pty'
+
+module CExpect
+  #
+  # Module methods for CExpect
+  #
+  module ModuleMethods
+    #
+    # Assume first element benefits from using CExpect
+    #
+    # This generalization is a bit iffy; it works for class methods
+    # that returns and yields an IO reader first, followed by any
+    # other parameters. But hey, if we need to wrap things that behave
+    # differently, we can just give this one (and its shared examples
+    # in the specs) a more specific name and implement another.
+    #
+    def cexpect_wrap(array, &block)
+      array[0] = CExpect::Reader.new(array[0])
+      if block_given?
+        block.call(*array)
+      else
+        array
+      end
+    end
+
+    def pipe(*args, &block)
+      cexpect_wrap(IO.pipe(*args), &block)
+    end
+
+    def spawn(*args, &block)
+      cexpect_wrap(PTY.spawn(*args), &block)
+    end
+  end
+end

data/lib/cexpect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module Cexpect
-  VERSION = '0.1.2'
+module CExpect
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cexpect
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Christer Jansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies: []
 description: An expect method with more reasonable return values and logging functionality
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -31,6 +32,7 @@ files:
 - bin/setup
 - cexpect.gemspec
 - lib/cexpect.rb
+- lib/cexpect/module_methods.rb
 - lib/cexpect/version.rb
 homepage: https://github.com/kondensatorn/cexpect
 licenses:
@@ -54,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