itamae 1.9.7.pre → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063ccd6fdae32d852d450265017ede39586ea176
-  data.tar.gz: e4456e84fc2421e01c86247f926aa6625f6921c5
+  metadata.gz: 328f99ca3c77bdfb7dd735eaa16c740f42dbf8d8
+  data.tar.gz: b5c102ee7950c954c7b56bc146ebdfdf89512f16
 SHA512:
-  metadata.gz: b88477096228dfad7451b746f41ccf727ee5ddf0b0da023d019e348467cd591e4f014cb4cd1417317599dbeb6e288e67657c775490db98b9064865e109d30191
-  data.tar.gz: e73bfa3cf90a183b5e6ef4931679d56bf88d420d0c946c591fda609a167c3fb4d8cb9298565b5d0cd142f09badc8226e3d697d73c8c68bb4a64c01fd955d3206
+  metadata.gz: 81b4df62bf844dba2fba5b76b9126650cdc81666583c112bf6fb0fb14aeeb9dc054b0d920ae7289c2cb4e983219110e42448b4b5fa6a877a0cd904e27df18ff2
+  data.tar.gz: d9391e3125d6d7257f1819aa7a4afbab53d07573a3d786f894fcb8bbedf01be3a8dc00a7fb37d1276400c9bc3023463976b2d0beda8b09439e0e05ac3dd0228b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.9.8
+
+Bugfixes
+
+- [edit action of file resource: Keep mtime if no change](https://github.com/itamae-kitchen/itamae/pull/212)
+
 ## v1.9.7 (pre)
 
 Bugfixes

data/lib/itamae/resource/file.rb

@@ -84,23 +84,22 @@ module Itamae
       end
 
       def action_edit(options)
-        if attributes.mode
-          run_specinfra(:change_file_mode, @temppath, attributes.mode)
-        else
-          mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
-          run_specinfra(:change_file_mode, @temppath, mode)
+        change_target = attributes.modified ? @temppath : attributes.path
+
+        if attributes.mode || attributes.modified
+          mode = attributes.mode || run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          run_specinfra(:change_file_mode, change_target, mode)
         end
 
-        if attributes.owner || attributes.group
-          run_specinfra(:change_file_owner, @temppath, 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)
+        if attributes.owner || attributes.group || attributes.modified
+          owner = attributes.owner || run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
+          group = attributes.group || run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
+          run_specinfra(:change_file_owner, change_target, owner, group)
         end
 
-        run_specinfra(:move_file, @temppath, attributes.path)
+        if attributes.modified
+          run_specinfra(:move_file, @temppath, attributes.path)
+        end
       end
 
       private

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.7.pre"
+  VERSION = "1.9.8"
 end

data/spec/integration/Vagrantfile

@@ -17,6 +17,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     mv /tmp/sources.list /etc/apt/sources.list
     apt-get update
   fi
+  echo America/New_York > /etc/timezone
+  dpkg-reconfigure --frontend noninteractive tzdata
       EOC
     end
 

data/spec/integration/default_spec.rb

@@ -216,6 +216,14 @@ describe file('/tmp/file_edit_keeping_mode_owner') do
   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 @@ describe file('/tmp/file_without_content_change_updates_mode_and_owner') do
   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

data/spec/integration/recipes/default.rb

@@ -402,6 +402,28 @@ end
 
 ###
 
+execute "f=/tmp/file_edit_with_content_change_updates_timestamp && echo 'Hello, world' > $f && touch -d 2016-05-02T01:23:45Z $f"
+
+file "/tmp/file_edit_with_content_change_updates_timestamp" do
+  action :edit
+  block do |content|
+    content.gsub!('world', 'Itamae')
+  end
+end
+
+###
+
+execute "touch -d 2016-05-02T12:34:56Z /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 @@ end
 
 ###
 
+execute "touch -d 2016-05-01T01:23:45Z /tmp/file_with_content_change_updates_timestamp"
+
+file "/tmp/file_with_content_change_updates_timestamp" do
+  content "Hello, world"
+end
+
+###
+
+execute "f=/tmp/file_without_content_change_keeping_timestamp && echo 'Hello, world' > $f && touch -d 2016-05-01T12:34:56Z $f"
+
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.7.pre
+  version: 1.9.8
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -308,9 +308,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1