itamae-mitsurin 0.35 → 0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db9ad7a86446e88dc50ab91c861e38155c1350f6
-  data.tar.gz: 2fe613b6476780c81e5311e744101a487f729d8c
+  metadata.gz: d035a5bf6fe73ee2c347aa0d3d867bfd8f689666
+  data.tar.gz: c662add51008eab10c8de6cb539dbecfbe4fe9ab
 SHA512:
-  metadata.gz: 190496a48de3ddb5777a3004172495ebe4d390051d6fbe72be8545677ed2613ed278b80dee8d443c38f96c0da8fe1252b17976d5ac236605db9dd8dfd4d5c932
-  data.tar.gz: a7cdb00986b1a28f2e6619d10e6a0a4839e4af690253d3903aad8c49288eb5e0c61bb4434d9221234acce291483a5a14143144b9b4018f8b06df9ae7a081af15
+  metadata.gz: ddd69d0300951a385e922ada278b176fc3425ac49a3f6ecc9a418bb706f7bba3ab3098c0ddb3881bf96f2ac57870b02545d34f5101d5d5dc6f9dc0bf22e29460
+  data.tar.gz: 6a00cca54e095d9e9e3ea908d3b49097c5e2830f0faa048015809a2388acc3b383f0ea21120c6dcd1e5d280048f2b7b7e985c056f74e83d32436f6f3cf9d4d6f

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

@@ -110,12 +110,14 @@ module ItamaeMitsurin
             # recipes load to_command
             command_recipe = []
             recipes.each do |recipe_h|
-              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb"
-              unless File.exists?("#{Dir.glob(target_recipe).join}")
-                ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
-                raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h[recipe_h.keys.join]}.rb"
+              Dir.glob(target_recipe).join("\s").split.each do |target|
+                unless File.exists?(target)
+                  ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
+                  raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+                end
+                command_recipe << " #{target}"
               end
-              command_recipe << " #{Dir.glob(target_recipe).join("\s")}"
             end
 
             command_recipe.sort_by! {|item| File.dirname(item)}

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

@@ -119,12 +119,14 @@ module ItamaeMitsurin
               # recipe load to_command
             command_recipe = []
             recipes.each do |recipe_h|
-              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb"
-              unless File.exists?("#{Dir.glob(target_recipe).join}")
-                ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
-                raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h[recipe_h.keys.join]}.rb"
+              Dir.glob(target_recipe).join("\s").split.each do |target|
+                unless File.exists?(target)
+                  ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
+                  raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+                end
+                command_recipe << " #{target}"
               end
-              command_recipe << " #{Dir.glob(target_recipe).join("\s")}"
             end
 
             command_recipe.sort_by! {|item| File.dirname(item)}

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

@@ -126,12 +126,14 @@ module ItamaeMitsurin
               # recipe load to_command
             command_recipe = []
             recipes.each do |recipe_h|
-              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb"
-              unless File.exists?("#{Dir.glob(target_recipe).join}")
-                ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
-                raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h[recipe_h.keys.join]}.rb"
+              Dir.glob(target_recipe).join("\s").split.each do |target|
+                unless File.exists?(target)
+                  ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
+                  raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+                end
+                command_recipe << " #{target}"
               end
-              command_recipe << " #{Dir.glob(target_recipe).join("\s")}"
             end
 
             command_recipe.sort_by! {|item| File.dirname(item)}

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

@@ -105,12 +105,14 @@ module ItamaeMitsurin
               # recipe load to_command
             command_recipe = []
             recipes.each do |recipe_h|
-              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h["#{recipe_h.keys.join}"]}.rb"
-              unless File.exists?("#{Dir.glob(target_recipe).join}")
-                ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
-                raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+              target_recipe = "site-cookbooks/**/#{recipe_h.keys.join}/recipes/#{recipe_h[recipe_h.keys.join]}.rb"
+              Dir.glob(target_recipe).join("\s").split.each do |target|
+                unless File.exists?(target)
+                  ex_recipe = recipe_h.to_s.gsub('=>', '::').gsub('"', '')
+                  raise "Recipe load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_recipe}"
+                end
+                command_recipe << " #{target}"
               end
-              command_recipe << " #{Dir.glob(target_recipe).join("\s")}"
             end
 
             command_recipe.sort_by! {|item| File.dirname(item)}

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

@@ -65,12 +65,14 @@ module Itamae
             # recipe load to_spec
             spec_pattern = []
             recipes.each do |spec_h|
-              target_spec = "site-cookbooks/**/#{spec_h.keys.join}/spec/#{spec_h["#{spec_h.keys.join}"]}_spec.rb"
-              unless File.exists?("#{Dir.glob(target_spec).join}")
-                ex_recipe = spec_h.to_s.gsub('=>', '::').gsub('"', '')
-                raise "Spec load error, nodefile:#{node_file}, reason:Not exist the spec #{ex_recipe}"
+              target_spec = "site-cookbooks/**/#{recipe_h.keys.join}/spec/#{recipe_h[recipe_h.keys.join]}_spec.rb"
+              Dir.glob(target_spec).join("\s").split.each do |target|
+                unless File.exists?(target)
+                  ex_spec = spec_h.to_s.gsub('=>', '::').gsub('"', '')
+                  raise "Spec load error, nodefile:#{node_file}, reason:Not exist the recipe #{ex_spec}"
+                end
+                spec_pattern << " #{target}"
               end
-              spec_pattern << " #{Dir.glob(target_spec).join("\s")}"
             end
 
             spec_pattern.sort_by! {|item| File.dirname(item)}

data/lib/itamae-mitsurin/version.txt

@@ -1 +1 @@
-0.35
+0.36

metadata

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