kuber_kit 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f2e6ace047f0c5f5e5c4b8595cc0354d89846d2c752e6bd849bb44b1e60fb9
-  data.tar.gz: c2e9494de5dce8db6221300fc6a3e95e67d979e714edee1b5d72670b38c64c42
+  metadata.gz: d3088efcb997e3dda2dbcd85d584265b7a5eec03b20093265842e3396592ab35
+  data.tar.gz: a52e92d808c31b2a0f654e8ba2eaa9cf46a0b7352855f7602e63fee7a09a1271
 SHA512:
-  metadata.gz: 2503111ae618310fe827d5622f988cd98ae06f4626e39fd1fcbeb8d1b2da8ace07ba3a358a05c048c62a0c463556e4e58c5ba32241a5e2a0ddcdb316b42bc349
-  data.tar.gz: 0e5eb0798fce0f39a4b777f80e5aeda939a5185e8da1fbd254b6d1e176f27708bd10787757a2c294c1469826c0bec6d20cbc36f73e5912b0a0d0e589d35900b6
+  metadata.gz: 5ab6df03558b78d0d146cd6d77224f048564ae8d84c9c6d18d2b9abddb6d6cd8c1e8306549bad16c254fd5632b83c2cfceb690518216251efc4008983aa31f86
+  data.tar.gz: 1a2837bfa4334e33fa3c7aee7274516c297e9df0b92adf0fd7f021576c3682af2b48f9336c80b849bf1c5655a88f4d3cf43a42f6669140f5875e99a6710b5a5e

data/Gemfile.lock

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

data/TODO.md

@@ -4,6 +4,5 @@
 - allow deploying only services enabled for specific configuration
 - find a way to always deploy some service, e.g. for migrations and env_files
 - add ability to set container health checks
-- implement interactive shell.exec!
 - template should be able to set default attributes
 - template should be able to depend on image?

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

@@ -13,7 +13,12 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
 
     deployment_service_name = service.attribute(:deployment_service_name, default: service.name.to_s)
     deployment_command_name = service.attribute(:deployment_command_name, default: "bash")
+    deployment_interactive  = service.attribute(:deployment_interactive, default: false)
 
-    docker_compose_commands.run(shell, config_path, service: deployment_service_name, command: deployment_command_name)
+    docker_compose_commands.run(shell, config_path, 
+      service:      deployment_service_name, 
+      command:      deployment_command_name,
+      interactive:  deployment_interactive
+    )
   end
 end

data/lib/kuber_kit/shell/abstract_shell.rb

@@ -6,6 +6,10 @@ class KuberKit::Shell::AbstractShell
     raise KuberKit::NotImplementedError, "must be implemented"
   end
 
+  def interactive!(command)
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+
   def read(file_path)
     raise KuberKit::NotImplementedError, "must be implemented"
   end

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

@@ -1,5 +1,17 @@
 class KuberKit::Shell::Commands::DockerComposeCommands
-  def run(shell, path, service:, command:)
-    shell.exec!(%Q{docker-compose -f #{path} run #{service} #{command}})
+  def run(shell, path, service:, command:, interactive: false)
+    command_parts = [
+      "docker-compose",
+      "-f #{path}",
+      "run",
+      service,
+      command
+    ]
+    
+    if interactive
+      shell.interactive!(command_parts.join(" "))
+    else
+      shell.exec!(command_parts.join(" "))
+    end
   end
 end

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

@@ -16,9 +16,8 @@ class KuberKit::Shell::Commands::KubectlCommands
 
     command_parts += Array(command_list)
 
-    # TODO: investigate how to do it with shell.
     if interactive
-      system(command_parts.join(" "))
+      shell.interactive!(command_parts.join(" "))
     else
       shell.exec!(command_parts.join(" "))
     end

data/lib/kuber_kit/shell/local_shell.rb

@@ -30,6 +30,16 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     result
   end
 
+  def interactive!(command, log_command: true)
+    command_number = command_counter.get_number.to_s.rjust(2, "0")
+    
+    if log_command
+      logger.info("Interactive: [#{command_number}]: #{command.to_s.cyan}")
+    end
+
+    system(command)
+  end
+
   def sync(local_path, remote_path, exclude: nil, delete: true)
     rsync_commands.rsync(self, local_path, remote_path, exclude: exclude, delete: delete)
   end

data/lib/kuber_kit/shell/ssh_shell.rb

@@ -38,6 +38,10 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
     raise ShellError.new(e.message)
   end
 
+  def interactive!(command, log_command: true)
+    raise "Currently interactive run is not supported for ssh shell."
+  end
+
   def sync(local_path, remote_path, exclude: nil, delete: true)
     rsync_commands.rsync(
       local_shell, local_path, remote_path, 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-12-10 00:00:00.000000000 Z
@@ -289,7 +289,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []