dapp 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc2314d803e1a087df9dd6c8e7bebf4f5c6659c
-  data.tar.gz: 644c73cfe0ed65e26b625f435264e539c5dad3d5
+  metadata.gz: 2f2da7e934e3e3b6d9e08042e859d7614701c769
+  data.tar.gz: 1358edc575c90ad5b33be8dc024da8e660c241b8
 SHA512:
-  metadata.gz: 6e97c0a4199cb7659fab736b9cbb7ed999f4f37da8d6cb6c42b857a0a7c78765300fb5b392eb793a0f6612eacd7fe6e1912269a3e4178b76f389c0b88ed4ef0a
-  data.tar.gz: 1fa49615e8c037f0ef24c3ffae307b3a24bc15f95f9371f36b42e267f05b8448ac65f2ecc64fdabe53c25960d7da61381a48d9665e8f5ba8b95f4039cf59e065
+  metadata.gz: 2443ae77043f7191132924f08848706514276b915e931dae425e630519a9feca503f22d86355e7c7cc17f6a9b936ae4b54d83d20d149740794d5e62f724453ed
+  data.tar.gz: 5e7326b71d8655d03100169fb492ed3c73f6b2580810dcd06711044eafc2ca002dc4322f2ebe1b6fde4402e1bd7d67eb482ceb8f94bb7c5c9c836c36a3a62482

data/config/en/common.yml

@@ -8,6 +8,8 @@ en:
         difference: "difference: %{value} MB"
       commands: "commands:"
       instructions: "instructions:"
+    container:
+      launched_command: "Launched command: '%{command}'"
     process:
       artifact_copy: "copying artifact '%{name}'"
       artifact_building: "building artifact '%{name}'"
@@ -50,6 +52,7 @@ en:
       another_image_already_tagged: 'WARNING: image with other id already exist.'
       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}."
     group:
       install_group: 'Install group'
       setup_group: 'Setup group'

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"
     dimg:
@@ -8,9 +8,9 @@ en:
       dimg_not_run: "Dimg run failed!"
       git_branch_without_name: "Dimg has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
-      chef_stage_checksum_not_calculated: "Chef stage '%{stage}' checksum is not calculated yet, run build first"
+      chef_stage_checksum_not_calculated: "Chef stage `%{stage}` checksum is not calculated yet, run build first"
     dappfile:
-      incorrect: "Dappfile with '%{error}':\n%{message}"
+      incorrect: "Dappfile with `%{error}`:\n%{message}"
     build:
       from_image_required: 'Missing from_image!'
       image_already_untagged: "Image `%{name}` already untagged!"
@@ -18,51 +18,49 @@ en:
       built_id_not_defined: '`from.built_id` not defined!'
       from_image_not_found: 'Image `%{name}` not found!'
     project:
-      spush_command_unexpected_dimgs_number: "Command 'spush' can process only one dimg!"
-      command_unexpected_dimgs_number: "Command can process only one dimg!"
-      no_such_dimg: "No such dimg: '%{dimgs_patterns}'!"
-      tag_command_unexpected_dimgs_number: "Command 'tag' can process only one dimg!"
-      tag_command_incorrect_tag: "Incorrect tag ('%{name}') given!"
-      repo_name_incorrect: "Incorrect repo ('%{name}') given!"
+      command_unexpected_dimgs_number: "Command can process only one dimg!\nAmbiguous dimg pattern: `%{dimgs_names}`!"
+      no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
+      tag_command_incorrect_tag: "Incorrect tag (`%{name}`) given!"
+      repo_name_incorrect: "Incorrect repo (`%{name}`) given!"
       dappfile_not_found: "Dappfile not found!"
       cannot_run_ssh_agent: "Cannot run ssh-agent"
-      ssh_key_not_found: "Ssh key '%{path}' not exist!"
-      mrproper_required_option: "Expected command option '--improper-dev-mode-cache', '--improper-cache-version-stages' or '--all'!"
+      ssh_key_not_found: "Ssh key `%{path}` not exist!"
+      mrproper_required_option: "Expected command option `--improper-dev-mode-cache`, `--improper-cache-version-stages` or `--all`!"
     config:
       dimg_name_required: 'Dimg name required!'
-      dimg_name_incorrect: "Dimg has incorrect name '%{name}': doesn't match regex '%{reg}'!"
-      export_to_required: "Export: 'to' directive required!"
+      dimg_name_incorrect: "Dimg has incorrect name `%{name}`: doesn't match regex `%{reg}`!"
+      export_to_required: "Export: `to` directive required!"
       export_cwd_absolute_path_required: "Export: given cwd path must be absolute!"
-      export_to_absolute_path_required: "Export: given 'to' path must be absolute!"
-      export_include_paths_relative_path_required: "Export: given 'include_paths' path must be relative!"
-      export_exclude_paths_relative_path_required: "Export: given 'exclude_paths' path must be relative!"
-      mount_from_absolute_path_required: "Mount: given 'from' path must be absolute!"
-      mount_from_type_required: "Mount: 'from' directive expect 'build_dir' or 'tmp_dir' type!"
+      export_to_absolute_path_required: "Export: given `to` path must be absolute!"
+      export_include_paths_relative_path_required: "Export: given `include_paths` path must be relative!"
+      export_exclude_paths_relative_path_required: "Export: given `exclude_paths` path must be relative!"
+      mount_from_absolute_path_required: "Mount: given `from` path must be absolute!"
+      mount_from_type_required: "Mount: `from` directive expect `build_dir` or `tmp_dir` type!"
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
       docker_from_incorrect: "`docker.from` has incorrect value `%{name}`!"
-      stage_artifact_not_associated: "Artifact not associated with any stage: expected 'before' or 'after' attribute!"
-      stage_artifact_double_associate: "Artifact cannot use with both associated attributes 'before' and 'after'!"
-      stage_artifact_not_supported_associated_stage: "Artifact not supported associated stage '%{stage}'!"
+      stage_artifact_not_associated: "Artifact not associated with any stage: expected `before` or `after` attribute!"
+      stage_artifact_double_associate: "Cannot use `%{stage}` stage for artifact, already used in `%{conflict_stage}` stage!"
+      stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
       artifact_conflict: "Conflict between artifacts paths!"
-      scratch_unsupported_directive: "Scratch dimg has unsupported directive '%{directive}'!"
+      scratch_unsupported_directive: "Scratch dimg has unsupported directive `%{directive}`!"
       scratch_artifact_required: "Scratch dimg without artifacts!"
-      scratch_artifact_associated: "Scratch artifact cannot be associated: not expected 'before'/'after' attribute!"
-      scratch_artifact_docker_from: "Scratch artifact must have directive 'docker.from'!"
+      scratch_artifact_associated: "Scratch artifact cannot be associated: not expected `before`/`after` attribute!"
+      scratch_artifact_docker_from: "Scratch artifact must have directive `docker.from`!"
     chef:
-      stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"
-      mdapp_dependency_in_metadata_forbidden: "Using mdapp as dependency in metadata.rb forbidden: detected '%{dependency}'"
+      stage_path_overlap: "Cannot install `%{cookbook}` cookbook's path %{from} into %{to}: already exists"
+      mdapp_dependency_in_metadata_forbidden: "Using mdapp as dependency in metadata.rb forbidden: detected `%{dependency}`"
       cookbook_path_not_found: "Dapp cookbook directory not found at %{path}"
       cookbook_berksfile_not_found: "Dapp cookbook Berksfile not found at %{path}"
       cookbook_metadata_not_found: "Dapp cookbook metadata.rb file not found at %{path}"
-      cookbook_not_specified_in_berksfile: "Dapp cookbook '%{name}' not specified in Berksfile at %{path}"
+      cookbook_not_specified_in_berksfile: "Dapp cookbook `%{name}` not specified in Berksfile at %{path}"
     registry:
       incorrect_repo: 'Incorrect repository!'
       no_such_dimg: 'No such dimg in registry!'
       authenticate_type_not_supported: 'Registry authenticate type not supported!'
-      page_not_found: "Page '%{url}' not found!"
+      page_not_found: "Page `%{url}` not found!"
       user_not_authorized: 'User not authorized!'
       response_with_error_status: 'Response with error status!'
-      berksfile_absolute_path_forbidden: "Absolute paths in Berksfile are not allowed (cookbook '%{cookbook}', path: '%{path}')"
+      berksfile_absolute_path_forbidden: "Absolute paths in Berksfile are not allowed (cookbook `%{cookbook}`, path: `%{path}`)"
     lock:
-      timeout: "Could not obtain lock for '%{name}' within %{timeout} seconds"
+      timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"

data/lib/dapp/cli.rb

@@ -12,16 +12,16 @@ Usage: dapp [options] sub-command [sub-command options]
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
-dapp build [options] [DIMGS PATTERN ...]
-dapp bp [options] [DIMGS PATTERN ...] REPO
-dapp push [options] [DIMGS PATTERN] REPO
-dapp spush [options] [DIMG PATTERN ...] REPO
-dapp tag [options] [DIMG PATTERN ...] TAG
-dapp list [options] [DIMGS PATTERN ...]
-dapp run [options] [DIMG PATTERN] [DOCKER ARGS]
-dapp cleanup [options] [DIMGS PATTERN ...]
+dapp build [options] [DIMG ...]
+dapp bp [options] [DIMG ...] REPO
+dapp push [options] [DIMG ...] REPO
+dapp spush [options] [DIMG] REPO
+dapp tag [options] [DIMG] TAG
+dapp list [options] [DIMG ...]
+dapp run [options] [DIMG] [DOCKER ARGS]
+dapp cleanup [options] [DIMG ...]
 dapp mrproper [options]
-dapp stage image [options] [DIMG PATTERN]
+dapp stage image [options] [DIMG]
 dapp stages
 
 Options:

data/lib/dapp/cli/bp.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp bp [options] [DIMGS PATTERNS] REPO
+  dapp bp [options] [DIMG ...] REPO
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
     REPO                        Pushed image name.
 
 Options:

data/lib/dapp/cli/build.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp build [options] [DIMGS PATTERN ...]
+  dapp build [options] [DIMG ...]
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/cleanup.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp cleanup [options] [DIMGS PATTERN ...]
+  dapp cleanup [options] [DIMG ...]
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/list.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp list [options] [DIMGS PATTERN ...]
+  dapp list [options] [DIMG ...]
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/push.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp push [options] [DIMG PATTERN] REPO
+  dapp push [options] [DIMG ...] REPO
 
-    DIMG PATTERN                Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/run.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp run [options] [DIMG PATTERN] [DOCKER ARGS]
+  dapp run [options] [DIMG] [DOCKER ARGS]
 
-    DIMG PATTERN                Dapp image to process [default: *].
+    DIMG                        Dapp image to process [default: *].
     DOCKER ARGS                 Docker run options and command separated by '--'
 
 Options:

data/lib/dapp/cli/spush.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp spush [options] [DIMGS PATTERN ...] REPO
+  dapp spush [options] [DIMG] REPO
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
     REPO                        Pushed image name.
 
 Options:

data/lib/dapp/cli/stage_image.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stage image [options] [DIMG PATTERN ...]
+  dapp stage image [options] [DIMG]
 
-    DIMG PATTERN                Dapp image to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/stages.rb

@@ -9,12 +9,12 @@ Version: #{Dapp::VERSION}
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
-dapp stages cleanup local
-dapp stages cleanup repo
-dapp stages flush local
-dapp stages flush repo
-dapp stages push
-dapp stages pull
+dapp stages cleanup local [options] [DIMG ...] REPO
+dapp stages cleanup repo [options] [DIMG ...] REPO
+dapp stages flush local [options] [DIMG ...]
+dapp stages flush repo [options] [DIMG ...] REPO
+dapp stages push [options] [DIMG ...] REPO
+dapp stages pull [options] [DIMG ...] REPO
 
 Options:
 BANNER

data/lib/dapp/cli/stages/cleanup_local.rb

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages cleanup local [options] [DIMGS PATTERN ...] REPO
+  dapp stages cleanup local [options] [DIMG ...] REPO
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/stages/cleanup_repo.rb

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages cleanup repo [options] [DIMGS PATTERN ...] REPO
+  dapp stages cleanup repo [options] [DIMG ...] REPO
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/stages/flush_local.rb

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages flush local [options] [DIMGS PATTERN ...]
+  dapp stages flush local [options] [DIMG ...]
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/stages/flush_repo.rb

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages flush repo [options] [DIMGS PATTERN ...] REPO
+  dapp stages flush repo [options] [DIMG ...] REPO
 
-    DIMGS PATTERN               Dapp images to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/stages/pull.rb

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages pull [options] [DIMG PATTERN] REPO
+  dapp stages pull [options] [DIMG ...] REPO
 
-    DIMG PATTERN                Dapp image to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/stages/push.rb

@@ -7,9 +7,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages push [options] [DIMG PATTERN] REPO
+  dapp stages push [options] [DIMG ...] REPO
 
-    DIMG PATTERN                Dapp image to process [default: *].
+    DIMG                        Dapp image to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/tag.rb

@@ -6,9 +6,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp tag [options] [DIMG PATTERN ...] TAG
+  dapp tag [options] [DIMG] TAG
 
-    DIMG PATTERN                Dapp image to process [default: *].
+    DIMG                        Dapp image to process [default: *].
     REPO                        Pushed image name.
 
 Options:

data/lib/dapp/config/artifact_group.rb

@@ -12,11 +12,11 @@ module Dapp
       end
 
       def _shell(&blk)
-        @_shell ||= Directive::Shell::Artifact.new(&blk)
+        @_shell ||= Directive::Shell::Artifact.new(project: project, &blk)
       end
 
       def _docker(&blk)
-        @_docker ||= Directive::Docker::Artifact.new(&blk)
+        @_docker ||= Directive::Docker::Artifact.new(project: project, &blk)
       end
 
       undef :artifact
@@ -32,7 +32,7 @@ module Dapp
       def export(*args, &blk)
         @_export.concat begin
                           artifact_config = pass_to_default(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", project: project))
-                          artifact = Directive::Artifact.new(config: artifact_config)
+                          artifact = Directive::Artifact.new(project: project, config: artifact_config)
                           artifact.send(:export, *args, &blk)
                           artifact._export
                         end
@@ -46,7 +46,7 @@ module Dapp
 
       def pass_to_default(obj)
         super(obj).tap do |artifact_dimg|
-          artifact_dimg.instance_variable_set(:@_artifact_dependencies, marshal_dup(_artifact_dependencies))
+          artifact_dimg.instance_variable_set(:@_artifact_dependencies, _artifact_dependencies.dup)
         end
       end
     end

data/lib/dapp/config/base.rb

@@ -11,8 +11,26 @@ module Dapp
 
       attr_reader :project
 
-      def marshal_dup(obj)
-        Marshal.load(Marshal.dump(obj))
+      def marshal_dump
+        instance_variables
+          .reject {|variable| variable == :@project}
+          .map {|variable| [variable, instance_variable_get(variable)]}
+      end
+
+      def marshal_load(variable_values)
+        variable_values.each do |variable, value|
+          instance_variable_set(variable, value)
+        end
+
+        self
+      end
+
+      def _clone
+        Marshal.load Marshal.dump(self)
+      end
+
+      def _clone_to(obj)
+        obj.marshal_load marshal_dump
       end
     end
   end

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

@@ -47,7 +47,7 @@ module Dapp
         end
 
         def mount(to, &blk)
-          _mount << Directive::Mount.new(to, &blk)
+          _mount << Directive::Mount.new(to, project: project, &blk)
         end
 
         def _dev_mode
@@ -59,15 +59,15 @@ module Dapp
         end
 
         def _chef
-          @_chef ||= Directive::Chef.new
+          @_chef ||= Directive::Chef.new(project: project)
         end
 
         def _shell
-          @_shell ||= Directive::Shell::Dimg.new
+          @_shell ||= Directive::Shell::Dimg.new(project: project)
         end
 
         def _docker
-          @_docker ||= Directive::Docker::Dimg.new
+          @_docker ||= Directive::Docker::Dimg.new(project: project)
         end
 
         def _mount
@@ -75,7 +75,7 @@ module Dapp
         end
 
         def _git_artifact
-          @_git_artifact ||= GitArtifact.new
+          @_git_artifact ||= GitArtifact.new(project: project)
         end
 
         [:build_dir, :tmp_dir].each do |mount_type|
@@ -114,17 +114,19 @@ module Dapp
         class GitArtifact < Directive::Base
           attr_reader :_local, :_remote
 
-          def initialize
+          def initialize(**kwargs, &blk)
             @_local = []
             @_remote = []
+
+            super(**kwargs, &blk)
           end
 
           def local(_, &blk)
-            @_local << Directive::GitArtifactLocal.new(&blk)
+            @_local << Directive::GitArtifactLocal.new(project: project, &blk)
           end
 
           def remote(repo_url, &blk)
-            @_remote << Directive::GitArtifactRemote.new(repo_url, &blk)
+            @_remote << Directive::GitArtifactRemote.new(repo_url, project: project, &blk)
           end
 
           def _local

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

@@ -6,9 +6,10 @@ module Dapp
       class Artifact < ArtifactBase
         attr_reader :_config
 
-        def initialize(config:)
+        def initialize(config:, **kwargs, &blk)
           @_config = config
-          super()
+
+          super(**kwargs, &blk)
         end
 
         def _export
@@ -31,19 +32,35 @@ module Dapp
           protected
 
           def before(stage)
-            associate_validation!(:before, stage)
+            stage = stage.to_sym
+            associate_validation!(:before, stage, @_before)
             @_before = stage
           end
 
           def after(stage)
-            associate_validation!(:after, stage)
+            stage = stage.to_sym
+            associate_validation!(:after, stage, @_after)
             @_after = stage
           end
 
-          def associate_validation!(type, stage)
-            another = [:before, :after].find { |t| t != type }
-            raise Error::Config, code: :stage_artifact_double_associate unless send("_#{another}").nil?
-            raise Error::Config, code: :stage_artifact_not_supported_associated_stage unless [:install, :setup].include? stage
+          def associate_validation!(type, stage, old_stage)
+            conflict_type = [:before, :after].find { |t| t != type }
+            conflict_stage = send("_#{conflict_type}")
+
+            raise Error::Config, code: :stage_artifact_not_supported_associated_stage,
+                                 data: { stage: "#{type} #{stage.inspect}" }  unless [:install, :setup].include? stage
+
+            raise Error::Config, code: :stage_artifact_double_associate,
+                                 data: { stage: "#{type} #{stage.inspect}",
+                                         conflict_stage: "#{conflict_type} #{conflict_stage.inspect}" } if conflict_stage
+
+            defined_stage = send("_#{type}")
+            project.log_config_warning(desc: {
+              code: :stage_artifact_rewritten,
+              context: :warning,
+              data: { stage: "#{type} #{stage.inspect}",
+                      conflict_stage: "#{type} #{defined_stage.inspect}" }
+            }) if defined_stage
           end
         end
       end

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

@@ -5,9 +5,10 @@ module Dapp
       class ArtifactBase < Base
         attr_reader :_owner, :_group
 
-        def initialize
+        def initialize(**kwargs, &blk)
           @_export = []
-          super
+
+          super(**kwargs, &blk)
         end
 
         def _export
@@ -23,13 +24,13 @@ module Dapp
         class Export < Directive::Base
           attr_accessor :_cwd, :_to, :_include_paths, :_exclude_paths, :_owner, :_group
 
-          def initialize(cwd = '/')
+          def initialize(cwd = '/', **kwargs, &blk)
             raise Error::Config, code: :export_cwd_absolute_path_required unless Pathname(cwd).absolute?
             @_cwd = cwd
             @_include_paths ||= []
             @_exclude_paths ||= []
 
-            super()
+            super(**kwargs, &blk)
           end
 
           def _artifact_options
@@ -84,7 +85,7 @@ module Dapp
         end
 
         def export(absolute_dir_path = '/', &blk)
-          @_export << self.class.const_get('Export').new(absolute_dir_path, &blk)
+          @_export << self.class.const_get('Export').new(absolute_dir_path, project: project, &blk)
         end
       end
     end

data/lib/dapp/config/directive/base.rb

@@ -3,14 +3,10 @@ module Dapp
     module Directive
       # Base
       class Base < Config::Base
-        def initialize(&blk)
-          instance_eval(&blk) unless blk.nil?
-        end
-
         protected
 
         def clone
-          marshal_dup(self)
+          _clone
         end
 
         def clone_to_artifact

data/lib/dapp/config/directive/chef.rb

@@ -5,11 +5,11 @@ module Dapp
       class Chef < Base
         attr_accessor :_dimod, :_recipe, :_attributes
 
-        def initialize
+        def initialize(**kwargs, &blk)
           @_dimod = []
           @_recipe = []
 
-          super
+          super(**kwargs, &blk)
         end
 
         def dimod(*args)

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

@@ -6,7 +6,7 @@ module Dapp
         class Dimg < Base
           attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint
 
-          def initialize
+          def initialize(**kwargs, &blk)
             @_volume = []
             @_expose = []
             @_env = {}
@@ -14,7 +14,7 @@ module Dapp
             @_cmd = []
             @_onbuild = []
 
-            super
+            super(**kwargs, &blk)
           end
 
           def volume(*args)
@@ -70,7 +70,7 @@ module Dapp
           protected
 
           def clone_to_artifact
-            Artifact.new.tap do |docker|
+            Artifact.new(project: project).tap do |docker|
               docker.instance_variable_set('@_from', @_from)
             end
           end

data/lib/dapp/config/directive/git_artifact_remote.rb

@@ -5,11 +5,11 @@ module Dapp
       class GitArtifactRemote < GitArtifactLocal
         attr_reader :_url, :_name, :_branch, :_commit
 
-        def initialize(url)
+        def initialize(url, **kwargs, &blk)
           @_url  = url
           @_name = url.gsub(%r{.*?([^\/ ]+)\.git}, '\\1')
 
-          super()
+          super(**kwargs, &blk)
         end
 
         def _export

data/lib/dapp/config/directive/mount.rb

@@ -6,10 +6,11 @@ module Dapp
         attr_reader :_from, :_to
         attr_reader :_type
 
-        def initialize(to)
+        def initialize(to, **kwargs, &blk)
           raise Error::Config, code: :mount_to_absolute_path_required unless Pathname((to = to.to_s)).absolute?
           @_to = to
-          super()
+
+          super(**kwargs, &blk)
         end
 
         protected

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

@@ -13,7 +13,7 @@ module Dapp
 
           def self.stage_command_generator(stage)
             define_method stage do |&blk|
-              (variable = instance_variable_get("@_#{stage}") || StageCommand.new).instance_eval(&blk)
+              (variable = instance_variable_get("@_#{stage}") || StageCommand.new(project: project)).instance_eval(&blk)
               instance_variable_set("@_#{stage}", variable)
             end
 
@@ -34,9 +34,10 @@ module Dapp
             attr_reader :_version
             attr_reader :_run
 
-            def initialize
+            def initialize(**kwargs, &blk)
               @_run = []
-              super
+
+              super(**kwargs, &blk)
             end
 
             def run(*args)
@@ -55,11 +56,7 @@ module Dapp
           end
 
           def clone_to_artifact
-            Artifact.new.tap do |shell|
-              instance_variables.each do |variable|
-                shell.instance_variable_set(variable, instance_variable_get(marshal_dup(variable)))
-              end
-            end
+            _clone_to Artifact.new(project: project)
           end
         end
       end

data/lib/dapp/core_ext/hash.rb

@@ -6,7 +6,7 @@ module Dapp
       def in_depth_merge(hash) # do not conflict with activesupport`s deep_merge
         merge(hash) do |_, v1, v2|
           if v1.is_a?(::Hash) && v2.is_a?(::Hash)
-            v1.merge(v2)
+            v1.in_depth_merge(v2)
           elsif v1.is_a?(::Array) || v2.is_a?(::Array)
             [v1, v2].flatten
           else

data/lib/dapp/image/stage.rb

@@ -72,6 +72,8 @@ module Dapp
         raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
         project.shellout!("docker run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", log_verbose: true)
       rescue Error::Shellout => error
+        project.log_warning(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container })
+
         raise unless project.introspect_error? || project.introspect_before_error?
         built_id = project.introspect_error? ? commit! : from.built_id
         raise Exception::IntrospectImage, data: { built_id: built_id,

data/lib/dapp/project/command/common.rb

@@ -66,6 +66,22 @@ module Dapp
         def log_proper_cache(&blk)
           log_step_with_indent(:'proper cache', &blk)
         end
+
+        def one_dimg!
+          raise Error::Project, code: :command_unexpected_dimgs_number, data: { dimgs_names: build_configs.map(&:_name).join(' ') } unless build_configs.one?
+        end
+
+        def push_format(dimg_name)
+          if dimg_name.nil?
+            spush_format
+          else
+            '%{repo}:%{dimg_name}-%{tag}'
+          end
+        end
+
+        def spush_format
+          '%{repo}:%{tag}'
+        end
       end
     end
   end # Project

data/lib/dapp/project/command/push.rb

@@ -11,7 +11,7 @@ module Dapp
           build_configs.each do |config|
             log_dimg_name_with_indent(config) do
               Dimg.new(config: config, project: self, ignore_git_fetch: true, should_be_built: true).tap do |dimg|
-                dimg.export!(repo, format: '%{repo}:%{dimg_name}-%{tag}')
+                dimg.export!(repo, format: push_format(config._name))
               end
             end
           end

data/lib/dapp/project/command/run.rb

@@ -6,7 +6,7 @@ module Dapp
       # Run
       module Run
         def run(docker_options, command)
-          raise Error::Project, code: :command_unexpected_dimgs_number unless build_configs.one?
+          one_dimg!
           Dimg.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).run(docker_options, command)
         end
       end

data/lib/dapp/project/command/spush.rb

@@ -7,9 +7,9 @@ module Dapp
       module Spush
         def spush(repo)
           validate_repo_name(repo)
-          raise Error::Project, code: :spush_command_unexpected_dimgs_number unless build_configs.one?
+          one_dimg!
           Dimg.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |dimg|
-            dimg.export!(repo, format: '%{repo}:%{tag}')
+            dimg.export!(repo, format: spush_format)
           end
         end
       end

data/lib/dapp/project/command/stage_image.rb

@@ -6,7 +6,7 @@ module Dapp
       # StageImage
       module StageImage
         def stage_image
-          raise Error::Project, code: :command_unexpected_dimgs_number unless build_configs.one?
+          one_dimg!
           puts Dimg.new(config: build_configs.first, project: self, ignore_git_fetch: true).stage_image_name(cli_options[:stage])
         end
       end

data/lib/dapp/project/command/tag.rb

@@ -6,7 +6,7 @@ module Dapp
       # Tag
       module Tag
         def tag(tag)
-          raise Error::Project, code: :tag_command_unexpected_dimgs_number unless build_configs.one?
+          one_dimg!
           raise Error::Project, code: :tag_command_incorrect_tag, data: { name: tag } unless Image::Docker.image_name?(tag)
           Dimg.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
             app.tag!(tag)

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.9'.freeze
+  VERSION = '0.7.10'.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.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout