itamae 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154b1597ae0505eec08966ce87e4481cebc99291
-  data.tar.gz: eaed49c1a0352814e22227999385e0668dc99320
+  metadata.gz: d6ca877086876cb9043c2ef01b6400e85ed2f69a
+  data.tar.gz: 4d9d0142b4bc23876cff279291080f48bf1c07ed
 SHA512:
-  metadata.gz: 749602fb374334e832b70aeadbae91dade0aaa0426747dc11394771c1cb4d4f00d78af4f290907659c15307e773c977e0fd7b4d6eaa72536248a9eca757b005d
-  data.tar.gz: 97c15caa14ea44d38898a2ec44c629a25a499855b5d16553e04fa431cc72dff470b7f8844e0b0fc31aff9d9abae51a8509a3263ec8c243b36b86c95baded7bc6
+  metadata.gz: e12647212d06db1104f299fc2e5579cf1063dc720c3c3f662393c06678987800f484b7254a45c655bffa3ee4422048d573f2cba23e6ddc0f6e74cbd23023ed67
+  data.tar.gz: c137de18d95c1ff7ddee2aa5110d1cb70c6b2e4e84fea742978df9bfcade9545686e961081b55279850e2aae2ec9519ece157b51401d44fa70f51ecc7433398d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.9.4
+
+Bugfixes
+
+- [Fix a bug that displays inappropriate diff in file deletion (by @takus)](https://github.com/itamae-kitchen/itamae/pull/200)
+- [Show diff on edit action of file resource in dry-run mode. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/197)
+- [Stop to call `chown --reference` and `chmod --reference` (by @yuichiro-naito)](https://github.com/itamae-kitchen/itamae/pull/193)
+
 ## v1.9.3
 
 Improvements
@@ -522,10 +530,10 @@ Features
 Features
 
 - New resource `remote_directory` which transfers a directory from local to remote like `remote_file` resource. (by @k0kubun)
-  - https://github.com/ryotarai/itamae/pull/66
+  - https://github.com/itamae-kitchen/itamae/pull/66
 
 ## v1.1.0
 
 Incompatible changes
 
-- [`uid` and `gid` attributes of `user` resource accept only Integer. (by @ryotarai)](https://github.com/ryotarai/itamae/pull/65)
+- [`uid` and `gid` attributes of `user` resource accept only Integer. (by @eagletmt)](https://github.com/itamae-kitchen/itamae/pull/65)

data/lib/itamae/resource/file.rb

@@ -12,6 +12,8 @@ module Itamae
       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 @@ module Itamae
         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 @@ module Itamae
       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
@@ -50,7 +50,7 @@ module Itamae
 
         super
 
-        if @temppath
+        if @temppath && @current_action != :delete
           compare_file
         end
       end
@@ -96,13 +96,17 @@ module Itamae
         if attributes.mode
           run_specinfra(:change_file_mode, @temppath, attributes.mode)
         else
-          run_command(['chmod', '--reference', attributes.path, @temppath])
+          mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          run_specinfra(:change_file_mode, @temppath, mode)
         end
 
         if attributes.owner || attributes.group
           run_specinfra(:change_file_owner, @temppath, attributes.owner, attributes.group)
         else
-          run_command(['chown', '--reference', attributes.path, @temppath])
+          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)
         end
 
         unless check_command(["diff", "-q", @temppath, attributes.path])

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.9.3
+1.9.4

data/spec/integration/default_spec.rb

@@ -208,6 +208,14 @@ describe file('/tmp/file_edit_sample') do
   it { should be_grouped_into "itamae2" }
 end
 
+describe file('/tmp/file_edit_keeping_mode_owner') do
+  it { should be_file }
+  its(:content) { should eq("Hello, Itamae") }
+  it { should be_mode 444 }
+  it { should be_owned_by "itamae" }
+  it { should be_grouped_into "itamae" }
+end
+
 describe file('/home/itamae2') do
   it { should be_directory }
   it { should be_owned_by "itamae2" }

data/spec/integration/recipes/default.rb

@@ -364,6 +364,10 @@ end
 
 #####
 
+execute 'echo -n 1 > /tmp/file_edit_notifies' do
+  action :nothing
+end
+
 file '/tmp/file_edit_sample' do
   content 'Hello, world'
   owner 'itamae'
@@ -382,8 +386,18 @@ file '/tmp/file_edit_sample' do
   notifies :run, "execute[echo -n 1 > /tmp/file_edit_notifies]"
 end
 
-execute 'echo -n 1 > /tmp/file_edit_notifies' do
-  action :nothing
+file '/tmp/file_edit_keeping_mode_owner' do
+  content 'Hello, world'
+  owner 'itamae'
+  group 'itamae'
+  mode '444'
+end
+
+file '/tmp/file_edit_keeping_mode_owner' do
+  action :edit
+  block do |content|
+    content.gsub!('world', 'Itamae')
+  end
 end
 
 ###

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor