Keep mtime if no change

lib/itamae/resource/file.rb

@@ -84,23 +84,27 @@ def action_delete(options)
       end
 
       def action_edit(options)
+        change_target = attributes.modified ? @temppath : attributes.path
+
         if attributes.mode
-          run_specinfra(:change_file_mode, @temppath, attributes.mode)
+          run_specinfra(:change_file_mode, change_target, attributes.mode)
         else
           mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
-          run_specinfra(:change_file_mode, @temppath, mode)
+          run_specinfra(:change_file_mode, change_target, mode)
         end
 
         if attributes.owner || attributes.group
-          run_specinfra(:change_file_owner, @temppath, attributes.owner, attributes.group)
+          run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
         else
           owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
           group = run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
-          run_specinfra(:change_file_owner, @temppath, owner)
-          run_specinfra(:change_file_group, @temppath, group)
+          run_specinfra(:change_file_owner, change_target, owner)
+          run_specinfra(:change_file_group, change_target, group)
         end
 
-        run_specinfra(:move_file, @temppath, attributes.path)
+        if attributes.modified
+          run_specinfra(:move_file, @temppath, attributes.path)
+        end
       end
 
       private

spec/integration/default_spec.rb

@@ -216,6 +216,14 @@
   it { should be_grouped_into "itamae" }
 end
 
+describe file('/tmp/file_edit_with_content_change_updates_timestamp') do
+  its(:mtime) { should be > DateTime.iso8601("2016-05-02T01:23:45Z") }
+end
+
+describe file('/tmp/file_edit_without_content_change_keeping_timestamp') do
+  its(:mtime) { should eq(DateTime.iso8601("2016-05-02T12:34:56Z")) }
+end
+
 describe file('/home/itamae2') do
   it { should be_directory }
   it { should be_owned_by "itamae2" }
@@ -240,3 +248,10 @@
   it { should be_grouped_into "itamae2" }
 end
 
+describe file('/tmp/file_with_content_change_updates_timestamp') do
+  its(:mtime) { should be > DateTime.iso8601("2016-05-01T01:23:45Z") }
+end
+
+describe file('/tmp/file_without_content_change_keeping_timestamp') do
+  its(:mtime) { should eq(DateTime.iso8601("2016-05-01T12:34:56Z")) }
+end

spec/integration/recipes/default.rb

@@ -402,6 +402,28 @@
 
 ###
 
+execute "touch -d 2016-05-02T01:23:45 /tmp/file_edit_with_content_change_updates_timestamp"
+
+file "/tmp/file_edit_with_content_change_updates_timestamp" do
+  action :edit
+  block do |content|
+    content[0 .. -1] = "Hello, world"
+  end
+end
+
+###
+
+execute "touch -d 2016-05-02T12:34:56 /tmp/file_edit_without_content_change_keeping_timestamp"
+
+file "/tmp/file_edit_without_content_change_keeping_timestamp" do
+  action :edit
+  block do |content|
+    # no change
+  end
+end
+
+###
+
 file '/tmp/file_without_content_change_updates_mode_and_owner' do
   action :create
   content 'Hello, world'
@@ -420,6 +442,22 @@
 
 ###
 
+execute "touch -d 2016-05-01T01:23:45 /tmp/file_with_content_change_updates_timestamp"
+
+file "/tmp/file_with_content_change_updates_timestamp" do
+  content "Hello, world"
+end
+
+###
+
+execute "echo 'Hello, world' > /tmp/file_without_content_change_keeping_timestamp ; touch -d 2016-05-01T12:34:56 /tmp/file_without_content_change_keeping_timestamp"
+
+file "/tmp/file_without_content_change_keeping_timestamp" do
+  content "Hello, world\n"
+end
+
+###
+
 unless run_command("echo -n Hello").stdout == "Hello"
   raise "run_command in a recipe failed"
 end