itamae 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5824e615aa71ac1b33b444d24ef09a784ce481fe
-  data.tar.gz: 18ded54560fa8f2c95d94bdee351d33edfc53b06
+  metadata.gz: 527c1c2c9aac7484eb00454e1d66d91d57e07f45
+  data.tar.gz: 557aa8fead8d4aeb0cfc289050548231e0b3fa33
 SHA512:
-  metadata.gz: f04064f58c4b1ed7130dee98dd8d640562140e49b49de8f4cf098181fe628fd1eafa9ff6350ed3e3213d52f9b1a160133e6169c973a34a556b095bd3a29a540a
-  data.tar.gz: 7180ffdc7d22da2ba174d6c9985e8bf596ba458943e3483a4391af88a84da75ff6535e2627aebdcce58fb60b4b72305b8ff7f4fb8ff389f94400fa5e31b07697
+  metadata.gz: 9f66b1c4369c7a72f4cad09cda136e8f83667ed83fe70e0dc46f1347ac7412c7d24114ae46414cbe5103fc02edc8bbf962d7c07118cb77191e92258d805fab43
+  data.tar.gz: e0d54f47e26b8765299a61c573b82204cbada17b1a541e85223e56da717cc9cccd71975c93d07f21480ed4924e0ed37627a9ae501789bc2bab7d7a3ab264060e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.5.1
+
+Improvements
+
+- [Logger can be injected one which doesn't have `color` method.](https://github.com/itamae-kitchen/itamae/commit/7c50f376f69029836047f26ab0a46b41b928c0d3)
+
 ## v1.5.0
 
 Improvements

data/lib/itamae/logger.rb

@@ -4,7 +4,7 @@ require 'ansi/code'
 
 module Itamae
   module Logger
-    module IndentHelper
+    module Helper
       def with_indent
         indent
         yield
@@ -37,6 +37,14 @@ module Itamae
         @indent_depth = val
       end
 
+      def color(code, &block)
+        if self.formatter.respond_to?(:color)
+          self.formatter.color(code, &block)
+        else
+          block.call
+        end
+      end
+
       %w!debug info warn error fatal unknown!.each do |level|
         module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           def #{level}(msg)
@@ -48,7 +56,6 @@ module Itamae
 
     class Formatter
       attr_accessor :colored
-      attr_accessor :color
 
       def call(severity, datetime, progname, msg)
         log = "%s : %s\n" % ["%5s" % severity, msg2str(msg)]
@@ -68,6 +75,7 @@ module Itamae
       end
 
       private
+
       def msg2str(msg)
         case msg
         when ::String
@@ -102,7 +110,7 @@ module Itamae
 
   @logger = ::Logger.new($stdout).tap do |l|
     l.formatter = Itamae::Logger::Formatter.new
-  end.extend(Itamae::Logger::IndentHelper)
+  end.extend(Itamae::Logger::Helper)
 
   class << self
     def logger
@@ -110,7 +118,7 @@ module Itamae
     end
 
     def logger=(l)
-      @logger = l.extend(Itamae::Logger::IndentHelper)
+      @logger = l.extend(Itamae::Logger::Helper)
     end
   end
 end

data/lib/itamae/resource/base.rb

@@ -228,13 +228,13 @@ module Itamae
           if current_value.nil? && value.nil?
             # ignore
           elsif current_value.nil? && !value.nil?
-            Itamae.logger.formatter.color :green do
+            Itamae.logger.color :green do
               Itamae.logger.info "#{resource_type}[#{resource_name}] #{key} will be '#{value}'"
             end
           elsif current_value == value || value.nil?
             Itamae.logger.debug "#{resource_type}[#{resource_name}] #{key} will not change (current value is '#{current_value}')"
           else
-            Itamae.logger.formatter.color :green do
+            Itamae.logger.color :green do
               Itamae.logger.info "#{resource_type}[#{resource_name}] #{key} will change from '#{current_value}' to '#{value}'"
             end
           end

data/lib/itamae/resource/file.rb

@@ -121,7 +121,7 @@ module Itamae
                     else
                       :clear
                     end
-            Itamae.logger.formatter.color(color) do
+            Itamae.logger.color(color) do
               Itamae.logger.info line.chomp
             end
           end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.5.0
+1.5.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ryota Arai