cexpect 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d6f51d1822901ccaef277fd26017749f6d65ed3eaea50836fa2fbe5b7e90410
-  data.tar.gz: 9eade35e51126e2ce00f99a02f3f1052f09314ecd19b516cb51f0d7ea4438139
+  metadata.gz: 82f8818774396505796ae2599538cbd7be691b63040a08b0b47632b61d46034d
+  data.tar.gz: 9fe872b5fe1ca1177f61f3c821060a4cedfeb3f9ac6699c05ec672466f697249
 SHA512:
-  metadata.gz: 28a4cc9e4edfa0b18fa6d57f0c43f0fefae54b8872de8fe09c56595b31bf203a0aa5a24fe8005ebc737483c5a7d5e293fdd1d95276a57faccb717e786420ddc1
-  data.tar.gz: 180e097fe5134c7527264a9a464bb5d4c27a8317dd08aef3886a560e997a00f1836f6740987fe6ccf83e8f181be8e5509f6a0ad2849b5788f89d9ac60312c1d6
+  metadata.gz: b0d23bd1fd740490889d8fd0bd19b8c221b766eeab9c24e425605792e80c0f787686f189c51eb36934d12371b1a8ac9f0c23a8bd429d7cabd7d27d40e2808ae3
+  data.tar.gz: b668abcda69c2e833a68157a082e215d560119a88483c42201d6872906e7db78d46e47f090b5982075d641eafe2960edd1ae83b21293fd6da0bfde6194b2ddb9

data/.rubocop.yml

@@ -4,13 +4,11 @@ AllCops:
   Exclude:
     - 'bin/{console,setup}' # not mine
     - 'Gemfile'             # maintained through "bundle" command
+  NewCops: enable
 
 # TODO: Clean up tests
 RSpec/ExpectInHook:
   Enabled: false
-RSpec/FilePath:
-  Exclude:
-    - spec/cexpect_spec.rb
 RSpec/MessageSpies:
   Enabled: false
 RSpec/NestedGroups:

data/Gemfile

@@ -3,8 +3,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in cexpect.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 0.82.0"
-gem "rubocop-rspec", "~> 1.38"
+gem "rake", "~> 13.2"
+gem "rspec", "~> 3.13"
+gem "rspec-support", "~> 3.13.1"
+gem "rubocop", "~> 1.65"
+gem "rubocop-rspec", "~> 3.0"

data/Gemfile.lock

@@ -1,55 +1,68 @@
 PATH
   remote: .
   specs:
-    cexpect (0.1.4)
+    cexpect (0.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.4.4)
-    jaro_winkler (1.5.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    diff-lcs (1.5.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    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)
+      racc
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.4)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.65.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 2.4, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rspec (1.41.0)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
+    ruby-progressbar (1.13.0)
+    strscan (3.1.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
+  x86_64-darwin-23
 
 DEPENDENCIES
   cexpect!
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  rubocop (~> 0.82.0)
-  rubocop-rspec (~> 1.38)
+  rake (~> 13.2)
+  rspec (~> 3.13)
+  rspec-support (~> 3.13.1)
+  rubocop (~> 1.65)
+  rubocop-rspec (~> 3.0)
 
 BUNDLED WITH
-   2.1.4
+   2.5.17

data/README.md

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

data/cexpect.gemspec

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop: disable Gemspec/RequireMFA
+
 require_relative 'lib/cexpect/version'
 
 Gem::Specification.new do |spec|
@@ -9,11 +11,11 @@ Gem::Specification.new do |spec|
   spec.email         = ['christer@janssons.org']
 
   spec.summary       = 'An improved expect method'
-  spec.description   = 'An expect method with more reasonable return' \
-                       ' values and logging functionality'
+  spec.description   = 'An expect method with more reasonable return ' \
+                       'values and logging functionality'
   spec.homepage      = 'https://github.com/kondensatorn/cexpect'
   spec.license       = 'BSD-2-Clause'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -30,3 +32,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 end
+
+# rubocop: enable Gemspec/RequireMFA

data/lib/cexpect/version.rb

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

data/lib/cexpect.rb

@@ -11,13 +11,16 @@ module CExpect
   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
-    def initialize(io, observers = nil)
-      extend(LoggingReader) if observers
-      super(io)
+    def add_observer(*args)
+      extend Observable # overwrites this method with Observable#add_observer
+      # Call the new add_observer method
+      add_observer(*args)
+
+      extend LoggingReader
     end
 
     def expect(pat, timeout = nil, match_method: :re_match)
@@ -56,7 +59,7 @@ module CExpect
     def getc(timeout)
       rd = __getobj__
 
-      return nil if !IO.select([rd], nil, nil, timeout) || eof?
+      return nil if !rd.wait_readable(timeout) || eof?
 
       rd.getc.chr
     end
@@ -71,11 +74,9 @@ module CExpect
   end
 
   #
-  # Adds logging capability when observers are given to constructor
+  # Adds logging capability
   #
   module LoggingReader
-    include Observable
-
     def log(pat, buf)
       return if count_observers.zero?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cexpect
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Christer Jansson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies: []
 description: An expect method with more reasonable return values and logging functionality
 email:
@@ -41,7 +41,7 @@ metadata:
   homepage_uri: https://github.com/kondensatorn/cexpect
   source_code_uri: https://github.com/kondensatorn/cexpect
   changelog_uri: https://github.com/kondensatorn/cexpect/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -49,15 +49,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.15
+signing_key:
 specification_version: 4
 summary: An improved expect method
 test_files: []