dapp 0.9.4 → 0.10.0

data/lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb

@@ -12,7 +12,7 @@ module Dapp
             end
 
             def dependencies
-              next_stage.next_stage.context # Install
+              dimg.stage_by_name(:install).context
             end
           end # GAPreInstallPatchDependencies
         end

data/lib/dapp/dimg/build/stage/install/install.rb

@@ -5,6 +5,7 @@ module Dapp
         module Install
           class Install < Base
             include Mod::Group
+            include Mod::GitArtifactsDependencies
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreInstallPatch.new(dimg, self)

data/lib/dapp/dimg/build/stage/mod/git_artifact_dependencies.rb

@@ -0,0 +1,23 @@
+module Dapp
+  module Dimg
+    module Build
+      module Stage
+        module Mod
+          module GitArtifactsDependencies
+            def local_git_artifacts_dependencies
+              dimg.local_git_artifacts.map do |git_artifact|
+                args = []
+                args << self
+                if dimg.dev_mode?
+                  args << git_artifact.latest_commit
+                  args << nil
+                end
+                git_artifact.stage_dependencies_checksums(*args)
+              end
+            end
+          end
+        end # Mod
+      end # Stage
+    end # Build
+  end # Dimg
+end # Dapp

data/lib/dapp/dimg/build/stage/mod/group.rb

@@ -24,7 +24,7 @@ module Dapp
 
             def group_opened?
               return false if prev_group_stage.nil?
-              prev_group_stage.group_opened? || !prev_group_stage.empty?
+              prev_group_stage.group_opened? || prev_group_stage.image_should_be_build?
             end
 
             def prev_group_stage

data/lib/dapp/dimg/build/stage/mod/logging.rb

@@ -74,8 +74,10 @@ module Dapp
             end
 
             def log_image_build_process
-              return yield if should_be_quiet?
-              dimg.dapp.log_process(log_name, process: dimg.dapp.t(code: 'status.process.building'), short: should_not_be_detailed?) { yield }
+              dimg.dapp.log_process(log_name,
+                                    process: dimg.dapp.t(code: 'status.process.building'),
+                                    short: should_not_be_detailed?,
+                                    quiet: should_be_quiet?) { yield }
             end
 
             def ignore_log_commands?

data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb

@@ -10,10 +10,6 @@ module Dapp
               @prev_stage = GAPostSetupPatchDependencies.new(dimg, self)
               super
             end
-
-            def next_g_a_stage
-              next_stage.next_stage
-            end
           end # GAPostSetupPatch
         end
       end # Stage

data/lib/dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies.rb

@@ -21,7 +21,7 @@ module Dapp
 
             def changes_size_since_g_a_pre_setup_patch
               dimg.git_artifacts.map do |git_artifact|
-                git_artifact.patch_size(prev_stage.prev_stage.layer_commit(git_artifact), git_artifact.latest_commit)
+                git_artifact.patch_size(prev_g_a_stage.layer_commit(git_artifact), git_artifact.latest_commit)
               end.reduce(0, :+)
             end
           end # GAPostSetupPatchDependencies

data/lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch.rb

@@ -10,10 +10,6 @@ module Dapp
               @prev_stage = GAPreSetupPatchDependencies.new(dimg, self)
               super
             end
-
-            def prev_g_a_stage
-              super.prev_stage.prev_stage # GAPostInstallPatch
-            end
           end # GAPrePatch
         end
       end # Stage

data/lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch_dependencies.rb

@@ -12,7 +12,7 @@ module Dapp
             end
 
             def dependencies
-              next_stage.next_stage.context # Setup
+              dimg.stage_by_name(:setup).context
             end
           end # GAPreSetupPatchDependencies
         end

data/lib/dapp/dimg/build/stage/setup/setup.rb

@@ -5,6 +5,7 @@ module Dapp
         module Setup
           class Setup < Base
             include Mod::Group
+            include Mod::GitArtifactsDependencies
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreSetupPatch.new(dimg, self)

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

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     class Builder::Chef < Builder::Base
-      DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.17.3-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
+      DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:1.2.22-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
 
       %i(before_install install before_setup setup build_artifact).each do |stage|
         define_method("#{stage}?") {!stage_empty?(stage)}
@@ -30,7 +30,7 @@ module Dapp
 
         %i(before_install install before_setup setup).each do |stage|
           unless stage_empty?(stage) || stage_cookbooks_checksum_path(stage).exist?
-            raise Error::Chef, code: :chef_stage_checksum_not_calculated, data: {stage: stage}
+            raise Error::Chef, code: :stage_checksum_not_calculated, data: {stage: stage}
           end
         end
       end
@@ -71,7 +71,7 @@ module Dapp
       def builder_cookbook
         @builder_cookbook ||= begin
           unless dimg.dapp.builder_cookbook_path.exist?
-            raise Error,
+            raise Error::Chef,
                   code: :builder_cookbook_not_found,
                   data: {path: dimg.dapp.builder_cookbook_path.to_s}
           end

data/lib/dapp/dimg/config/artifact_group.rb

@@ -2,6 +2,14 @@ module Dapp
   module Dimg
     module Config
       class ArtifactGroup < DimgGroup
+        def export(*args, &blk)
+          artifact_config = pass_to_default(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", dapp: dapp))
+          artifact = Directive::Artifact.new(dapp: dapp, config: artifact_config)
+          artifact.export(*args, &blk).tap do
+            _export.concat artifact._export
+          end
+        end
+
         def _shell(&blk)
           @_shell ||= Directive::Shell::Artifact.new(dapp: dapp, &blk)
         end
@@ -14,28 +22,16 @@ module Dapp
           @_export ||= []
         end
 
+        def validate!
+          _export.each(&:validate!)
+        end
+
         undef :artifact
         undef :dimg
         undef :dimg_group
 
         protected
 
-        def export(*args, &blk)
-          _export.concat begin
-            artifact_config = pass_to_default(
-              ArtifactDimg.new(
-                "artifact-#{SecureRandom.hex(2)}",
-                dapp: dapp
-              )
-            )
-
-            artifact = Directive::Artifact.new(dapp: dapp, config: artifact_config)
-            artifact.send(:export, *args, &blk)
-
-            artifact._export
-          end
-        end
-
         def check_dimg_directive_order(_directive)
         end
 

data/lib/dapp/dimg/config/dimg/instance_methods.rb

@@ -5,6 +5,7 @@ module Dapp
         module InstanceMethods
           attr_reader :_builder
           attr_reader :_chef, :_shell, :_docker, :_git_artifact, :_mount, :_artifact
+          attr_reader :_artifact_groups
 
           def dev_mode
             @_dev_mode = true
@@ -25,20 +26,20 @@ module Dapp
           end
 
           def artifact(&blk)
-            _artifact.concat begin
-                               pass_to_custom(ArtifactGroup.new(dapp: dapp), :clone_to_artifact).tap do |artifact_group|
-                                 artifact_group.instance_eval(&blk) if block_given?
-                               end._export
-                             end
+            pass_to_custom(ArtifactGroup.new(dapp: dapp), :clone_to_artifact).tap do |artifact_group|
+              _artifact_groups << directive_eval(artifact_group, &blk)
+            end
           end
 
           def git(url = nil, &blk)
             type = url.nil? ? :local : :remote
-            _git_artifact.send(type, url.to_s, &blk)
+            _git_artifact.public_send(type, url.to_s, &blk)
           end
 
           def mount(to, &blk)
-            _mount << Directive::Mount.new(to, dapp: dapp, &blk)
+            Directive::Mount.new(to, dapp: dapp, &blk).tap do |mount|
+              _mount << mount
+            end
           end
 
           def _dev_mode
@@ -75,8 +76,12 @@ module Dapp
             end
           end
 
+          def _artifact_groups
+            @_artifact_groups ||= []
+          end
+
           def _artifact
-            @_artifact ||= []
+            _artifact_groups.map(&:_export).flatten
           end
 
           [:before, :after].each do |order|
@@ -104,11 +109,15 @@ module Dapp
             end
 
             def local(_, &blk)
-              @_local << Directive::GitArtifactLocal.new(dapp: dapp, &blk)
+              Directive::GitArtifactLocal.new(dapp: dapp, &blk).tap do |git|
+                @_local << git
+              end
             end
 
             def remote(repo_url, &blk)
-              @_remote << Directive::GitArtifactRemote.new(repo_url, dapp: dapp, &blk)
+              Directive::GitArtifactRemote.new(repo_url, dapp: dapp, &blk).tap do |git|
+                @_remote << git
+              end
             end
 
             def _local
@@ -119,14 +128,12 @@ module Dapp
               @_remote.map(&:_export).flatten
             end
 
-            protected
-
             def empty?
               (_local + _remote).empty?
             end
 
             def validate!
-              (_local + _remote).each { |exp| exp.send(:validate!) }
+              (_local + _remote).each(&:validate!)
             end
           end
 
@@ -137,11 +144,6 @@ module Dapp
             raise Error::Config, code: :builder_type_conflict unless @_builder == type
           end
 
-          def directive_eval(directive, &blk)
-            directive.instance_eval(&blk) if block_given?
-            directive
-          end
-
           def pass_to_default(dimg)
             pass_to_custom(dimg, :clone)
           end
@@ -152,7 +154,7 @@ module Dapp
 
               obj.instance_variable_set(directive, begin
                 case variable
-                when Directive::Base, GitArtifact then variable.send(clone_method)
+                when Directive::Base, GitArtifact then variable.public_send(clone_method)
                 when Symbol then variable
                 when Array then variable.dup
                 when TrueClass, FalseClass then variable
@@ -167,7 +169,7 @@ module Dapp
           def passed_directives
             [:@_chef, :@_shell, :@_docker,
              :@_git_artifact, :@_mount,
-             :@_artifact, :@_builder, :@_dev_mode]
+             :@_artifact_groups, :@_builder, :@_dev_mode]
           end
         end # InstanceMethods
         # rubocop:enable Metrics/ModuleLength

data/lib/dapp/dimg/config/dimg/validation.rb

@@ -3,8 +3,6 @@ module Dapp
     module Config
       class Dimg < Base
         module Validation
-          protected
-
           def validate!
             directives_validate!
             validate_scratch!
@@ -12,6 +10,8 @@ module Dapp
             validate_artifacts_artifacts!
           end
 
+          protected
+
           def validate_scratch!
             if _docker._from.nil?
               validate_scratch_directives!
@@ -25,7 +25,7 @@ module Dapp
             passed_directives.each do |v|
               next if (value = instance_variable_get(v)).nil?
               Array(value).each do |elm|
-                elm.send(:validate!) if elm.methods.include?(:validate!)
+                elm.validate! if elm.respond_to?(:validate!)
               end
             end
           end
@@ -36,7 +36,7 @@ module Dapp
             directives.each do |name, user_name|
               raise Error::Config,
                     code: :scratch_unsupported_directive,
-                    data: { directive: user_name } unless public_send(name).send(:empty?)
+                    data: { directive: user_name } unless public_send(name).empty?
             end
 
             docker_directives = [:_expose, :_env, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint]
@@ -44,7 +44,7 @@ module Dapp
               value = _docker.public_send(directive)
               raise Error::Config,
                     code: :scratch_unsupported_directive,
-                    data: { directive: "docker.#{directive}" } unless value.nil? || value.send(:empty?)
+                    data: { directive: "docker.#{directive}" } unless value.nil? || value.empty?
             end
           end
 

data/lib/dapp/dimg/config/directive/artifact.rb

@@ -7,7 +7,6 @@ module Dapp
 
           def initialize(config:, **kwargs, &blk)
             @_config = config
-
             super(**kwargs, &blk)
           end
 
@@ -23,27 +22,31 @@ module Dapp
             attr_accessor :_config
             attr_accessor :_before, :_after
 
-            def not_associated?
-              (_before || _after).nil?
-            end
-
-            protected
-
             def before(stage)
-              stage = stage.to_sym
-              associate_validation!(:before, stage, @_before)
-              @_before = stage
+              sub_directive_eval do
+                stage = stage.to_sym
+                associate_validation!(:before, stage, @_before)
+                @_before = stage
+              end
             end
 
             def after(stage)
-              stage = stage.to_sym
-              associate_validation!(:after, stage, @_after)
-              @_after = stage
+              sub_directive_eval do
+                stage = stage.to_sym
+                associate_validation!(:after, stage, @_after)
+                @_after = stage
+              end
             end
 
+            def not_associated?
+              (_before || _after).nil?
+            end
+
+            protected
+
             def associate_validation!(type, stage, _old_stage)
               conflict_type = [:before, :after].find { |t| t != type }
-              conflict_stage = send("_#{conflict_type}")
+              conflict_stage = public_send("_#{conflict_type}")
 
               raise Error::Config, code: :stage_artifact_not_supported_associated_stage,
                                    data: { stage: "#{type} #{stage.inspect}" } unless [:install, :setup].include? stage
@@ -52,7 +55,7 @@ module Dapp
                                    data: { stage: "#{type} #{stage.inspect}",
                                            conflict_stage: "#{conflict_type} #{conflict_stage.inspect}" } if conflict_stage
 
-              defined_stage = send("_#{type}")
+              defined_stage = public_send("_#{type}")
               dapp.log_config_warning(
                 desc: {
                   code: :stage_artifact_rewritten,

data/lib/dapp/dimg/config/directive/artifact_base.rb

@@ -7,10 +7,23 @@ module Dapp
 
           def initialize(**kwargs, &blk)
             @_export = []
-
             super(**kwargs, &blk)
           end
 
+          def owner(owner)
+            sub_directive_eval { @_owner = owner }
+          end
+
+          def group(group)
+            sub_directive_eval { @_group = group }
+          end
+
+          def export(absolute_dir_path = '/', &blk)
+            self.class.const_get('Export').new(absolute_dir_path, dapp: dapp, &blk).tap do |export|
+              @_export << export
+            end
+          end
+
           def _export
             @_export.each do |export|
               export._owner ||= @_owner
@@ -43,53 +56,43 @@ module Dapp
               }
             end
 
-            protected
-
             def to(absolute_path)
-              raise Error::Config, code: :export_to_absolute_path_required unless Pathname(absolute_path).absolute?
-              @_to = path_format(absolute_path)
+              sub_directive_eval do
+                raise Error::Config, code: :export_to_absolute_path_required unless Pathname(absolute_path).absolute?
+                @_to = path_format(absolute_path)
+              end
             end
 
             def include_paths(*relative_paths)
-              unless relative_paths.all? { |path| Pathname(path).relative? }
-                raise Error::Config, code: :export_include_paths_relative_path_required
+              sub_directive_eval do
+                unless relative_paths.all? { |path| Pathname(path).relative? }
+                  raise Error::Config, code: :export_include_paths_relative_path_required
+                end
+                _include_paths.concat(relative_paths.map(&method(:path_format)))
               end
-              _include_paths.concat(relative_paths.map(&method(:path_format)))
             end
 
             def exclude_paths(*relative_paths)
-              unless relative_paths.all? { |path| Pathname(path).relative? }
-                raise Error::Config, code: :export_exclude_paths_relative_path_required
+              sub_directive_eval do
+                unless relative_paths.all? { |path| Pathname(path).relative? }
+                  raise Error::Config, code: :export_exclude_paths_relative_path_required
+                end
+                _exclude_paths.concat(relative_paths.map(&method(:path_format)))
               end
-              _exclude_paths.concat(relative_paths.map(&method(:path_format)))
             end
 
             def owner(owner)
-              @_owner = owner
+              sub_directive_eval { @_owner = owner }
             end
 
             def group(group)
-              @_group = group
+              sub_directive_eval { @_group = group }
             end
 
             def validate!
               raise Error::Config, code: :export_to_required if _to.nil?
             end
           end
-
-          protected
-
-          def owner(owner)
-            @_owner = owner
-          end
-
-          def group(group)
-            @_group = group
-          end
-
-          def export(absolute_dir_path = '/', &blk)
-            @_export << self.class.const_get('Export').new(absolute_dir_path, dapp: dapp, &blk)
-          end
         end
       end
     end