Merge pull request #197 from ryotarai/show-diff-on-edit-action

Show diff on edit action of file resource in dry-run mode.
itamae-kitchen · Mar 6, 2016 · cadd381 · cadd381
2 parents b520cb8 + b3b3c2a
commit cadd381
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/itamae/resource/file.rb b/lib/itamae/resource/file.rb
@@ -12,6 +12,8 @@ class File < Base
       define_attribute :block, type: Proc, default: proc {}
 
       def pre_action
+        current.exist = run_specinfra(:check_file_is_file, attributes.path)
+
         case @current_action
         when :create
           attributes.exist = true
@@ -20,7 +22,7 @@ def pre_action
         when :edit
           attributes.exist = true
 
-          unless runner.dry_run?
+          if !runner.dry_run? || current.exist
             content = backend.receive_file(attributes.path)
             attributes.block.call(content)
             attributes.content = content
@@ -31,8 +33,6 @@ def pre_action
       end
 
       def set_current_attributes
-        current.exist = run_specinfra(:check_file_is_file, attributes.path)
-
         if current.exist
           current.mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
           current.owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp