dapp 0.22.6 → 0.22.7

data/lib/dapp/deployment/kubernetes.rb

@@ -119,11 +119,11 @@ module Dapp
           err_data[:request_parameters] = request_parameters
 
           if response.status.to_s.start_with? '5'
-            raise Error::Base, code: :server_error, data: err_data
+            raise Error::Default, code: :server_error, data: err_data
           elsif response.status.to_s == '404'
             raise Error::NotFound, data: err_data
           else not response.status.to_s.start_with? '2'
-            raise Error::Base, code: :bad_request, data: err_data
+            raise Error::Default, code: :bad_request, data: err_data
           end
         end
       end
@@ -165,7 +165,7 @@ module Dapp
           if File.exist?((kube_config_path = File.join(ENV['HOME'], '.kube/config')))
             yaml_load_file(kube_config_path)
           else
-            raise Error::Base, code: :kube_config_not_found, data: { path: kube_config_path }
+            raise Error::Default, code: :kube_config_not_found, data: { path: kube_config_path }
           end
         end
       end

data/lib/dapp/deployment/kubernetes/error.rb

@@ -1,20 +1,20 @@
 module Dapp
   module Deployment
     module Kubernetes::Error
-      class Base < ::Dapp::Deployment::Error::Kubernetes
+      class Default < ::Dapp::Deployment::Error::Kubernetes
         def initialize(**net_status)
           super(**net_status, context: :kubernetes)
         end
       end
 
-      class NotFound < Base
+      class NotFound < Default
         def initialize(**net_status)
           super({code: :not_found}.merge(net_status))
         end
       end
 
-      class Timeout < Base; end
-      class ConnectionRefused < Base; end
+      class Timeout < Default; end
+      class ConnectionRefused < Default; end
     end
   end
 end

data/lib/dapp/deployment/secret.rb

@@ -77,7 +77,7 @@ module Dapp
         end
       end
 
-      class Error < ::Dapp::Deployment::Error::Base
+      class Error < ::Dapp::Deployment::Error::Default
         def initialize(**net_status)
           super(net_status.merge(context: :secret))
         end

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

@@ -1,7 +1,7 @@
 module Dapp::Dimg::CLI
   module Command
     class Dimg < ::Dapp::CLI
-      SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag', 'build-context', 'cleanup repo', 'flush repo'].freeze
+      SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag', 'build-context', 'cleanup repo', 'flush local', 'flush repo'].freeze
 
       banner <<BANNER.freeze
 Usage: dapp dimg [options] subcommand [subcommand options]
@@ -16,6 +16,7 @@ Available subcommands: (for details, dapp dimg SUB-COMMAND --help)
   dapp dimg list [options] [DIMG ...]
   dapp dimg run [options] [DIMG] [DOCKER ARGS]
   dapp dimg cleanup repo [options] [DIMG ...] REPO
+  dapp dimg flush local [options] [DIMG ...]
   dapp dimg flush repo [options] [DIMG ...] REPO
   dapp dimg cleanup [options]
   dapp dimg mrproper [options]

data/lib/dapp/dimg/cli/command/dimg/build_context/export.rb

@@ -16,6 +16,11 @@ BANNER
                  long: '--build-context-directory DIR_PATH',
                  description: 'Path to the directory with context'
 
+          option :use_system_tar,
+                 long: '--use-system-tar',
+                 boolean: true,
+                 default: false
+
           def run_method
             :"build_context_#{class_to_lowercase}"
           end

data/lib/dapp/dimg/cli/command/dimg/flush_local.rb

@@ -0,0 +1,24 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class FlushLocal < Base
+        banner <<BANNER.freeze
+Usage:
+
+  dapp dimg flush local [options] [DIMG ...]
+
+Options:
+BANNER
+
+        option :with_stages,
+               long: '--with-stages',
+               boolean: true
+
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments))
+        end
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/command/dimg/push.rb

@@ -11,6 +11,8 @@ Usage:
 
 Options:
 BANNER
+        extend ::Dapp::CLI::Command::Options::Tag
+
         option :lock_timeout,
                long: '--lock-timeout TIMEOUT',
                description: 'Redefine resource locking timeout (in seconds)',
@@ -20,32 +22,6 @@ BANNER
                long: '--git-artifact-branch BRANCH',
                description: 'Default branch to archive artifacts from'
 
-        option :tag,
-               long: '--tag TAG',
-               description: 'Add tag (can be used one or more times)',
-               default: [],
-               proc: proc { |v| composite_options(:tags) << v }
-
-        option :tag_branch,
-               long: '--tag-branch',
-               description: 'Tag by git branch',
-               boolean: true
-
-        option :tag_build_id,
-               long: '--tag-build-id',
-               description: 'Tag by CI build id',
-               boolean: true
-
-        option :tag_ci,
-               long: '--tag-ci',
-               description: 'Tag by CI branch and tag',
-               boolean: true
-
-        option :tag_commit,
-               long: '--tag-commit',
-               description: 'Tag by git commit',
-               boolean: true
-
         option :with_stages,
                long: '--with-stages',
                boolean: true

data/lib/dapp/dimg/cli/command/dimg/stages/base.rb

@@ -3,8 +3,8 @@ module Dapp::Dimg::CLI
     class Dimg < ::Dapp::CLI
       class Stages < ::Dapp::CLI
         class Base < Base
-          def run_dapp_command(run_command, options: {}, log_running_time: true)
-            super(run_command, options: options.merge(verbose: true), log_running_time: log_running_time)
+          def run_dapp_command(run_command, options: {}, log_running_time: true, **extra_options)
+            super(run_command, options: options.merge(verbose: true), log_running_time: log_running_time, **extra_options)
           end
         end
       end

data/lib/dapp/dimg/cli/command/dimg/tag.rb

@@ -5,19 +5,26 @@ module Dapp::Dimg::CLI
         banner <<BANNER.freeze
 Usage:
 
-  dapp dimg tag [options] [DIMG] TAG
+  dapp dimg tag [options] [DIMG ...] [REPO]
   
     DIMG                        Dapp image to process [default: *].
-    REPO                        Pushed image name.
 
 Options:
 BANNER
+        extend ::Dapp::CLI::Command::Options::Tag
 
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          tag = self.class.required_argument(self, 'tag')
           run_dapp_command(nil, options: cli_options(dimgs_patterns: cli_arguments)) do |dapp|
-            dapp.public_send(run_method, tag)
+            repo = if not cli_arguments[0].nil?
+              self.class.required_argument(self, 'repo')
+            else
+              dapp.name
+            end
+
+            dapp.options[:repo] = repo
+
+            dapp.public_send(run_method)
           end
         end
       end

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

@@ -13,7 +13,7 @@ module Dapp
         end
 
         def dimg_config_validate!
-          raise Error::Config, code: :dimg_name_required if _dimg.any? { |dimg| dimg._name.nil? } && _dimg.size > 1
+          raise ::Dapp::Error::Config, code: :dimg_name_required if _dimg.any? { |dimg| dimg._name.nil? } && _dimg.size > 1
           _dimg.each(&:validate!)
         end
       end

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

@@ -48,12 +48,12 @@ module Dapp
               conflict_type = [:before, :after].find { |t| t != 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
+              raise ::Dapp::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
+              raise ::Dapp::Error::Config, code: :stage_artifact_double_associate,
+                                           data: { stage: "#{type} #{stage.inspect}",
+                                                   conflict_stage: "#{conflict_type} #{conflict_stage.inspect}" } if conflict_stage
 
               defined_stage = public_send("_#{type}")
               dapp.log_config_warning(

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

@@ -61,13 +61,13 @@ module Dapp
 
             def _cwd=(value)
               return if value.nil?
-              raise Error::Config, code: :export_cwd_absolute_path_required unless Pathname(value).absolute?
+              raise ::Dapp::Error::Config, code: :export_cwd_absolute_path_required unless Pathname(value).absolute?
               @_cwd = path_format(value)
             end
 
             def to(absolute_path)
               sub_directive_eval do
-                raise Error::Config, code: :export_to_absolute_path_required unless Pathname(absolute_path).absolute?
+                raise ::Dapp::Error::Config, code: :export_to_absolute_path_required unless Pathname(absolute_path).absolute?
                 @_to = path_format(absolute_path)
               end
             end
@@ -75,7 +75,7 @@ module Dapp
             def include_paths(*relative_paths)
               sub_directive_eval do
                 unless relative_paths.all? { |path| Pathname(path).relative? }
-                  raise Error::Config, code: :export_include_paths_relative_path_required
+                  raise ::Dapp::Error::Config, code: :export_include_paths_relative_path_required
                 end
                 _include_paths.concat(relative_paths.map(&method(:path_format)))
               end
@@ -84,7 +84,7 @@ module Dapp
             def exclude_paths(*relative_paths)
               sub_directive_eval do
                 unless relative_paths.all? { |path| Pathname(path).relative? }
-                  raise Error::Config, code: :export_exclude_paths_relative_path_required
+                  raise ::Dapp::Error::Config, code: :export_exclude_paths_relative_path_required
                 end
                 _exclude_paths.concat(relative_paths.map(&method(:path_format)))
               end
@@ -99,7 +99,7 @@ module Dapp
             end
 
             def validate!
-              raise Error::Config, code: :export_to_required if _to.nil?
+              raise ::Dapp::Error::Config, code: :export_to_required if _to.nil?
             end
           end
         end

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

@@ -142,7 +142,7 @@ module Dapp
 
             def builder(type)
               @_builder = type if _builder == :none
-              raise Error::Config, code: :builder_type_conflict unless @_builder == type
+              raise ::Dapp::Error::Config, code: :builder_type_conflict unless @_builder == type
             end
 
             def passed_directives

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

@@ -18,7 +18,7 @@ module Dapp
                 validate_scratch_directives!
                 validate_scratch_artifacts!
               else
-                raise Error::Config, code: :stage_artifact_not_associated unless _import_artifact.empty?
+                raise ::Dapp::Error::Config, code: :stage_artifact_not_associated unless _import_artifact.empty?
               end
             end
 
@@ -31,7 +31,7 @@ module Dapp
               end
               _mount.map(&:_to).tap do |mounts_points|
                 mounts_points.each do |path|
-                  raise Error::Config, code: :mount_duplicate_to, data: { path: path } if mounts_points.count(path) > 1
+                  raise ::Dapp::Error::Config, code: :mount_duplicate_to, data: { path: path } if mounts_points.count(path) > 1
                 end
               end
             end
@@ -40,25 +40,23 @@ module Dapp
               directives = [[:_shell, :shell], [:_chef, :chef], [:_git_artifact, :git],
                             [:_tmp_dir_mount, :mount], [:_build_dir_mount, :mount], [:_custom_dir_mount, :mount]]
               directives.each do |name, user_name|
-                raise Error::Config,
-                      code: :scratch_unsupported_directive,
-                      data: { directive: user_name } unless public_send(name).empty?
+                raise ::Dapp::Error::Config, code: :scratch_unsupported_directive,
+                                             data: { directive: user_name } unless public_send(name).empty?
               end
 
               docker_directives = [:_expose, :_env, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint]
               docker_directives.each do |directive|
                 value = _docker.public_send(directive)
-                raise Error::Config,
-                      code: :scratch_unsupported_directive,
-                      data: { directive: "docker.#{directive}" } unless value.nil? || value.empty?
+                raise ::Dapp::Error::Config, code: :scratch_unsupported_directive,
+                                             data: { directive: "docker.#{directive}" } unless value.nil? || value.empty?
               end
             end
 
             def validate_scratch_artifacts!
-              raise Error::Config, code: :scratch_artifact_associated unless _associated_artifacts.empty?
-              raise Error::Config, code: :scratch_artifact_required if _import_artifact.empty?
+              raise ::Dapp::Error::Config, code: :scratch_artifact_associated unless _associated_artifacts.empty?
+              raise ::Dapp::Error::Config, code: :scratch_artifact_required if _import_artifact.empty?
               _import_artifact.each do |artifact|
-                raise Error::Config, code: :scratch_artifact_docker_from if artifact._config._docker._from.nil?
+                raise ::Dapp::Error::Config, code: :scratch_artifact_docker_from if artifact._config._docker._from.nil?
               end
             end
 
@@ -115,7 +113,7 @@ module Dapp
               verifiable_artifact[:include_paths].each do |verifiable_path|
                 potential_conflicts = artifact[:include_paths].select { |path| path.start_with?(verifiable_path) }
                 validate_artifact_path!(verifiable_artifact, potential_conflicts)
-              end.empty? && verifiable_artifact[:exclude_paths].empty? && raise(Error::Config, code: :artifact_conflict)
+              end.empty? && verifiable_artifact[:exclude_paths].empty? && raise(::Dapp::Error::Config, code: :artifact_conflict)
               validate_artifact_path!(verifiable_artifact, artifact[:include_paths]) if verifiable_artifact[:include_paths].empty?
             end
 
@@ -125,7 +123,7 @@ module Dapp
                   break if verifiable_artifact[:exclude_paths].include?(path) || ((path = File.dirname(path)) == '.')
                 end
                 verifiable_artifact[:exclude_paths].include?(path)
-              end.tap { |res| res || raise(Error::Config, code: :artifact_conflict) }
+              end.tap { |res| res || raise(::Dapp::Error::Config, code: :artifact_conflict) }
             end
 
             def _associated_artifacts

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

@@ -5,7 +5,7 @@ module Dapp
         module Docker
           class Artifact < Base
             def method_missing(m, *args)
-              raise Error::Config, code: :docker_artifact_unsupported_directive if Dimg.instance_methods.include?(m)
+              raise ::Dapp::Error::Config, code: :docker_artifact_unsupported_directive if Dimg.instance_methods.include?(m)
               super
             end
 

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

@@ -9,7 +9,7 @@ module Dapp
             def from(image, cache_version: nil)
               sub_directive_eval do
                 image = image.to_s
-                raise(Error::Config, code: :docker_from_incorrect, data: { name: image }) unless ::Dapp::Dimg::Image::Docker.image_name?(image)
+                raise(::Dapp::Error::Config, code: :docker_from_incorrect, data: { name: image }) unless ::Dapp::Dimg::Image::Docker.image_name?(image)
                 @_from = image.include?(':') ? image : [image, 'latest'].join(':')
                 @_from_cache_version = cache_version
               end

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

@@ -3,23 +3,39 @@ module Dapp
     module Config
       module Directive
         class GitArtifactLocal < ArtifactBase
+          attr_reader :_as
+
+          def as(value)
+            @_as = value
+          end
+
           def export(absolute_dir_path = '/', &blk)
             super
           end
           alias add export
           undef_method :export
 
+          def _export
+            super do |export|
+              export._as    = @_as
+
+              yield(export) if block_given?
+            end
+          end
+
           class Export < ArtifactBase::Export
+            attr_accessor :_as
+
             def stage_dependencies(&blk)
               @stage_dependencies ||= StageDependencies.new(&blk)
             end
 
             def validate!
-              raise Error::Config, code: :add_to_required if _to.nil?
+              raise ::Dapp::Error::Config, code: :add_to_required if _to.nil?
             end
 
             def _artifact_options
-              super.merge(stages_dependencies: stage_dependencies.to_h)
+              super.merge(stages_dependencies: stage_dependencies.to_h, as: _as)
             end
 
             class StageDependencies < Directive::Base
@@ -29,7 +45,7 @@ module Dapp
                 define_method(stage) do |*glob|
                   sub_directive_eval do
                     if (globs = glob.flatten.map { |g| path_format(g) }).any? { |g| Pathname(g).absolute? }
-                      raise Error::Config, code: :stages_dependencies_paths_relative_path_required, data: { stage: stage }
+                      raise ::Dapp::Error::Config, code: :stages_dependencies_paths_relative_path_required, data: { stage: stage }
                     end
                     instance_variable_set(:"@#{stage}", public_send("_#{stage}") + globs)
                   end

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

@@ -29,6 +29,8 @@ module Dapp
               export._name   = @_name
               export._branch ||= @_branch
               export._commit ||= @_commit
+
+              yield(export) if block_given?
             end
           end
 
@@ -49,7 +51,7 @@ module Dapp
 
             def validate!
               super
-              raise Error::Config, code: :git_artifact_remote_branch_with_commit if !_branch.nil? && !_commit.nil?
+              raise ::Dapp::Error::Config, code: :git_artifact_remote_branch_with_commit if !_branch.nil? && !_commit.nil?
             end
           end
         end

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

@@ -8,7 +8,7 @@ module Dapp
           attr_reader :_type
 
           def initialize(to, **kwargs, &blk)
-            raise Error::Config, code: :mount_to_absolute_path_required unless Pathname((to = to.to_s)).absolute?
+            raise ::Dapp::Error::Config, code: :mount_to_absolute_path_required unless Pathname((to = to.to_s)).absolute?
             @_to = path_format(to)
 
             super(**kwargs, &blk)
@@ -17,7 +17,7 @@ module Dapp
           def from(type)
             sub_directive_eval do
               type = type.to_sym
-              raise Error::Config, code: :mount_from_type_required unless [:tmp_dir, :build_dir].include? type
+              raise ::Dapp::Error::Config, code: :mount_from_type_required unless [:tmp_dir, :build_dir].include? type
               @_type = type
             end
           end
@@ -30,7 +30,7 @@ module Dapp
           end
 
           def validate!
-            raise Error::Config, code: :mount_from_or_from_path_required if _type.nil?
+            raise ::Dapp::Error::Config, code: :mount_from_or_from_path_required if _type.nil?
           end
         end
       end