dapp 0.7.18 → 0.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0dcb2453cc6b24dceb7490d086e4c755c56d4c7
-  data.tar.gz: 438de659b1cde4c9312e959cdb406a51a99e3363
+  metadata.gz: 0fb95faf56ca420cff6868898fb7507b2282f0d0
+  data.tar.gz: bf64455dcb33e447d8044c898d0159f2e5290eb9
 SHA512:
-  metadata.gz: a2f7072fc7882ef94e2d9864ef7bad40dad70d820a679b2267da3316931118c6a02bfbced85ec3c451b5bc47ce58975e12d85e50225501ba90727ef6e27e61d0
-  data.tar.gz: e682d5bc70806fcd53af05c2ded8dc9a16471dff0ee5d6774038ff8ec4f4035cc629320a787991e515cbc09defb3e2e84a113cc539085d8dcbfa2b7623489d74
+  metadata.gz: 5bd04cc708034bd5bdade09dba0bf77f0d2c0d8c0ed434409b32437fca1ffaa86bd25b3c296fc8eab22b80234caf3eeb0922ae6c834d541d8c60cb6eb0d9bfac
+  data.tar.gz: 2a992ce6691468ac9207592e3cea2011664213768a86189b2def78da5acea80ef5df6cb3116a3038b28268472b4670aeabcb703d4b9bd205866cfebb43d44e13

data/config/en/common.yml

@@ -55,6 +55,7 @@ en:
       tag_ignored: "WARNING: tag `%{tag}` ignored."
       dimg_not_found_in_registry: "WARNING: Dimg not found in registry."
       stage_artifact_rewritten: "WARNING: Artifact stage rewritten from %{conflict_stage} to %{stage}."
+      recipe_does_not_used: "WARNING: Recipe `%{recipe}` doesn't used in any stage."
     group:
       install_group: 'Install group'
       setup_group: 'Setup group'

data/lib/dapp/build/stage/artifact_default.rb

@@ -18,10 +18,10 @@ module Dapp
           group = artifact[:options][:group]
           to = artifact[:options][:to]
 
-          command = safe_cp(to, artifact_dimg.container_tmp_path(artifact_name), Process.uid, Process.gid, cwd, include_paths, exclude_paths)
+          command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_name).to_s, Process.uid, Process.gid, include_paths, exclude_paths)
           run_artifact_dimg(artifact_dimg, artifact_name, command)
 
-          command = safe_cp(dimg.container_tmp_path('artifact', artifact_name), to, owner, group, '', include_paths, exclude_paths)
+          command = safe_cp(dimg.container_tmp_path('artifact', artifact_name).to_s, to, owner, group, include_paths, exclude_paths)
           image.add_command command
           image.add_volume "#{dimg.tmp_path('artifact', artifact_name)}:#{dimg.container_tmp_path('artifact', artifact_name)}:ro"
         end
@@ -30,33 +30,32 @@ module Dapp
         private
 
         # rubocop:disable Metrics/ParameterLists, Metrics/AbcSize, Metrics/MethodLength
-        def safe_cp(from, to, owner, group, cwd = '', include_paths = [], exclude_paths = [])
+        def safe_cp(from, to, owner, group, include_paths = [], exclude_paths = [])
           credentials = ''
           credentials += "-o #{owner} " if owner
           credentials += "-g #{group} " if group
-          excludes = find_command_excludes(from, cwd, exclude_paths).join(' ')
+          excludes = find_command_excludes(from, exclude_paths).join(' ')
 
-          copy_files = proc do |from_, cwd_, path_ = ''|
-            cwd_ = File.expand_path(File.join('/', cwd_))
-            "if [[ -d #{File.join(from_, cwd_, path_)} ]]; then " \
-            "#{dimg.project.find_bin} #{File.join(from_, cwd_, path_)} #{excludes} -type f -exec " \
+          copy_files = proc do |from_, path_ = ''|
+            "if [[ -d #{File.join(from_, path_)} ]]; then " \
+            "#{dimg.project.find_bin} #{File.join(from_, path_)} #{excludes} -type f -exec " \
             "#{dimg.project.bash_bin} -ec '#{dimg.project.install_bin} -D #{credentials} {} " \
             "#{File.join(to, '$(echo {} | ' \
-            "#{dimg.project.sed_bin} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\; ;" \
+            "#{dimg.project.sed_bin} -e \"s/#{from_.gsub('/', '\\/')}//g\")")}' \\; ;" \
             'fi'
           end
 
           commands = []
           commands << [dimg.project.install_bin, credentials, '-d', to].join(' ')
-          commands.concat(include_paths.empty? ? Array(copy_files.call(from, cwd)) : include_paths.map { |path| copy_files.call(from, cwd, path) })
+          commands.concat(include_paths.empty? ? Array(copy_files.call(from)) : include_paths.map { |path| copy_files.call(from, path) })
           commands << "#{dimg.project.find_bin} #{to} -type d -exec " \
                       "#{dimg.project.bash_bin} -ec '#{dimg.project.install_bin} -d #{credentials} {}' \\;"
           commands.join(' && ')
         end
         # rubocop:enable Metrics/ParameterLists, Metrics/AbcSize, Metrics/MethodLength
 
-        def find_command_excludes(from, cwd, exclude_paths)
-          exclude_paths.map { |path| "-not \\( -path #{File.join(from, cwd, path)} -prune \\)" }
+        def find_command_excludes(from, exclude_paths)
+          exclude_paths.map { |path| "-not \\( -path #{File.join(from, path)} -prune \\)" }
         end
       end # ArtifactDefault
     end # Stage

data/lib/dapp/build/stage/import_artifact.rb

@@ -50,11 +50,7 @@ module Dapp
           container_archive_path = File.join(artifact_dimg.container_tmp_path(artifact_name), 'archive.tar.gz')
 
           exclude_paths = artifact[:options][:exclude_paths].map { |path| "--exclude=#{path}" }.join(' ')
-          include_paths = if include_paths.empty?
-                            [File.join(to, cwd, '*')]
-                          else
-                            include_paths.map { |path| File.join(to, cwd, path, '*') }
-                          end
+          include_paths = include_paths.empty? ? [File.join(cwd, '*')] : include_paths.map { |path| File.join(cwd, path, '*') }
           include_paths.map! { |path| path[1..-1] } # relative path
 
           command = "#{sudo} #{dimg.project.tar_bin} -czf #{container_archive_path} #{exclude_paths} #{include_paths.join(' ')} #{credentials}"

data/lib/dapp/builder/base.rb

@@ -8,6 +8,9 @@ module Dapp
         @dimg = dimg
       end
 
+      def before_build_check
+      end
+
       def before_dimg_should_be_built_check
       end
 

data/lib/dapp/builder/chef.rb

@@ -57,8 +57,26 @@ module Dapp
         end
       end
 
+      def before_build_check
+        %i(before_install install before_setup setup build_artifact).tap do |stages|
+          (enabled_recipes - stages.map { |stage| stage_enabled_recipes(stage) }.flatten.uniq).each do |recipe|
+            dimg.project.log_warning(desc: { code: :recipe_does_not_used, data: { recipe: recipe } })
+          end
+        end
+      end
+
       private
 
+      def stage_enabled_modules(stage)
+        @stage_enabled_modules ||= {}
+        @stage_enabled_modules[stage] ||= enabled_modules.select { |cookbook| stage_entry_exist?(stage, cookbook, stage) }
+      end
+
+      def stage_enabled_recipes(stage)
+        @stage_enabled_recipes ||= {}
+        @stage_enabled_recipes[stage] ||= enabled_recipes.select { |recipe| stage_entry_exist?(stage, project_name, recipe) }
+      end
+
       def enabled_modules
         dimg.config._chef._dimod
       end
@@ -440,26 +458,21 @@ module Dapp
         @stage_cookbooks_runlist[stage] ||= begin
           res = []
 
-          does_entry_exist = proc do |cookbook, entrypoint|
-            stage_cookbooks_path(stage, cookbook, 'recipes', "#{entrypoint}.rb").exist?
-          end
-
           format_entry = proc do |cookbook, entrypoint|
             entrypoint = 'void' if entrypoint.nil?
             "#{cookbook}::#{entrypoint}"
           end
 
           enabled_modules.map do |cookbook|
-            if does_entry_exist[cookbook, stage]
+            if stage_enabled_modules(stage).include? cookbook
               [cookbook, stage]
             else
               [cookbook, nil]
             end
           end.tap { |entries| res.concat entries }
 
-          enabled_recipes.map { |recipe| [project_name, recipe] }
-                         .select { |entry| does_entry_exist[*entry] }
-                         .tap do |entries|
+          stage_enabled_recipes(stage).map { |recipe| [project_name, recipe] }
+                                      .tap do |entries|
             if entries.any?
               res.concat entries
             else
@@ -480,6 +493,10 @@ module Dapp
         stage_cookbooks_runlist(stage).empty?
       end
 
+      def stage_entry_exist?(stage, cookbook, entrypoint)
+        stage_cookbooks_path(stage, cookbook, 'recipes', "#{entrypoint}.rb").exist?
+      end
+
       def _stage_cookbooks_path(stage)
         stage_build_path(stage, 'cookbooks')
       end

data/lib/dapp/dimg.rb

@@ -29,6 +29,7 @@ module Dapp
         project.lock("#{project.name}.images", readonly: true) do
           last_stage.build_lock! do
             begin
+              builder.before_build_check
               last_stage.build!
             ensure
               last_stage.save_in_cache! if last_stage.image.built? || dev_mode?

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.18'.freeze
+  VERSION = '0.7.19'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

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