kuber_kit 0.3.8 → 0.4.1

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

@@ -9,8 +9,12 @@ class KuberKit::Tools::LoggerFactory
     Logger::FATAL  => String::Colors::PURPLE,
   }
 
-  def create(stdout, level = nil)
-    logger = Logger.new(stdout)
+  include KuberKit::Import[
+    "configs",
+  ]
+
+  def create(stdout = nil, level = nil)
+    logger = Logger.new(stdout || configs.log_file_path)
 
     logger.level = level || Logger::DEBUG
 
@@ -22,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.8"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.1
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -145,6 +145,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -182,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
@@ -286,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
@@ -293,7 +297,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -308,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: []