kommando 0.0.22 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d04e223cee14a391a08470955f57eaa63009148
-  data.tar.gz: 58629080acfb3bc56c0f071283a652ea90ebacd5
+  metadata.gz: 06f39743982905083dccf326b8edd83f882cefa4
+  data.tar.gz: f7eb8a290c764606b716c2b15a451179502eb716
 SHA512:
-  metadata.gz: bebe0fa396b5e2be603e7454550e11a1098135df56c0e9529bd7bc6a0a2213789146147d36043eff7877a0ff8080fb4d0ec2c2b7dacff2202862d57b45f4d348
-  data.tar.gz: 5b6f6f11dae84848a166d9b9ee76150659d1d29feda6f91263b4e3c394e9e92d174a395c94f3ccd8cb3ef66479b8dde9c4a41c5797904b98ee58be66781443f5
+  metadata.gz: c913d9b57655dfd1768c682cba99f0f0109c8cad22d2eff6a024c68c1b85e75672fab5449295f4ce9cfee0917994507f76bf338ecfdcbc21e79cd3aa3b523814
+  data.tar.gz: 2fead68560757c6bad67aa22d663fa59cce61587bab9b52ed7e01f7ea6b71d379c468e230f0549bbe5e7c2963ab5eeac1cf1668aa492c6648e74b2811ccd859f

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 *.gem
 .byebug_history
+/profiles

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.1

data/.travis.yml

@@ -1,4 +1,16 @@
+dist: trusty
 language: ruby
 rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -yqq nano
+  - gem install bundler
+install:
+  - bundle
+script:
+  - rake
+  - bin/e2e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 0.1.0
+- DOCS: `demos/ping_monitor.rb`
+- FEAT: `k.out.once` can chain `k.out.every` (`k.out.once(/smth/).every(/aftersmth/)`
+- FEAT: `k.out.every` can chain `k.out.once` (`k.out.every(/smth/).once(/aftersmth/)`
+- FEAT: MatchData will be passed as the first argument of the proc on `k.once` and `k.every`
+- FEAT: `k.out.every` matching with chaining
+- FEAT: `k.out.once` matching with chaining (will deprecate `k.on`)
+- FEAT: Ruby 2.1 compatibility
+- FEAT: `k.when` returns `k` so when's can be defined as a chain
+- FIX: Ruby 2.4 Fixnum deprecation warning
+
 ## 0.0.22
 - FEAT: Global whens with `Kommando.when :timeout block` and clearing with `Kommando.when = nil`
 - FEAT: Context available with `k.when :timeout do |kontextual_k|` and `Kommando.when :timeout |kontextual_k|`

data/README.md

@@ -1,4 +1,5 @@
 # Kommando
+[![Build Status](https://travis-ci.org/matti/kommando.svg?branch=master)](https://travis-ci.org/matti/kommando)
 
 Command runner with expect-like features. Great for integration testing.
 
@@ -115,6 +116,14 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bin/release`, which will run all tests, create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Notes
+
+```
+RSPEC_PROFILE=each rake spec
+RSPEC_PROFILE=all rake spec
+# --> profiles directory
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/matti/kommando.

data/bin/autotest

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+while true; do
+  rake
+  read input
+done

data/bin/e2e

@@ -6,7 +6,7 @@ require 'tempfile'
 find_examples = Kommando.new "find examples -type f -name *"
 find_examples.run
 
-e2e_output = Tempfile.new
+e2e_output = Tempfile.new "test"
 
 for example in find_examples.out.split("\r\n") do
   print "Running #{example} ".ljust(74, ".")

data/bin/matrix

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+require "./lib/kommando"
+require "yaml"
+
+docker_compose=YAML.load(File.read("docker-compose.yml"))
+services = docker_compose["services"].keys
+
+Kommando.run("docker-compose build", {
+  output: true
+}).when(:failed) {
+  raise "build failed"
+}
+
+ks = []
+for service in services
+  k = Kommando.new "docker-compose up #{service}"
+  k.run_async
+  ks << k
+end
+
+loop do
+  for k in ks do
+    cmd=k.instance_variable_get(:@cmd)
+    puts "#{cmd} (#{(k.code ? "STOP" : "RUNNING")})"
+
+    if k.code
+      puts k.out
+      exit 1
+    end
+  end
+
+  print "-"*20; puts " #{DateTime.now.to_s}"
+  sleep 2
+end

data/bin/release

@@ -9,7 +9,8 @@ set -e
 
 rake; rake; rake
 bin/e2e
-#bin/stress 2 10
+#bin/matrix
+bin/stress 2 10
 
 echo
 head CHANGELOG.md

data/demos/ping_monitor.rb

@@ -0,0 +1,19 @@
+require "./lib/kommando"
+
+k = Kommando.new "ping -i 0.2 127.0.0.1"
+
+k.out.every /time=(\d+\.\d+)\s/ do |m|
+  time = m[1].to_f
+  print "#{time} ".ljust(6)
+  puts "x" * (time*300.to_i)
+end
+
+k.out.once(/^PING.+\n$/).every(/^(.+)\r\n/) do |m|
+  unless m[1].start_with? "64 bytes from"
+    puts "ERR: unexpected reply: #{m[1]}"
+    exit 1
+  end
+end
+
+
+k.run

data/docker-compose.yml

@@ -0,0 +1,27 @@
+version: '2.1'
+
+services:
+  alpine:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.alpine
+
+  debian:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.debian
+
+  alpine-2.1:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.alpine-2.1
+
+  alpine-2.2:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.alpine-2.2
+
+  alpine-2.3:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.alpine-2.3

data/docker/Dockerfile.alpine

@@ -0,0 +1,14 @@
+FROM ruby:2.4.1-alpine
+
+RUN apk add --no-cache \
+  git build-base \
+  nano bash
+
+WORKDIR /app
+
+COPY Gemfile Gemfile.lock kommando.gemspec ./
+COPY lib/kommando/version.rb ./lib/kommando/
+RUN bundle install
+
+COPY . .
+ENTRYPOINT docker/entrypoint.sh

data/docker/Dockerfile.alpine-2.1

@@ -0,0 +1,14 @@
+FROM ruby:2.1-alpine
+
+RUN apk add --no-cache \
+  git build-base \
+  nano bash
+
+WORKDIR /app
+
+COPY Gemfile Gemfile.lock kommando.gemspec ./
+COPY lib/kommando/version.rb ./lib/kommando/
+RUN bundle install
+
+COPY . .
+ENTRYPOINT docker/entrypoint.sh

data/docker/Dockerfile.alpine-2.2

@@ -0,0 +1,14 @@
+FROM ruby:2.2-alpine
+
+RUN apk add --no-cache \
+  git build-base \
+  nano bash
+
+WORKDIR /app
+
+COPY Gemfile Gemfile.lock kommando.gemspec ./
+COPY lib/kommando/version.rb ./lib/kommando/
+RUN bundle install
+
+COPY . .
+ENTRYPOINT docker/entrypoint.sh

data/docker/Dockerfile.alpine-2.3

@@ -0,0 +1,14 @@
+FROM ruby:2.3-alpine
+
+RUN apk add --no-cache \
+  git build-base \
+  nano bash
+
+WORKDIR /app
+
+COPY Gemfile Gemfile.lock kommando.gemspec ./
+COPY lib/kommando/version.rb ./lib/kommando/
+RUN bundle install
+
+COPY . .
+ENTRYPOINT docker/entrypoint.sh

data/docker/Dockerfile.debian

@@ -0,0 +1,13 @@
+FROM ruby:2.4.1
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y nano
+
+WORKDIR /app
+
+COPY Gemfile Gemfile.lock kommando.gemspec ./
+COPY lib/kommando/version.rb ./lib/kommando/
+RUN bundle install
+
+COPY . .
+ENTRYPOINT docker/entrypoint.sh

data/docker/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+set -e
+
+while true; do
+  rake
+done

data/examples/every.rb

@@ -0,0 +1,23 @@
+require "./lib/kommando"
+
+calls = []
+calls_chained = []
+
+k = Kommando.new("$ echo hello hello hello hell", {
+  output: false
+})
+
+k.out.every("hello") do
+  calls << :got_hello
+end
+
+k.out.every("hello") do
+  calls_chained << :got_hello
+end.every("hell") do
+  calls_chained << :got_hell
+end
+
+k.run
+
+raise "err" unless calls == [:got_hello, :got_hello, :got_hello]
+raise "err chained" unless calls_chained == [:got_hello, :got_hell, :got_hello, :got_hell, :got_hello, :got_hell]

data/examples/every_ping.rb

@@ -0,0 +1,15 @@
+require "./lib/kommando"
+
+calls = []
+
+k = Kommando.new("ping -c 2 -i 0.2 127.0.0.1", {
+  output: false
+})
+
+k.out.every(/from (\d+\.\d+\.\d+\.\d+):/) do |m|
+  calls << m[1]
+end
+
+k.run
+
+raise "err" unless calls == ["127.0.0.1", "127.0.0.1"]

data/examples/k_visibility.rb

@@ -0,0 +1,15 @@
+require "./lib/kommando"
+
+k_in_when, k_in_out_on = nil, nil
+
+k = Kommando.new "$ echo something"
+k.when(:exit) do #NOTE: no |k| needed (naturally)
+  k_in_when = true if k
+end
+k.out.on("something") do
+  k_in_out_on = true if k
+end
+
+k.run
+
+raise "err" unless k_in_when && k_in_out_on

data/examples/kill.rb

@@ -2,7 +2,7 @@ require "./lib/kommando"
 
 k = Kommando.run_async "sleep 10"
 
-sleep 1
+sleep 0.1
 k.kill
 puts "..killed."
 

data/examples/live_output.rb

@@ -1,5 +1,5 @@
 require "./lib/kommando"
 
-Kommando.run "ping -c 3 127.0.0.1", {
+Kommando.run "ping -c 3 -i 0.2 127.0.0.1", {
   output: true
 }

data/examples/nano.rb

@@ -1,7 +1,7 @@
 require "./lib/kommando"
 require "tempfile"
 
-scratch = Tempfile.new
+scratch = Tempfile.new "test"
 
 k = Kommando.new "nano #{scratch.path}", {
   output: true

data/examples/nano_match.rb

@@ -1,7 +1,7 @@
 require "./lib/kommando"
 require "tempfile"
 
-scratch = Tempfile.new
+scratch = Tempfile.new "test"
 
 k = Kommando.new "nano #{scratch.path}", {
   output: true

data/examples/out_once.rb

@@ -0,0 +1,21 @@
+require "./lib/kommando"
+
+calls = []
+calls_matchdata = []
+
+k = Kommando.new("ping -c 3 -i 0.2 127.0.0.1", {
+  output: false
+})
+
+k.out.once("bytes") do
+  calls << :first
+end
+
+k.out.once(/from (\d+)\./) do |m|
+  calls_matchdata << m[1]
+end
+
+k.run
+
+raise "err" unless calls == [:first]
+raise "err matchdata" unless calls_matchdata == ["127"]

data/examples/out_once_chaining.rb

@@ -0,0 +1,29 @@
+require "./lib/kommando"
+
+calls_bytes = []
+calls_icmp = []
+calls_ttl_then_time = []
+
+k = Kommando.new("ping -c 3 -i 0.2 127.0.0.1", {
+  output: true
+})
+
+k.out.on("bytes") do
+  calls_bytes << :only_bytes
+end
+
+k.out.once("icmp_seq") do
+  calls_icmp << :first_icmp
+end.once("icmp_seq") do
+  calls_icmp << :second_icmp
+end
+
+k.out.once("ttl").once("time") do
+  calls_ttl_then_time << :only_ttl_then_time
+end
+
+k.run
+
+raise "err icmp" unless calls_icmp == [:first_icmp, :second_icmp]
+raise "err bytes" unless calls_bytes == [:only_bytes]
+raise "err ttl_then_time" unless calls_ttl_then_time == [:only_ttl_then_time]

data/examples/stdout_to_file.rb

@@ -1,9 +1,9 @@
 require "./lib/kommando"
 require "tempfile"
 
-outfile = Tempfile.new
+outfile = Tempfile.new "test"
 
-k = Kommando.new "ping -c 3 127.0.0.1", {
+k = Kommando.new "ping -c 3 -i 0.2 127.0.0.1", {
   output: outfile.path
 }
 

data/examples/timeout.rb

@@ -1,10 +1,10 @@
 require "./lib/kommando"
 
 k = Kommando.new "sleep 2", {
-  timeout: 0.5
+  timeout: 0.1
 }
 k2 = Kommando.new "sleep 2", {
-  timeout: 0.5
+  timeout: 0.1
 }
 
 did_run_timeout_callback = false

data/examples/when_chaining.rb

@@ -0,0 +1,15 @@
+require "./lib/kommando"
+
+calls = []
+k = Kommando.new("$ exit 0")
+k.when(:success) do
+  calls << :success
+end.when(:failed) do
+  calls << :failed  # should never happen
+end.when(:exit) do
+  calls << :exit
+end
+
+k.run
+
+raise "err" unless calls == [:exit, :success]

data/kommando.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/matti/kommando"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  if Dir.exist? ".git"
+    spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -27,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "stackprof"
   spec.add_development_dependency "trapper"
+  spec.add_development_dependency "rspec-prof"
 end

data/lib/kommando.rb

@@ -1,10 +1,15 @@
 require "pty"
 require "timeout"
 
+class Kommando
+end
+
 require_relative "kommando/error"
 require_relative "kommando/version"
-require_relative "kommando/buffer"
 require_relative "kommando/when"
+require_relative "kommando/stdout"
+require_relative "kommando/stdin"
+require_relative "kommando/matchers"
 
 class Kommando
   class << self
@@ -38,7 +43,6 @@ class Kommando
       @@timeout=value
     end
 
-
     def when(event_name, &block)
       @@whens ||= Kommando::When.new
       @@whens.register event_name, block
@@ -53,8 +57,9 @@ class Kommando
     Thread.abort_on_exception=true
 
     @cmd = cmd
-    @stdout = Buffer.new
-    @stdin = Buffer.new
+    @shell = @cmd.start_with? "$"
+    @stdout = Kommando::Stdout.new @shell
+    @stdin = Kommando::Stdin.new
 
     @output_stdout = opts[:output] == true
     @output_file = if opts[:output].class == String
@@ -63,7 +68,7 @@ class Kommando
 
     @timeout = if opts[:timeout].class == Float
       opts[:timeout]
-    elsif opts[:timeout].class == Fixnum
+    elsif opts[:timeout].class.to_s == "Integer" || opts[:timeout].class.to_s == "Fixnum"
       opts[:timeout].to_f
     else
       @timeout = @@timeout
@@ -94,11 +99,6 @@ class Kommando
     @thread = nil
     @pid = nil
 
-    @shell = false
-
-    @matchers = {}
-    @matcher_buffer = ""
-
     @whens = {}
     @when = When.new(self)
 
@@ -138,8 +138,7 @@ class Kommando
     return false if @executed
     @executed = true
 
-    command, *args = if @cmd.start_with? "$"
-      @shell = true
+    command, *args = if @shell
       trash, line = @cmd.split "$", 2
       line.lstrip!
       ["bash", "-c", line]
@@ -270,16 +269,16 @@ class Kommando
         137
       else
         begin
-          Timeout.timeout(0.1) do
-            Process.wait @pid if @pid
-          end
+          Process.wait @pid if @pid
         rescue Errno::ECHILD => ex
           # safe to supress, I guess
-        rescue Timeout::Error => ex
-          # seems to be okay...
         end
 
-        $?.exitstatus
+        if $?
+          $?.exitstatus
+        else
+          137   # sometimes with ruby2.1 ? (maybefix now?)
+        end
       end
 
       @when.fire :error if @rescue_happened
@@ -298,19 +297,7 @@ class Kommando
   end
 
   def out
-    string = if @shell
-      @stdout.to_s.strip
-    else
-      @stdout.to_s
-    end
-
-    kommando = self
-    string.define_singleton_method(:on) do |matcher, &block|
-      matchers = kommando.instance_variable_get(:@matchers)
-      matchers[matcher] = block
-    end
-
-    string
+    @stdout.to_s
   end
 
   def code
@@ -333,6 +320,7 @@ class Kommando
 
   def when(event, &block)
     @when.register event, block
+    self
   end
 
   private
@@ -375,21 +363,9 @@ class Kommando
       break if flushing == true && c == nil
       next unless c
 
-      @stdout.append c if c
+      @stdout << c
       print c if @output_stdout
       stdout_file.write c if @output_file
-
-      if c
-        @matcher_buffer << c
-
-        matchers_copy = @matchers.clone # blocks can insert to @matchers while iteration is undergoing
-        matchers_copy.each_pair do |matcher,block|
-          if @matcher_buffer.match matcher
-            block.call
-            @matchers.delete matcher # do not match again  TODO: is this safe?
-          end
-        end
-      end
     end
   end
 

data/lib/kommando/matchers.rb

@@ -0,0 +1,6 @@
+module Kommando::Matchers
+end
+
+require_relative "matchers/base"
+require_relative "matchers/once"
+require_relative "matchers/every"

data/lib/kommando/matchers/base.rb

@@ -0,0 +1,31 @@
+class Kommando::Matchers::Base
+  attr_reader :nested_matchers
+  
+  def initialize(regexp, block)
+    @regexp = regexp
+    @block = block
+
+    @nested_matchers = []
+  end
+
+  def match(string)
+    raise "#match not implemented"
+  end
+
+  def call(match_data=nil)
+    return unless @block
+    @block.call match_data
+  end
+
+  def once(regexp, &block)
+    m = Kommando::Matchers::Once.new regexp, block
+    @nested_matchers << m
+    m
+  end
+
+  def every(regexp, &block)
+    m = Kommando::Matchers::Every.new regexp, block
+    @nested_matchers << m
+    m
+  end
+end

data/lib/kommando/matchers/every.rb

@@ -0,0 +1,16 @@
+class Kommando::Matchers::Every < Kommando::Matchers::Base
+  def initialize(regexp, block)
+    super regexp, block
+    @cursor = 0
+  end
+
+  def match(string)
+    match_data = string[@cursor..-1].match(@regexp)
+    @cursor = string.length if match_data
+    match_data
+  end
+
+  def skip_by(string)
+    @cursor = string.length
+  end
+end

data/lib/kommando/matchers/once.rb

@@ -0,0 +1,5 @@
+class Kommando::Matchers::Once < Kommando::Matchers::Base
+  def match(string)
+    string.match(@regexp)
+  end
+end

data/lib/kommando/stdin.rb

@@ -0,0 +1,22 @@
+class Kommando; class Stdin
+  def initialize
+    @buffer = []
+  end
+
+	def getc
+    @buffer.shift
+	end
+
+	def <<(string)
+    @buffer << string
+	end
+
+  def write(string)
+    self << string
+  end
+
+  def writeln(string)
+    self << string << "\r"
+  end
+end
+end

data/lib/kommando/stdout.rb

@@ -0,0 +1,61 @@
+class Kommando; class Stdout
+  def initialize(shell)
+    @buffer = []
+    @matchers = []
+    @matcher_buffer = ""
+
+    @shell = shell
+  end
+
+  def <<(c)
+    @buffer << c
+    @matcher_buffer << c
+
+    matchers_copy = @matchers.clone # blocks can insert to @matchers while iteration is undergoing
+    matchers_copy.each do |matcher|
+      if (match_data = matcher.match @matcher_buffer)
+        matcher.call match_data
+        unless matcher.class == Kommando::Matchers::Every
+          @matchers.delete matcher  #TODO: is this safe?
+        end
+
+        matcher.nested_matchers.each do |nested_matcher|
+          if nested_matcher.class == Kommando::Matchers::Every
+            nested_matcher.skip_by(@matcher_buffer)
+          end
+          @matchers = @matchers + [nested_matcher] #TODO: is this safe?
+        end
+      end
+    end
+  end
+
+  def to_s
+    string = @buffer.join ""
+
+    #TODO: this behaviour maybe makes no sense?
+    string.strip! if @shell
+
+    matchers = @matchers
+    #TODO: deprecate .on
+    string.define_singleton_method(:on) do |regexp, &block|
+      m = Kommando::Matchers::Once.new regexp, block
+      matchers << m
+      m
+    end
+
+    string.define_singleton_method(:once) do |regexp, &block|
+      m = Kommando::Matchers::Once.new regexp, block
+      matchers << m
+      m
+    end
+
+    string.define_singleton_method(:every) do |regexp, &block|
+      m = Kommando::Matchers::Every.new regexp, block
+      matchers << m
+      m
+    end
+
+    string
+  end
+
+end; end

data/lib/kommando/version.rb

@@ -1,3 +1,3 @@
 class Kommando
-  VERSION = "0.0.22"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.1.0
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Great for integration testing.
 email:
 - matti.paksula@iki.fi
@@ -139,23 +153,38 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/autotest
 - bin/console
 - bin/e2e
 - bin/loop
+- bin/matrix
 - bin/reinstall
 - bin/release
 - bin/setup
 - bin/stress
 - bin/version
+- demos/ping_monitor.rb
+- docker-compose.yml
+- docker/Dockerfile.alpine
+- docker/Dockerfile.alpine-2.1
+- docker/Dockerfile.alpine-2.2
+- docker/Dockerfile.alpine-2.3
+- docker/Dockerfile.debian
+- docker/entrypoint.sh
 - examples/async.rb
 - examples/env.rb
+- examples/every.rb
+- examples/every_ping.rb
 - examples/exit.rb
 - examples/in.rb
 - examples/in_shell.rb
+- examples/k_visibility.rb
 - examples/kill.rb
 - examples/live_output.rb
 - examples/nano.rb
 - examples/nano_match.rb
+- examples/out_once.rb
+- examples/out_once_chaining.rb
 - examples/passwd.rb
 - examples/ping.rb
 - examples/shell.rb
@@ -168,10 +197,16 @@ files:
 - examples/uptime.rb
 - examples/wait.rb
 - examples/when.rb
+- examples/when_chaining.rb
 - kommando.gemspec
 - lib/kommando.rb
-- lib/kommando/buffer.rb
 - lib/kommando/error.rb
+- lib/kommando/matchers.rb
+- lib/kommando/matchers/base.rb
+- lib/kommando/matchers/every.rb
+- lib/kommando/matchers/once.rb
+- lib/kommando/stdin.rb
+- lib/kommando/stdout.rb
 - lib/kommando/version.rb
 - lib/kommando/when.rb
 - tests/forever_true.rb
@@ -197,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Command runner with expect-like features

data/lib/kommando/buffer.rb

@@ -1,36 +0,0 @@
-class Kommando::Buffer
-
-  def initialize
-    @buffer = []
-
-    @matchers = {}
-  end
-
-  def append(string)
-    @buffer << string
-  end
-
-  def to_s
-    @buffer.join ""
-  end
-
-  def <<(string)
-    @buffer << string
-  end
-
-  def write(string)
-    self << string
-  end
-
-  def writeln(string)
-    self.write "#{string}\r"
-  end
-
-  def getc
-    @buffer.shift
-  end
-
-  def on(matcher, &block)
-    @matchers[matcher] = block
-  end
-end