dapp 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NThkZTliY2NiMmIyMjYxOTU2NzU0OWFhMDc4NjgxYTE0Y2U1MDMxZQ==
+    ZDIwZTRlMjc2NjRmODU1ZDQ5MmU4YmYyMTVjY2E1NWFmMWI1YmVkNA==
   data.tar.gz: !binary |-
-    MjlmYTUwZDNjYTE1MDVlYTIxODdjODVkNjFkMWNmMTJjNWVmMDkwOQ==
+    NjMwODFkZWRkY2NmNjZkZDJlMjcyNWFmZjYwYjc4NDIzYzM4ZDMzYg==
 SHA512:
   metadata.gz: !binary |-
-    NTE5N2M4ZTRlZmE3OWU2ZTUzOTVlYzVjMmVlY2Q3MWE3NjEwMTEyZjU1M2Ri
-    ZjhmNGI1YzRlMTk5YjE4YmI4MzA3Yzg3N2EyMTkyMmNkODcyNDFmOTkzMGMx
-    ZjU2MDFiNmI1ODAxOGYxYjM4ZjEwMTI3Yjc3NDVhZDIyMGI1N2U=
+    MTFlYmY1MzhmZmFmN2E2ZWUzMWQyNjA1ZDljNGMzNzNjODRjMWUwMzI5MjJi
+    YzhiNWRiZGM0NTU0YjVhMzYwNmNmYTY0ZDUxZWRhMzViNTExMzNiZjI1MGZk
+    NjIzYTkzZjQ2Zjc3N2QyOGY5OGVhMDU3NmEwYTExM2YzZmE3NWY=
   data.tar.gz: !binary |-
-    ZWUxNDM5ZWEyMTRlYWQwMjI3NzllYmE0YzZiY2JjN2U4NTFkYTgxNmQ5ZDA0
-    MmUxOWEzYjk0MDg4Y2YxNjQ3ZjhiNTQyYmI4Yjg4ZjFkMWU4MDRmOWY1NTRm
-    MzBiMDJkNjM4NmI3Y2RlNzBlODRiMzg1MThlYmFlMmJiYzUzNWM=
+    MWE1NGM5ZmQ4ODg4M2NjY2VmN2U2YTRkNjU1ZjAxYmM0OWQwMjEyNWY3ZjFm
+    Yzg5NjIwMGM2ZGY4NDMwYmNmZTZmODU5YjI2ZWJmMGIyMDgxYjA5MGFmMTBj
+    YmIxMWY2NGUwNzM3MmE5YTkwMTM3MzMyMWU1OTU5OGQwODk1MzA=

data/lib/dapp/builder/chef.rb

@@ -72,13 +72,13 @@ module Dapp
 
       def local_cookbook_paths_for_checksum
         @local_cookbook_paths_for_checksum ||= berksfile
-                                               .local_cookbooks
-                                               .values
-                                               .map { |cookbook| cookbook[:path] }
-                                               .product(LOCAL_COOKBOOK_CHECKSUM_PATTERNS)
-                                               .map { |cb, dir| Dir[cb.join(dir)] }
-                                               .flatten
-                                               .map(&Pathname.method(:new))
+          .local_cookbooks
+          .values
+          .map { |cookbook| cookbook[:path] }
+          .product(LOCAL_COOKBOOK_CHECKSUM_PATTERNS)
+          .map { |cb, dir| Dir[cb.join(dir)] }
+          .flatten
+          .map(&Pathname.method(:new))
       end
 
       def stage_cookbooks_paths_for_checksum(stage)
@@ -202,35 +202,38 @@ module Dapp
             [['metadata.json', 'metadata.json'],
              ['attributes', 'attributes'],
              ["files/#{stage}", 'files/default'],
-             ["templates/#{stage}", 'templates/default']].select { |from, _| cookbook_path.join(from).exist? }
+             ["templates/#{stage}", 'templates/default']
+            ].select { |from, _| cookbook_path.join(from).exist? }
           end
 
           install_paths = Dir[cookbooks_vendor_path('*')]
-                          .map(&Pathname.method(:new))
-                          .map do |cookbook_path|
-            cookbook_name = File.basename cookbook_path
-            is_project = (cookbook_name == project_name)
-            is_mdapp = cookbook_name.start_with? 'mdapp-'
-            mdapp_enabled = is_mdapp && application.config._chef._modules.include?(cookbook_name)
-
-            paths = if is_project
-                      recipe_paths = application.config._chef._recipes
-                                                .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
-                                                .select { |from, _| cookbook_path.join(from).exist? }
-
-                      (recipe_paths + common_paths[cookbook_path]) if recipe_paths.any?
-                    elsif is_mdapp && mdapp_enabled
-                      recipe_path = "recipes/#{stage}.rb"
-                      if cookbook_path.join(recipe_path).exist?
-                        [[recipe_path, recipe_path]] + common_paths[cookbook_path]
-                      end
-                    else
-                      [['.', '.']]
-                    end
-
-            [cookbook_path, paths] if paths && paths.any?
-          end
-                          .compact
+            .map(&Pathname.method(:new))
+            .map do |cookbook_path|
+              cookbook_name = File.basename cookbook_path
+              is_project = (cookbook_name == project_name)
+              is_mdapp = cookbook_name.start_with? 'mdapp-'
+              mdapp_enabled = is_mdapp && application.config._chef._modules.include?(cookbook_name)
+
+              paths = if is_project
+                recipe_paths = application.config._chef._recipes
+                  .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
+                  .select { |from, _| cookbook_path.join(from).exist? }
+
+                (recipe_paths + common_paths[cookbook_path]) if recipe_paths.any?
+              elsif is_mdapp && mdapp_enabled
+                recipe_path = "recipes/#{stage}.rb"
+                if cookbook_path.join(recipe_path).exist?
+                  [[recipe_path, recipe_path]] + common_paths[cookbook_path]
+                elsif cookbook_metadata.depends.include? cookbook_name
+                  [['metadata.json', 'metadata.json']]
+                end
+              else
+                [['.', '.']]
+              end
+
+              [cookbook_path, paths] if paths && paths.any?
+            end
+            .compact
 
           stage_cookbooks_path(stage).mkpath
           install_paths.each do |cookbook_path, paths|

data/lib/dapp/builder/chef/cookbook_metadata.rb

@@ -18,6 +18,10 @@ module Dapp
             @cookbook_metadata.version = version
           end
 
+          def depends(dependency)
+            @cookbook_metadata.depends << dependency
+          end
+
           # rubocop:disable Style/MethodMissing
           def method_missing(*_a, &_blk)
           end
@@ -34,6 +38,10 @@ module Dapp
         attr_accessor :name
         attr_accessor :version
 
+        def depends
+          @depends ||= []
+        end
+
         def initialize(path)
           @path = path
           @parser = Parser.new(self)

data/lib/dapp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dmitry Stolyarov