kondate 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7774a2c7a591fadd1d4c2b7782ed1780bbc052d9
-  data.tar.gz: 3bfc5d71a9a56769a1c3531f8b4fd80cd44cd555
+  metadata.gz: b54a2f96280eb909e0e542d324820de43b6ade6b
+  data.tar.gz: 424d90982dbb240817604b84dd42c25eb17e49cb
 SHA512:
-  metadata.gz: 4ecfaf0b6ddd496e1f2f82e659193b821aff56fe1a9876f4a0bcc16deedf6ac763aca2f4a67a132898c46cc44de20726ecdf38641733b9162ed4cef810820572
-  data.tar.gz: ebb781eb6faa46669559a151e4063e93643c447bb31fd549a859168070f3169806dd92a4dc1c5f045cbd8b0d1cc5b8a2a47968a78129ff8798b65879c7bd5bb2
+  metadata.gz: fafee50e2a6a054acf7251c97757274bb8579a0ef53e41cc288fc1fc1a220f5cf55a1c8d722e5fcb2a0c4e2bdda7f27334777132cfce86379ff6f02765f45c59
+  data.tar.gz: 6de4e87c5b2df2cf9d3c8bc4ad39aa0ce15a14f231b255df825b66a2202295f768f6ab733d00e53d87f4cbc5acd8313385e6b7bec03a1b4223e5cd25f8cf6233

data/.gitignore

@@ -18,3 +18,4 @@
 /kondate/
 .vagrant
 .tags
+/bin/

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.8 (2017-01-27)
+
+Enhancements:
+
+* Add hostname to itamae log prefix
+
 # 0.4.7 (2017-01-26)
 
 Fixes:

data/kondate.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'highline'
   spec.add_dependency 'facter'
   spec.add_dependency 'parallel'
+  spec.add_dependency 'frontkick'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "test-unit"

data/lib/kondate/cli.rb

@@ -8,6 +8,7 @@ require 'shellwords'
 require 'find'
 require 'facter'
 require 'parallel'
+require 'frontkick'
 
 module Kondate
   class CLI < Thor
@@ -156,7 +157,11 @@ module Kondate
         command << " --recipe-graph=#{@options[:recipe_graph]}" if @options[:recipe_graph]
         command << " bootstrap.rb"
         $stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
-        return false unless system(env, command)
+
+        output_with_hostname(host) do |out, err|
+          result = Frontkick.exec(env, command, out: out, err: err)
+          return false unless result.successful?
+        end
       end
       true
     end
@@ -181,11 +186,46 @@ module Kondate
         env['TARGET_NODE_FILE'] = property_file.path
         command = "bundle exec rspec #{spec_files.map{|f| f.shellescape }.join(' ')}"
         $stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
-        return false unless system(env, command)
+
+        output_with_hostname(host) do |out, err|
+          result = Frontkick.exec(env, command, out: out, err: err)
+          return false unless result.successful?
+        end
       end
       true
     end
 
+    def output_with_hostname(host, &block)
+      out_r, out_w = IO.pipe
+      out_w.sync = true
+      err_r, err_w = IO.pipe
+      err_w.sync = true
+
+      $stdout.sync = true
+      $stderr.sync = true
+
+      out_thr = Thread.new do
+        while r = out_r.gets
+          $stdout.write "#{host} | #{r}"
+        end
+      end
+
+      err_thr = Thread.new do
+        while r = err_r.gets
+          $stderr.write "#{host} | #{r}"
+        end
+      end
+
+      yield(out_w, err_w)
+    ensure
+      out_r.close rescue nil
+      out_w.close rescue nil
+      err_r.close rescue nil
+      err_w.close rescue nil
+      out_thr.exit rescue nil
+      err_thr.exit rescue nil
+    end
+
     def proceed?(property_files)
       if property_files.values.compact.reject(&:empty?).empty?
         $stderr.puts "Nothing to run"

data/lib/kondate/itamae_bootstrap.rb

@@ -11,6 +11,8 @@ module Kondate
     end
 
     def bootstrap
+      $stdout.sync = true
+      $stderr.sync = true
       bootstrap_middleware_recipes
       bootstrap_role_recipes
     end

data/lib/kondate/templates/spec/spec_helper.rb

@@ -6,6 +6,8 @@ require 'yaml'
 ### required for kondate #####
 host = ENV['TARGET_HOST']
 set :set_property, YAML.load_file(ENV['TARGET_NODE_FILE'])
+$stdout.sync = true
+$stderr.sync = true
 ############################
 
 set :backend, :ssh

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: frontkick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement