itamae 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c3734924aed2c2ab9472e781e7c512c31599b46
-  data.tar.gz: fe29b7a53a36075a3886be1d89e17355edf528cd
+  metadata.gz: 9b5da1c2ff4d918217ee4f29df62cb0660fdb7a9
+  data.tar.gz: 18078c7885176596c4c3396a8908ff5cc8baa72c
 SHA512:
-  metadata.gz: c7a9d8d4400cc1b46276c7e5115e4c5bd653fb9d2cb63c3edcd548d36207b021947b8925aaaab9b693bf8e4a26db4c9324275c0b80a4e2ea9ac5e4cb382f97a2
-  data.tar.gz: abd0f092cfa89168efe723b0210a58ba3a4ec82993818be5cda8a7787d5827148744fd6dda2355e2482146b79d7414f084bc7e4d3b568a2d695385abc4721379
+  metadata.gz: cc92d067302c74eabb5e20c0856540bf6a39486ed520f43744346150c82a69e338de577fa44277156fbdad8bb40ee67a1ee08bb28330c4ef8d6c81bdd414001a
+  data.tar.gz: 3932d9c1c1053356b4bb45fbfbbdadf73a35e2edcc7025ad12241b21b645e90834ea55c21bd7d3042a7d00830e38e666a45dadec937f6299eaa01f2092b8ba3c

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.3.5
+
+Improvements
+
+- [`create` action of `file` resource without `content` attribute changes mode and owner without touching the content of the file](https://github.com/itamae-kitchen/itamae/compare/itamae-kitchen:d4a0abc...itamae-kitchen:3eae144)
+
+Bugfixes
+
+- [Edit action of file resource should set owner and mode if specified (by @eagletmt)](https://github.com/itamae-kitchen/itamae/pull/143)
+
 ## v1.3.4
 
 Improvements

data/README.md

@@ -1,4 +1,4 @@
-# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s/master "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/itamae-kitchen/itamae?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s/master "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Slack](https://itamae-slackin.herokuapp.com/badge.svg)](https://itamae-slackin.herokuapp.com/)
 
 Simple and lightweight configuration management tool inspired by Chef.
 
@@ -37,6 +37,10 @@ $ bundle exec rake spec
 
 - [(in Japanese) Itamae - Infra as Code 現状確認会](https://speakerdeck.com/ryotarai/itamae-infra-as-code-xian-zhuang-que-ren-hui)
 
+## Get Involved
+
+[Don't hesitate to join our Slack team!](https://itamae-slackin.herokuapp.com/)
+
 ## Contributing
 
 If you have a problem, please [create an issue](https://github.com/ryotarai/itamae/issues/new) or a pull request.

data/lib/itamae/resource/file.rb

@@ -5,7 +5,7 @@ module Itamae
     class File < Base
       define_attribute :action, default: :create
       define_attribute :path, type: String, default_name: true
-      define_attribute :content, type: String, default: ''
+      define_attribute :content, type: String, default: nil
       define_attribute :mode, type: String
       define_attribute :owner, type: String
       define_attribute :group, type: String
@@ -54,24 +54,28 @@ module Itamae
       end
 
       def action_create(options)
+        change_target = @temppath || attributes.path
+
         if attributes.mode
-          run_specinfra(:change_file_mode, @temppath, attributes.mode)
+          run_specinfra(:change_file_mode, change_target, attributes.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)
         end
 
-        if run_specinfra(:check_file_is_file, attributes.path)
-          unless check_command(["diff", "-q", @temppath, attributes.path])
-            # the file is modified
+        if @temppath
+          if run_specinfra(:check_file_is_file, attributes.path)
+            unless check_command(["diff", "-q", @temppath, attributes.path])
+              # the file is modified
+              updated!
+            end
+          else
+            # new file
             updated!
           end
-        else
-          # new file
-          updated!
-        end
 
-        run_specinfra(:move_file, @temppath, attributes.path)
+          run_specinfra(:move_file, @temppath, attributes.path)
+        end
       end
 
       def action_delete(options)
@@ -81,8 +85,18 @@ module Itamae
       end
 
       def action_edit(options)
-        run_command(['chmod', '--reference', attributes.path, @temppath])
-        run_command(['chown', '--reference', attributes.path, @temppath])
+        if attributes.mode
+          run_specinfra(:change_file_mode, @temppath, attributes.mode)
+        else
+          run_command(['chmod', '--reference', attributes.path, @temppath])
+        end
+
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, @temppath, attributes.owner, attributes.group)
+        else
+          run_command(['chown', '--reference', attributes.path, @temppath])
+        end
+
         run_specinfra(:move_file, @temppath, attributes.path)
       end
 
@@ -116,6 +130,11 @@ module Itamae
       end
 
       def send_tempfile
+        if current.exist && !attributes.content && !content_file
+          @temppath = nil
+          return
+        end
+
         begin
           src = if content_file
                   content_file

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.3.4
+1.3.5

data/spec/integration/default_spec.rb

@@ -163,9 +163,9 @@ end
 describe file('/tmp/file_edit_sample') 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" }
+  it { should be_mode 400 }
+  it { should be_owned_by "itamae2" }
+  it { should be_grouped_into "itamae2" }
 end
 
 describe file('/home/itamae2') do
@@ -173,3 +173,10 @@ describe file('/home/itamae2') do
   it { should be_owned_by "itamae2" }
   it { should be_grouped_into "itamae2" }
 end
+
+describe file('/tmp/file_create_without_content') do
+  its(:content) { should eq("Hello, World") }
+  it { should be_mode 600 }
+  it { should be_owned_by "itamae" }
+  it { should be_grouped_into "itamae" }
+end

data/spec/integration/recipes/default.rb

@@ -263,6 +263,18 @@ end
 
 #####
 
+file "/tmp/file_create_without_content" do
+  content "Hello, World"
+end
+
+file "/tmp/file_create_without_content" do
+  owner "itamae"
+  group "itamae"
+  mode "600"
+end
+
+#####
+
 execute 'true' do
   verify 'true'
 end
@@ -318,6 +330,9 @@ end
 
 file '/tmp/file_edit_sample' do
   action :edit
+  owner 'itamae2'
+  group 'itamae2'
+  mode '400'
   block do |content|
     content.gsub!('world', 'Itamae')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor