kommando 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 087165e6259c0a09ac7fb5eaf432338dd92fe9b6
-  data.tar.gz: 06ff447d8ee0ebadce51fae705628cef8877d08d
+  metadata.gz: 8f31bfc50087990d25272c5bb0bd2d45967dfb70
+  data.tar.gz: 8ee8d780d34cc47e500bcb0479d7d9e80934c65b
 SHA512:
-  metadata.gz: 378bdaa26cda65cd3cd154501578cddc3a6e34c19e573ac3a3bf92bb270d2cecdec64a91eb1ded589cd641b2520cac7d9f8e6d4521d52bd20f13b2eef2ad08c6
-  data.tar.gz: 961ed2f546c6edf6b81091a0988128331dbc485cdb25d71d7f7fefd83ba22ecdc4352d9ce73f4dcb810343a45d2683e984b1831fde3a70499d02efff9138ca18
+  metadata.gz: a4b6b2dc55fcbfbe5c95e270d7ce48424eaf1e6a46b57c7f002c3cda1fc51e3858e93f9f866fcd6801f134f0247e395551ce9b0b7cfb34dbecc8872bd06eaee7
+  data.tar.gz: 526e8c68a2543d69422d22904ccb3561dcddfbeefa4a64a45f0b9566caf045183a1c80d41e4e84bc98f60ff6fac7c00fe21f72f322831407637b9d2be8edeccf

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 *.gem
+.byebug_history

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.0.12
+Support for matching out and running code on match.
+
+ - FEAT: Out matching with `out.on /regexp/, block`.
+ - EXAMPLES: `stderr_to_out.rb`, `in_shell.rb` and `nano_match.rb`
+
 ## 0.0.11
 STDIN support.
 

data/bin/release

@@ -7,7 +7,7 @@ fi
 
 set -e
 
-rake
+rake; rake; rake
 bin/e2e
 bin/stress 2 10
 

data/bin/stress

@@ -35,6 +35,7 @@ puts "starting #{number_of_threads} threads for #{number_of_iterations} iteratio
 threads = []
 number_of_threads.times do |i|
   threads << Thread.new do
+    sleep(rand(0.9)) # rampup
     stress number_of_iterations
   end
 end

data/examples/in_shell.rb

@@ -0,0 +1,16 @@
+require "./lib/kommando"
+
+k = Kommando.new "$ printf 'name: '; read N; printf \"lol, $N\n\"", {
+  output: true
+}
+
+k.out.on "name: " do
+  k.out.on /^lol, [^\n]+\r\n/ do
+    puts "Matched 'lol, USERINPUT\\r\\n' on stdout"
+  end
+
+  k.in << "hello\n"
+
+end
+
+k.run

data/examples/nano.rb

@@ -22,3 +22,5 @@ Thread.new do
 end
 
 k.run
+
+`reset`  #TODO: how to reset in kommando?

data/examples/nano_match.rb

@@ -0,0 +1,24 @@
+require "./lib/kommando"
+require "tempfile"
+
+scratch = Tempfile.new
+
+k = Kommando.new "nano scratch.path", {
+  output: true
+}
+k.out.on "GNU nano" do
+  k.in << "hello\r"
+  k.in << "\x1B\x1Bx"
+
+  k.out.on "Save modified buffer" do
+    k.in << "y"
+
+    k.out.on "File Name to Write" do
+      k.in << "\r"
+    end
+  end
+end
+
+k.run
+
+`reset` #TODO: reset in kommando

data/examples/stderr_to_out.rb

@@ -0,0 +1,7 @@
+require "./lib/kommando"
+
+k = Kommando.new "$ (>&2 echo 'err'); echo 'out'"
+k.run
+
+raise "err" unless k.out == "err\r\nout"
+puts k.out

data/kommando.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-autotest", "~> 1.0"
   spec.add_development_dependency "ZenTest", "~> 4.11"
+  spec.add_development_dependency "byebug"
 end

data/lib/kommando.rb

@@ -36,6 +36,9 @@ class Kommando
     @pid = nil
 
     @shell = false
+
+    @matchers = {}
+    @matcher_buffer = ""
   end
 
   def run_async
@@ -130,16 +133,30 @@ class Kommando
             @stdout.append c if 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
 
         thread_stdin = Thread.new do
+          sleep 0.1 # allow program to start, do not write "in terminal"
           while true do
             c = @stdin.getc
             unless c
               sleep 0.01
               next
             end
+
             stdin.write c
           end
         end
@@ -188,11 +205,19 @@ class Kommando
   end
 
   def out
-    if @shell
+    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
   end
 
   def code

data/lib/kommando/buffer.rb

@@ -2,6 +2,8 @@ class Kommando::Buffer
 
   def initialize
     @buffer = []
+
+    @matchers = {}
   end
 
   def append(string)
@@ -19,4 +21,8 @@ class Kommando::Buffer
   def getc
     @buffer.shift
   end
+
+  def on(matcher, &block)
+    @matchers[matcher] = block
+  end
 end

data/lib/kommando/version.rb

@@ -1,3 +1,3 @@
 class Kommando
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.11'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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
@@ -108,11 +122,14 @@ files:
 - examples/env.rb
 - examples/exit.rb
 - examples/in.rb
+- examples/in_shell.rb
 - examples/kill.rb
 - examples/live_output.rb
 - examples/nano.rb
+- examples/nano_match.rb
 - examples/ping.rb
 - examples/shell.rb
+- examples/stderr_to_out.rb
 - examples/stdout_to_file.rb
 - examples/timeout.rb
 - examples/uptime.rb