itamae 1.1.24 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415c20d30292ed0e272ed3cbf4ae265ee2e13a49
-  data.tar.gz: a6084dba3f47e602a7563b8442193417c9ac2b1b
+  metadata.gz: 3c28cb6ce63cd01d6be927470128c5e21666a6ce
+  data.tar.gz: d9ab010148c396f5c176757ced0ab51ead30846b
 SHA512:
-  metadata.gz: e9ae2c9df28f65efdf00a292015ff0267df8e642949a9c58bb15a777af7c01eb75fd6882b164579fcd907f860063908424b767dd45d2266af8ae840b9468cb7b
-  data.tar.gz: 9871ff0e1ce3528f7f52563bf8037bb55716dce9b8cb5d66233f257ea9202531159a8a679fb4a89d8d72bf7d4d22a239d5d6377e0c678cba4214ec160ca24fbe
+  metadata.gz: c36b27f65ae8e7767fc66204dd0a4a6f845cf67ef70925a6f10bac5c227ea2d67ee28d9b9fe81a8d2c642be2a40dfa0ee3ed147a5a72e81d51eb11d2706f2699
+  data.tar.gz: 4b8541dca0a658732c6d38606fa6e393fd5557ed5111f016918646d7a2a810c8e918539f3c5e92e0dfe34efe9a0a8438c2fdc050c16656edddd176798b3142bb

data/README.md

@@ -49,8 +49,7 @@ Further example is here: [spec/integration/recipes/default.rb](spec/integration/
 
 ## Documentations
 
-- http://itamae.kitchen/docs.html
-- https://github.com/ryotarai/itamae/wiki
+- https://github.com/itamae-kitchen/itamae/wiki
 
 ## Run tests
 

data/lib/itamae/backend.rb

@@ -68,7 +68,7 @@ module Itamae
       result = Specinfra::Runner.run_command(command)
       exit_status = result.exit_status
 
-      Logger.formatter.indent do
+      Logger.formatter.with_indent do
         if exit_status == 0 || !options[:error]
           method = :debug
           message = "exited with #{exit_status}"

data/lib/itamae/logger.rb

@@ -9,7 +9,7 @@ module Itamae
       attr_accessor :depth
       attr_accessor :color
 
-      INDENT_LENGTH = 3
+      INDENT_LENGTH = 2
 
       def initialize(*args)
         super
@@ -26,19 +26,28 @@ module Itamae
         end
       end
 
-      def indent
-        @depth += 1
+      def with_indent
+        indent
         yield
       ensure
+        outdent
+      end
+
+      def indent
+        @depth += 1
+      end
+
+      def outdent
         @depth -= 1
+        @depth = 0 if @depth < 0
       end
 
       def color(code)
-        @prev_color = @color
+        prev_color = @color
         @color = code
         yield
       ensure
-        @color = @prev_color
+        @color = prev_color
       end
 
       private

data/lib/itamae/recipe.rb

@@ -43,7 +43,7 @@ module Itamae
     def run(options = {})
       Logger.info "Recipe: #{@path}"
 
-      Logger.formatter.indent do
+      Logger.formatter.with_indent do
         @children.run(options)
 
         @delayed_notifications.uniq do |notification|

data/lib/itamae/resource/base.rb

@@ -116,26 +116,28 @@ module Itamae
       end
 
       def run(specific_action = nil, options = {})
-        Logger.info "#{resource_type}[#{resource_name}]"
-
-        Logger.formatter.indent do
-          if do_not_run_because_of_only_if?
-            Logger.info "Execution skipped because of only_if attribute"
-            return
-          elsif do_not_run_because_of_not_if?
-            Logger.info "Execution skipped because of not_if attribute"
-            return
-          end
+        Logger.debug "#{resource_type}[#{resource_name}]"
 
-          [specific_action || attributes.action].flatten.each do |action|
-            run_action(action, options)
-          end
+        Logger.formatter.indent if Logger.debug?
 
-          verify unless options[:dry_run]
-          notify(options) if updated?
+        if do_not_run_because_of_only_if?
+          Logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of only_if attribute"
+          return
+        elsif do_not_run_because_of_not_if?
+          Logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of not_if attribute"
+          return
         end
+
+        [specific_action || attributes.action].flatten.each do |action|
+          run_action(action, options)
+        end
+
+        verify unless options[:dry_run]
+        notify(options) if updated?
+
+        Logger.formatter.outdent if Logger.debug?
       rescue Backend::CommandExecutionError
-        Logger.error "Failed."
+        Logger.error "#{resource_type}[#{resource_name}] Failed."
         exit 2
       end
 
@@ -164,27 +166,28 @@ module Itamae
 
         clear_current_attributes
 
-        Logger.info "action: #{action}"
+        Logger.debug "#{resource_type}[#{resource_name}] action: #{action}"
 
         return if action == :nothing
 
-        Logger.formatter.indent do
-          Logger.debug "(in pre_action)"
-          pre_action
-
-          Logger.debug "(in set_current_attributes)"
-          set_current_attributes
+        Logger.formatter.indent if Logger.debug?
+        Logger.debug "(in pre_action)"
+        pre_action
 
-          Logger.debug "(in show_differences)"
-          show_differences
+        Logger.debug "(in set_current_attributes)"
+        set_current_attributes
 
-          unless options[:dry_run]
-            public_send("action_#{action}".to_sym, options)
-          end
+        Logger.debug "(in show_differences)"
+        show_differences
 
-          updated! if different?
+        unless options[:dry_run]
+          public_send("action_#{action}".to_sym, options)
         end
 
+        updated! if different?
+
+        Logger.formatter.outdent if Logger.debug?
+
         @current_action = nil
       end
 
@@ -215,13 +218,13 @@ module Itamae
             # ignore
           elsif current_value.nil? && !value.nil?
             Logger.formatter.color :green do
-              Logger.info "#{key} will be '#{value}'"
+              Logger.info "#{resource_type}[#{resource_name}] #{key} will be '#{value}'"
             end
           elsif current_value == value || value.nil?
-            Logger.debug "#{key} will not change (current value is '#{current_value}')"
+            Logger.debug "#{resource_type}[#{resource_name}] #{key} will not change (current value is '#{current_value}')"
           else
             Logger.formatter.color :green do
-              Logger.info "#{key} will change from '#{current_value}' to '#{value}'"
+              Logger.info "#{resource_type}[#{resource_name}] #{key} will change from '#{current_value}' to '#{value}'"
             end
           end
         end
@@ -359,7 +362,7 @@ module Itamae
         return if @verify_commands.empty?
 
         Logger.info "Verifying..."
-        Logger.formatter.indent do
+        Logger.formatter.with_indent do
           @verify_commands.each do |command|
             run_command(command)
           end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.24
+1.1.25

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.24
+  version: 1.1.25
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor