itamae 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6ca877086876cb9043c2ef01b6400e85ed2f69a
-  data.tar.gz: 4d9d0142b4bc23876cff279291080f48bf1c07ed
+  metadata.gz: 69eb224b93a5e9bfb3144ea3a867c430335bd42b
+  data.tar.gz: 1cdcb57ab16cd5fcc3263ab47fb2c79a6d4505d8
 SHA512:
-  metadata.gz: e12647212d06db1104f299fc2e5579cf1063dc720c3c3f662393c06678987800f484b7254a45c655bffa3ee4422048d573f2cba23e6ddc0f6e74cbd23023ed67
-  data.tar.gz: c137de18d95c1ff7ddee2aa5110d1cb70c6b2e4e84fea742978df9bfcade9545686e961081b55279850e2aae2ec9519ece157b51401d44fa70f51ecc7433398d
+  metadata.gz: 7b99272fc2ec58d6ddb79054ef9613982011ac10d3674fcb2c53b22fc1f81def84f0d4975c3c151d9860c8e48919c776e26af315bd1000544191df880bb53269
+  data.tar.gz: 6e11b47673437f304e4a12e1bb3e0ee3a7893d9260929b7d39058f6571b08c65c35570395fcc06cfe05d41274cd1caab74b85287bc177e94df551e8f26895f82

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.9.5
+
+Bugfixes
+
+- [Set mode and owner correctly when file not changed (by @sorah)](https://github.com/itamae-kitchen/itamae/commit/438d79e4ef714f637f8f1cb50b01293e5232340a)
+- [Make tempfile unreadable to secure (by @sorah)](https://github.com/itamae-kitchen/itamae/commit/7af1d29fc020e57f3587aace728fbb40e35669cf)
+- [Accept any objects as a log message (by @abicky)](https://github.com/itamae-kitchen/itamae/pull/195)
+
 ## v1.9.4
 
 Bugfixes

data/lib/itamae/logger.rb

@@ -48,10 +48,25 @@ module Itamae
       %w!debug info warn error fatal unknown!.each do |level|
         module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           def #{level}(msg)
-            super("  " * indent_depth + msg)
+            super(indent_msg(msg))
           end
         EOC
       end
+
+      private
+
+      def indent_msg(msg)
+        spaces = "  " * indent_depth
+        case msg
+        when ::String
+          "#{spaces}#{msg}"
+        when ::Exception
+          "#{spaces}#{msg.message} (#{msg.class})\n" <<
+          (msg.backtrace || []).map {|f| "#{spaces}#{f}"}.join("\n")
+        else
+          "#{spaces}#{msg.inspect}"
+        end
+      end
     end
 
     class Formatter

data/lib/itamae/resource/file.rb

@@ -60,15 +60,6 @@ module Itamae
           run_command(["touch", attributes.path])
         end
 
-        change_target = @temppath || attributes.path
-
-        if attributes.mode
-          run_specinfra(:change_file_mode, change_target, attributes.mode)
-        end
-        if attributes.owner || attributes.group
-          run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
-        end
-
         if @temppath
           if run_specinfra(:check_file_is_file, attributes.path)
             unless check_command(["diff", "-q", @temppath, attributes.path])
@@ -79,10 +70,20 @@ module Itamae
             # new file
             updated!
           end
+        end
 
-          if updated?
-            run_specinfra(:move_file, @temppath, attributes.path)
-          end
+        change_target = @temppath && updated?  ? @temppath : attributes.path
+
+        if attributes.mode
+          run_specinfra(:change_file_mode, change_target, attributes.mode)
+        end
+
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
+        end
+
+        if @temppath && updated?
+          run_specinfra(:move_file, @temppath, attributes.path)
         end
       end
 
@@ -170,7 +171,11 @@ module Itamae
                 end
 
           @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
+
+          run_command(["touch", @temppath])
+          run_specinfra(:change_file_mode, @temppath, '0600')
           backend.send_file(src, @temppath)
+          run_specinfra(:change_file_mode, @temppath, '0600')
         ensure
           f.unlink if f
         end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.9.4
+1.9.5

data/spec/integration/default_spec.rb

@@ -232,3 +232,11 @@ end
 describe file('/tmp/file_edit_notifies') do
   its(:content) { should eq("1") }
 end
+
+describe file('/tmp/file_without_content_change_updates_mode_and_owner') do
+  its(:content) { should eq("Hello, world") }
+  it { should be_mode 666 }
+  it { should be_owned_by "itamae2" }
+  it { should be_grouped_into "itamae2" }
+end
+

data/spec/integration/recipes/default.rb

@@ -402,6 +402,24 @@ end
 
 ###
 
+file '/tmp/file_without_content_change_updates_mode_and_owner' do
+  action :create
+  content 'Hello, world'
+  owner 'itamae'
+  group 'itamae'
+  mode '444'
+end
+
+file '/tmp/file_without_content_change_updates_mode_and_owner' do
+  action :create
+  content 'Hello, world' # no change
+  owner 'itamae2'
+  group 'itamae2'
+  mode '666'
+end
+
+###
+
 unless run_command("echo -n Hello").stdout == "Hello"
   raise "run_command in a recipe failed"
 end

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+module Itamae
+  describe Logger do
+    describe "#debug" do
+      context "`msg` is a String" do
+        it "indents the message" do
+          expect_any_instance_of(::Logger).to receive(:debug).with("  msg")
+          Itamae.logger.with_indent do
+            Itamae.logger.debug("msg")
+          end
+        end
+      end
+
+      context "`msg` is an Exception" do
+        let(:msg) { ::Exception.new("error") }
+
+        before do
+          allow(msg).to receive(:backtrace) { %w!frame1 frame2! }
+        end
+
+        it "indents the error message and the backtrace" do
+          expect_any_instance_of(::Logger).to receive(:debug).with(<<-MSG.rstrip)
+  error (Exception)
+  frame1
+  frame2
+          MSG
+          Itamae.logger.with_indent do
+            Itamae.logger.debug(msg)
+          end
+        end
+      end
+
+      context "`msg` is an Array" do
+        it "indents the message" do
+          expect_any_instance_of(::Logger).to receive(:debug).with("  []")
+          Itamae.logger.with_indent do
+            Itamae.logger.debug([])
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -286,6 +286,7 @@ files:
 - spec/unit/lib/itamae/handler/fluentd_spec.rb
 - spec/unit/lib/itamae/handler_proxy_spec.rb
 - spec/unit/lib/itamae/handler_spec.rb
+- spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb
@@ -338,6 +339,7 @@ test_files:
 - spec/unit/lib/itamae/handler/fluentd_spec.rb
 - spec/unit/lib/itamae/handler_proxy_spec.rb
 - spec/unit/lib/itamae/handler_spec.rb
+- spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb