dapp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTM1NTkwNWNjMzM0YTkzYTdlOGMzODY4MzE4ZGQ5YWZmNjI0YmU5Zg==
+    YzZiYzcxYjE1NWZlOGFhNTkzNzYzYTU5OTBhYmFmMTcxNjJkOGE5YQ==
   data.tar.gz: !binary |-
-    YjM5ODYyYzIzNDA3YjkyODFkYThjYjE2NTFhNDA4MGQxM2IyZGE2Mg==
+    NWM2YTA4OTY5MTRhZmU2YzUxMDhmNWQwMmRmNmIzY2JjOWE0MTI0Ng==
 SHA512:
   metadata.gz: !binary |-
-    OThjNmU0YmUyODZlODdkNzI2YjdiM2MyZDA4YmZkOWY2NTdmM2Y4MGJkYWM1
-    MTliMzkyMjcwMThiMGMzNTE2MGQyMGI0NGMyMTNlMDdkM2M5NDMzYjcxZTc0
-    YzM3YmMzZTkyNGYwZTM4YmJjMjY5YmFkN2U3YmVmMTgwODA5ZWY=
+    MDljYWUxMTk5MDM2ZGE3YmQ4MWUzMGRlNTU4ZTMwYmQ1OGRkOTQzMDBkMDU2
+    YTkzNTgzNmFmMGY3YjcxMjA5MDg4Y2I0OGE1MmZhMDIwOWRkM2FhMWM4Mzhm
+    Nzc1ZTFmNzIxNWM1NWY5MWNhNTQzZjQzZmU5NDg4YTYyNWZkY2I=
   data.tar.gz: !binary |-
-    OWRiZGIzNzY0MTQzYzk3OTJlMDYxNDA4ZjI2OWEwZGQzNDQ2NTQ3NjQ4MGUx
-    N2Y4NTVmY2UyNTNhMGUzNmUwMTI1Zjg3ODJjZDhlYmIwZDIyZDgxZTFiZmRm
-    YWUwNGU0ZmY1MzJlNmU2ZDNhYmRmYTg1ZWFmODU1ZTYxMWFjZDQ=
+    ZGIzNTcyYjRhMjM4MTIxYjJiYWU4ODU5NDYzYjQxZjhlZjA3MGI4OGNlMzVj
+    Y2U0NTdhOThiMGJmMTVmODYyYTUzMWQ4NDkzNzZhYzgwYTBlMTc3MWU0NGU5
+    MDg5ZDQxYjg0Y2YxZWIxZDM0MTNkMWE0MDY4ZjAyYTE5MGM5NTg=

data/bin/dapp

@@ -10,7 +10,7 @@ begin
 rescue Dapp::Error::Shellout => e
   $stderr.puts(Dapp::Helper::NetStatus.message(e))
   exit 1
-rescue Dapp::Error::Base => e
+rescue Dapp::Error::Base, NetStatus::Exception => e
   $stderr.puts(Dapp::Helper::Paint.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
   exit 1
 rescue Interrupt => _e

data/config/en/common.yml

@@ -2,10 +2,14 @@ en:
   common:
     image:
       signature: "signature: %{signature}"
-      info: "date: %{date}\nsize: %{size} MB"
+      info:
+        date: "date: %{value}"
+        size: "size: %{value} MB"
+        difference: "difference: %{value} MB"
       commands: "commands:"
     process:
       artifact_copy: "copying artifact '%{name}'"
+      artifact_building: "building artifact '%{name}'"
       git_artifact_loading: 'loading git_artifact'
       git_artifact_clone: "cloning remote git_artifact '%{name}'"
       git_artifact_fetch: "fetching remote git_artifact '%{name}'"
@@ -22,6 +26,7 @@ en:
         default: '[FAILED]'
     state:
       using_cache: '[USING CACHE]'
+      not_present: '[NOT PRESENT]'
       build: '[BUILD]'
       push: '[PUSH]'
     introspect:

data/config/en/net_status.yml

@@ -1,6 +1,6 @@
 en:
   net_status:
-    missing_translation: "Missing translation for code: '%{code}'."
+    missing_translation: "Missing translation for code: '%{code}'!"
     shellout:
       shell_command_failed: ">>> START STREAM\n%{stream}\n>>> END STREAM"
     application:
@@ -23,5 +23,7 @@ en:
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
       docker_from_not_defined: "Docker `from` not defined!"
-      artifact_unexpected_attribute: "Artifact doesn't have attribute '%{attr}'!"
-      git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't have attribute '%{attr}'!"
+      artifact_unexpected_attribute: "Artifact doesn't has attribute '%{attr}'!"
+      stage_artifact_not_associated: "Artifact not associated with any stage!"
+      stage_artifact_incorrect_associated_value: "Artifact option '%{option}' has incorrect value '%{value}'!"
+      git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't has attribute '%{attr}'!"

data/lib/dapp.rb

@@ -31,9 +31,9 @@ require 'dapp/cli/build'
 require 'dapp/cli/push'
 require 'dapp/cli/smartpush'
 require 'dapp/cli/list'
-require 'dapp/cli/flush'
-require 'dapp/cli/flush/stages'
-require 'dapp/cli/flush/metadata'
+require 'dapp/cli/stages'
+require 'dapp/cli/stages/flush'
+require 'dapp/cli/stages/cleanup'
 require 'dapp/cli/run'
 require 'dapp/filelock'
 require 'dapp/config/application'
@@ -48,6 +48,8 @@ require 'dapp/builder/chef'
 require 'dapp/builder/chef/cookbook_metadata'
 require 'dapp/builder/chef/berksfile'
 require 'dapp/builder/shell'
+require 'dapp/build/stage/mod/artifact'
+require 'dapp/build/stage/mod/logging'
 require 'dapp/build/stage/base'
 require 'dapp/build/stage/source_base'
 require 'dapp/build/stage/from'

data/lib/dapp/application.rb

@@ -29,11 +29,8 @@ module Dapp
     end
 
     def build!
-      log_step(config._name)
-      with_log_indent do
-        last_stage.build!
-        last_stage.save_in_cache!
-      end
+      last_stage.build!
+      last_stage.save_in_cache!
     ensure
       FileUtils.rm_rf(tmp_path)
     end
@@ -71,10 +68,6 @@ module Dapp
       @builder ||= Builder.const_get(config._builder.capitalize).new(self)
     end
 
-    def meta_options
-      { cli_options: cli_options, ignore_git_fetch: ignore_git_fetch }
-    end
-
     protected
 
     attr_reader :last_stage

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

@@ -5,6 +5,8 @@ module Dapp
       class Base
         include Helper::Sha256
         include Helper::Trivia
+        include Mod::Artifact
+        include Mod::Logging
 
         attr_accessor :prev_stage, :next_stage
         attr_reader :application
@@ -16,28 +18,14 @@ module Dapp
           @next_stage.prev_stage = self
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def build!
           return if should_be_skipped?
           prev_stage.build! if prev_stage
-          begin
-            if image.tagged?
-              application.log_state(name, state: application.t(code: 'state.using_cache'))
-            elsif application.dry_run?
-              application.log_state(name, state: application.t(code: 'state.build'), styles: { status: :success })
-            else
-              application.log_process(name, process: application.t(code: 'status.process.building'), short: should_be_not_detailed?) do
-                image_build!
-              end
-            end
-          ensure
-            log_build
-          end
+          image_build
           raise Exception::IntrospectImage,
                 message: application.t(code: 'introspect.stage', data: { name: name }),
                 data: { built_id: image.built_id, options: image.send(:prepared_options) } if should_be_introspected?
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
         def save_in_cache!
           return if image.tagged?
@@ -53,6 +41,7 @@ module Dapp
           @image ||= begin
             Image::Stage.new(name: image_name, from: from_image).tap do |image|
               image.add_volume "#{application.tmp_path}:#{application.container_tmp_path}"
+              image.add_change_label dapp: application.config._basename
               before_artifacts.each { |artifact| apply_artifact(artifact, image) }
               yield image if block_given?
               after_artifacts.each { |artifact| apply_artifact(artifact, image) }
@@ -66,19 +55,25 @@ module Dapp
           class_to_lowercase.to_sym
         end
 
-        def should_be_not_detailed?
-          image.send(:bash_commands).empty?
-        end
-
-        def should_be_skipped?
-          image.tagged? && !application.log_verbose? && application.cli_options[:introspect_stage].nil?
-        end
-
-        def should_be_introspected?
-          application.cli_options[:introspect_stage] == name && !application.dry_run? && !application.is_artifact
+        # rubocop:disable Metrics/AbcSize
+        def image_build
+          if image.tagged?
+            application.log_state(name, state: application.t(code: 'state.using_cache'))
+          elsif should_be_not_present?
+            application.log_state(name, state: application.t(code: 'state.not_present'))
+          elsif application.dry_run?
+            application.log_state(name, state: application.t(code: 'state.build'), styles: { status: :success })
+          else
+            application.log_process(name, process: application.t(code: 'status.process.building'), short: should_be_not_detailed?) do
+              image_do_build
+            end
+          end
+        ensure
+          log_build
         end
+        # rubocop:enable Metrics/AbcSize
 
-        def image_build!
+        def image_do_build
           image.build!(log_verbose: application.log_verbose?,
                        log_time: application.log_time?,
                        introspect_error: application.cli_options[:introspect_error],
@@ -92,97 +87,8 @@ module Dapp
         end
 
         def image_name
-          "dapp:#{signature}"
-        end
-
-        def image_info
-          date, size = image.info
-          _date, from_size = from_image.info
-          [date, (from_size.to_f - size.to_f).abs]
-        end
-
-        def format_image_info
-          date, size = image_info
-          application.t(code: 'image.info', data: { date: Time.parse(date).localtime, size: size.to_f.round(2) })
-        end
-
-        # rubocop:disable Metrics/AbcSize
-        def log_build
-          application.with_log_indent do
-            application.log_info application.t(code: 'image.signature', data: { signature: image_name })
-            application.log_info format_image_info if image.tagged?
-            unless (bash_commands = image.send(:bash_commands)).empty?
-              application.log_info application.t(code: 'image.commands')
-              application.with_log_indent { application.log_info bash_commands.join("\n") }
-            end
-          end if application.log? && application.log_verbose?
-        end
-        # rubocop:enable Metrics/AbcSize
-
-        def before_artifacts
-          @before_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._before == name })
-        end
-
-        def after_artifacts
-          @after_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._after == name })
-        end
-
-        def do_artifacts(artifacts)
-          artifacts.map do |artifact|
-            {
-              name: artifact._config._name,
-              options: artifact._artifact_options,
-              app: Application.new(config: artifact._config, is_artifact: true, **application.meta_options).tap(&:build!)
-            }
-          end
-        end
-
-        def artifacts_signatures
-          (before_artifacts + after_artifacts).map { |artifact| hashsum [artifact[:app].signature, artifact[:options]] }
-        end
-
-        def apply_artifact(artifact, image)
-          return if application.dry_run?
-
-          artifact_name = artifact[:name]
-          app = artifact[:app]
-          cwd = artifact[:options][:cwd]
-          paths = artifact[:options][:paths]
-          owner = artifact[:options][:owner]
-          group = artifact[:options][:group]
-          where_to_add = artifact[:options][:where_to_add]
-
-          docker_options = ['--rm',
-                            "--volume #{application.tmp_path('artifact', artifact_name)}:#{app.container_tmp_path(artifact_name)}",
-                            '--entrypoint /bin/sh']
-          commands = safe_cp(where_to_add, app.container_tmp_path(artifact_name), Process.uid, Process.gid)
-          application.log_secondary_process(application.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
-            app.run(docker_options, Array(application.shellout_pack(commands)))
-          end
-
-          commands = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, cwd, paths)
-          image.add_commands commands
-        end
-
-        # rubocop:disable Metrics/ParameterLists
-        def safe_cp(from, to, owner, group, cwd = '', paths = [])
-          credentials = ''
-          credentials += "-o #{owner} " if owner
-          credentials += "-g #{group} " if group
-
-          commands = []
-          commands << ['install', credentials, '-d', to].join(' ')
-
-          copy_files = lambda do |from_, cwd_, path_ = ''|
-            "find #{File.join(from_, cwd_, path_)} -type f -exec bash -ec 'install -D #{credentials} {} " \
-            "#{File.join(to, "$(echo {} | sed -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"
-          end
-
-          commands.concat(paths.empty? ? Array(copy_files.call(from, cwd)) : paths.map { |path| copy_files.call(from, cwd, path) })
-          commands << "find #{to} -type d -exec bash -ec 'install -d #{credentials} {}' \\;"
-          commands.join(' && ')
+          "#{application.config._basename}-dappstage:#{signature}"
         end
-        # rubocop:enable Metrics/ParameterLists
       end # Base
     end # Stage
   end # Build

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

@@ -17,7 +17,7 @@ module Dapp
 
         protected
 
-        def image_build!
+        def image_do_build
           from_image.pull!(log_time: application.log_time?)
           super
         end
@@ -31,10 +31,6 @@ module Dapp
         def from_image
           @from_image ||= Image::Stage.new(name: from_image_name)
         end
-
-        def image_info
-          image.info
-        end
       end # Prepare
     end # Stage
   end # Build

data/lib/dapp/build/stage/mod/artifact.rb

@@ -0,0 +1,92 @@
+module Dapp
+  module Build
+    module Stage
+      # Mod
+      module Mod
+        # Artifact
+        module Artifact
+          def before_artifacts
+            @before_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._before == name })
+          end
+
+          def after_artifacts
+            @after_artifacts ||= do_artifacts(application.config._artifact.select { |artifact| artifact._after == name })
+          end
+
+          def do_artifacts(artifacts)
+            verbose = application.log_verbose?
+            artifacts.map do |artifact|
+              process = application.t(code: 'process.artifact_building', data: { name: artifact._config._name })
+              application.log_secondary_process(process, short: !verbose) do
+                application.with_log_indent do
+                  {
+                    name: artifact._config._name,
+                    options: artifact._artifact_options,
+                    app: Application.new(artifact_app_options(artifact, verbose)).tap(&:build!)
+                  }
+                end
+              end
+            end
+          end
+
+          def artifact_app_options(artifact, verbose)
+            {
+              config: artifact._config,
+              cli_options: application.cli_options.merge(log_quiet: !verbose),
+              ignore_git_fetch: application.ignore_git_fetch,
+              is_artifact: true
+            }
+          end
+
+          def artifacts_signatures
+            (before_artifacts + after_artifacts).map { |artifact| hashsum [artifact[:app].signature, artifact[:options]] }
+          end
+
+          # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def apply_artifact(artifact, image)
+            return if application.dry_run?
+
+            artifact_name = artifact[:name]
+            app = artifact[:app]
+            cwd = artifact[:options][:cwd]
+            paths = artifact[:options][:paths]
+            owner = artifact[:options][:owner]
+            group = artifact[:options][:group]
+            where_to_add = artifact[:options][:where_to_add]
+
+            docker_options = ['--rm',
+                              "--volume #{application.tmp_path('artifact', artifact_name)}:#{app.container_tmp_path(artifact_name)}",
+                              '--entrypoint /bin/sh']
+            commands = safe_cp(where_to_add, app.container_tmp_path(artifact_name), Process.uid, Process.gid)
+            application.log_secondary_process(application.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
+              app.run(docker_options, Array(application.shellout_pack(commands)))
+            end
+
+            commands = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, cwd, paths)
+            image.add_commands commands
+          end
+          # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+          # rubocop:disable Metrics/ParameterLists
+          def safe_cp(from, to, owner, group, cwd = '', paths = [])
+            credentials = ''
+            credentials += "-o #{owner} " if owner
+            credentials += "-g #{group} " if group
+
+            copy_files = lambda do |from_, cwd_, path_ = ''|
+              "find #{File.join(from_, cwd_, path_)} -type f -exec bash -ec 'install -D #{credentials} {} " \
+            "#{File.join(to, "$(echo {} | sed -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"
+            end
+
+            commands = []
+            commands << ['install', credentials, '-d', to].join(' ')
+            commands.concat(paths.empty? ? Array(copy_files.call(from, cwd)) : paths.map { |path| copy_files.call(from, cwd, path) })
+            commands << "find #{to} -type d -exec bash -ec 'install -d #{credentials} {}' \\;"
+            commands.join(' && ')
+          end
+          # rubocop:enable Metrics/ParameterLists
+        end
+      end # Mod
+    end # Stage
+  end # Build
+end # Dapp

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

@@ -0,0 +1,64 @@
+module Dapp
+  module Build
+    module Stage
+      # Mod
+      module Mod
+        # Logging
+        module Logging
+          def log_build
+            application.with_log_indent do
+              application.log_info application.t(code: 'image.signature', data: { signature: image_name })
+              log_image_info
+              log_image_commands
+            end if application.log? && application.log_verbose?
+          end
+
+          def log_image_commands
+            return if (bash_commands = image.send(:bash_commands)).empty?
+            application.log_info application.t(code: 'image.commands')
+            application.with_log_indent { application.log_info bash_commands.join("\n") }
+          end
+
+          def log_image_info
+            return unless image.tagged?
+            date, size = image_info
+            application.log_info application.t(code: 'image.info.date', data: { value: date })
+            size_code = size_difference? ? 'image.info.difference' : 'image.info.size'
+            application.log_info application.t(code: size_code, data: { value: size })
+          end
+
+          def image_info
+            date, size = image.info
+            if size_difference?
+              _date, from_size = from_image.info
+              size = size.to_f - from_size.to_f
+            end
+
+            [Time.parse(date).localtime, size.to_f.round(2)]
+          end
+
+          def size_difference?
+            from_image.tagged? && !prev_stage.nil?
+          end
+
+          def should_be_skipped?
+            image.tagged? && !application.log_verbose? && application.cli_options[:introspect_stage].nil?
+          end
+
+          def should_be_not_present?
+            return false if next_stage.nil?
+            next_stage.image.tagged? || next_stage.should_be_not_present?
+          end
+
+          def should_be_not_detailed?
+            image.send(:bash_commands).empty?
+          end
+
+          def should_be_introspected?
+            application.cli_options[:introspect_stage] == name && !application.dry_run? && !application.is_artifact
+          end
+        end
+      end # Mod
+    end # Stage
+  end # Build
+end # Dapp

data/lib/dapp/builder/chef.rb

@@ -65,20 +65,19 @@ module Dapp
         @cookbook_metadata ||= CookbookMetadata.new(cookbook_metadata_path)
       end
 
-
       def berksfile_lock_checksum
         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))
+                                               .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)
@@ -95,14 +94,14 @@ module Dapp
           stage_cookbooks_checksum_path(stage).read.strip
         else
           checksum = if stage == :chef_cookbooks
-            cookbooks_checksum
-          else
-            application.hashsum [
-              _paths_checksum(stage_cookbooks_paths_for_checksum(stage)),
-              *application.config._chef._modules,
-              stage == :infra_install ? chefdk_image : nil
-            ].compact
-          end
+                       cookbooks_checksum
+                     else
+                       application.hashsum [
+                         _paths_checksum(stage_cookbooks_paths_for_checksum(stage)),
+                         *application.config._chef._modules,
+                         stage == :infra_install ? chefdk_image : nil
+                       ].compact
+                     end
 
           stage_cookbooks_checksum_path(stage).write "#{checksum}\n"
           checksum
@@ -117,7 +116,6 @@ module Dapp
         ]
       end
 
-
       def chefdk_image
         DEFAULT_CHEFDK_IMAGE # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
       end
@@ -143,7 +141,6 @@ module Dapp
         end
       end
 
-
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_cookbooks
         volumes_from = chefdk_container
@@ -187,7 +184,7 @@ module Dapp
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def _cookbooks_vendor_path
-        application.metadata_path("cookbooks.#{cookbooks_checksum}")
+        application.tmp_path(application.config._name, "cookbooks.#{cookbooks_checksum}")
       end
 
       def cookbooks_vendor_path(*path)
@@ -196,7 +193,6 @@ module Dapp
         end.join(*path)
       end
 
-
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_stage_cookbooks(stage)
         @install_stage_cookbooks ||= {}
@@ -204,36 +200,35 @@ module Dapp
           common_paths = proc do |cookbook_path|
             [['metadata.json', 'metadata.json'],
              ["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 { |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 and 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 and paths.any?
-            }
-            .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]
+                      end
+                    else
+                      [['.', '.']]
+                    end
+
+            [cookbook_path, paths] if paths && paths.any?
+          end
+                          .compact
 
           stage_cookbooks_path(stage).mkpath
           install_paths.each do |cookbook_path, paths|
@@ -279,7 +274,6 @@ module Dapp
         stage_tmp_path(stage, 'cookbooks', *path)
       end
 
-
       def install_chef_solo_stage_config(stage)
         @install_chef_solo_stage_config ||= {}
         @install_chef_solo_stage_config[stage] ||= true.tap do
@@ -295,7 +289,6 @@ module Dapp
         container_stage_tmp_path(stage, 'config.rb', *path)
       end
 
-
       def stage_tmp_path(stage, *path)
         application.tmp_path(application.config._name, stage).join(*path)
       end

data/lib/dapp/cli.rb

@@ -7,7 +7,7 @@ module Dapp
     include Mixlib::CLI
     include Helper::Trivia
 
-    SUBCOMMANDS = %w(build smartpush push list run flush).freeze
+    SUBCOMMANDS = %w(build smartpush push list run stages).freeze
 
     banner <<BANNER.freeze
 Usage: dapp [options] sub-command [sub-command options]
@@ -19,7 +19,7 @@ dapp push [options] [PATTERN] REPO
 dapp smartpush [options] [PATTERN ...] REPOPREFIX
 dapp list [options] [PATTERN ...]
 dapp run [options] [PATTERN] [DOCKER ARGS]
-dapp flush
+dapp stages
 
 Options:
 BANNER

data/lib/dapp/cli/{flush.rb → stages.rb}

@@ -3,16 +3,16 @@ require 'mixlib/cli'
 module Dapp
   class CLI
     # CLI flush subcommand
-    class Flush < CLI
-      SUBCOMMANDS = %w(metadata stages).freeze
+    class Stages < CLI
+      SUBCOMMANDS = %w(flush cleanup).freeze
 
       banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
-dapp flush metadata
-dapp flush stages
+dapp stages flush
+dapp stages cleanup
 BANNER
     end
   end

data/lib/dapp/cli/{flush/metadata.rb → stages/cleanup.rb}

@@ -2,23 +2,19 @@ require 'mixlib/cli'
 
 module Dapp
   class CLI
-    class Flush
-      # Flush metadata subcommand
-      class Metadata < Base
+    class Stages
+      # Flush stages subcommand
+      class Cleanup < Base
         banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp flush metadata
+  dapp stages cleanup
 Options:
 BANNER
-        option :metadata_dir,
-               long: '--metadata-dir PATH',
-               description: 'Metadata directory'
-
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          Controller.new(cli_options: config, patterns: cli_arguments).flush_metadata
+          Controller.new(cli_options: config, patterns: cli_arguments).stages_cleanup
         end
       end
     end

data/lib/dapp/cli/{flush/stages.rb → stages/flush.rb}

@@ -2,20 +2,19 @@ require 'mixlib/cli'
 
 module Dapp
   class CLI
-    class Flush
+    class Stages
       # Flush stages subcommand
-      class Stages < Flush
+      class Flush < Base
         banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp flush stages
+  dapp stages flush
 Options:
 BANNER
-
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          Controller.flush_stages
+          Controller.new(cli_options: config, patterns: cli_arguments).stages_flush
         end
       end
     end

data/lib/dapp/config/application.rb

@@ -2,9 +2,9 @@ module Dapp
   module Config
     # Application
     class Application
-      attr_reader :_name
       attr_reader :_builder
       attr_reader :_home_path
+      attr_reader :_basename
       attr_reader :_docker
       attr_reader :_git_artifact
       attr_reader :_artifact
@@ -70,6 +70,10 @@ module Dapp
         @_builder = type
       end
 
+      def _name
+        @_name || @_basename
+      end
+
       def _apps
         @_apps.empty? ? [self] : @_apps.flatten
       end
@@ -98,6 +102,7 @@ module Dapp
         Application.new(self).tap do |app|
           app.instance_variable_set(:'@_builder', _builder)
           app.instance_variable_set(:'@_home_path', _home_path)
+          app.instance_variable_set(:'@_basename', _basename)
           app.instance_variable_set(:'@_app_install_dependencies', _app_install_dependencies)
           app.instance_variable_set(:'@_app_setup_dependencies', _app_setup_dependencies)
           app.instance_variable_set(:'@_artifact', Marshal.load(Marshal.dump(_artifact)))

data/lib/dapp/config/artifact.rb

@@ -47,15 +47,25 @@ module Dapp
 
       # Stage
       class Stage < Base
+        STAGES = [:from, :infra_install, :source_1_archive, :source_1, :app_install, :source_2,
+                  :infra_setup, :source_3, :chef_cookbooks, :app_setup, :source_4, :source_5].freeze
+
         attr_accessor :_config
         attr_accessor :_before, :_after
 
+        def initialize(*args)
+          super
+          raise Error::Config, code: :stage_artifact_not_associated if _before.nil? && _after.nil?
+        end
+
         def _before=(stage)
           @_before = stage.to_sym
+          validate_associated_option(option: :before, value: @_before)
         end
 
         def _after=(stage)
           @_after = stage.to_sym
+          validate_associated_option(option: :after, value: @_after)
         end
 
         protected
@@ -63,6 +73,13 @@ module Dapp
         def code
           :artifact_unexpected_attribute
         end
+
+        private
+
+        def validate_associated_option(option:, value:)
+          return if STAGES.include? value
+          raise Error::Config, code: :stage_artifact_incorrect_associated_value, data: { option: option, value: value }
+        end
       end
     end
   end

data/lib/dapp/config/docker.rb

@@ -8,8 +8,8 @@ module Dapp
       def initialize
         @_volume = []
         @_expose = []
-        @_env = []
-        @_label = []
+        @_env = {}
+        @_label = {}
         @_cmd = []
         @_onbuild = []
       end
@@ -28,11 +28,11 @@ module Dapp
       end
 
       def env(**options)
-        @_env.concat(options_to_args(options))
+        @_env.merge!(options)
       end
 
       def label(**options)
-        @_label.concat(options_to_args(options))
+        @_label.merge!(options)
       end
 
       def cmd(*args)
@@ -76,12 +76,6 @@ module Dapp
       def clone
         Marshal.load(Marshal.dump(self))
       end
-
-      private
-
-      def options_to_args(options)
-        options.map { |key, value| "#{key.upcase}=#{value}" }
-      end
     end
   end
 end

data/lib/dapp/config/main.rb

@@ -4,7 +4,7 @@ module Dapp
     class Main < Application
       def initialize(**options)
         @_home_path    = Pathname.new(options[:dappfile_path]).parent.expand_path.to_s
-        @_name         = Pathname.new(@_home_path).basename.to_s
+        @_basename     = Pathname.new(@_home_path).basename.to_s
         @_builder      = Pathname.new(@_home_path).join('Berksfile').exist? ? :chef : :shell
 
         @_docker       = Docker.new
@@ -16,7 +16,7 @@ module Dapp
       end
 
       def name(value)
-        @_name = value
+        @_basename = value
       end
     end
   end

data/lib/dapp/controller.rb

@@ -23,7 +23,12 @@ module Dapp
     end
 
     def build
-      build_configs.each { |config| Application.new(config: config, cli_options: cli_options).build! }
+      build_configs.each do |config|
+        log_step(config._name)
+        with_log_indent do
+          Application.new(config: config, cli_options: cli_options).build!
+        end
+      end
     end
 
     def list
@@ -43,17 +48,12 @@ module Dapp
       end
     end
 
-    def flush_metadata
-      build_configs.each do |config|
-        log(config._name)
-        app = Application.new(config: config, cli_options: cli_options, ignore_git_fetch: true)
-        FileUtils.rm_rf app.metadata_path
-      end
+    def stages_flush
+      shellout(%{docker rmi $(docker images --format="{{.Repository}}:{{.Tag}}" #{build_configs.first._basename}-dappstage)})
     end
 
-    def self.flush_stages
-      shellout('docker rmi $(docker images --format="{{.Repository}}:{{.Tag}}" dapp)')
-      shellout('docker rmi $(docker images -f "dangling=true" -q)')
+    def stages_cleanup
+      shellout(%{docker rmi $(docker images -f "dangling=true" -f "label=dapp=#{build_configs.first._basename}" -q)})
     end
 
     private

data/lib/dapp/helper/i18n.rb

@@ -13,7 +13,7 @@ module Dapp
         data = desc[:data] || {}
         ::I18n.t [:common, context, code].join('.'), [:common, code].join('.'), **data, raise: true
       rescue ::I18n::MissingTranslationData => _e
-        raise NetStatus::Exception, code: :missing_translation, data: { code: code }
+        raise ::NetStatus::Exception, code: :missing_translation, data: { code: code }
       end
     end
   end # Helper

data/lib/dapp/helper/log.rb

@@ -43,6 +43,7 @@ module Dapp
       def with_log_indent(with = true)
         log_indent_next if with
         yield
+      ensure
         log_indent_prev if with
       end
 

data/lib/dapp/image/arguments.rb

@@ -10,12 +10,12 @@ module Dapp
         add_change_option(:expose, value)
       end
 
-      def add_change_env(value)
-        add_change_option(:env, value)
+      def add_change_env(**options)
+        add_change_option(:env, options_to_args(options))
       end
 
-      def add_change_label(value)
-        add_change_option(:label, value)
+      def add_change_label(**options)
+        add_change_option(:label, options_to_args(options))
       end
 
       def add_change_cmd(value)
@@ -84,6 +84,10 @@ module Dapp
         end
       end
 
+      def options_to_args(options)
+        options.map { |key, value| "#{key}=#{value}" }
+      end
+
       def prepared_options
         prepared_options_default(options) { |k, vals| Array(vals).map { |v| "--#{k}=#{v}" }.join(' ') }
       end

data/lib/dapp/image/stage.rb

@@ -19,16 +19,10 @@ module Dapp
       end
 
       def build!(**kwargs)
-        @built_id = if should_be_built?
-                      begin
-                        run!(**kwargs)
-                        commit!
-                      ensure
-                        shellout("docker rm #{container_name}")
-                      end
-                    else
-                      from.built_id
-                    end
+        run!(**kwargs)
+        @built_id = commit!
+      ensure
+        shellout("docker rm #{container_name}")
       end
 
       def export!(name, log_verbose: false, log_time: false, force: false)
@@ -65,10 +59,6 @@ module Dapp
       def commit!
         shellout!("docker commit #{prepared_change} #{container_name}").stdout.strip
       end
-
-      def should_be_built?
-        !(bash_commands.empty? && change_options.empty?)
-      end
     end # Stage
   end # Image
 end # Dapp

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -338,6 +338,8 @@ files:
 - lib/dapp/build/stage/from.rb
 - lib/dapp/build/stage/infra_install.rb
 - lib/dapp/build/stage/infra_setup.rb
+- lib/dapp/build/stage/mod/artifact.rb
+- lib/dapp/build/stage/mod/logging.rb
 - lib/dapp/build/stage/source_1.rb
 - lib/dapp/build/stage/source_1_archive.rb
 - lib/dapp/build/stage/source_2.rb
@@ -353,13 +355,13 @@ files:
 - lib/dapp/cli.rb
 - lib/dapp/cli/base.rb
 - lib/dapp/cli/build.rb
-- lib/dapp/cli/flush.rb
-- lib/dapp/cli/flush/metadata.rb
-- lib/dapp/cli/flush/stages.rb
 - lib/dapp/cli/list.rb
 - lib/dapp/cli/push.rb
 - lib/dapp/cli/run.rb
 - lib/dapp/cli/smartpush.rb
+- lib/dapp/cli/stages.rb
+- lib/dapp/cli/stages/cleanup.rb
+- lib/dapp/cli/stages/flush.rb
 - lib/dapp/config/application.rb
 - lib/dapp/config/artifact.rb
 - lib/dapp/config/chef.rb