kuber_kit 0.3.11 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8482307f03712fa9621bd81744aa15292d0378a24316c907050ddb1c379981
-  data.tar.gz: 28c6b0a83c41d0e221a62e0c45d034a6ecd28722ecb3e98a65471bcaf206372e
+  metadata.gz: c5c1697ed582055ca1d233797dcc663ffd8c2e7a00763b7d8a9ea8ca639b2270
+  data.tar.gz: a707b96dc99201d2d3c2338ceaef7d53d5241772f718b2453cb6249ce82b2335
 SHA512:
-  metadata.gz: 9034b084c1eb1db7dd70ad33f067a19e093bdaaf040aa3b65473d5e823570e35480b0915d1b0274a40ffda74c218e7aaa24ee919935bc1424d579e7c7cbf3ec5
-  data.tar.gz: 39bab8853fed26799be1b3b7e1f708be89c82e9082e70c05d5746fd99e11ab52f45a822bfcba572317c6a6128e7fbc823a7b9d9313379a93bc288bf9d7c80ba2
+  metadata.gz: be389af37cb52dd30f7a7cd6795231d3e7894fea24d303c1bdcb47f84b74e4e8b558a20e04e611a2263ae2d44cb008edd5e77beba4011d137fb5df06dd63b909
+  data.tar.gz: ee6144b4aad93cfa417d3cad69bfb1cc14b11fea014a50d02bfa2996306fa4b32de7923b9d8105ca79d7793ffac5dc123bb5bb7f2d4562e97405dafab3399956

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.3.11)
+    kuber_kit (0.4.4)
       cli-ui
       contracts-lite
       dry-auto_inject

data/TODO.md

@@ -1,7 +1,6 @@
 - https://ttytoolkit.org/
+- do not show result for images list, if list is too large
 - kit status should show the list of services and their status, with ability to select & view logs
-- list services and require confirmation before deployment
-- add kit logs support, should work similar to kit attach
 - allow deploying only services enabled for specific configuration
 - find a way to always deploy some service, e.g. for migrations and env_files
 - template should be able to set default attributes

data/example/configurations/review.rb

@@ -2,4 +2,5 @@ KuberKit
   .define_configuration(:review)
   .use_registry(:review_default, as: :default)
   .use_artifact(:kuber_kit_repo, as: :kuber_kit_repo)
+  .deployer_require_confirimation
   #.use_build_server(:remote_bs)

data/example/infrastructure/artifacts.rb

@@ -9,5 +9,5 @@ KuberKit.add_artifact(
 KuberKit.add_artifact(
   KuberKit::Core::Artifacts::Git
     .new(:kuber_kit_repo)
-    .setup(remote_url: "git@github.com:ArtStation/kuber_kit.git")
+    .setup(remote_url: "git@github.com:ArtStation/kuber_kit.git", branch: "main")
 )

data/example/services/docker_app.rb

@@ -0,0 +1,12 @@
+KuberKit
+  .define_service(:docker_app)
+  .images(:ruby_app)
+  .deployer_strategy(:docker)
+  .attributes(
+    deployer: {
+      detached:         true,
+      image_name:       :ruby_app,
+      container_name:   "test_docker_app",
+      delete_if_exists: true
+    }
+  )

data/lib/kuber_kit.rb

@@ -177,6 +177,8 @@ module KuberKit
   module UI
     autoload :Interactive, 'ui/interactive'
     autoload :Simple, 'ui/simple'
+    autoload :Debug, 'ui/debug'
+    autoload :Api, 'ui/api'
   end
 
   autoload :CLI, 'cli'
@@ -205,12 +207,12 @@ module KuberKit
       @current_configuration = nil
     end
 
-    def set_debug_mode(value)
-      @debug_mode = value
+    def set_ui_mode(value)
+      @ui_mode = value
     end
     
-    def debug_mode?
-      !!@debug_mode
+    def ui_mode
+      @ui_mode
     end
 
     def deprecation_warnings_disabled?
@@ -252,6 +254,14 @@ module KuberKit
       KuberKit::Core::ContextHelper::BaseHelper.class_exec(&proc)
     end
 
+    def user
+      @user ||= ENV["KUBER_KIT_USERNAME"] || `whoami`.chomp
+    end
+
+    def user_id
+      @user_id ||= `id -u #{user}`.chomp
+    end
+
     def configure(&proc)
       yield(Container["configs"])
     end

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -5,7 +5,6 @@ class KuberKit::Actions::ConfigurationLoader
     "core.service_store",
     "core.configuration_store",
     "artifacts_sync.artifacts_updater",
-    "tools.logger",
     "shell.local_shell",
     "ui",
     "configs"
@@ -18,20 +17,20 @@ class KuberKit::Actions::ConfigurationLoader
     services_path = options[:services_path] || File.join(root_path, configs.services_dirname)
     infra_path    = options[:infra_path]  || File.join(root_path, configs.infra_dirname)
     configurations_path  = options[:configurations_path]  || File.join(root_path, configs.configurations_dirname)
-    configuration_name   = ENV["KUBER_KIT_CONFIGURATION"] || options[:configuration]
+    configuration_name   = options[:configuration] || ENV["KUBER_KIT_CONFIGURATION"]
 
-    logger.info "Launching kuber_kit with:"
-    logger.info "  Root path: #{root_path.to_s.yellow}"
-    logger.info "  Images path: #{images_path.to_s.yellow}"
-    logger.info "  Services path: #{services_path.to_s.yellow}"
-    logger.info "  Infrastructure path: #{infra_path.to_s.yellow}"
-    logger.info "  Configurations path: #{configurations_path.to_s.yellow}"
-    logger.info "  Configuration name: #{configuration_name.to_s.yellow}"
+    ui.print_debug "ConfigurationLoader", "Launching kuber_kit with:"
+    ui.print_debug "ConfigurationLoader", "  Root path: #{root_path.to_s.yellow}"
+    ui.print_debug "ConfigurationLoader", "  Images path: #{images_path.to_s.yellow}"
+    ui.print_debug "ConfigurationLoader", "  Services path: #{services_path.to_s.yellow}"
+    ui.print_debug "ConfigurationLoader", "  Infrastructure path: #{infra_path.to_s.yellow}"
+    ui.print_debug "ConfigurationLoader", "  Configurations path: #{configurations_path.to_s.yellow}"
+    ui.print_debug "ConfigurationLoader", "  Configuration name: #{configuration_name.to_s.yellow}"
 
     ui.print_info("Logs", "See logs at: #{configs.log_file_path}")
 
     unless File.exists?(root_path)
-      ui.print_warning "WARNING", "KuberKit root path #{root_path} doesn't exist. You may want to pass it --path parameter."
+      ui.print_warning "ConfigurationLoader", "KuberKit root path #{root_path} doesn't exist. You may want to pass it --path parameter."
     end
 
     if Gem::Version.new(KuberKit::VERSION) < Gem::Version.new(configs.kuber_kit_min_version)
@@ -65,6 +64,7 @@ class KuberKit::Actions::ConfigurationLoader
     true
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
+    
     false
   end
   
@@ -97,6 +97,6 @@ class KuberKit::Actions::ConfigurationLoader
       require(path)
     end
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
-    logger.warn("Directory with infrastructure not found: #{infra_path}")
+    ui.print_warning("ConfigurationLoader", "Directory with infrastructure not found: #{infra_path}")
   end
 end

data/lib/kuber_kit/actions/env_file_reader.rb

@@ -15,6 +15,7 @@ class KuberKit::Actions::EnvFileReader
     true
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
+    
     false
   end
 end

data/lib/kuber_kit/actions/image_compiler.rb

@@ -3,7 +3,7 @@ class KuberKit::Actions::ImageCompiler
     "image_compiler.image_dependency_resolver",
     "image_compiler.build_server_pool_factory",
     "shell.local_shell",
-    "tools.logger",
+    "configs",
     "ui",
     image_compiler: "image_compiler.action_handler",
   ]
@@ -13,14 +13,18 @@ class KuberKit::Actions::ImageCompiler
     build_id = generate_build_id
     build_server_pool = build_server_pool_factory.create()
 
+    compiled_images = []
+    compilation_result = {}
     image_dependency_resolver.each_with_deps(image_names) do |dep_image_names|
+      ui.print_debug("ImageCompiler", "Scheduling to compile: #{dep_image_names.inspect}. Limit: #{configs.compile_simultaneous_limit}")
       result = compile_simultaneously(dep_image_names, build_id, build_server_pool)
-      abort unless result
+      compiled_images += dep_image_names
+      compilation_result = compilation_result.merge(result)
     end
 
     build_server_pool.disconnect_all
 
-    true
+    { images: compiled_images, compilation: compilation_result }
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
 
@@ -30,20 +34,22 @@ class KuberKit::Actions::ImageCompiler
   private
     def compile_simultaneously(image_names, build_id, build_server_pool)
       task_group = ui.create_task_group
+      compiler_result = {}
       image_names.map do |image_name|
 
-        logger.info("Started compiling: #{image_name.to_s.green}")
+        ui.print_debug("ImageCompiler", "Started compiling: #{image_name.to_s.green}")
         task_group.add("Compiling #{image_name.to_s.yellow}") do |task|
           shell = build_server_pool.get_shell
           
-          image_compiler.call(shell, image_name, build_id)
+          compiler_result[image_name] = image_compiler.call(shell, image_name, build_id)
 
           task.update_title("Compiled #{image_name.to_s.green}")
-          logger.info("Finished compiling: #{image_name.to_s.green}")
+          ui.print_debug("ImageCompiler", "Finished compiling: #{image_name}")
         end
         
       end
       task_group.wait
+      compiler_result
     end
 
     def generate_build_id

data/lib/kuber_kit/actions/service_deployer.rb

@@ -4,17 +4,17 @@ class KuberKit::Actions::ServiceDeployer
     "service_deployer.service_list_resolver",
     "core.service_store",
     "shell.local_shell",
-    "tools.logger",
     "ui",
     service_deployer: "service_deployer.action_handler",
   ]
 
   Contract KeywordArgs[
-    services:     Maybe[ArrayOf[String]],
-    tags:         Maybe[ArrayOf[String]],
-    skip_compile: Maybe[Bool],
+    services:             Maybe[ArrayOf[String]],
+    tags:                 Maybe[ArrayOf[String]],
+    skip_compile:         Maybe[Bool],
+    require_confirmation: Maybe[Bool],
   ] => Any
