itamae 1.1.25 → 1.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c28cb6ce63cd01d6be927470128c5e21666a6ce
-  data.tar.gz: d9ab010148c396f5c176757ced0ab51ead30846b
+  metadata.gz: fb27312cdd1e4cbfccca56ee5eb7a85e48188d2a
+  data.tar.gz: 164226caebc7e74dad4d9584f694b03b07bfd61f
 SHA512:
-  metadata.gz: c36b27f65ae8e7767fc66204dd0a4a6f845cf67ef70925a6f10bac5c227ea2d67ee28d9b9fe81a8d2c642be2a40dfa0ee3ed147a5a72e81d51eb11d2706f2699
-  data.tar.gz: 4b8541dca0a658732c6d38606fa6e393fd5557ed5111f016918646d7a2a810c8e918539f3c5e92e0dfe34efe9a0a8438c2fdc050c16656edddd176798b3142bb
+  metadata.gz: b6b7ac732a3b58aea5425e075ce7b787be1167cf38dc85a19300ec256bf6af4d9e0dd1e66ed33cc5fb5ba5ece0a76cbcb583a07895269119ad53dea55667a254
+  data.tar.gz: b510acec0c54fee7d6bfcca40c5fec9129f41b3ffe307dfaa2046f4dcf60f0b9b8e02bdb868a8d54bfab3d81bbf9aebbd6847b762ef5672f54a7d4af5d17d432

data/Rakefile

@@ -84,6 +84,8 @@ namespace :release do
     end
     system "git add #{version_file}"
     system "git commit -m 'Bump up version'"
+
+    Rake::Task["release"].invoke
   end
 end
 

data/lib/itamae/logger.rb

@@ -33,6 +33,14 @@ module Itamae
         outdent
       end
 
+      def with_indent_if(condition, &block)
+        if condition
+          with_indent(&block)
+        else
+          block.call
+        end
+      end
+
       def indent
         @depth += 1
       end

data/lib/itamae/resource/base.rb

@@ -118,24 +118,22 @@ module Itamae
       def run(specific_action = nil, options = {})
         Logger.debug "#{resource_type}[#{resource_name}]"
 
-        Logger.formatter.indent if Logger.debug?
-
-        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
+        Logger.formatter.with_indent_if(Logger.debug?) do
+          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
 
-        verify unless options[:dry_run]
-        notify(options) if updated?
+          [specific_action || attributes.action].flatten.each do |action|
+            run_action(action, options)
+          end
 
-        Logger.formatter.outdent if Logger.debug?
+          verify unless options[:dry_run]
+          notify(options) if updated?
+        end
       rescue Backend::CommandExecutionError
         Logger.error "#{resource_type}[#{resource_name}] Failed."
         exit 2
@@ -170,23 +168,22 @@ module Itamae
 
         return if action == :nothing
 
-        Logger.formatter.indent if Logger.debug?
-        Logger.debug "(in pre_action)"
-        pre_action
-
-        Logger.debug "(in set_current_attributes)"
-        set_current_attributes
+        Logger.formatter.with_indent_if(Logger.debug?) do
+          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
 
-        Logger.formatter.outdent if Logger.debug?
+          updated! if different?
+        end
 
         @current_action = nil
       end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.25
+1.1.26

metadata

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