kommando 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90cd16476bfc79190a5707fa07bd7c6d235f5a04
-  data.tar.gz: 947a4d5c54f2837e2f969bb1ca7ef1de0487a06b
+  metadata.gz: e48c9ee88deb15984338770bcb3f88df16233c55
+  data.tar.gz: 1734e1fbce11cb305053d2a75c193a92ce71889d
 SHA512:
-  metadata.gz: f1bf07fac67f79fa57574c243cfee2e1da16168d4c9a4ce8b7a8ba65f55f09bf491355af063c64a7a1fbce5dc456b05cce877bbdcc3d4223c2cf6002411bac31
-  data.tar.gz: 069f925a8b7b8c13a2f317a6c9b6ea557b1a21c5aad2b82b3d03d2fe86d0023c33280c78827756a02f8acd102aab2bc6b657346ab93a1d616fa027103fc69168
+  metadata.gz: 1fdc4301a64924c7bd60e2555a40c27a83849c47b674deb717017cb9c873aa2693cc790332545cf39a3e818af913190b59a4de903ee2869902ea1a6470bede89
+  data.tar.gz: b05437941a9ec740fe09a8aac78fa8b67ee3ed05f150b88e1ddb941e0308662c96fec308195146f33bac1f85fade218faad6ad3ac702eb21be9645fdc8061123

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.0.5
+Fixes.
+
+ - FIX: File output is flushed in sync.
+ - FIX: Linux compatibility attempt.
+
 ## 0.0.4
 Writes standard out to file and timeouts.
 

data/README.md

@@ -28,7 +28,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 `bin/e2e` runs all Kommando files in `examples/` with `kommando`.
 
-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 `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+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).
 
 ## Contributing
 

data/bin/reinstall

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-VERSION=$(ruby -r "./lib/kommando/version" -e "puts Kommando::VERSION")
+VERSION=$(bin/version)
 
 gem uninstall kommando
 gem build kommando.gemspec

data/bin/release

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+git diff-index --quiet --cached HEAD
+if [[ $? != 0 ]]; then
+  echo "git dirty."
+  exit 1
+fi
+
+set -e
+
+rake
+bin/e2e
+bin/stress 2 10
+
+echo
+head CHANGELOG.md
+echo
+echo "Changelog ok?"
+read
+
+bin/version
+echo "Version ok?"
+read
+
+echo "Release to rubygems?"
+read
+echo "Sure?"
+read
+echo "Double sure?"
+bundle exec rake release

data/bin/version

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+ruby -r "./lib/kommando/version" -e "puts Kommando::VERSION"

data/lib/kommando.rb

@@ -7,6 +7,23 @@ require_relative "kommando/buffer"
 
 class Kommando
 
+  # http://stackoverflow.com/a/7263243
+  module SafePTY
+    def self.spawn command, *args, &block
+
+      PTY.spawn(command, *args) do |r,w,p|
+        begin
+          yield r,w,p
+        rescue Errno::EIO
+        ensure
+          Process.wait p
+        end
+      end
+
+      $?.exitstatus
+    end
+  end
+
   def initialize(cmd, opts={})
     @cmd = cmd
     @stdout = Buffer.new
@@ -21,8 +38,12 @@ class Kommando
     elsif opts[:timeout].class == Fixnum
       opts[:timeout].to_f
     end
+    @thread_did_timeout = nil
 
+    @code = nil
     @executed = false
+
+    @retry = opts[:retry] == true
   end
 
   def run
@@ -31,22 +52,37 @@ class Kommando
 
     command, *args = @cmd.split " "
     begin
-      PTY.spawn(command, *args) do |stdout, stdin, pid|
-        stdout_file = File.open @output_file, 'w' if @output_file
+      exitstatus = SafePTY.spawn(command, *args) do |stdout, stdin, pid|
+        if @retry && stdout.eof?
+          @executed = false
+          return run
+        end
+
+        if @output_file
+          stdout_file = File.open @output_file, 'w'
+          stdout_file.sync = true
+        end
 
         Thread.abort_on_exception = true
         thread_stdout = Thread.new do
           while true do
             break if stdout.eof?
 
-            c = stdout.getc
+            c = nil
+            begin
+              Timeout.timeout(0.1) do
+                c = stdout.getc
+              end
+            rescue Timeout::Error
+              # sometimes it just hangs.
+            end
+
             @stdout.append c if c
             print c if @output_stdout
             stdout_file.write c if @output_file
           end
         end
 
-        thread_did_timeout = nil
         if @timeout
           begin
             Timeout.timeout(@timeout) do
@@ -54,23 +90,19 @@ class Kommando
             end
           rescue Timeout::Error
             Process.kill('KILL', pid)
-            thread_did_timeout = true
+            @thread_did_timeout = true
           end
         else
           thread_stdout.join
         end
 
         stdout_file.close if @output_file
+      end
 
-        # http://stackoverflow.com/a/7263243
-        Process.wait(pid)
-
-        @code = if thread_did_timeout
-          1
-        else
-          $?.exitstatus
-        end
-
+      @code = if @thread_did_timeout
+        1
+      else
+        exitstatus
       end
     rescue RuntimeError => ex
       if ex.message == "can't get Master/Slave device"

data/lib/kommando/version.rb

@@ -1,3 +1,3 @@
 class Kommando
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/tests/forever_true.rb

@@ -0,0 +1,12 @@
+require "./lib/kommando"
+
+puts "Running forever..."
+while true do
+  k = Kommando.new "/usr/bin/true"
+  k.run
+  unless k.code == 0
+    raise "true failed..."
+  end
+  
+  print "."
+end

data/tests/forever_uptime.rb

@@ -0,0 +1,21 @@
+require "./lib/kommando"
+
+puts "Running forever..."
+
+iterations = 0
+while true do
+  k = Kommando.new "uptime", {
+    retry: true  # TODO: make this pass without true
+  }
+  k.run
+
+  unless k.out.size > 60
+    puts k.out
+    raise "uptime output doesn't have enough content"
+  end
+
+  iterations += 1
+  if iterations % 100 == 0
+    print "."
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,8 +100,10 @@ files:
 - bin/console
 - bin/e2e
 - bin/reinstall
+- bin/release
 - bin/setup
 - bin/stress
+- bin/version
 - examples/exit.rb
 - examples/live_output.rb
 - examples/ping.rb
@@ -113,6 +115,8 @@ files:
 - lib/kommando/buffer.rb
 - lib/kommando/error.rb
 - lib/kommando/version.rb
+- tests/forever_true.rb
+- tests/forever_uptime.rb
 homepage: http://github.com/matti/kommando
 licenses:
 - MIT