kommando 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c723b5a14a2c459faa1541baf8191bd3d5e085
-  data.tar.gz: 933819bd35d6494959f5a3d1fd4d4fc871ba60c4
+  metadata.gz: 96fe9669f6508544674dd94b73b3b8c9cf34ae8f
+  data.tar.gz: 9a58c3f6946f95ac9edf60d55a2cdf47e15fdd40
 SHA512:
-  metadata.gz: 8bae101165bffb3ebc49ace448bd297a5139f8d4265911d8283aa7dadd9db08277fade2934a03a618220eacf6398a5266ee0f94764e22b3a872fc4a311376821
-  data.tar.gz: 7e0a9e250d0979fb94ca4c4ef1331a3115056b414f358346a17c5ab9cfb49bf78439796c4f6ca80c3a5ff16b238b4c67a28789f86cec188ab34c45f8d1cab0a9
+  metadata.gz: 50c8bd2ffb7986a0ee4c3abf75ef39b650e035e506d475930d6ec81da4a06fa90378cf9f9ecd4bd9c7a42a6c27962ec0ab8df24b0a0450de260bd2cd8aa1b7dc
+  data.tar.gz: a52c9187140f7964d8f0f6e6dba3191f78dc95b6984d07d056b3268a3beb08926d770eccb27d7b0e9e4fdec37373b17257f5c5346f09a974947159cf08bc7531

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 0.0.15
+Exit and timeout callbacks, output shorthand.
+
+- FEAT: Shorthand `Kommando.puts "uptime"`
+- FEAT: Callback `k.when :exit block`
+- FEAT: Callback `k.when :timeout block`
+- EXAMPLES: `async.rb`
+
+## 0.0.14
+When callbacks
+
+ - FEAT: Callback `k.when "start" block`
+ - EXAMPLES: `when.rb`
+
 ## 0.0.13
 Shorthands for run and run_async, blocking until completed.
 

data/examples/async.rb

@@ -1,9 +1,17 @@
 require "./lib/kommando"
 
-k = Kommando.run_async "sleep 0.5"
+k = Kommando.new "sleep 1"
+
+exited = false
+k.when "exit" do
+  exited = true
+end
+
+k.run_async
 puts "started in background"
 
-while (k.code == nil) do
+
+until (exited) do
   print "."
   sleep 0.1
 end

data/examples/shorthands.rb

@@ -10,4 +10,4 @@ k.wait
 
 raise "err" unless k.out == "hello"
 
-puts k.out
+Kommando.puts "$ echo ok"

data/examples/timeout.rb

@@ -7,9 +7,19 @@ k2 = Kommando.new "sleep 2", {
   timeout: 0.5
 }
 
+did_run_timeout_callback = false
+
+k.when :timeout do
+  did_run_timeout_callback = true
+end
+
 k.run
 k2.run
 
 if k.code == 1 && k2.code == 1
   puts "timed out"
+else
+  raise "code not 1"
 end
+
+raise "timeout callback not called" unless did_run_timeout_callback

data/examples/when.rb

@@ -0,0 +1,32 @@
+require "./lib/kommando"
+
+k = Kommando.new "$ echo hello"
+ended = false
+got_start = false
+got_exit = false
+got_start_when_given_as_symbol = false
+
+k.when "start" do
+  got_start = true
+  puts "start!"
+  raise "code in start" if k.code
+  raise "ended in start" if ended
+end
+
+k.when :start do
+  puts ":start!"
+  got_start_when_given_as_symbol = true
+end
+
+k.when :exit do
+  got_exit = true
+end
+
+k.run
+ended = true
+
+raise "got_start not set" unless got_start
+raise "got_start_when_given_as_symbol not set" unless got_start_when_given_as_symbol
+raise "got_exit not set" unless got_exit
+
+puts "end"

data/lib/kommando.rb

@@ -18,6 +18,12 @@ class Kommando
       k.run_async
       k
     end
+
+    def puts(cmd, opts={})
+      k = Kommando.new cmd, opts
+      k.run
+      Kernel.puts k.out
+    end
   end
 
   def initialize(cmd, opts={})
@@ -52,6 +58,8 @@ class Kommando
 
     @matchers = {}
     @matcher_buffer = ""
+
+    @whens = {}
   end
 
   def run_async
@@ -174,6 +182,12 @@ class Kommando
           end
         end
 
+        if @whens[:start]
+          @whens[:start].each do |block|
+            block.call
+          end
+        end
+
         if @timeout
           begin
             Timeout.timeout(@timeout) do
@@ -214,6 +228,18 @@ class Kommando
       raise Kommando::Error, "Command '#{command}' not found"
     end
 
+    if @whens[:timeout]
+      @whens[:timeout].each do |block|
+        block.call
+      end
+    end
+
+    if @whens[:exit]
+      @whens[:exit].each do |block|
+        block.call
+      end
+    end
+
     true
   end
 
@@ -244,4 +270,12 @@ class Kommando
   def wait
     sleep 0.001 until @code
   end
+
+  def when(event, &block)
+    @whens[event.to_sym] = if @whens[event.to_sym]
+      @whens[event.to_sym] << block
+    else
+      [block]
+    end
+  end
 end

data/lib/kommando/version.rb

@@ -1,3 +1,3 @@
 class Kommando
-  VERSION = "0.0.13"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,7 @@ files:
 - examples/timeout.rb
 - examples/uptime.rb
 - examples/wait.rb
+- examples/when.rb
 - kommando.gemspec
 - lib/kommando.rb
 - lib/kommando/buffer.rb