dapp 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344169cb4810496ce7bdffabb39b0e0d67d922be
-  data.tar.gz: 80300942c9abcfd25956099e7680d06c980deba1
+  metadata.gz: 179056218ee2a02f2ffdfde2690975b9488688ab
+  data.tar.gz: 3d11dfb1d6681698baf231ca52977fffeea3f89b
 SHA512:
-  metadata.gz: 6c9f6344686884f6be5132acad1e4be8a433dbdc7362b07a0e9cdede2d45aeebf699536d4860e7b82d69c060ffee7c52c796488181cd0c2fba140817ed3ae592
-  data.tar.gz: d7ec6ba5e7adcaa342c64cb5258e1cb74a6a4579d522e13c863dee0e24a0c9fdb4df04fcc80cbd463ad5a7c6a0c54206017da8e8421775a5d2ba402a1cd952a9
+  metadata.gz: 45d2a40d9f64aed890272df4ec5c1e3a488f8b3d58cfa4018272a03ce33f012a81a80c8ac4dc60967cc3933aabb3d0b1058ea519fc504b8b2e5f533e5b6e75c4
+  data.tar.gz: 824abefb9e41019be8fb285a2b6350d05803382c4d1003ac4e6938149cbd50c1a2fe955801678ef0c3dc80a0b596f9e51cc5d8684b845d273aab1f9a0695b331

data/lib/dapp/builder/chef.rb

@@ -82,22 +82,6 @@ module Dapp
         application.hashsum berksfile_lock_path.read if berksfile_lock_path.exist?
       end
 
-      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))
-      end
-
-      def stage_cookbooks_paths_for_checksum(stage)
-        install_stage_cookbooks(stage)
-        Dir[stage_cookbooks_path(stage, '**/*')].map(&Pathname.method(:new))
-      end
-
       def stage_cookbooks_checksum_path(stage)
         application.build_path("#{cookbooks_checksum}.#{stage}.checksum")
       end
@@ -109,8 +93,11 @@ module Dapp
           checksum = if stage == :chef_cookbooks
                        cookbooks_checksum
                      else
+                       paths = Dir[stage_cookbooks_path(stage, '**/*')].map(&Pathname.method(:new))
+
                        application.hashsum [
-                         _paths_checksum(stage_cookbooks_paths_for_checksum(stage)),
+                         application.paths_content_hashsum(paths),
+                         *paths.map { |p| p.relative_path_from(stage_cookbooks_path(stage)).to_s }.sort,
                          *enabled_modules,
                          stage == :infra_install ? chefdk_image : nil
                        ].compact
@@ -122,11 +109,23 @@ module Dapp
       end
 
       def cookbooks_checksum
-        @cookbooks_checksum ||= application.hashsum [
-          berksfile_lock_checksum,
-          _paths_checksum(local_cookbook_paths_for_checksum),
-          *enabled_modules
-        ]
+        @cookbooks_checksum ||= begin
+          paths = 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))
+
+          application.hashsum [
+            application.paths_content_hashsum(paths),
+            *paths.map { |p| p.relative_path_from(berksfile.home_path).to_s }.sort,
+            berksfile_lock_checksum,
+            *enabled_modules
+          ]
+        end
       end
 
       def chefdk_image
@@ -193,8 +192,6 @@ module Dapp
              "dappdeps/berksdeps:0.1.0 bash -ec '#{application.shellout_pack(vendor_commands.join(' && '))}'"].compact.join(' '),
             log_verbose: application.log_verbose?
           )
-
-          true
         end
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -211,80 +208,77 @@ module Dapp
 
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_stage_cookbooks(stage)
-        @install_stage_cookbooks ||= {}
-        @install_stage_cookbooks[stage] ||= true.tap do
-          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? }
-          end
+        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? }
+        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_name = (is_mdapp ? cookbook_name.split('mdapp-')[1] : nil)
-            mdapp_enabled = is_mdapp && enabled_modules.include?(mdapp_name)
-
-            paths = if is_project
-                      recipe_paths = enabled_recipes
-                                     .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
-                                     .select { |from, _| cookbook_path.join(from).exist? }
-
-                      if recipe_paths.any?
-                        [*recipe_paths, *common_paths[cookbook_path]]
-                      else
-                        [nil, *common_paths[cookbook_path]]
-                      end
-                    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]]
-                      else
-                        [nil, *common_paths[cookbook_path]]
-                      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_name = (is_mdapp ? cookbook_name.split('mdapp-')[1] : nil)
+          mdapp_enabled = is_mdapp && enabled_modules.include?(mdapp_name)
+
+          paths = if is_project
+                    recipe_paths = enabled_recipes
+                                   .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
+                                   .select { |from, _| cookbook_path.join(from).exist? }
+
+                    if recipe_paths.any?
+                      [*recipe_paths, *common_paths[cookbook_path]]
                     else
-                      [['.', '.']]
+                      [nil, *common_paths[cookbook_path]]
                     end
+                  elsif is_mdapp && mdapp_enabled
+                    recipe_path = "recipes/#{stage}.rb"
 
-            [cookbook_path, paths] if paths && paths.any?
-          end.compact
-
-          stage_cookbooks_path(stage).mkpath
-          install_paths.each do |cookbook_path, paths|
-            cookbook = cookbook_path.basename
-
-            paths.each do |from, to|
-              if from.nil?
-                to_path = stage_cookbooks_path(stage, cookbook, 'recipes/void.rb')
-                to_path.parent.mkpath
-                FileUtils.touch to_path
-              else
-                from_path = cookbook_path.join(from)
-                to_path = stage_cookbooks_path(stage, cookbook, to)
-                if from_path.directory? && to_path.exist?
-                  Dir[from_path.join('**/*')]
-                    .map(&Pathname.method(:new))
-                    .each do |from_subpath|
-                      to_subpath = to_path.join(from_subpath.relative_path_from(from_path))
-                      raise Error, code: :stage_path_overlap,
-                                   data: { stage: stage,
-                                           cookbook: cookbook,
-                                           from: from_subpath.relative_path_from(cookbook_path),
-                                           to: to_subpath.relative_path_from(stage_cookbooks_path(stage, cookbook)) } if to_subpath.exist?
-
-                      to_subpath.parent.mkpath
-                      FileUtils.cp_r from_subpath, to_subpath
+                    if cookbook_path.join(recipe_path).exist?
+                      [[recipe_path, recipe_path], *common_paths[cookbook_path]]
+                    else
+                      [nil, *common_paths[cookbook_path]]
                     end
-                else
-                  to_path.parent.mkpath
-                  FileUtils.cp_r from_path, to_path
-                end
+                  else
+                    [['.', '.']]
+                  end
+
+          [cookbook_path, paths] if paths && paths.any?
+        end.compact
+
+        _stage_cookbooks_path(stage).mkpath
+        install_paths.each do |cookbook_path, paths|
+          cookbook = cookbook_path.basename
+
+          paths.each do |from, to|
+            if from.nil?
+              to_path = _stage_cookbooks_path(stage).join(cookbook, 'recipes/void.rb')
+              to_path.parent.mkpath
+              FileUtils.touch to_path
+            else
+              from_path = cookbook_path.join(from)
+              to_path = _stage_cookbooks_path(stage).join(cookbook, to)
+              if from_path.directory? && to_path.exist?
+                Dir[from_path.join('**/*')]
+                  .map(&Pathname.method(:new))
+                  .each do |from_subpath|
+                    to_subpath = to_path.join(from_subpath.relative_path_from(from_path))
+                    raise Error, code: :stage_path_overlap,
+                                 data: { stage: stage,
+                                         cookbook: cookbook,
+                                         from: from_subpath.relative_path_from(cookbook_path),
+                                         to: to_subpath.relative_path_from(_stage_cookbooks_path(stage).join(cookbook)) } if to_subpath.exist?
+
+                    to_subpath.parent.mkpath
+                    FileUtils.cp_r from_subpath, to_subpath
+                  end
+              else
+                to_path.parent.mkpath
+                FileUtils.cp_r from_path, to_path
               end
             end
           end
@@ -294,8 +288,6 @@ module Dapp
 
       # rubocop:disable Metrics/AbcSize
       def stage_cookbooks_runlist(stage)
-        install_stage_cookbooks(stage)
-
         @stage_cookbooks_runlist ||= {}
         @stage_cookbooks_runlist[stage] ||= begin
           res = []
@@ -344,8 +336,15 @@ module Dapp
         stage_cookbooks_runlist(stage).empty?
       end
 
+      def _stage_cookbooks_path(stage)
+        stage_build_path(stage, 'cookbooks')
+      end
+
       def stage_cookbooks_path(stage, *path)
-        stage_build_path(stage, 'cookbooks', *path)
+        _stage_cookbooks_path(stage).tap do |cookbooks_path|
+          @install_stage_cookbooks ||= {}
+          @install_stage_cookbooks[stage] ||= true.tap { install_stage_cookbooks(stage) }
+        end.join(*path)
       end
 
       def install_chef_solo_stage_config(stage)
@@ -370,15 +369,6 @@ module Dapp
       def container_stage_build_path(_stage, *path)
         path.compact.map(&:to_s).inject(Pathname.new('/.dapp/chef/build'), &:+)
       end
-
-      def _paths_checksum(paths)
-        application.hashsum [
-          *paths.map(&:to_s).sort,
-          *paths.reject(&:directory?)
-                .sort
-                .reduce(nil) { |a, e| application.hashsum [a, e.read].compact }
-        ]
-      end
     end
   end
 end

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

@@ -26,6 +26,7 @@ module Dapp
           end
         end # Parser
 
+        attr_reader :home_path
         attr_reader :path
         attr_reader :local_cookbooks
 
@@ -39,7 +40,7 @@ module Dapp
         def add_local_cookbook_path(name, path)
           @local_cookbooks[name] = {
             name: name,
-            path: @home_path.join(path)
+            path: home_path.join(path)
           }
         end
 

data/lib/dapp/helper/sha256.rb

@@ -6,6 +6,13 @@ module Dapp
         sha256(arg)
       end
 
+      def paths_content_hashsum(paths)
+        paths.map(&:to_s)
+          .reject { |path| File.directory?(path) }
+          .sort
+          .reduce(nil) { |hash, path| hashsum [hash, File.read(path)].compact }
+      end
+
       def sha256(arg)
         Digest::SHA256.hexdigest Array(arg).compact.map(&:to_s).join(':::')
       end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
   BUILD_CACHE_VERSION = 2
 end

metadata

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