dapp 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2FmYzM3MDM3ZjJiYzA2NTBkZDlkZjQ3ZjcwODBiZDc3ZDQ3YmNhZQ==
+    MTU3NmEyYmMxYjg4M2FjNDY0YzEwMmY2YzFkZjJhMmMyZmEwN2Y0Ng==
   data.tar.gz: !binary |-
-    NzUwNTk0YWM5Nzc2NjhkOTk0MzUwYjhlZTA5YjI4ZDhhY2EyODQ3OA==
+    OWJhNjNiMDUxODkwZWQ5MDdjMjA4YmRmOTk5M2Y4ZjJhMjhkMzUxYw==
 SHA512:
   metadata.gz: !binary |-
-    MzljMjQ3ZTIwMWNmNDI3YTdkOWE1MzNkN2I0OTU1YjlkMDQ0OWMxMTkxOGJl
-    Y2QxNDJhZDM1NTc1OTMxMGVmNmM3OTE1NmJlODIwYWMzNWFmMzQxOTBiYTI0
-    NWY1NjVjYjNkZWQwZmJiMTA1OTk1MDhjMjFkYTNmZTUxMmU5Yzc=
+    OTdiN2YzOTZmYzE3YzA0MzA1OWNiNTYyMjI2NWJmODU2NDIzM2ZkNzBjMTJh
+    MTc4YzNiNGFiMzJiM2VjYTY5MGFiYzNiMDA4ZWE4ODQ3MDQ1YWNhM2M0ZTNl
+    OWY0MDk3ODIxMzk1NzhhMDExMTIxMGM1ZjgyMGM0NWRiMTQzNDA=
   data.tar.gz: !binary |-
-    NTcxODBkNTA5YTlkYTZiYTgzMDk4OTE5YTcxMmU2Y2FmZGMwZWMxNjdhOWNk
-    MTMwZGI0N2Q5ODRkOGFlMGY2N2Q1MThjZGI0NDQxZmNmMTdhN2EzZjk1YzY1
-    NmU3ODhiYTU1ZGM0NjFkMjQ1NDcyNmMyY2Y4YjkyNDkyMDkzNjg=
+    MzgzMDZiMTk5MjAzMjExMDRiZTc2MmFjNTFiNzhjNGI3YTBlNTdjOTE1ZWU4
+    NjE5OGU4NjNlM2I4NzNiODRjNTg2MDA4MDhkZDA2YzdmOWFkY2FhZDMwZGRh
+    YWRlZjU4YzM2YmVmYWRjNjdmNDY2NzY4ZGM3Nzg0ZDViZGJmZmI=

data/lib/dapp/builder/chef.rb

@@ -49,6 +49,10 @@ module Dapp
         end
       end
 
+      def enabled_recipes
+        application.config._chef._recipes
+      end
+
       def project_name
         cookbook_metadata.name
       end
@@ -210,7 +214,7 @@ module Dapp
         @install_stage_cookbooks[stage] ||= true.tap do
           common_paths = proc do |cookbook_path|
             [['metadata.json', 'metadata.json'],
-             ['attributes', 'attributes'],
+             ["attributes/#{stage}", 'attributes/default'],
              ["files/#{stage}", 'files/default'],
              ["templates/#{stage}", 'templates/default']
             ].select { |from, _| cookbook_path.join(from).exist? }
@@ -226,7 +230,7 @@ module Dapp
               mdapp_enabled = is_mdapp && enabled_modules.include?(mdapp_name)
 
               paths = if is_project
-                recipe_paths = application.config._chef._recipes
+                recipe_paths = enabled_recipes
                   .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
                   .select { |from, _| cookbook_path.join(from).exist? }
 
@@ -263,19 +267,27 @@ module Dapp
 
         @stage_cookbooks_runlist ||= {}
         @stage_cookbooks_runlist[stage] ||= [].tap do |res|
-          to_runlist_entrypoint = proc do |cookbook, entrypoint|
+          to_entry = proc { |cookbook, entrypoint| "#{cookbook}::#{entrypoint}" }
+          to_recipe_entry = proc do |cookbook, entrypoint|
             entrypoint_file = stage_cookbooks_path(stage, cookbook, 'recipes', "#{entrypoint}.rb")
             next unless entrypoint_file.exist?
-            "#{cookbook}::#{entrypoint}"
+            to_entry[cookbook, entrypoint]
           end
 
-          res.concat(application.config._chef._recipes.map do |recipe|
-            to_runlist_entrypoint[project_name, recipe]
-          end.flatten.compact)
+          enabled_recipes
+            .map { |recipe| to_recipe_entry[project_name, recipe] }
+            .compact
+            .tap do |entries|
+              if entries.any?
+                res.concat entries
+              else
+                res << to_entry[project_name, 'void']
+              end
+            end
 
-          res.concat(enabled_modules.map do |mod|
-            to_runlist_entrypoint["mdapp-#{mod}", stage]
-          end.flatten.compact)
+          enabled_modules
+            .map { |mod| to_recipe_entry["mdapp-#{mod}", stage] || to_entry["mdapp-#{mod}", 'void'] }
+            .tap { |entries| res.concat entries }
         end
       end
       # rubocop:enable Metrics/AbcSize

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

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