cexpect 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6bc730347682ee7cb83f6397e57cdbd97441469bcdd23a45762ead541fa65b
-  data.tar.gz: ddb67b29b21e989a3f885a25464166c9f641bd72c7bc8546cfe7bf695fdcd7b9
+  metadata.gz: 71a03d41938ba2bc030d57d1f9e001d3d46f83883229a403970d3c71944db525
+  data.tar.gz: 78821e42067945ed38b4074cacaa35d21d0709c1b81039f2e4c51e8962618be7
 SHA512:
-  metadata.gz: 5eac45f42370b2bd9bd373f064330b45d7ad325d0c2cdd278b1901969bd30e0aef3f906ac4602a152736868c13cf2af6b204c3e8a787439c1863f4be40acc9b5
-  data.tar.gz: d1c3f35a437e74295bbfe7aecd2334439e849ea2cbabec7f78d0a31a2d28760f04ca80f859448b6a2cc82e5a2ad35ce3719e77f994e256a03d5875ef133dbad0
+  metadata.gz: 5cd81fe419c51c3cc31cf5fe7eddb143502bcc156ab69dbd299196e2aac9b3c3b5c5d2fc05af169ee4fce94cb5007ab33a4538f01435de1e3a7979ccb2319893
+  data.tar.gz: a142379f43421f2b99e3fbe8d524ce2ce7b8fc7f69a81592b43c1b5fe9ce7489b0cf78c43deb44a5afd8dee5779fcea0b33b395f8c4e286224c397ef928123d0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cexpect (0.1.1)
+    cexpect (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/cexpect.rb

@@ -1,22 +1,14 @@
 # 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

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'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cexpect
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Christer Jansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies: []
 description: An expect method with more reasonable return values and logging functionality
 email:
@@ -31,6 +31,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: