itamae-mitsurin 0.45 → 0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec2c9668277bd1b04553438f10d215cc0c996c21
-  data.tar.gz: 47bdc2fd6ad9ac8218a9ce7607303ae587d95299
+  metadata.gz: 9d1f6d29ae9b227945bb222e0eb972c819039c5b
+  data.tar.gz: 9acdc555933504a72946673268da92c337ee7647
 SHA512:
-  metadata.gz: 76665bda355bf49f0fa5e6e3b43477ddfa7661a6b2313a9b0af7e363db16ab71d00d12104927cabd00af419348c94a047345acc230d114fa8815d345b5fb2dcb
-  data.tar.gz: 45687ee91f3f4b576e132cc28536cf9dee92b115197157ea3c60bbda8ad636c0cc8b108ed484c98b4a6972400eba1854fa53d4de754a5d2dd440c239004ea878
+  metadata.gz: 618c953d6cac86794aa74fcc8637e48b9a079848a44fba14dfa17f644fedac7ed78e576637b0aa3995d6e4cf55f654547fe1ea47be0bea2c69e435b690b32581
+  data.tar.gz: f20681d4563b280058249ae489677edaf94534fd587bd85d50f424ff719d6cb43eeb6da342d7a625bf36d1b760fac044a7524625c8c96dd406238edbda02dc39

data/lib/itamae-mitsurin/mitsurin/itamae_task.rb

@@ -111,9 +111,9 @@ module ItamaeMitsurin
             command_recipe = []
             recipes.each do |recipe_h|
               target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h[recipe_h.keys.join]}.rb"
-            if Dir.glob(target_recipe).empty?
-              raise "Recipe load error, nodefile: #{node_file}, reason: Does not exist " +
-                    recipe_h.keys.join + '::' +recipe_h.values.join
+              if Dir.glob(target_recipe).empty?
+                raise "Recipe load error, nodefile: #{node_file}, reason: Does not exist " +
+                      recipe_h.keys.join + '::' +recipe_h.values.join
               end
               Dir.glob(target_recipe).join("\s").split.each do |target|
                 unless File.exists?(target)

data/lib/itamae-mitsurin/mitsurin/itamae_with_git_task.rb

@@ -120,9 +120,9 @@ module ItamaeMitsurin
             command_recipe = []
             recipes.each do |recipe_h|
               target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h[recipe_h.keys.join]}.rb"
-            if Dir.glob(target_recipe).empty?
-              raise "Recipe load error, nodefile: #{node_file}, reason: Does not exist " +
-                    recipe_h.keys.join + '::' +recipe_h.values.join
+              if Dir.glob(target_recipe).empty?
+                raise "Recipe load error, nodefile: #{node_file}, reason: Does not exist " +
+                      recipe_h.keys.join + '::' +recipe_h.values.join
               end
               Dir.glob(target_recipe).join("\s").split.each do |target|
                 unless File.exists?(target)

data/lib/itamae-mitsurin/mitsurin/itamae_with_target_task.rb

@@ -138,9 +138,9 @@ module ItamaeMitsurin
             command_recipe = []
             recipes.each do |recipe_h|
               target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h[recipe_h.keys.join]}.rb"
-            if Dir.glob(target_recipe).empty?
-              raise "Recipe load error, nodefile: #{node_file}, reason: Does not exist " +
-                    recipe_h.keys.join + '::' +recipe_h.values.join
+              if Dir.glob(target_recipe).empty?
+                raise "Recipe load error, nodefile: #{node_file}, reason: Does not exist " +
+                      recipe_h.keys.join + '::' +recipe_h.values.join
               end
               Dir.glob(target_recipe).join("\s").split.each do |target|
                 unless File.exists?(target)

data/lib/itamae-mitsurin/resource/file.rb

@@ -84,23 +84,22 @@ module ItamaeMitsurin
       end
 
       def action_edit(options)
-        if attributes.mode
-          run_specinfra(:change_file_mode, @temppath, attributes.mode)
-        else
-          mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
-          run_specinfra(:change_file_mode, @temppath, mode)
+        change_target = attributes.modified ? @temppath : attributes.path
+
+        if attributes.mode || attributes.modified
+          mode = attributes.mode || run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          run_specinfra(:change_file_mode, change_target, mode)
         end
 
-        if attributes.owner || attributes.group
-          run_specinfra(:change_file_owner, @temppath, attributes.owner, attributes.group)
-        else
-          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)
+        if attributes.owner || attributes.group || attributes.modified
+          owner = attributes.owner || run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
+          group = attributes.group || run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
+          run_specinfra(:change_file_owner, change_target, owner, group)
         end
 
-        run_specinfra(:move_file, @temppath, attributes.path)
+        if attributes.modified
+          run_specinfra(:move_file, @temppath, attributes.path)
+        end
       end
 
       private

data/lib/itamae-mitsurin/version.txt

@@ -1 +1 @@
-0.45
+0.46

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.45'
+  version: '0.46'
 platform: ruby
 authors:
 - Akihiro Kamiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor