kommando 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f39743982905083dccf326b8edd83f882cefa4
-  data.tar.gz: f7eb8a290c764606b716c2b15a451179502eb716
+  metadata.gz: 5a2293ea68b1d7c3e6fd7e3045a87aad8aee5ca3
+  data.tar.gz: ac8e7fcad1629c33147e8cbd637e30843758ba02
 SHA512:
-  metadata.gz: c913d9b57655dfd1768c682cba99f0f0109c8cad22d2eff6a024c68c1b85e75672fab5449295f4ce9cfee0917994507f76bf338ecfdcbc21e79cd3aa3b523814
-  data.tar.gz: 2fead68560757c6bad67aa22d663fa59cce61587bab9b52ed7e01f7ea6b71d379c468e230f0549bbe5e7c2963ab5eeac1cf1668aa492c6648e74b2811ccd859f
+  metadata.gz: 1f6e2bd07f08f2cc30977bb704ecf475e4e47b8b6552f24ffc13ed7a134973c81e01dff32bd52f49d5acb23e59365e05da0c50861925a5c8a26a176edb0ca67d
+  data.tar.gz: b3683acec3ee38045cb8348bb58ccc011dc7f6fc6a7eef0357376405ae91a20b7ef5164c682c3ed95d174b732e71b4d36481b542f99cc97912ea760f8b7a7be2

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.1.1
+- FIX: Use `sh` with `Kommando.run "$ ls"` if `bash` was not found.
+
 ## 0.1.0
 - DOCS: `demos/ping_monitor.rb`
 - FEAT: `k.out.once` can chain `k.out.every` (`k.out.once(/smth/).every(/aftersmth/)`

data/bin/matrix

@@ -2,6 +2,11 @@
 
 require "./lib/kommando"
 require "yaml"
+loops=if ARGV[0]
+  ARGV[0].to_i
+else
+  -1
+end
 
 docker_compose=YAML.load(File.read("docker-compose.yml"))
 services = docker_compose["services"].keys
@@ -19,17 +24,31 @@ for service in services
   ks << k
 end
 
+def cleanup(ks)
+  ks.map(&:kill)
+  Kommando.run "docker-compose down"
+end
+
 loop do
+  puts "loops: #{loops}"
+  loops = loops - 1
+
   for k in ks do
     cmd=k.instance_variable_get(:@cmd)
     puts "#{cmd} (#{(k.code ? "STOP" : "RUNNING")})"
 
     if k.code
       puts k.out
+      cleanup(ks)
       exit 1
     end
   end
 
   print "-"*20; puts " #{DateTime.now.to_s}"
   sleep 2
+
+  if loops == 0
+    cleanup(ks)
+    exit 0
+  end
 end

data/bin/release

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

data/demos/ping_monitor.rb

@@ -1,3 +1,14 @@
+# $ ruby demos/ping_monitor.rb 
+# 0.077 xxxxxxxxxxxxxxxxxxxxxxx
+# 0.021 xxxxxx
+# 0.027 xxxxxxxx
+# 0.021 xxxxxx
+# 0.021 xxxxxx
+# 0.041 xxxxxxxxxxxx
+# 0.021 xxxxxx
+# 0.023 xxxxxx
+# ^C
+
 require "./lib/kommando"
 
 k = Kommando.new "ping -i 0.2 127.0.0.1"

data/docker-compose.yml

@@ -24,4 +24,4 @@ services:
   alpine-2.3:
     build:
       context: .
-      dockerfile: docker/Dockerfile.alpine-2.3
+      dockerfile: docker/Dockerfile.alpine-2.3

data/docker/Dockerfile.alpine

@@ -2,7 +2,7 @@ FROM ruby:2.4.1-alpine
 
 RUN apk add --no-cache \
   git build-base \
-  nano bash
+  nano
 
 WORKDIR /app
 

data/docker/Dockerfile.alpine-2.1

@@ -2,7 +2,7 @@ FROM ruby:2.1-alpine
 
 RUN apk add --no-cache \
   git build-base \
-  nano bash
+  nano
 
 WORKDIR /app
 

data/docker/Dockerfile.alpine-2.2

@@ -2,7 +2,7 @@ FROM ruby:2.2-alpine
 
 RUN apk add --no-cache \
   git build-base \
-  nano bash
+  nano
 
 WORKDIR /app
 

data/docker/Dockerfile.alpine-2.3

@@ -2,7 +2,7 @@ FROM ruby:2.3-alpine
 
 RUN apk add --no-cache \
   git build-base \
-  nano bash
+  nano
 
 WORKDIR /app
 

data/docker/Dockerfile.debian

@@ -10,4 +10,4 @@ COPY lib/kommando/version.rb ./lib/kommando/
 RUN bundle install
 
 COPY . .
-ENTRYPOINT docker/entrypoint.sh
+ENTRYPOINT docker/entrypoint.sh

data/examples/redis_workaround.rb

@@ -0,0 +1,30 @@
+require "./lib/kommando"
+
+k = Kommando.new "redis-cli --raw", {
+  output: true
+}
+
+# redis sends cursor position queries (!) even with --raw
+k.out.every /\e\[6n/ do |m|
+  k.in.write '\e0;0R'
+end
+
+got_pong = false
+k.out.once "127.0.0.1:6379>" do
+  k.in.writeln "ping"
+end.once "PONG" do
+  got_pong = true
+end
+
+k.run_async
+
+# mitigate kommando bug with thread deadlock when writing to in from .every and .once
+loop do
+  break if got_pong
+  sleep 0.1
+end
+sleep 0.1
+k.in.writeln "exit"
+k.wait
+
+#Outputs some ANSI trash to terminal when exits (;1R;1R)

data/lib/kommando.rb

@@ -141,7 +141,12 @@ class Kommando
     command, *args = if @shell
       trash, line = @cmd.split "$", 2
       line.lstrip!
-      ["bash", "-c", line]
+
+      if `command -v bash`
+        ["bash", "-c", line]
+      else
+        ["sh", "-c", line]
+      end
     else
       @cmd.split " "
     end

data/lib/kommando/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,6 +187,7 @@ files:
 - examples/out_once_chaining.rb
 - examples/passwd.rb
 - examples/ping.rb
+- examples/redis_workaround.rb
 - examples/shell.rb
 - examples/shorthands.rb
 - examples/stackprof.rb
@@ -232,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Command runner with expect-like features