dapp 0.22.6 → 0.22.7

data/lib/dapp/dimg/error/build.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Build < Base; end
+      class Build < Default; end
     end
   end
 end

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

@@ -1,11 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Chef < Base
-        def initialize(**net_status)
-          super(context: 'chef', **net_status)
-        end
-      end
+      class Chef < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/{command.rb → default.rb}

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Command < Base; end
+      class Default < ::Dapp::Error::Default; end
     end
   end
 end

data/lib/dapp/dimg/error/dimg.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Dimg < Base; end
+      class Dimg < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/lock.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Lock < Base; end
+      class Lock < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/registry.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Registry < Base; end
+      class Registry < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/rugged.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Rugged < Base; end
+      class Rugged < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/tar_writer.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class TarWriter < Base; end
+      class TarWriter < Default; end
     end
   end
 end

data/lib/dapp/dimg/git_artifact.rb

@@ -6,12 +6,13 @@ module Dapp
 
       attr_reader :repo
       attr_reader :name
+      attr_reader :as
 
       # FIXME: переименовать cwd в from
 
       # rubocop:disable Metrics/ParameterLists
       def initialize(repo, to:, name: nil, branch: nil, commit: nil,
-                     cwd: nil, include_paths: nil, exclude_paths: nil, owner: nil, group: nil,
+                     cwd: nil, include_paths: nil, exclude_paths: nil, owner: nil, group: nil, as: nil,
                      stages_dependencies: {})
         @repo = repo
         @name = name
@@ -25,6 +26,7 @@ module Dapp
         @exclude_paths = exclude_paths
         @owner = owner
         @group = group
+        @as = as
 
         @stages_dependencies = stages_dependencies
       end

data/lib/dapp/dimg/image/argument.rb

@@ -65,7 +65,9 @@ module Dapp
         def prepare_instructions(options)
           options.map do |key, vals|
             case key
-            when :cmd, :entrypoint then [vals]
+            when :cmd, :entrypoint
+              vals = [''] if vals == []
+              [vals]
             when :env, :label then vals.map(&method(:options_to_args)).flatten
             else vals
             end.map { |val| %(#{key.to_s.upcase} #{val}) }

data/lib/dapp/dimg/image/dimg.rb

@@ -0,0 +1,15 @@
+module Dapp
+  module Dimg
+    module Image
+      class Dimg < Stage
+        def export!(export_name = name)
+          super(export_name)
+        end
+
+        def tag!(tag_name = name)
+          super(tag_name)
+        end
+      end
+    end # Image
+  end # Dimg
+end # Dapp

data/lib/dapp/dimg/image/stage.rb

@@ -32,15 +32,6 @@ module Dapp
           !built_id.nil?
         end
 
-        def export_dimg!(name, sheme_name:)
-          self.class.new(name: name, dapp: dapp, from: self).tap do |image|
-            image.add_service_change_label(:'dapp-tag-scheme' => sheme_name)
-            image.add_service_change_label(:'dapp-dimg' => true)
-            image.build!
-            image.export!(name)
-          end
-        end
-
         def export!(name)
           tag!(name).tap do |image|
             image.push!

data/lib/dapp/error/base.rb

@@ -1,9 +1,5 @@
 module Dapp
   module Error
-    class Base < NetStatus::Exception
-      def initialize(net_status = {})
-        super({ context: self.class.to_s.split('::').last.downcase }.merge(net_status))
-      end
-    end
+    class Base < NetStatus::Exception; end
   end
 end

data/lib/dapp/error/command.rb

@@ -0,0 +1,5 @@
+module Dapp
+  module Error
+    class Command < Default; end
+  end
+end

data/lib/dapp/error/config.rb

@@ -0,0 +1,5 @@
+module Dapp
+  module Error
+    class Config < Default; end
+  end
+end

data/lib/dapp/error/dapp.rb

@@ -1,5 +1,5 @@
 module Dapp
   module Error
-    class Dapp < Base; end
+    class Dapp < Default; end
   end
 end

data/lib/dapp/error/dappfile.rb

@@ -1,5 +1,5 @@
 module Dapp
   module Error
-    class Dappfile < Base; end
+    class Dappfile < Default; end
   end
 end

data/lib/dapp/error/default.rb

@@ -0,0 +1,11 @@
+module Dapp
+  module Error
+    class Default < Base
+      include Mod::User
+
+      def initialize(net_status = {})
+        super({ context: self.class.to_s.split('::').last.downcase }.merge(net_status))
+      end
+    end
+  end
+end

data/lib/dapp/error/mod/user.rb

@@ -0,0 +1,11 @@
+module Dapp
+  module Error
+    module Mod
+      module User
+        def user?
+          true
+        end
+      end
+    end
+  end
+end

data/lib/dapp/error/shellout.rb

@@ -1,5 +1,5 @@
 module Dapp
   module Error
-    class Shellout < Base; end
+    class Shellout < Default; end
   end
 end

data/lib/dapp/exception/base.rb

@@ -1,5 +1,5 @@
 module Dapp
   module Exception
-    class Base < Error::Base; end
+    class Base < Error::Default; end
   end
 end

data/lib/dapp/helper/yaml.rb

@@ -1,8 +1,9 @@
 module Dapp
   module Helper
     module YAML
-      def yaml_load_file(file_path, hash: true)
-        yaml_load(File.read(file_path), hash: hash)
+      def yaml_load_file(file_path, hash: true, default: {})
+        return default if (context = File.read(file_path).strip).empty?
+        yaml_load(context, hash: hash)
       rescue ::Dapp::Error::Dapp => e
         raise ::Dapp::Error::Dapp, code: :yaml_file_incorrect, data: { file: file_path, message: e.net_status[:data][:message] }
       end

data/lib/dapp/kube/cli/command/kube/deploy.rb

@@ -8,6 +8,8 @@ Usage:
 
 Options:
 BANNER
+      extend ::Dapp::CLI::Command::Options::Tag
+
       option :namespace,
              long: '--namespace NAME',
              default: nil
@@ -18,32 +20,6 @@ BANNER
              default: [],
              proc: proc { |v| composite_options(:image_versions) << v }
 
-      option :tag,
-             long: '--tag TAG',
-             description: 'Custom tag',
-             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 :tmp_dir_prefix,
              long: '--tmp-dir-prefix PREFIX',
              description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'

data/lib/dapp/kube/cli/command/kube/lint.rb

@@ -8,37 +8,12 @@ Usage:
 
 Options:
 BANNER
+      extend ::Dapp::CLI::Command::Options::Tag
 
       option :namespace,
              long: '--namespace NAME',
              default: nil
 
-      option :tag,
-             long: '--tag TAG',
-             description: 'Custom tag',
-             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 :helm_set_options,
              long: '--set STRING_ARRAY',
              default: [],

data/lib/dapp/kube/cli/command/kube/render.rb

@@ -8,36 +8,12 @@ Usage:
 
 Options:
 BANNER
+      extend ::Dapp::CLI::Command::Options::Tag
+
       option :namespace,
              long: '--namespace NAME',
              default: nil
 
-      option :tag,
-             long: '--tag TAG',
-             description: 'Custom tag',
-             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 :tmp_dir_prefix,
              long: '--tmp-dir-prefix PREFIX',
              description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'

data/lib/dapp/kube/cli/command/kube/secret_key_generate.rb

@@ -8,8 +8,8 @@ Usage:
 
 Options:
 BANNER
-      def run_dapp_command(run_method, options: {}, log_running_time: false)
-        super(run_method, options: options, log_running_time: log_running_time)
+      def run_dapp_command(run_method, options: {}, log_running_time: false, **extra_options)
+        super(run_method, options: options, log_running_time: log_running_time, **extra_options)
       end
     end
   end

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

@@ -14,8 +14,7 @@ module Dapp
 
             repo = option_repo
             tag = begin
-              raise Error::Command, code: :expected_only_one_tag,
-                                    data: { tags: option_tags.join(', ') } if option_tags.count > 1
+              raise ::Dapp::Error::Command, code: :expected_only_one_tag, data: { tags: option_tags.join(', ') } if option_tags.count > 1
               option_tags.first
             end
             validate_repo_name!(repo)
@@ -44,12 +43,12 @@ module Dapp
           end
 
           def kube_check_helm_chart!
-            raise Error::Command, code: :helm_directory_not_exist, data: { path: kube_chart_path } unless kube_chart_path.exist?
+            raise ::Dapp::Error::Command, code: :helm_directory_not_exist, data: { path: kube_chart_path } unless kube_chart_path.exist?
           end
 
           def kube_check_helm_template_plugin!
             unless shellout!("helm plugin list | awk '{print $1}'").stdout.lines.map(&:strip).any? { |plugin| plugin == 'template' }
-              raise Error::Command, code: :helm_template_plugin_not_installed, data: { path: kube_chart_path }
+              raise ::Dapp::Error::Command, code: :helm_template_plugin_not_installed, data: { path: kube_chart_path }
             end
           end
 
@@ -103,19 +102,19 @@ module Dapp
 
 {{- define "_dimg" -}}
 {{-   $context := index . 0 -}}
-{{-   if eq (typeOf $context.Values.global.dapp.docker_image) "map[string]interface {}" -}}
+{{-   if not $context.Values.global.dapp.is_nameless_dimg -}}
 {{-     required "No dimg specified for template" nil -}}
 {{-   end -}}
-{{    $context.Values.global.dapp.docker_image }}
+{{    $context.Values.global.dapp.dimg.docker_image }}
 {{- end -}}
 
 {{- define "_dimg2" -}}
 {{-   $name := index . 0 -}}
 {{-   $context := index . 1 -}}
-{{-   if ne (typeOf $context.Values.global.dapp.docker_image) "map[string]interface {}" -}}
+{{-   if $context.Values.global.dapp.is_nameless_dimg -}}
 {{-     required (printf "No dimg should be specified for template, got `%s`" $name) nil -}}
 {{-   end -}}
-{{    required (printf "Unknown dimg `%s` specified for template" $name) (pluck $name $context.Values.global.dapp.docker_image | first) }}
+{{    index (required (printf "Unknown dimg `%s` specified for template" $name) (pluck $name $context.Values.global.dapp.dimg | first)) "docker_image" }}
 {{- end -}}
 
 {{- define "dimg" -}}
@@ -134,7 +133,7 @@ module Dapp
 
 {{- define "_dapp_container__imagePullPolicy" -}}
 {{-   $context := index . 0 -}}
-{{-   if $context.Values.global.dapp.is_branch -}}
+{{-   if $context.Values.global.dapp.ci.is_branch -}}
 imagePullPolicy: Always
 {{-   end -}}
 {{- end -}}
@@ -169,19 +168,19 @@ image: {{ tuple $name $context | include "_dimg2" }}
 
 {{- define "_dimg_id" -}}
 {{-   $context := index . 0 -}}
-{{-   if eq (typeOf $context.Values.global.dapp.docker_image_id) "map[string]interface {}" -}}
+{{-   if not $context.Values.global.dapp.is_nameless_dimg -}}
 {{-     required "No dimg specified for template" nil -}}
 {{-   end -}}
-{{    $context.Values.global.dapp.docker_image_id }}
+{{    $context.Values.global.dapp.dimg.docker_image_id }}
 {{- end -}}
 
 {{- define "_dimg_id2" -}}
 {{-   $name := index . 0 -}}
 {{-   $context := index . 1 -}}
-{{-   if ne (typeOf $context.Values.global.dapp.docker_image_id) "map[string]interface {}" -}}
+{{-   if $context.Values.global.dapp.is_nameless_dimg -}}
 {{-     required (printf "No dimg should be specified for template, got `%s`" $name) nil -}}
 {{-   end -}}
-{{    required (printf "Unknown dimg `%s` specified for template" $name) (pluck $name $context.Values.global.dapp.docker_image_id | first) }}
+{{    index (required (printf "Unknown dimg `%s` specified for template" $name) (pluck $name $context.Values.global.dapp.dimg | first)) "docker_image_id" }}
 {{- end -}}
 
 {{- define "dimg_id" -}}
@@ -200,7 +199,7 @@ image: {{ tuple $name $context | include "_dimg2" }}
 
 {{- define "_dapp_container_env" -}}
 {{-   $context := index . 0 -}}
-{{-   if $context.Values.global.dapp.is_branch -}}
+{{-   if $context.Values.global.dapp.ci.is_branch -}}
 - name: DOCKER_IMAGE_ID
   value: {{ tuple $context | include "_dimg_id" }}
 {{-   end -}}
@@ -209,7 +208,7 @@ image: {{ tuple $name $context | include "_dimg2" }}
 {{- define "_dapp_container_env2" -}}
 {{-   $name := index . 0 -}}
 {{-   $context := index . 1 -}}
-{{-   if $context.Values.global.dapp.is_branch -}}
+{{-   if $context.Values.global.dapp.ci.is_branch -}}
 - name: DOCKER_IMAGE_ID
   value: {{ tuple $name $context | include "_dimg_id2" }}
 {{-   end -}}
@@ -238,7 +237,7 @@ image: {{ tuple $name $context | include "_dimg2" }}
 
           def kube_values_paths
             self.options[:helm_values_options].map { |p| Pathname(p).expand_path }.each do |f|
-              raise Error::Command, code: :values_file_not_found, data: { path: f } unless f.file?
+              raise ::Dapp::Error::Command, code: :values_file_not_found, data: { path: f } unless f.file?
             end
           end
 
@@ -260,7 +259,7 @@ image: {{ tuple $name $context | include "_dimg2" }}
           end
 
           def kube_check_helm!
-            raise Error::Command, code: :helm_not_found if shellout('which helm').exitstatus == 1
+            raise ::Dapp::Error::Command, code: :helm_not_found if shellout('which helm').exitstatus == 1
           end
 
           def kube_release_name
@@ -284,15 +283,12 @@ image: {{ tuple $name $context | include "_dimg2" }}
           end
 
           def kube_secret_file_validate!(file_path)
-            raise Error::Command, code: :secret_file_not_found, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
-            raise Error::Command, code: :secret_file_empty, data: { path: File.expand_path(file_path) } if File.read(file_path).strip.empty?
+            raise ::Dapp::Error::Command, code: :secret_file_not_found, data: { path: File.expand_path(file_path) } unless File.exist?(file_path)
+            raise ::Dapp::Error::Command, code: :secret_file_empty, data: { path: File.expand_path(file_path) }     if File.read(file_path).strip.empty?
           end
 
           def secret_key_should_exist!
-            raise(Error::Command,
-              code: :secret_key_not_found,
-              data: {not_found_in: secret_key_not_found_in.join(', ')}
-            ) if secret.nil?
+            raise ::Dapp::Error::Command, code: :secret_key_not_found, data: { not_found_in: secret_key_not_found_in.join(', ') } if secret.nil?
           end
 
           def kube_chart_secret_path(*path)