dapp 0.13.3 → 0.13.4

data/lib/dapp/dapp/deps/base.rb

@@ -10,10 +10,10 @@ module Dapp
 
         def base_container
           @base_container ||= begin
-            if shellout("docker inspect #{base_container_name}").exitstatus.nonzero?
+            if shellout("#{host_docker_bin} inspect #{base_container_name}").exitstatus.nonzero?
               log_secondary_process(t(code: 'process.base_container_creating'), short: true) do
                 shellout!(
-                  ['docker create',
+                  ["#{host_docker_bin} create",
                    "--name #{base_container_name}",
                    "--volume /.dapp/deps/base/#{BASE_VERSION} dappdeps/base:#{BASE_VERSION}"].join(' ')
                 )

data/lib/dapp/dapp/deps/gitartifact.rb

@@ -10,10 +10,10 @@ module Dapp
 
         def gitartifact_container
           @gitartifact_container ||= begin
-            if shellout("docker inspect #{gitartifact_container_name}").exitstatus.nonzero?
+            if shellout("#{host_docker_bin} inspect #{gitartifact_container_name}").exitstatus.nonzero?
               log_secondary_process(t(code: 'process.gitartifact_container_creating'), short: true) do
                 shellout!(
-                  ['docker create',
+                  ["#{host_docker_bin} create",
                    "--name #{gitartifact_container_name}",
                    "--volume /.dapp/deps/gitartifact/#{GITARTIFACT_VERSION}",
                    "dappdeps/gitartifact:#{GITARTIFACT_VERSION}"].join(' ')

data/lib/dapp/dapp/logging/base.rb

@@ -3,15 +3,15 @@ module Dapp
     module Logging
       module Base
         def log_quiet?
-          options[:log_quiet]
+          option_quiet
         end
 
         def log_time?
-          options[:log_time]
+          option_time
         end
 
         def log_verbose?
-          options[:log_verbose]
+          option_verbose
         end
 
         def ignore_config_warning?
@@ -27,11 +27,11 @@ module Dapp
         end
 
         def dry_run?
-          options[:dry_run]
+          option_dry_run
         end
 
         def dev_mode?
-          options[:dev].nil? ? config._dev_mode : options[:dev]
+          option_dev
         end
 
         def log_info(*args, **kwargs)

data/lib/dapp/dapp/logging/process.rb

@@ -25,7 +25,7 @@ module Dapp
         end
 
         # rubocop:disable Metrics/ParameterLists
-        def log_process(message, process: nil, short: false, quiet: false, verbose: nil, style: {}, status: {}, &blk)
+        def log_process(message, process: nil, short: false, quiet: false, style: {}, status: {}, &blk)
           style[:message] ||= DEFAULT_STYLE[:message]
           style[:process] ||= DEFAULT_STYLE[:process]
           style[:failed] ||= DEFAULT_STYLE[:failed]
@@ -34,21 +34,19 @@ module Dapp
           status[:success] ||= t(code: 'status.success.default')
           status[:failed] ||= t(code: 'status.failed.default')
 
-          is_verbose = (verbose.nil? ? log_verbose? : verbose) && !short
-
           if quiet
             log_process_quiet(message.to_s, style: style, status: status, &blk)
-          elsif is_verbose
+          elsif short
+            log_process_short(message.to_s, style: style, status: status, &blk)
+          else
             process ||= t(code: 'status.process.default')
             log_process_verbose(message.to_s, process: process, style: style, status: status, &blk)
-          else
-            log_process_short(message.to_s, style: style, status: status, &blk)
           end
         end
         # rubocop:enable Metrics/ParameterLists
 
         def log_secondary_process(message, **kwargs, &blk)
-          log_process(message, **kwargs.merge(style: { message: :secondary, success: :secondary }, quiet: !log_verbose?), &blk)
+          log_process(message, **kwargs.merge(style: { message: :secondary, success: :secondary }), &blk)
         end
 
         protected

data/lib/dapp/dapp/shellout/base.rb

@@ -28,9 +28,12 @@ module Dapp
         end
 
         def shellout!(*args, **kwargs)
-          shellout_with_logging(**kwargs) do |options|
-            shellout(*args, **options).tap(&:error!)
+          if instance_of? Dapp
+            default_kwarg = proc { |key, value| kwargs[key] = value unless kwargs.key?(key) }
+            default_kwarg.call(:quiet, log_quiet?)
+            default_kwarg.call(:time, log_time?)
           end
+          _shellout_with_logging!(*args, **kwargs)
         end
 
         def shellout_pack(command)
@@ -49,22 +52,18 @@ module Dapp
 
         protected
 
-        def shellout_with_logging(log_verbose: false, force_log: false, **kwargs)
-          return yield(**kwargs) unless instance_of? Dapp
-
-          begin
-            stream = Stream.new
-            if force_log || (log_verbose && log_verbose?)
-              kwargs[:live_stream] = Proxy::Base.new(stream, STDOUT, with_time: log_time?)
-            else
-              kwargs[:live_stdout] = Proxy::Base.new(stream, with_time: log_time?)
-            end
-            kwargs[:live_stderr] = Proxy::Error.new(stream, with_time: log_time?)
-
-            yield(**kwargs)
-          rescue ::Mixlib::ShellOut::ShellCommandFailed => e
-            raise Error::Shellout, code: class_to_lowercase(e.class), data: { stream: stream.show }
+        def _shellout_with_logging!(*args, verbose: false, quiet: true, time: false, **kwargs)
+          stream = Stream.new
+          if verbose && !quiet
+            kwargs[:live_stream] = Proxy::Base.new(stream, STDOUT, with_time: time)
+          else
+            kwargs[:live_stdout] = Proxy::Base.new(stream, with_time: time)
           end
+          kwargs[:live_stderr] = Proxy::Error.new(stream, with_time: time)
+
+          shellout(*args, **kwargs).tap(&:error!)
+        rescue ::Mixlib::ShellOut::ShellCommandFailed => e
+          raise Error::Shellout, code: Helper::Trivia.class_to_lowercase(e.class), data: { stream: stream.show }
         end
       end
     end

data/lib/dapp/deployment/cli/command/deployment.rb

@@ -1,15 +1,14 @@
 module Dapp::Deployment::CLI
   module Command
     class Deployment < ::Dapp::CLI
-      SUBCOMMANDS = ['apply', 'mrproper', 'minikube setup'].freeze
+      SUBCOMMANDS = ['apply', 'mrproper'].freeze
 
       banner <<BANNER.freeze
-Usage: dapp deployment sub-command [sub-command options]
+Usage: dapp deployment subcommand [subcommand options]
 
 Available subcommands: (for details, dapp deployment SUB-COMMAND --help)
 
   dapp deployment apply [options] [APP ...] REPO
-  dapp deployment minikube setup
   dapp deployment mrproper [options]
 
 Options:

data/lib/dapp/deployment/dapp/command/apply.rb

@@ -10,14 +10,14 @@ module Dapp
             validate_repo_name!(repo)
             validate_tag_name!(image_version)
 
-            log_process("Applying deployment #{deployment.name}", verbose: true) do
+            log_process("Applying deployment #{deployment.name}") do
               with_log_indent do
                 deployment.kube.delete_unknown_resources!
 
                 deployment.to_kube_bootstrap_pods(repo, image_version).each do |name, spec|
                   next if deployment.kube.pod_succeeded?(name)
                   deployment.kube.delete_pod!(name) if deployment.kube.pod_exist?(name)
-                  log_process(:bootstrap, verbose: true) do
+                  log_process(:bootstrap) do
                     with_log_indent do
                       deployment.kube.run_job!(spec, name)
                     end
@@ -25,7 +25,7 @@ module Dapp
                 end
 
                 deployment.to_kube_before_apply_job_pods(repo, image_version).each do |name, spec|
-                  log_process(:before_apply_job, verbose: true) do
+                  log_process(:before_apply_job) do
                     deployment.kube.delete_pod!(name) if deployment.kube.pod_exist?(name)
                     with_log_indent do
                       deployment.kube.run_job!(spec, name)
@@ -34,7 +34,7 @@ module Dapp
                 end
 
                 deployment.apps.each do |app|
-                  log_process("Applying app #{app.name}", verbose: true) do
+                  log_process("Applying app #{app.name}") do
                     with_log_indent do
                       (app.kube.existing_deployments_names - app.to_kube_deployments(repo, image_version).keys).each do |deployment_name|
                         app.kube.delete_deployment!(deployment_name)
@@ -47,7 +47,7 @@ module Dapp
                       app.to_kube_bootstrap_pods(repo, image_version).each do |name, spec|
                         next if app.kube.pod_succeeded?(name)
                         app.kube.delete_pod!(name) if app.kube.pod_exist?(name)
-                        log_process(:bootstrap, verbose: true) do
+                        log_process(:bootstrap) do
                           with_log_indent do
                             app.kube.run_job!(spec, name)
                           end
@@ -55,7 +55,7 @@ module Dapp
                       end
 
                       app.to_kube_before_apply_job_pods(repo, image_version).each do |name, spec|
-                        log_process(:before_apply_job, verbose: true) do
+                        log_process(:before_apply_job) do
                           app.kube.delete_pod!(name) if app.kube.pod_exist?(name)
                           with_log_indent do
                             app.kube.run_job!(spec, name)

data/lib/dapp/deployment/dapp/dapp.rb

@@ -3,7 +3,6 @@ module Dapp
     module Dapp
       module Dapp
         include Command::Apply
-        include Command::MinikubeSetup
         include Command::Mrproper
         include Command::Common
 

data/lib/dapp/deployment/kube_app.rb

@@ -117,7 +117,7 @@ module Dapp
       # NOTICE: Однако, при обновлении deployment ревизия сбрасывается и ожидание переустановки этой ревизии
       # NOTICE: является одним из критериев завершения ожидания на данный момент.
       def _wait_for_deployment(d, old_d_revision: nil)
-        app.deployment.dapp.log_process("Waiting for kubernetes Deployment #{d['metadata']['name']} readiness", verbose: true) do
+        app.deployment.dapp.log_process("Waiting for kubernetes Deployment #{d['metadata']['name']} readiness") do
           app.deployment.dapp.with_log_indent do
             known_events_by_pod = {}
 

data/lib/dapp/deployment/kube_base.rb

@@ -38,7 +38,7 @@ module Dapp
           end
         end
 
-        deployment.dapp.log_process(:running, verbose: true) do
+        deployment.dapp.log_process(:running) do
           log_thread = Thread.new do
             begin
               deployment.kubernetes.pod_log(name, follow: true) { |chunk| puts chunk }

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

@@ -4,7 +4,7 @@ module Dapp
       module Stage
         class ArtifactBase < Base
           def dependencies
-            artifacts_signatures
+            @dependencies ||= artifacts_signatures
           end
 
           def prepare_image
@@ -50,9 +50,7 @@ module Dapp
           def artifacts_dimgs_build!
             artifacts.each do |artifact|
               process = dimg.dapp.t(code: 'process.artifact_building', data: { name: artifact[:name] })
-              dimg.dapp.log_secondary_process(process,
-                                              short: !dimg.dapp.log_verbose?,
-                                              quiet: dimg.artifact? && !dimg.dapp.log_verbose?) do
+              dimg.dapp.log_secondary_process(process) do
                 dimg.dapp.with_log_indent do
                   artifact[:dimg].build!
                 end
@@ -65,10 +63,7 @@ module Dapp
                               "--volume #{dimg.tmp_path('artifact', artifact_name)}:#{artifact_dimg.container_tmp_path(artifact_name)}",
                               "--volumes-from #{dimg.dapp.base_container}",
                               "--entrypoint #{dimg.dapp.bash_bin}"]
-            dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.artifact_copy',
-                                                        data: { name: artifact_name }),
-                                            short: true,
-                                            quiet: dimg.artifact? && !dimg.dapp.log_verbose?) do
+            dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
               artifact_dimg.run(docker_options, [%(-ec '#{dimg.dapp.shellout_pack(commands)}')])
             end
           end

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

@@ -47,17 +47,19 @@ module Dapp
           end
           # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
 
-          # rubocop:disable Metrics/CyclomaticComplexity
           def build!
-            return if build_should_be_skipped?
             prev_stage.build! if prev_stage
-            if image_should_be_build?
-              prepare_image if !image.built? && !should_be_not_present? || should_be_introspected?
-              log_image_build(&method(:image_build))
+            image_build       unless empty?
+            image_introspect  if image_should_be_introspected?
+          end
+
+          def image_introspect
+            if image.built?
+              dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options))
+            else
+              dimg.dapp.log_warning(desc: { code: :introspect_image_impossible, data: { name: name } })
             end
-            dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options)) if should_be_introspected?
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           def save_in_cache!
             prev_stage.save_in_cache! if prev_stage
@@ -106,12 +108,35 @@ module Dapp
 
               image.add_service_change_label :"dapp-mount-#{type.to_s.tr('_', '-')}" => mounts.join(';')
             end
+
+            image_add_custom_mounts
+          end
+
+          def image_add_custom_mounts
+            adding_custom_dir_mounts.each do |from, to_pathes|
+              FileUtils.mkdir_p(from)
+              to_pathes.tap(&:uniq!).map { |to_path| image.add_volume "#{from}:#{to_path}" }
+              image.add_service_change_label :"dapp-mount-custom-dir-#{from.gsub('/', '--')}" => to_pathes.join(';')
+            end
           end
 
           def adding_mounts_by_type(type)
             (config_mounts_by_type(type) + labels_mounts_by_type(type)).uniq
           end
 
+          def adding_custom_dir_mounts
+            config_custom_dir_mounts.in_depth_merge(labels_custom_dir_mounts)
+          end
+
+          def config_custom_dir_mounts
+            dimg.config._custom_dir_mount.reduce({}) do |mounts, mount|
+              from_path = File.expand_path(mount._from)
+              mounts[from_path] ||= []
+              mounts[from_path] << mount._to
+              mounts
+            end
+          end
+
           def config_mounts_by_type(type)
             dimg.config.public_send("_#{type}_mount").map(&:_to)
           end
@@ -120,8 +145,11 @@ module Dapp
             from_image.labels.select { |l, _| l == "dapp-mount-#{type.to_s.tr('_', '-')}" }.map { |_, value| value.split(';') }.flatten
           end
 
-          def image_should_be_build?
-            (!empty? && !image.built?) || dimg.dapp.log_verbose?
+          def labels_custom_dir_mounts
+            from_image.labels.map do |label, value|
+              next unless label =~ /dapp-mount-custom-dir-(?<from>.+)/
+              [File.expand_path(Regexp.last_match(:from).gsub('--', '/')), value.split(';')]
+            end.compact.to_h
           end
 
           def empty?
@@ -133,18 +161,16 @@ module Dapp
           end
 
           def signature
-            @signature ||= begin
-              if empty?
-                prev_stage.signature
-              else
-                args = []
-                args << prev_stage.signature unless prev_stage.nil?
-                args << dimg.build_cache_version
-                args << builder_checksum
-                args.concat(dependencies.flatten)
+            if empty?
+              prev_stage.signature
+            else
+              args = []
+              args << prev_stage.signature unless prev_stage.nil?
+              args << dimg.build_cache_version
+              args << builder_checksum
+              args.concat(dependencies.flatten)
 
-                hashsum args
-              end
+              hashsum args
             end
           end
 
@@ -156,19 +182,7 @@ module Dapp
           end
 
           def git_artifacts_dependencies
-            local_git_artifacts_dependencies + remote_git_artifacts_dependencies
-          end
-
-          def local_git_artifacts_dependencies
-            default_git_artifacts_dependencies(dimg.local_git_artifacts)
-          end
-
-          def remote_git_artifacts_dependencies
-            default_git_artifacts_dependencies(dimg.remote_git_artifacts)
-          end
-
-          def default_git_artifacts_dependencies(git_artifacts)
-            git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksum(self) }
+            dimg.git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksum(self) }
           end
 
           def dependencies
@@ -200,11 +214,12 @@ module Dapp
           protected
 
           def image_build
-            image.build!
-          end
-
-          def build_should_be_skipped?
-            image.built? && !dimg.dapp.log_verbose? && !should_be_introspected?
+            prepare_image if image_should_be_prepared?
+            log_image_build do
+              dimg.dapp.log_process(log_name,
+                                    process: dimg.dapp.t(code: 'status.process.building'),
+                                    short: should_not_be_detailed?) { image.build! }
+            end
           end
 
           def should_be_tagged?
@@ -215,6 +230,10 @@ module Dapp
             !(empty? || image.tagged? || should_be_not_present?)
           end
 
+          def image_should_be_prepared?
+            !image.built? && !should_be_not_present? || image_should_be_introspected?
+          end
+
           def should_be_not_present?
             return false if next_stage.nil?
             next_stage.image.tagged? || next_stage.should_be_not_present?

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

@@ -9,7 +9,7 @@ module Dapp
           end
 
           def dependencies
-            [change_options]
+            @dependencies ||= [change_options]
           end
 
           def prepare_image

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

@@ -4,7 +4,7 @@ module Dapp
       module Stage
         class From < Base
           def dependencies
-            [from_image_name, dimg.config._docker._from_cache_version, config_mounts_dirs]
+            @dependencies ||= [from_image_name, dimg.config._docker._from_cache_version, config_mounts_dirs]
           end
 
           protected
@@ -23,13 +23,17 @@ module Dapp
           end
 
           def config_mounts_dirs
-            [:tmp_dir, :build_dir].map { |type| config_mounts_by_type(type) }.flatten.uniq
+            ([:tmp_dir, :build_dir].map { |type| config_mounts_by_type(type) } + config_custom_dir_mounts.map(&:last)).flatten.uniq
           end
 
           def adding_mounts_by_type(_type)
             []
           end
 
+          def adding_custom_dir_mounts
+            []
+          end
+
           def should_not_be_detailed?
             from_image.tagged?
           end