-  def call(services:, tags:, skip_compile: false)
+  def call(services:, tags:, skip_compile: false, require_confirmation: false)
     if services.empty? && tags.empty?
       services, tags = show_tags_selection
     end
@@ -25,7 +25,16 @@ class KuberKit::Actions::ServiceDeployer
     )
 
     unless service_names.any?
-      ui.print_warning "WARNING", "No service found with given options, nothing will be deployed."
+      ui.print_warning "ServiceDeployer", "No service found with given options, nothing will be deployed."
+      return false
+    end
+
+    services_list = service_names.map(&:to_s).map(&:yellow).join(", ")
+    ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
+
+    if require_confirmation
+      result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
+      return false unless result == "confirm".green
     end
 
     services = service_names.map do |service_name|
@@ -35,9 +44,9 @@ class KuberKit::Actions::ServiceDeployer
     images_names = services.map(&:images).flatten.uniq
 
     compile_images(images_names) unless skip_compile
-    deploy_services(service_names)
+    deployment_result = deploy_services(service_names)
 
-    true
+    { services: service_names, deployment: deployment_result }
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
 
@@ -47,18 +56,22 @@ class KuberKit::Actions::ServiceDeployer
   def deploy_services(service_names)
     task_group = ui.create_task_group
 
+    deployer_result = {}
+
     service_names.each do |service_name|
 
-      logger.info("Started deploying: #{service_name.to_s.green}")
+      ui.print_debug("ServiceDeployer", "Started deploying: #{service_name.to_s.green}")
       task_group.add("Deploying #{service_name.to_s.yellow}") do |task|
-        service_deployer.call(local_shell, service_name.to_sym)
+        deployer_result[service_name] = service_deployer.call(local_shell, service_name.to_sym)
 
         task.update_title("Deployed #{service_name.to_s.green}")
-        logger.info("Finished deploying: #{service_name.to_s.green}")
+        ui.print_debug("ServiceDeployer", "Finished deploying: #{service_name.to_s.green}")
       end
     end
 
     task_group.wait
+
+    deployer_result
   end
 
   def compile_images(images_names)

data/lib/kuber_kit/actions/template_reader.rb

@@ -14,6 +14,7 @@ class KuberKit::Actions::TemplateReader
     true
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
+    
     false
   end
 end

data/lib/kuber_kit/artifacts_sync/artifacts_updater.rb

@@ -4,7 +4,8 @@ class KuberKit::ArtifactsSync::ArtifactsUpdater
   include KuberKit::Import[
     "artifacts_sync.git_artifact_resolver",
     "artifacts_sync.null_artifact_resolver",
-    "tools.logger"
+
+    "ui"
   ]
 
   def use_resolver(artifact_resolver, artifact_class:)
@@ -23,7 +24,7 @@ class KuberKit::ArtifactsSync::ArtifactsUpdater
     artifacts.each do |artifact|
       resolver = @@resolvers[artifact.class]
 
-      logger.info "Updating artifact #{artifact.name.to_s.green}"
+      ui.print_debug "ArtifactUpdater", "Updating artifact #{artifact.name.to_s.green}"
       
       raise ResolverNotFoundError, "Can't find resolver for artifact #{artifact}" if resolver.nil?
 

data/lib/kuber_kit/cli.rb

@@ -7,6 +7,7 @@ class KuberKit::CLI < Thor
   class_option :images_path, :type => :string
   class_option :infra_path, :type => :string
   class_option :configurations_path, :type => :string
+  class_option :ui, :type => :string, :desc => "UI mode (interactive|debug|simple)"
   class_option :debug, :type => :boolean, aliases: ["-d"]
   class_option :configuration, :type => :string, aliases: ["-C"]
 
@@ -14,48 +15,47 @@ class KuberKit::CLI < Thor
   def compile(image_names_str)
     setup(options)
     
+    started_at = Time.now.to_i
     image_names = image_names_str.split(",").map(&:strip).map(&:to_sym)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       result = KuberKit::Container['actions.image_compiler'].call(image_names, options)
     end
 
-    logger = KuberKit::Container['tools.logger']
     if result
-      logger.info("---------------------------")
-      logger.info("Image compilation finished!")
-      logger.info("---------------------------")
+      time = (Time.now.to_i - started_at)
+      print_result("Image compilation finished! (#{time}s)", result: result)
     else
-      logger.info("-------------------------".red)
-      logger.info("Image compilation failed!".red)
-      logger.info("-------------------------".red)
+      exit 1
     end
   end
 
   desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
-  method_option :services,      :type => :array,    aliases: ["-s"]
-  method_option :tags,          :type => :array,    aliases: ["-t"]
-  method_option :skip_compile,  :type => :boolean,  aliases: ["-B"]
+  method_option :services,              :type => :array,    aliases: ["-s"], repeatable: true
+  method_option :tags,                  :type => :array,    aliases: ["-t"], repeatable: true
+  method_option :skip_compile,          :type => :boolean,  aliases: ["-B"]
+  method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
   def deploy
     setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
+      require_confirmation = options[:require_confirmation] || 
+                             KuberKit.current_configuration.deployer_require_confirimation ||
+                             false
+      started_at = Time.now.to_i
       result = KuberKit::Container['actions.service_deployer'].call(
-        services:     options[:services] || [], 
-        tags:         options[:tags] || [],
-        skip_compile: options[:skip_compile] || false
+        services:             (options[:services] || []).flatten.uniq, 
+        tags:                 (options[:tags] || []).flatten.uniq,
+        skip_compile:         options[:skip_compile] || false,
+        require_confirmation: require_confirmation
       )
     end
 
-    logger = KuberKit::Container['tools.logger']
     if result
-      logger.info("---------------------------")
-      logger.info("Service deployment finished!")
-      logger.info("---------------------------")
+      time = (Time.now.to_i - started_at)
+      print_result("Service deployment finished! (#{time}s)", result: result)
     else
-      logger.info("-------------------------".red)
-      logger.info("Service deployment failed!".red)
-      logger.info("-------------------------".red)
+      exit 1
     end
   end
 
@@ -134,7 +134,11 @@ class KuberKit::CLI < Thor
 
   private
     def setup(options)
-      KuberKit.set_debug_mode(options[:debug])
+      if options[:debug]
+        KuberKit.set_ui_mode(:debug)
+      elsif options[:ui]
+        KuberKit.set_ui_mode(options[:ui].to_sym)
+      end
 
       # We should load config before loading any bean, to make sure that bean won't be built with default config
       root_path     = options[:path] || File.join(Dir.pwd, KuberKit::Container['configs'].kuber_kit_dirname)
@@ -143,4 +147,8 @@ class KuberKit::CLI < Thor
         require config_file_path
       end
     end
+
+    def print_result(message, data = {})
+      KuberKit::Container['ui'].print_result(message, data)
+    end
 end

data/lib/kuber_kit/container.rb

@@ -258,8 +258,12 @@ class KuberKit::Container
   end
 
   register "ui" do
-    if KuberKit.debug_mode?
+    if KuberKit.ui_mode == :debug
+      KuberKit::UI::Debug.new
+    elsif KuberKit.ui_mode == :simple
       KuberKit::UI::Simple.new
+    elsif KuberKit.ui_mode == :api
+      KuberKit::UI::Api.new
     else
       KuberKit::UI::Interactive.new
     end

data/lib/kuber_kit/core/configuration.rb

@@ -1,35 +1,37 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deployer_strategy, :deployer_namespace, :services_attributes, :build_servers,
-              :global_build_vars
+              :services_attributes, :build_servers, :global_build_vars,
+              :deployer_strategy, :deployer_namespace, :deployer_require_confirimation
 
   Contract KeywordArgs[
-    name:            Symbol,
-    artifacts:       Hash,
-    registries:      Hash,
-    env_files:       Hash,
-    templates:       Hash,
-    kubeconfig_path: Maybe[String],
-    deployer_strategy:  Symbol,
-    deployer_namespace: Maybe[Symbol],
-    services_attributes: HashOf[Symbol => Hash],
-    build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
-    global_build_vars:   HashOf[Symbol => Any],
+    name:                 Symbol,
+    artifacts:            Hash,
+    registries:           Hash,
+    env_files:            Hash,
+    templates:            Hash,
+    kubeconfig_path:      Maybe[String],
+    services_attributes:  HashOf[Symbol => Hash],
+    build_servers:        ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
+    global_build_vars:    HashOf[Symbol => Any],
+    deployer_strategy:              Symbol,
+    deployer_namespace:             Maybe[Symbol],
+    deployer_require_confirimation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deployer_strategy:, deployer_namespace:, services_attributes:, build_servers:, 
-                 global_build_vars:)
-    @name             = name
-    @artifacts        = artifacts
-    @registries       = registries
-    @env_files        = env_files
-    @templates        = templates
-    @kubeconfig_path  = kubeconfig_path
-    @deployer_strategy  = deployer_strategy
-    @deployer_namespace = deployer_namespace
-    @build_servers    = build_servers
+                 services_attributes:, build_servers:, global_build_vars:,
+                 deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
+    @name                 = name
+    @artifacts            = artifacts
+    @registries           = registries
+    @env_files            = env_files
+    @templates            = templates
+    @kubeconfig_path      = kubeconfig_path
+    @build_servers        = build_servers
     @services_attributes  = services_attributes
     @global_build_vars    = global_build_vars
+    @deployer_strategy              = deployer_strategy
+    @deployer_namespace             = deployer_namespace
+    @deployer_require_confirimation = deployer_require_confirimation
   end
 
   def service_attributes(service_name)

data/lib/kuber_kit/core/configuration_definition.rb

@@ -17,18 +17,19 @@ class KuberKit::Core::ConfigurationDefinition
 
   def to_attrs
     OpenStruct.new(
-      name:             @configuration_name,
-      artifacts:        @artifacts,
-      registries:       @registries,
-      env_files:        @env_files,
-      templates:        @templates,
-      kubeconfig_path:  @kubeconfig_path,
-      deployer_strategy:  @deployer_strategy,
-      deployer_namespace: @deployer_namespace,
-      enabled_services: @enabled_services,
-      build_servers:    @build_servers,
+      name:                 @configuration_name,
+      artifacts:            @artifacts,
+      registries:           @registries,
+      env_files:            @env_files,
+      templates:            @templates,
+      kubeconfig_path:      @kubeconfig_path,
+      enabled_services:     @enabled_services,
+      build_servers:        @build_servers,
       services_attributes:  @services_attributes,
       global_build_vars:    @global_build_vars,
+      deployer_strategy:              @deployer_strategy,
+      deployer_namespace:             @deployer_namespace,
+      deployer_require_confirimation: @deployer_require_confirimation || false,
     )
   end
 
@@ -94,6 +95,12 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
+  def deployer_require_confirimation
+    @deployer_require_confirimation = true
+
+    self
+  end
+
   def enabled_services(services)
     if services.is_a?(Hash)
       @enabled_services += services.keys.map(&:to_sym)

data/lib/kuber_kit/core/configuration_factory.rb

@@ -20,17 +20,18 @@ class KuberKit::Core::ConfigurationFactory
     build_servers = fetch_build_servers(configuration_attrs.build_servers)
 
     KuberKit::Core::Configuration.new(
-      name:               configuration_attrs.name,
-      artifacts:          artifacts,
-      registries:         registries,
-      env_files:          env_files,
-      templates:          templates,
-      kubeconfig_path:    configuration_attrs.kubeconfig_path,
-      deployer_strategy:  configuration_attrs.deployer_strategy || configs.deployer_strategy,
-      deployer_namespace: configuration_attrs.deployer_namespace,
-      build_servers:      build_servers,
+      name:                 configuration_attrs.name,
+      artifacts:            artifacts,
+      registries:           registries,
+      env_files:            env_files,
+      templates:            templates,
+      kubeconfig_path:      configuration_attrs.kubeconfig_path,
+      build_servers:        build_servers,
       services_attributes:  configuration_attrs.services_attributes,
       global_build_vars:    configuration_attrs.global_build_vars || {},
+      deployer_strategy:              configuration_attrs.deployer_strategy || configs.deployer_strategy,
+      deployer_namespace:             configuration_attrs.deployer_namespace,
+      deployer_require_confirimation: configuration_attrs.deployer_require_confirimation,
     )
   end
 

data/lib/kuber_kit/core/configuration_store.rb

@@ -3,7 +3,7 @@ class KuberKit::Core::ConfigurationStore
     "core.configuration_factory",
     "core.configuration_definition_factory",
     "shell.local_shell",
-    "tools.logger"
+    "ui"
   ]
 
   def define(configuration_name)
@@ -33,7 +33,7 @@ class KuberKit::Core::ConfigurationStore
       load_definition(path)
     end
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
-    logger.warn("Directory with configurations not found: #{dir_path}")
+    ui.print_warning("ConfigurationStore", "Directory with configurations not found: #{dir_path}")
     []
   end
 

data/lib/kuber_kit/core/image_store.rb

@@ -3,7 +3,7 @@ class KuberKit::Core::ImageStore
     "core.image_factory",
     "core.image_definition_factory",
     "shell.local_shell",
-    "tools.logger"
+    "ui"
   ]
 
   def define(image_name, image_dir = nil)
@@ -33,7 +33,7 @@ class KuberKit::Core::ImageStore
       load_definition(path)
     end
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
-    logger.warn("Directory with images not found: #{dir_path}")
+    ui.print_warning("ImageStore", "Directory with images not found: #{dir_path}")
     []
   end
 

data/lib/kuber_kit/core/service_store.rb

@@ -3,7 +3,7 @@ class KuberKit::Core::ServiceStore
     "core.service_factory",
     "core.service_definition_factory",
     "shell.local_shell",
-    "tools.logger"
+    "ui",
   ]
 
   def define(service_name)
@@ -33,7 +33,7 @@ class KuberKit::Core::ServiceStore
       load_definition(path)
     end
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
-    logger.warn("Directory with services not found: #{dir_path}")
+    ui.print_warning("ServiceStore", "Directory with services not found: #{dir_path}")
     []
   end
 

data/lib/kuber_kit/image_compiler/compiler.rb

@@ -12,7 +12,9 @@ class KuberKit::ImageCompiler::Compiler
     context_helper = context_helper_factory.build_image_context(shell, image)
     image_build_dir_creator.create(shell, image, image_build_dir, context_helper: context_helper)
 
-    image_builder.build(shell, image, image_build_dir, context_helper: context_helper)
+    result = image_builder.build(shell, image, image_build_dir, context_helper: context_helper)
     image_build_dir_creator.cleanup(shell, image_build_dir)
+
+    result
   end
 end

data/lib/kuber_kit/image_compiler/image_builder.rb

@@ -10,7 +10,13 @@ class KuberKit::ImageCompiler::ImageBuilder
   def build(shell, image, build_dir, context_helper: nil)
     image.before_build_callback.call(context_helper, build_dir) if image.before_build_callback
 
-    docker_commands.build(shell, build_dir, ["-t=#{image.registry_url}"])
+    build_options = ["-t=#{image.registry_url}"]
+    # use quite option for api mode ui, so it will only return built image id
+    if KuberKit.ui_mode == :api
+      build_options << "-q"
+    end
+
+    build_result = docker_commands.build(shell, build_dir, build_options)
 
     version_tag = version_tag_builder.get_version
     docker_commands.tag(shell, image.registry_url, version_tag)
@@ -21,5 +27,7 @@ class KuberKit::ImageCompiler::ImageBuilder
     end
 
     image.after_build_callback.call(context_helper, build_dir) if image.after_build_callback
+
+    build_result
   end
 end

data/lib/kuber_kit/image_compiler/image_dependency_resolver.rb

@@ -20,7 +20,9 @@ class KuberKit::ImageCompiler::ImageDependencyResolver
       next_dependencies = get_next(image_names, resolved: resolved_dependencies, limit: compile_limit)
     end
 
-    block.call(image_names - resolved_dependencies)
+    (image_names - resolved_dependencies).each_slice(compile_limit) do |group|
+      block.call(group)
+    end
   end
   
   Contract Or[Symbol, ArrayOf[Symbol]], KeywordArgs[

data/lib/kuber_kit/service_deployer/strategies/docker.rb

@@ -10,8 +10,10 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     :image_name,
     :detached,
     :command_name,
-    :command_args,
-    :delete_if_exists
+    :custom_args,
+    :delete_if_exists,
+    :volumes,
+    :networks,
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -23,8 +25,11 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     end
     
     container_name = strategy_options.fetch(:container_name, service.uri)
-    command_name   = strategy_options.fetch(:command_name, "bash")
-    command_args   = strategy_options.fetch(:command_args, nil)
+    command_name   = strategy_options.fetch(:command_name, nil)
+    custom_args    = strategy_options.fetch(:custom_args, nil)
+    networks       = strategy_options.fetch(:networks, [])
+    volumes        = strategy_options.fetch(:volumes, [])
+    hostname       = strategy_options.fetch(:hostname, container_name)
 
     image_name = strategy_options.fetch(:image_name, nil)
     if image_name.nil?
@@ -37,15 +42,27 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       docker_commands.delete_container(shell, container_name)
     end
 
-    command_args = Array(command_args)
+    custom_args = Array(custom_args)
     if container_name
-      command_args << "--name #{container_name}"
+      custom_args << "--name #{container_name}"
+    end
+    if hostname
+      custom_args << "--hostname #{hostname}"
+    end
+    networks.each do |network|
+      docker_commands.create_network(shell, network)
+      custom_args << "--network #{network}"
+    end
+    volumes.each do |volume|
+      volume_name, _ = volume.split(":")
+      docker_commands.create_volume(shell, volume_name) unless volume_name.start_with?("/")
+      custom_args << "--volume #{volume}"
     end
 
     docker_commands.run(
       shell, image.remote_registry_url, 
       command:    command_name,
-      args:       command_args, 
+      args:       custom_args, 
       detached:   !!strategy_options[:detached]
     )
   end

data/lib/kuber_kit/service_deployer/strategies/docker_compose.rb

@@ -8,7 +8,7 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
   STRATEGY_OPTIONS = [
     :service_name, 
     :command_name,
-    :command_args,
+    :custom_args,
     :detached
   ]
 
@@ -25,13 +25,13 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
     end
 
     service_name = strategy_options.fetch(:service_name, service.name.to_s)
-    command_name = strategy_options.fetch(:command_name, "bash")
-    command_args = strategy_options.fetch(:command_args, nil)
+    command_name = strategy_options.fetch(:command_name, nil)
+    custom_args  = strategy_options.fetch(:custom_args, nil)
 
     docker_compose_commands.run(shell, config_path, 
       service:  service_name, 
       command:  command_name,
-      args:     command_args, 
+      args:     custom_args, 
       detached: !!strategy_options[:detached]
     )
   end

data/lib/kuber_kit/service_deployer/strategies/kubernetes.rb

@@ -39,7 +39,7 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
       kubectl_commands.delete_resource(shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: namespace)
     end
 
-    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    apply_result = kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
 
     restart_enabled = strategy_options.fetch(:restart_if_exists, true)
     if restart_enabled && resource_exists
@@ -48,5 +48,7 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
         kubeconfig_path: kubeconfig_path, namespace: namespace
       )
     end
+    
+    apply_result
   end
 end

data/lib/kuber_kit/shell/commands/docker_commands.rb

@@ -3,7 +3,7 @@ class KuberKit::Shell::Commands::DockerCommands
     default_args = ["--rm=true"]
     args_list = (default_args + args).join(" ")
 
-    shell.exec!(%Q{docker build #{build_dir} #{args_list}})
+    shell.exec!(%Q{docker image build #{build_dir} #{args_list}})
   end
 
   def tag(shell, image_name, tag_name)
@@ -29,26 +29,67 @@ class KuberKit::Shell::Commands::DockerCommands
     end
   end
 
-  def container_exists?(shell, container_name)
-    result = get_container_id(shell, container_name)
+  def container_exists?(shell, container_name, status: nil)
+    result = get_containers(shell, container_name, status: status)
     result && result != ""
   end
 
-  def delete_container(shell, container_name)
-    shell.exec!(%Q{docker rm -f #{container_name}})
-  end
-
-  def get_container_id(shell, container_name, only_healthy: false, status: "running")
+  def get_containers(shell, container_name, only_healthy: false, status: nil)
     command_parts = []
     command_parts << "docker ps -a -q"
 
     if only_healthy
       command_parts << "--filter=\"health=healthy\""
     end
-
-    command_parts << "--filter=\"status=#{status}\""
+    if status
+      command_parts << "--filter=\"status=#{status}\""
+    end
     command_parts << "--filter=\"name=#{container_name}\""
 
     shell.exec!(command_parts.join(" "))
   end
+
+  def delete_container(shell, container_name)
+    shell.exec!("docker rm -f #{container_name}")
+  end
+
+  def create_network(shell, name)
+    unless network_exists?(shell, name)
+      shell.exec!("docker network create #{name}")
+    end
+  end
+
+  def network_exists?(shell, network_name)
+    result = get_networks(shell, network_name)
+    result && result != ""
+  end
+
+  def get_networks(shell, network_name)
+    command_parts = []
+    command_parts << "docker network ls"
+    command_parts << "--filter=\"name=#{network_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
+
+  def create_volume(shell, name)
+    unless volume_exists?(shell, name)
+      shell.exec!("docker volume create #{name}")
+    end
+  end
+
+  def volume_exists?(shell, volume_name)
+    result = get_volumes(shell, volume_name)
+    result && result != ""
+  end
+
+  def get_volumes(shell, volume_name)
+    command_parts = []
+    command_parts << "docker volume ls"
+    command_parts << "--filter=\"name=#{volume_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
 end

data/lib/kuber_kit/shell/local_shell.rb

@@ -2,16 +2,16 @@ require 'fileutils'
 
 class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
   include KuberKit::Import[
-    "tools.logger",
     "shell.command_counter",
     "shell.rsync_commands",
+    "ui",
   ]
 
   def exec!(command, log_command: true)
     command_number = command_counter.get_number.to_s.rjust(2, "0")
     
     if log_command
-      logger.info("Execute: [#{command_number}]: #{command.to_s.cyan}")
+      ui.print_debug("LocalShell", "Execute: [#{command_number}]: #{command.to_s.cyan}")
     end
 
     result = nil
@@ -20,7 +20,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
 
     if result && result != "" && log_command
-      logger.info("Finished [#{command_number}] with result: \n#{result.grey}")
+      ui.print_debug("LocalShell", "Finished [#{command_number}] with result: \n  ----\n#{result.grey}\n  ----")
     end
 
     if $?.exitstatus != 0
@@ -34,7 +34,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     command_number = command_counter.get_number.to_s.rjust(2, "0")
     
     if log_command
-      logger.info("Interactive: [#{command_number}]: #{command.to_s.cyan}")
+      ui.print_debug("LocalShell", "Interactive: [#{command_number}]: #{command.to_s.cyan}")
     end
 
     result = system(command)
@@ -57,7 +57,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
 
     File.write(file_path, content)
 
-    logger.info("Created file #{file_path.to_s.cyan}\r\n#{content.grey}")
+    ui.print_debug("LocalShell", "Created file #{file_path.to_s.cyan}\r\n  ----\r\n#{content.grey}\r\n  ----")
 
     true
   end

data/lib/kuber_kit/shell/ssh_shell.rb

@@ -2,7 +2,7 @@ require 'tempfile'
 
 class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
   include KuberKit::Import[
-    "tools.logger",
+    "ui",
     "shell.command_counter",
     "shell.rsync_commands",
     "shell.local_shell"
@@ -24,13 +24,13 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
     command_number = command_counter.get_number.to_s.rjust(2, "0")
     
     if log_command
-      logger.info("#{ssh_session.host.green} > Execute: [#{command_number}]: #{command.to_s.cyan}")
+      ui.print_debug("SshShell", "#{ssh_session.host.green} > Execute: [#{command_number}]: #{command.to_s.cyan}")
     end
 
     result = ssh_session.exec!(command)
 
     if result && result != "" && log_command
-      logger.info("#{ssh_session.host.green} > Finished [#{command_number}] with result: \n#{result.grey}")
+      ui.print_debug("SshShell", "#{ssh_session.host.green} > Finished [#{command_number}] with result: \n#{result.grey}")
     end
 
     result
@@ -62,7 +62,7 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
       sync(file.path, file_path)
     end
 
-    logger.info("Created file #{file_path.to_s.cyan}\r\n#{content.grey}")
+    ui.print_debug("SshShell", "Created file #{file_path.to_s.cyan}\r\n  ----\r\n#{content.grey}\r\n  ----")
 
     true
   end

data/lib/kuber_kit/tools/logger_factory.rb

@@ -26,7 +26,7 @@ class KuberKit::Tools::LoggerFactory
       severity_text  = severity.to_s
       severity_text  = severity_text.colorize(severity_color) if severity_color
 
-      if level == Logger::INFO
+      if level == Logger::DEBUG
         "#{datetime.strftime("%Y/%m/%d %H:%M:%S").grey} #{msg}\n"
       else
         "#{datetime.strftime("%Y/%m/%d %H:%M:%S").grey} #{severity_text.downcase}: #{msg}\n"

data/lib/kuber_kit/ui/api.rb

@@ -0,0 +1,48 @@
+require 'json'
+class KuberKit::UI::Api < KuberKit::UI::Simple
+  class Task < KuberKit::UI::Simple::Task
+    def print_started
+      # do nothing, api formatter should only show result
+    end
+
+    def print_finished
+      # do nothing, api formatter should only show result
+    end
+  end
+
+  def create_task_group
+    TaskGroup.new(KuberKit::UI::Api::Task)
+  end
+
+  def create_task(title, &block)
+    task = KuberKit::UI::Api::Task.new(title, &block)
+    task.execute
+    task.wait
+  end
+
+  def print_info(title, text)
+    logger.debug(text)
+  end
+
+  def print_error(title, text)
+    logger.debug(text)
+    print_json({error: text})
+  end
+
+  def print_warning(title, text)
+    logger.debug(text)
+  end
+
+  def print_debug(title, text)
+    logger.debug(text)
+  end
+
+  def print_result(message, data = {})
+    print_json({message: message}.merge(data))
+  end
+
+  protected
+    def print_json(data)
+      puts JSON.generate(data)
+    end
+end

data/lib/kuber_kit/ui/debug.rb

@@ -0,0 +1,31 @@
+class KuberKit::UI::Debug < KuberKit::UI::Simple
+  def print_info(title, text)
+    print_text(text, color: String::Colors::BLUE)
+  end
+
+  def print_error(title, text)
+    print_text(text, color: String::Colors::RED)
+  end
+
+  def print_warning(title, text)
+    print_text(text, color: String::Colors::YELLOW)
+    logger.debug(text)
+  end
+
+  def print_debug(title, text)
+    print_text(text, color: nil)
+    logger.debug(text)
+  end
+
+  def print_result(message, data = {})
+    print_debug("Result", "---------------------------")
+    print_debug("Result", message)
+    print_debug("Result", "---------------------------")
+  end
+
+  protected
+    def print_text(text, color: nil)
+      colorized_message = color ? text.colorize(color) : text
+      puts "  #{Time.now.strftime("%H:%M:%S").grey} #{colorized_message}"
+    end
+end

data/lib/kuber_kit/ui/interactive.rb

@@ -1,6 +1,10 @@
 require 'cli/ui'
 
 class KuberKit::UI::Interactive
+  include KuberKit::Import[
+    "tools.logger",
+  ]
+
   class TaskGroup < CLI::UI::SpinGroup
   end
 
@@ -24,6 +28,17 @@ class KuberKit::UI::Interactive
 
   def print_warning(title, text)
     print_in_frame(title, text, color: :yellow)
+    logger.debug(text)
+  end
+
+  def print_debug(title, text)
+    logger.debug(text)
+  end
+
+  def print_result(message, data = {})
+    print_debug("Result", "---------------------------")
+    print_debug("Result", message)
+    print_debug("Result", "---------------------------")
   end
 
   def prompt(text, options, &callback)

data/lib/kuber_kit/ui/simple.rb

@@ -1,19 +1,33 @@
 class KuberKit::UI::Simple
+  include KuberKit::Import[
+    "tools.logger",
+  ]
+
   class Task
     def initialize(title, &callback)
       @title = title
       @callback = callback
     end
 
+    def print_started
+      puts "- #{@title}"
+    end
+
+    def print_finished
+      puts "- #{@title.grey}"
+    end
+
     def execute
       if @thread
         raise "Already started execution of task '#{title}'"
       end
 
       @thread = Thread.new do
-        puts "Start task: #{@title.green}"
+        Thread.current.abort_on_exception = true
+        Thread.current.report_on_exception = false
+        print_started
         @callback.call(self)
-        puts "Finish task: #{@title.green}"
+        print_finished
       end
     end
 
@@ -30,8 +44,12 @@ class KuberKit::UI::Simple
   end
 
   class TaskGroup
+    def initialize(task_class)
+      @task_class = task_class
+    end
+
     def add(task_title, &task_block)
-      task = Task.new(task_title, &task_block)
+      task = @task_class.new(task_title, &task_block)
       task.execute
       add_task(task)
     end
@@ -47,7 +65,7 @@ class KuberKit::UI::Simple
   end
 
   def create_task_group
-    TaskGroup.new
+    TaskGroup.new(KuberKit::UI::Simple::Task)
   end
 
   def create_task(title, &block)
@@ -66,6 +84,17 @@ class KuberKit::UI::Simple
 
   def print_warning(title, text)
     print_text(title, text, color: String::Colors::YELLOW)
+    logger.debug(text)
+  end
+
+  def print_debug(title, text)
+    logger.debug(text)
+  end
+
+  def print_result(message, data = {})
+    print_debug("Result", "---------------------------")
+    print_debug("Result", message)
+    print_debug("Result", "---------------------------")
   end
 
   def prompt(text, options, &callback)
@@ -75,7 +104,7 @@ class KuberKit::UI::Simple
     result
   end
 
-  private
+  protected
     def print_text(title, text, color:)
       puts "#{title.colorize(color)}\r\n #{text.colorize(color)}"
     end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.3.11"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.4
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -183,6 +183,7 @@ files:
 - example/infrastructure/registries.rb
 - example/infrastructure/templates.rb
 - example/services/compose_app.rb
+- example/services/docker_app.rb
 - example/services/env_file.rb
 - example/services/ruby_app.rb
 - kuber_kit.gemspec
@@ -287,6 +288,8 @@ files:
 - lib/kuber_kit/tools/file_presence_checker.rb
 - lib/kuber_kit/tools/logger_factory.rb
 - lib/kuber_kit/ui.rb
+- lib/kuber_kit/ui/api.rb
+- lib/kuber_kit/ui/debug.rb
 - lib/kuber_kit/ui/interactive.rb
 - lib/kuber_kit/ui/simple.rb
 - lib/kuber_kit/version.rb
@@ -294,7 +297,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -309,8 +312,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []