dapp 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 736bd0b9c90721b086654095099165858735d7b7
-  data.tar.gz: b35661d57687c80f77b802895e1b1266c03e0604
+  metadata.gz: ae5353ff9630589b96b901a1a154bd340bc54866
+  data.tar.gz: de780b94214808fe3d156d07d2563efd5dbb5bbd
 SHA512:
-  metadata.gz: 46ccabca9ea0395b300257d38b010e9b0f00a158a403f8142b4c53c25c643520d88c2d080c6ea0d30f3b01e91136f4dfd304685cbd04ba81b71f942c8ba69d6c
-  data.tar.gz: 4009d71698dddb250b37bc0d14dccbd2632bcc28a207920aed6520b3830f5054f9f61474e21a4741ee26a31ec871beacf08b28e5588bfe3469ad09aeefdefaf0
+  metadata.gz: 6852b64b7e5001053136398325d8af8120925505b4610c4b65a5a61553ca9f81088075926879c5919169c109d3a54dc0126943f0f9c5d7795ca6ce1168c03fad
+  data.tar.gz: 9eef518c4c08935d9907488f4c0b784db6fe9736b9b587ad0b5ca9c8a1194f152d67b716db54174659da32a951cc20f299b621fc599060bb570f4b5e89f3c036

data/lib/dapp/builder/chef.rb

@@ -208,14 +208,14 @@ module Dapp
 
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_stage_cookbooks(stage)
-        common_paths = proc do |cookbook_path|
-          [['metadata.json', 'metadata.json'],
-           ['attributes/common', 'attributes'],
-           ["attributes/#{stage}", 'attributes'],
-           ["files/#{stage}", 'files/default'],
-           ["templates/#{stage}", 'templates/default']].select { |from, _| cookbook_path.join(from).exist? }
+        select_existing_paths = ->(cookbook_path, paths) do
+          paths.select { |from, _| cookbook_path.join(from).exist? }
         end
 
+        common_paths = [['metadata.json', 'metadata.json'],
+                        ["files/#{stage}", 'files/default'],
+                        ["templates/#{stage}", 'templates/default']]
+
         install_paths = Dir[cookbooks_vendor_path('*')]
                         .map(&Pathname.method(:new))
                         .map do |cookbook_path|
@@ -230,18 +230,30 @@ module Dapp
                                    .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
                                    .select { |from, _| cookbook_path.join(from).exist? }
 
+                    common_project_paths = select_existing_paths.call(
+                      cookbook_path, [*common_paths,
+                                      ['attributes/common', 'attributes'],
+                                      ["attributes/#{stage}", 'attributes']]
+                    )
+
                     if recipe_paths.any?
-                      [*recipe_paths, *common_paths[cookbook_path]]
+                      [*recipe_paths, *common_project_paths]
                     else
-                      [nil, *common_paths[cookbook_path]]
+                      [nil, *common_project_paths]
                     end
                   elsif is_mdapp && mdapp_enabled
                     recipe_path = "recipes/#{stage}.rb"
 
+                    common_mdapp_paths = select_existing_paths.call(
+                      cookbook_path, [*common_paths,
+                                      ['attributes/common.rb', 'attributes/common.rb'],
+                                      ["attributes/#{stage}.rb", "attributes/#{stage}.rb"]]
+                    )
+
                     if cookbook_path.join(recipe_path).exist?
-                      [[recipe_path, recipe_path], *common_paths[cookbook_path]]
+                      [[recipe_path, recipe_path], *common_mdapp_paths]
                     else
-                      [nil, *common_paths[cookbook_path]]
+                      [nil, *common_mdapp_paths]
                     end
                   else
                     [['.', '.']]
@@ -252,7 +264,7 @@ module Dapp
 
         _stage_cookbooks_path(stage).mkpath
         install_paths.each do |cookbook_path, paths|
-          cookbook = cookbook_path.basename
+          cookbook = cookbook_path.basename.to_s
 
           paths.each do |from, to|
             if from.nil?

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.5.6'.freeze
   BUILD_CACHE_VERSION = 3
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout