dapp 0.22.6 → 0.22.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657b2271dc5a641fcd90ed720470a81ce478f73a
-  data.tar.gz: 5b4201a16c7da7be4cdddc0b9b3a2a697c7e59b9
+  metadata.gz: 8d39108e47246ec97bcdb25fd0464b58772efc23
+  data.tar.gz: 0d0262e3bd5675b69bc988e4c25588523e6881d0
 SHA512:
-  metadata.gz: 9ddad23ac4121cec7218dbaef4b2353710eef0d62bbe618cd07a25e89f1ea21b9b49e89e7282198f8a3d767cd8f85291fc854e38161c3bc05683443530ba09b4
-  data.tar.gz: bdc290374d797d1d5632226fa20e168c2f14350f988e60bc53c6e7966c9ff9795bc03bc863974cdff8136f24319ef5ea06223aace8f8b59f3e3067babbaa0093
+  metadata.gz: 5e182c079f4848bbf817d2380c1b3dae904eb6c69beebc541fcfaad6d480060608b5d3ecd126faa94cd2146345b57afdd96ba03aca8bd1b954db90b5192b7e7d
+  data.tar.gz: ac6a75467e166fa1a20c360cb2cb82846d8de06e3c3ba187cbcd281010a767309e2eef0ac3fb754d97e701bb80422b8f485703485b7184cfd42422f119cbf31e

data/bin/dapp

@@ -16,8 +16,8 @@ begin
 
       raise
     end
-  rescue ::SystemExit
-    raise
+  rescue ::SystemExit then raise
+  rescue Errno::EPIPE then nil
   rescue ::Exception => e
     "/tmp/dapp-stacktrace-#{SecureRandom.uuid}.out".tap do |filename|
       ::File.open(filename, 'w') do |dapp_stacktrace|
@@ -31,9 +31,13 @@ begin
 rescue Dapp::Error::Shellout => e
   $stderr.puts(Dapp::Helper::NetStatus.message(e))
   exit 1
-rescue Dapp::Error::Base, NetStatus::Exception => e
-  $stderr.puts(Dapp::Dapp.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
-  exit 1
+rescue Dapp::Error::Base, Dapp::Dapp::Logging::I18n::I18nError => e
+  if e.respond_to?(:user?) && e.user?
+    $stderr.puts(Dapp::Dapp.paint_string(Dapp::Helper::NetStatus.message(e), :warning))
+    exit 1
+  else
+    raise
+  end
 rescue Interrupt => _e
   $stderr.puts(Dapp::Dapp.paint_string('Interrupted', :warning))
   exit 1

data/config/en/common.yml

@@ -27,6 +27,7 @@ en:
     status:
       process:
         pushing: '[PUSHING]'
+        exporting: '[EXPORTING]'
         pulling: '[PULLING]'
         building: '[BUILDING]'
         default: '[RUNNING]'
@@ -42,6 +43,7 @@ en:
       rebuild: '[REBUILD]'
       build: '[BUILD]'
       push: '[PUSH]'
+      export: '[EXPORT]'
       pull: '[PULL]'
       tag: '[TAG]'
     warning:

data/config/en/net_status.yml

@@ -6,9 +6,6 @@ en:
     dimg:
       dimg_not_built: "Dimg hasn't been built yet!"
       dimg_not_run: "Dimg run failed!"
-    kube:
-      deploy_timeout: "Deploy timeout!"
-      connect_timeout: "Connect timeout when connecting to kube API."
     dappfile:
       incorrect: "Dappfile with `%{error}`:\n%{message}"
     build:
@@ -45,6 +42,8 @@ en:
       incorrect_yaml_structure: "Incorrect YAML structure in `%{path}`!"
       editor_not_found: "Editor not found!"
       expected_only_one_tag: 'Expected only one tag (`%{tags}`)!'
+      kube_deploy_timeout: "Deploy timeout!"
+      kube_connect_timeout: "Connect timeout when connecting to kube API."
     dapp:
       no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
       no_such_app: "No such app: `%{apps_patterns}`!"
@@ -52,7 +51,7 @@ en:
       cannot_run_ssh_agent: "Can't run ssh-agent!"
       ssh_key_not_found: "Ssh key `%{path}` doesn't exist!"
       docker_not_found: "Docker not found!"
-      docker_version: "Required docker version (`%{version}`): `%{min_version}` <= VERSION <= `%{max_version}`!"
+      docker_version: "Required docker version (`%{version}`): VERSION must be newer than `%{min_version}`!"
       dapp_config_file_incorrect: "%{message}"
       yaml_file_incorrect: "Yaml file `%{file}`: `%{message}`"
       yaml_incorrect: "`%{message}`"
@@ -127,15 +126,13 @@ en:
     app:
       namespace_not_found: "App `%{name}`: namespace `%{namespace}` not found!"
       namespace_not_defined: "App `%{name}`: namespace not defined!"
-    deployment:
-      namespace_not_found: "Deployment `%{name}`: namespace `%{namespace}` not found!"
-      namespace_not_defined: "Deployment `%{name}`: namespace not defined!"
-      bootstrap_failed: "Bootstrap failed:\n  phase: `%{phase}`\n  message: `%{message}`"
-      bootstrap_command_failed: "Bootstrap failed:\n  reason: `%{reason}`\n  message: `%{message}`\n  exit_code: `%{exit_code}`"
-      bootstrap_image_not_found: "Bootstrap failed because `%{reason}`: `%{message}`"
     kubernetes:
-      kube_config_not_found: "Kube config `%{path}` not found!"
-      kube_server_connection_refused: "Kube server `%{url}` connection refused: %{error}"
+      config_not_found: "Kube config `%{config_path}` not found!"
+      user_config_not_found: "User's `%{user}` config is not found in config %{config_path}"
+      cluster_config_not_found: "Cluster's `%{cluster}` config is not found in config %{config_path}"
+      config_context_not_found: "Context `%{context_name}` is not found in config %{config_path}"
+      server_connection_refused: "Kube server `%{url}` connection refused: %{error}"
+      server_error: "Kube respond with server error code %{response_http_status}, request parameters: `%{request_parameters}`, response: `%{response_raw_body}`"
     secret:
       bad_data: "Data `%{data}` can't be decrypted: check encryption key and data!"
       key_length_too_short: "Encryption key isn't valid (required size %{required_size} bytes)!"

data/lib/dapp.rb

@@ -36,19 +36,23 @@ require 'dapp/helper/net_status'
 require 'dapp/helper/tar'
 require 'dapp/helper/yaml'
 require 'dapp/prctl'
+require 'dapp/error/mod/user'
 require 'dapp/error/base'
+require 'dapp/error/default'
 require 'dapp/error/dapp'
 require 'dapp/error/dappfile'
+require 'dapp/error/command'
+require 'dapp/error/config'
 require 'dapp/error/shellout'
 require 'dapp/exception/base'
 require 'dapp/cli'
+require 'dapp/cli/command/options/tag'
 require 'dapp/cli/command/base'
 require 'dapp/cli/command/update'
 require 'dapp/cli/command/slug'
 require 'dapp/cli/cli'
 require 'dapp/config/directive/base'
 require 'dapp/config/config'
-require 'dapp/config/error/config'
 require 'dapp/dapp/lock'
 require 'dapp/dapp/ssh_agent'
 require 'dapp/dapp/git_artifact'
@@ -69,53 +73,12 @@ require 'dapp/dapp/shellout/base'
 require 'dapp/dapp/command/common'
 require 'dapp/dapp/command/slug'
 require 'dapp/dapp'
-require 'dapp/deployment'
-require 'dapp/deployment/config/directive/mod/group'
-require 'dapp/deployment/config/directive/mod/jobs'
-require 'dapp/deployment/error/base'
-require 'dapp/deployment/error/config'
-require 'dapp/deployment/error/app'
-require 'dapp/deployment/error/command'
-require 'dapp/deployment/error/kubernetes'
-require 'dapp/deployment/error/deployment'
-require 'dapp/deployment/config/directive/base'
-require 'dapp/deployment/config/directive/expose'
-require 'dapp/deployment/config/directive/namespace/instance_methods'
-require 'dapp/deployment/config/directive/namespace'
-require 'dapp/deployment/config/directive/app/instance_methods'
-require 'dapp/deployment/config/directive/app'
-require 'dapp/deployment/config/directive/group'
-require 'dapp/deployment/config/directive/deployment'
-require 'dapp/deployment/config/directive/job'
-require 'dapp/deployment/config/config'
-require 'dapp/deployment/core_ext/hash'
-require 'dapp/deployment/mod/namespace'
-require 'dapp/deployment/mod/system_environments'
-require 'dapp/deployment/mod/jobs'
-require 'dapp/deployment/app'
-require 'dapp/deployment/deployment'
-require 'dapp/deployment/kube_base'
-require 'dapp/deployment/kube_app'
-require 'dapp/deployment/kube_deployment'
-require 'dapp/deployment/kubernetes'
-require 'dapp/deployment/kubernetes/error'
-require 'dapp/deployment/cli/command/base'
-require 'dapp/deployment/cli/command/deployment'
-require 'dapp/deployment/cli/command/deployment/apply'
-require 'dapp/deployment/cli/command/deployment/mrproper'
-require 'dapp/deployment/cli/cli'
-require 'dapp/deployment/dapp/command/mrproper'
-require 'dapp/deployment/dapp/command/apply'
-require 'dapp/deployment/dapp/command/common'
-require 'dapp/deployment/dapp/dappfile'
-require 'dapp/deployment/dapp/dapp'
-require 'dapp/deployment/secret'
 require 'dapp/kube'
-require 'dapp/kube/error/base'
-require 'dapp/kube/error/command'
+require 'dapp/kube/error/default'
 require 'dapp/kube/error/kubernetes'
 require 'dapp/kube/secret'
 require 'dapp/kube/kubernetes'
+require 'dapp/kube/kubernetes/error'
 require 'dapp/kube/kubernetes/client'
 require 'dapp/kube/kubernetes/client/error'
 require 'dapp/kube/kubernetes/client/resource/base'
@@ -130,6 +93,7 @@ require 'dapp/kube/kubernetes/manager/container'
 require 'dapp/kube/kubernetes/manager/job'
 require 'dapp/kube/kubernetes/manager/deployment'
 require 'dapp/kube/helm'
+require 'dapp/kube/helm/values'
 require 'dapp/kube/helm/release'
 require 'dapp/kube/cli/command/base'
 require 'dapp/kube/cli/command/kube'
@@ -213,6 +177,7 @@ require 'dapp/dimg/cli/command/dimg/stages/push'
 require 'dapp/dimg/cli/command/dimg/stages/pull'
 require 'dapp/dimg/cli/command/dimg/run'
 require 'dapp/dimg/cli/command/dimg/cleanup_repo'
+require 'dapp/dimg/cli/command/dimg/flush_local'
 require 'dapp/dimg/cli/command/dimg/flush_repo'
 require 'dapp/dimg/cli/command/dimg/cleanup'
 require 'dapp/dimg/cli/command/dimg/bp'
@@ -243,6 +208,7 @@ require 'dapp/dimg/dapp/command/common'
 require 'dapp/dimg/dapp/command/build'
 require 'dapp/dimg/dapp/command/bp'
 require 'dapp/dimg/dapp/command/cleanup_repo'
+require 'dapp/dimg/dapp/command/flush_local'
 require 'dapp/dimg/dapp/command/flush_repo'
 require 'dapp/dimg/dapp/command/cleanup'
 require 'dapp/dimg/dapp/command/mrproper'
@@ -270,7 +236,7 @@ require 'dapp/dimg/docker_registry/base/authorization'
 require 'dapp/dimg/docker_registry/base'
 require 'dapp/dimg/docker_registry/dimg'
 require 'dapp/dimg/docker_registry/default'
-require 'dapp/dimg/error/base'
+require 'dapp/dimg/error/default'
 require 'dapp/dimg/error/dimg'
 require 'dapp/dimg/error/build'
 require 'dapp/dimg/error/tar_writer'
@@ -278,8 +244,6 @@ require 'dapp/dimg/error/rugged'
 require 'dapp/dimg/error/registry'
 require 'dapp/dimg/error/chef'
 require 'dapp/dimg/error/lock'
-require 'dapp/dimg/error/config'
-require 'dapp/dimg/error/command'
 require 'dapp/dimg/exception/base'
 require 'dapp/dimg/exception/introspect_image'
 require 'dapp/dimg/exception/registry'
@@ -293,6 +257,7 @@ require 'dapp/dimg/git_artifact'
 require 'dapp/dimg/image/argument'
 require 'dapp/dimg/image/docker'
 require 'dapp/dimg/image/stage'
+require 'dapp/dimg/image/dimg'
 require 'dapp/dimg/image/scratch'
 require 'dapp/dimg/dimg/git_artifact'
 require 'dapp/dimg/dimg/path'

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

@@ -0,0 +1,39 @@
+module Dapp
+  class CLI
+    module Command
+      module Options
+        module Tag
+          def self.extended(klass)
+            klass.class_eval do
+              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
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,7 +23,8 @@ module Dapp
         end
 
         def validate_compliance!(pattern, value, error_code)
-          raise Error::Config, code: error_code, data: { value: value, pattern: pattern } unless /^#{pattern}$/ =~ value
+          return if /^#{pattern}$/ =~ value
+          raise ::Dapp::Error::Config, code: error_code, data: { value: value, pattern: pattern }
         end
 
         def initialize_variables

data/lib/dapp/dapp.rb

@@ -152,15 +152,12 @@ module Dapp
           raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
           docker_bin = res.stdout.strip
 
-          current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
-          required_min_docker_version = '1.10.0'
-          required_max_docker_version = '17.09.0'
-
-          if Gem::Version.new(required_min_docker_version) > Gem::Version.new(current_docker_version[/(\d+\.)+\d+/]) ||
-              Gem::Version.new(required_max_docker_version) < Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
-            raise Error::Dapp, code: :docker_version, data: { min_version: required_min_docker_version,
-                                                              max_version: required_max_docker_version,
-                                                              version: current_docker_version[/(\d+\.)+\d+/] }
+          current_docker_version = Gem::Version.new(shellout!("#{docker_bin} --version").stdout.strip[/(\d+\.)+\d+(?=\.\d+)/])
+          required_min_docker_version = Gem::Version.new('1.10')
+
+          if required_min_docker_version >= current_docker_version
+            raise Error::Dapp, code: :docker_version, data: { min_version: required_min_docker_version.to_s,
+                                                              version: current_docker_version.to_s }
           end
 
           [].tap do |cmd|

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

@@ -3,10 +3,15 @@ module Dapp
     module Command
       module Common
         def option_repo
-          unless options[:repo].nil?
-            return "localhost:5000/#{name}" if options[:repo] == ':minikube'
-            options[:repo]
-          end
+          shortcut_or_key(options[:repo])
+        end
+
+        def shortcut_or_key(key)
+          shortcuts[key] || key
+        end
+
+        def shortcuts
+          { ':minikube' => "localhost:5000/#{name}" }
         end
 
         def dimg_registry(repo)

data/lib/dapp/dapp/logging/i18n.rb

@@ -2,6 +2,10 @@ module Dapp
   class Dapp
     module Logging
       module I18n
+        class I18nError < ::NetStatus::Exception
+          include ::Dapp::Error::Mod::User
+        end
+
         def self.initialize
           ::I18n.load_path << Dir[File.join(::Dapp.root, 'config', '**', '*')].select { |path| File.file?(path) }
           ::I18n.reload!
@@ -16,7 +20,7 @@ module Dapp
           paths << [:common, code].join('.')
           ::I18n.t(*paths, **data, raise: true)
         rescue ::I18n::MissingTranslationData => _e
-          raise ::NetStatus::Exception, code: :missing_translation, data: { code: code }
+          raise I18nError, code: :missing_translation, data: { code: code }
         end
       end
     end # Helper

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

@@ -53,7 +53,7 @@ module Dapp
 
         def log_process_quiet(message, style: {}, status: {})
           yield
-        rescue Error::Base => e
+        rescue Error::Default => e
           info                  = paint_string(slice(message), style[:message])
           failed_message        = paint_string(rjust(status[:failed], info), style[:failed])
           before_error_messages = [log_indent + info + failed_message, e.net_status[:data][:before_error_messages]].flatten
@@ -81,7 +81,7 @@ module Dapp
           message = success_message
           start = Time.now
           with_log_indent { yield }
-        rescue Error::Base, SignalException, StandardError => _e
+        rescue Error::Default, SignalException, StandardError => _e
           message = failed_message
           raise
         ensure

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

@@ -15,11 +15,11 @@ module Dapp
         protected
 
         def deployment_config_validate!
-          raise Error::Config, code: :app_name_required if _app.any? { |app| app._name.nil? } && _app.size > 1
+          raise ::Dapp::Error::Config, code: :app_name_required if _app.any? { |app| app._name.nil? } && _app.size > 1
           _app.each do |app|
-            raise Error::Config, code: :app_dimg_not_defined, data: { app: app._name } if app._dimg.nil? && !_dimg.map(&:_name).compact.empty?
+            raise ::Dapp::Error::Config, code: :app_dimg_not_defined, data: { app: app._name } if app._dimg.nil? && !_dimg.map(&:_name).compact.empty?
             unless _dimg.map(&:_name).include?(app._dimg)
-              raise Error::Config, code: :app_dimg_not_found, data: { app: app._name, dimg: app._dimg }
+              raise ::Dapp::Error::Config, code: :app_dimg_not_found, data: { app: app._name, dimg: app._dimg }
             end
           end
 
@@ -29,10 +29,10 @@ module Dapp
                 next if (job_config = obj.public_send("_#{job}")).empty?
                 job_dimg = job_config._dimg || obj._dimg
                 if job_dimg.nil? && !_dimg.map(&:_name).compact.empty?
-                  raise Error::Config, code: :"#{directive}_#{job}_dimg_not_defined"
+                  raise ::Dapp::Error::Config, code: :"#{directive}_#{job}_dimg_not_defined"
                 end
                 unless _dimg.map(&:_name).include?(job_dimg)
-                  raise Error::Config, code: :"#{directive}_#{job}_dimg_not_found", data: { dimg: job_dimg }
+                  raise ::Dapp::Error::Config, code: :"#{directive}_#{job}_dimg_not_found", data: { dimg: job_dimg }
                 end
               end
             end

data/lib/dapp/deployment/config/directive/expose.rb

@@ -57,7 +57,7 @@ module Dapp
 
             def define_number(number, code)
               number.to_i.tap do |n|
-                raise Error::Config, code: code, data: { number: number } unless (0..65536).cover?(n)
+                raise ::Dapp::Error::Config, code: code, data: { number: number } unless (0..65536).cover?(n)
               end
             end
           end

data/lib/dapp/deployment/config/directive/namespace/instance_methods.rb

@@ -17,7 +17,7 @@ module Dapp
             def scale(value)
               sub_directive_eval do
                 value.to_i.tap do |v|
-                  raise Error::Config, code: :unsupported_scale_value, data: { value: value } unless v > 0
+                  raise ::Dapp::Error::Config, code: :unsupported_scale_value, data: { value: value } unless v > 0
                   @_scale = v
                 end
               end

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

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

data/lib/dapp/deployment/error/{base.rb → default.rb}

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

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

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

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

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