itamae 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aeeda7470e3841a47a420c875efb9d332f5359e
-  data.tar.gz: 48fe841ad7c50ab056314b47e33835d506bc5e10
+  metadata.gz: 16430941743e871422f34e8a84999bfdd676261c
+  data.tar.gz: 8b937db3cfbd6baa310f0086576f46bffee03b6b
 SHA512:
-  metadata.gz: 553a0d69d5f583903f5f09226a9084165a389efa9481a94ea057e74da50d40a1828b57f60bcf4448ccc46366d5ac6aed10504bda68fb07adea2b7d1a5668c854
-  data.tar.gz: e14ac9b44bc9672014ef0c8d3d38eeca1a3dcbf496c07769c4a51f7c46166c9db4a6b723d5da328dcc87a24bb550e6a51d4495bec280e41048f8d593f7fea50a
+  metadata.gz: e74644471245614750aff1fc8c11a9f7a5b8afff95bac06f053a2ddecbe269fb0b1b57c2d105956f62358df4530b5b0e6f0cc9a08db737ce4366b92572d3af80
+  data.tar.gz: 821c7cbcad69cfbb44f1d0d9d8d0c17d8241cf2332fc79693f76e48beb66e9ef2f95c0514bf5e49c1e5ab9e1f84423280e0c08447015263af673b5d5c7bd8faa

data/lib/itamae/resource/base.rb

@@ -54,6 +54,8 @@ module Itamae
           return
         end
 
+        pre_action
+
         set_current_attributes
         show_differences
 
@@ -113,6 +115,10 @@ module Itamae
         super
       end
 
+      def pre_action
+        # do nothing
+      end
+
       def set_current_attributes
         # do nothing
       end
@@ -126,7 +132,7 @@ module Itamae
       def show_differences
         @current_attributes.each_pair do |key, current_value|
           value = @attributes[key]
-          if current_value == value
+          if current_value == value || value.nil?
             Logger.info "  #{key} will not change (current value is '#{current_value}')"
           else
             Logger.info "  #{key} will change from '#{current_value}' to '#{value}'"

data/lib/itamae/resource/directory.rb

@@ -10,17 +10,26 @@ module Itamae
       define_attribute :group, type: String
 
       def set_current_attributes
-        if run_specinfra(:check_file_is_directory, path)
+        exist = run_specinfra(:check_file_is_directory, path)
+        @current_attributes[:exist?] = exist
+
+        if exist
           @current_attributes[:mode] = run_specinfra(:get_file_mode, path).stdout.chomp
           @current_attributes[:owner] = run_specinfra(:get_file_owner_user, path).stdout.chomp
           @current_attributes[:group] = run_specinfra(:get_file_owner_group, path).stdout.chomp
         else
-          updated!
+          @current_attributes[:mode] = nil
+          @current_attributes[:owner] = nil
+          @current_attributes[:group] = nil
+        end
+
+        if action == :create
+          @attributes[:exist?] = true
         end
       end
 
       def create_action
-        if ! run_specinfra(:check_file_is_directory, path)
+        if !run_specinfra(:check_file_is_directory, path)
           run_specinfra(:create_file_as_directory, path)
         end
         if attributes[:mode]

data/lib/itamae/resource/file.rb

@@ -11,7 +11,7 @@ module Itamae
       define_attribute :owner, type: String
       define_attribute :group, type: String
 
-      def create_action
+      def pre_action
         src = if content_file
                 content_file
               else
@@ -21,14 +21,52 @@ module Itamae
                 end
               end
 
-        temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
-        copy_file(src, temppath)
+        @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
+        copy_file(src, @temppath)
+      end
+
+      def set_current_attributes
+        exist = run_specinfra(:check_file_is_file, path)
+        @current_attributes[:exist?] = exist
 
+        if exist
+          @current_attributes[:mode] = run_specinfra(:get_file_mode, path).stdout.chomp
+          @current_attributes[:owner] = run_specinfra(:get_file_owner_user, path).stdout.chomp
+          @current_attributes[:group] = run_specinfra(:get_file_owner_group, path).stdout.chomp
+        else
+          @current_attributes[:mode] = nil
+          @current_attributes[:owner] = nil
+          @current_attributes[:group] = nil
+        end
+
+        if action == :create
+          @attributes[:exist?] = true
+        end
+      end
+
+      def show_differences
+        super
+
+        if @current_attributes[:exist?]
+          diff = run_command(["diff", "-u", path, @temppath], error: false)
+          if diff.exit_status == 0
+            # no change
+            Logger.info "  file content will not change"
+          else
+            Logger.info "  diff:"
+            diff.stdout.each_line do |line|
+              Logger.info "    #{line.strip}"
+            end
+          end
+        end
+      end
+
+      def create_action
         if mode
-          run_specinfra(:change_file_mode, temppath, mode)
+          run_specinfra(:change_file_mode, @temppath, mode)
         end
         if owner || group
-          run_specinfra(:change_file_owner, temppath, owner, group)
+          run_specinfra(:change_file_owner, @temppath, owner, group)
         end
 
         if run_specinfra(:check_file_is_file, path)
@@ -37,7 +75,7 @@ module Itamae
         end
 
         # TODO: specinfra
-        run_command(["mv", temppath, path])
+        run_command(["mv", @temppath, path])
       end
     end
   end

data/lib/itamae/resource/remote_file.rb

@@ -5,7 +5,7 @@ module Itamae
     class RemoteFile < File
       define_attribute :source, type: String, required: true
 
-      def create_action
+      def pre_action
         content_file(::File.expand_path(source, ::File.dirname(@recipe.path)))
 
         super

data/lib/itamae/resource/template.rb

@@ -7,7 +7,7 @@ module Itamae
     class Template < File
       define_attribute :source, type: String, required: true
 
-      def create_action
+      def pre_action
         src = ::File.expand_path(source, ::File.dirname(@recipe.path))
         content(ERB.new(::File.read(src), nil, '-').result(binding))
 

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.0.0.beta4"
+  VERSION = "1.0.0.beta5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Ryota Arai