itamae 1.9.12 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d9449b41e179eee46bdba56f3c099d58c652d48116f7927f7cc12fcf6d0f015
-  data.tar.gz: 63f4dd7419342509efa326830783d421d97c1295074c231b7f8de854fab47f87
+  metadata.gz: d31a078719d6c81a81538a9018dd038502f5b70b05918927bc3a97e6afdf8ebb
+  data.tar.gz: 23e7489bd095e53a783be646ba54c9d88dad035eb00248528126fb35f03a50ac
 SHA512:
-  metadata.gz: e1925e7d871bc4622c9c10ce086d735e203093a3b533a348cff643912aa9798cc26561a46cc4e6b9245b1c5ccfa93199b9e8df4c9e3a0a4b2f258c9297c79ef5
-  data.tar.gz: 18649f349ddb64abfb85215a00ea56b9aeca3ee809916853aa3f10a461e2dbfe0acc2bd5ca9b1bed077c64aa634b3e6277d8cc54015d51e31bd49a1afdb3abc2
+  metadata.gz: a00853cae59ed87678e3351a3888d352c372c03d8cd6ebbe1491df525648440efb69ed8c67611dce68a41681ea8782d263feec21b87c229df5d646bfb16997c8
+  data.tar.gz: c5315707855dce49e9470a6c9723ecb537fd1b117cc29ea755bf023c320fe5aedb2d1d1882e173509cf68ed1e502c9728451471bb810ea4bbdf520ccb2f2e63b

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## Unreleased
 [full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.12...master)
 
+## v1.9.13
+[full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.11...v1.9.12)
+
+Bugfixes
+
+- [Fixed. Can not create empty file](https://github.com/itamae-kitchen/itamae/pull/269)
+
 ## v1.9.12
 [full changelog](https://github.com/itamae-kitchen/itamae/compare/v1.9.11...v1.9.12)
 

data/Rakefile

@@ -22,12 +22,14 @@ namespace :spec do
       task target => ["docker:#{target}", "provision:#{target}", "serverspec:#{target}"]
 
       namespace :docker do
+        desc "Run docker for #{target}"
         task target do
           sh "docker run --privileged -d --name itamae #{target} /sbin/init"
         end
       end
 
       namespace :provision do
+        desc "Run itamae to #{target}"
         task target do
           suites = [
             [

data/lib/itamae/resource/file.rb

@@ -118,6 +118,13 @@ module Itamae
           return
         end
 
+        # When the path currently doesn't exist yet, :change_file_xxx should be performed against `@temppath`.
+        # Checking that by `diff -q /dev/null xxx` doesn't work when xxx's content is "", because /dev/null's content is also "".
+        if !current.exist && attributes.exist
+          attributes.modified = true
+          return
+        end
+
         case run_command(["diff", "-q", compare_to, @temppath], error: false).exit_status
         when 1
           # diff found

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.12"
+  VERSION = "1.9.13"
 end

data/spec/integration/default_spec.rb

@@ -303,3 +303,21 @@ end
 describe file('/tmp/subscribed_from_parent') do
   it { should be_file }
 end
+
+describe file('/tmp/empty_file1') do
+  it { should exist }
+  it { should be_file }
+  its(:content) { should eq "" }
+end
+
+describe file('/tmp/empty_file2') do
+  it { should exist }
+  it { should be_file }
+  its(:content) { should eq "" }
+end
+
+describe file('/tmp/empty_file3') do
+  it { should exist }
+  it { should be_file }
+  its(:content) { should eq "" }
+end

data/spec/integration/recipes/default.rb

@@ -271,14 +271,14 @@ end
 
 ######
 
-execute "mkdir /tmp/link-force-no-dereference1"
+execute "mkdir -p /tmp/link-force-no-dereference1"
 link "link-force-no-dereference" do
   cwd "/tmp"
   to "link-force-no-dereference1"
   force true
 end
 
-execute "mkdir /tmp/link-force-no-dereference2"
+execute "mkdir -p /tmp/link-force-no-dereference2"
 link "link-force-no-dereference" do
   cwd "/tmp"
   to "link-force-no-dereference2"
@@ -556,6 +556,20 @@ end
 
 ###
 
+file "/tmp/empty_file1" do
+  content ""
+end
+
+remote_file "/tmp/empty_file2" do
+  source "files/empty_file"
+end
+
+template "/tmp/empty_file3" do
+  source "templates/empty_file.erb"
+end
+
+###
+
 v1 = node.memory.total
 v2 = node[:memory][:total]
 v3 = node['memory']['total']

data/spec/unit/lib/itamae/handler_proxy_spec.rb

@@ -20,8 +20,8 @@ module Itamae
             expect(handler).to receive(:event).with(:name_started, :arg)
             expect(handler).to receive(:event).with(:name_failed, :arg)
             expect {
-              subject.event(:name, :arg) { raise }
-            }.to raise_error
+              subject.event(:name, :arg) { raise "name is failed" }
+            }.to raise_error "name is failed"
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.12
+  version: 1.9.13
 platform: ruby
 authors:
 - Ryota Arai
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -275,12 +275,14 @@ files:
 - spec/integration/recipes/define/default.rb
 - spec/integration/recipes/define/files/remote_file_in_definition
 - spec/integration/recipes/dry_run.rb
+- spec/integration/recipes/files/empty_file
 - spec/integration/recipes/files/remote_file_auto
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/recipes/redefine.rb
+- spec/integration/recipes/templates/empty_file.erb
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
@@ -329,12 +331,14 @@ test_files:
 - spec/integration/recipes/define/default.rb
 - spec/integration/recipes/define/files/remote_file_in_definition
 - spec/integration/recipes/dry_run.rb
+- spec/integration/recipes/files/empty_file
 - spec/integration/recipes/files/remote_file_auto
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/recipes/redefine.rb
+- spec/integration/recipes/templates/empty_file.erb
 - spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb