kondate 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b54a2f96280eb909e0e542d324820de43b6ade6b
-  data.tar.gz: 424d90982dbb240817604b84dd42c25eb17e49cb
+  metadata.gz: bf4004d5d01890e7fed5e1d00f7510368849b712
+  data.tar.gz: 16d2d4481549467e5888cfa8c97970ab28d71aae
 SHA512:
-  metadata.gz: fafee50e2a6a054acf7251c97757274bb8579a0ef53e41cc288fc1fc1a220f5cf55a1c8d722e5fcb2a0c4e2bdda7f27334777132cfce86379ff6f02765f45c59
-  data.tar.gz: 6de4e87c5b2df2cf9d3c8bc4ad39aa0ce15a14f231b255df825b66a2202295f768f6ab733d00e53d87f4cbc5acd8313385e6b7bec03a1b4223e5cd25f8cf6233
+  metadata.gz: 4b4e0ac8cd360f975f444aeaa0ec2fd7891eab7394e1f1377468be09e61aea7f727d528951cd5d04ef80a9f552ebec2f0fc9bd342ece2636d730233bc742802e
+  data.tar.gz: 65d5fb9e91a7ed2cde4a6af032a58795cd00d2e8630088f5e9bdeca1b6348b46c7f86456a34346e404e29e4671317c72c4a37b8348f0eb07bbcfaab0bec2d22f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.9 (2017-02-02)
+
+Enhancements:
+
+* Add hostname to itamae log prefix without using IO.pipe so that we can use debuggers such as pry
+
 # 0.4.8 (2017-01-27)
 
 Enhancements:

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 gem 'pry'
 gem 'pry-nav'
+gem 'byebug'

data/kondate.gemspec

@@ -25,7 +25,6 @@ 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,7 +8,6 @@ require 'shellwords'
 require 'find'
 require 'facter'
 require 'parallel'
-require 'frontkick'
 
 module Kondate
   class CLI < Thor
@@ -158,10 +157,7 @@ module Kondate
         command << " bootstrap.rb"
         $stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
 
-        output_with_hostname(host) do |out, err|
-          result = Frontkick.exec(env, command, out: out, err: err)
-          return false unless result.successful?
-        end
+        return false unless system(env, command)
       end
       true
     end
@@ -187,45 +183,11 @@ module Kondate
         command = "bundle exec rspec #{spec_files.map{|f| f.shellescape }.join(' ')}"
         $stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
 
-        output_with_hostname(host) do |out, err|
-          result = Frontkick.exec(env, command, out: out, err: err)
-          return false unless result.successful?
-        end
+        return false unless system(env, command)
       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

@@ -13,6 +13,7 @@ module Kondate
     def bootstrap
       $stdout.sync = true
       $stderr.sync = true
+      tweak_logger
       bootstrap_middleware_recipes
       bootstrap_role_recipes
     end
@@ -27,6 +28,17 @@ module Kondate
       @context.include_recipe(recipe)
     end
 
+    def tweak_logger
+      hostname = node[:hostname]
+      ::Itamae::Logger::Formatter.class_eval do
+        define_method(:call) do |severity, datetime, progname, msg|
+          log = "%s | %s : %s" % [hostname, "%5s" % severity, msg2str(msg)]
+
+          (colored ? colorize(log, severity) : log) + "\n"
+        end
+      end
+    end
+
     def bootstrap_middleware_recipes
       recipes = node['attributes'].keys
       recipes.each do |recipe|

data/lib/kondate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -94,20 +94,6 @@ 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