kuber_kit 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 050f5ef4e2ef34f21bd8d5d92593717770a82c54c40d929cdce949a9f2735171
-  data.tar.gz: 250684c19fc240e0f243ad3c5688cd170912b26c49559569d12717a0bd1655fb
+  metadata.gz: 00f2e6ace047f0c5f5e5c4b8595cc0354d89846d2c752e6bd849bb44b1e60fb9
+  data.tar.gz: c2e9494de5dce8db6221300fc6a3e95e67d979e714edee1b5d72670b38c64c42
 SHA512:
-  metadata.gz: 3b80414736ee18eb858e383dde9219468b20953d98bbc61439974683b0a0287758e6a039719783ee6c132b94fa999c1e3f4eb9c6c020939313d29d100dc365c3
-  data.tar.gz: e7a7b01fea7a033bf14755dd597ca85079d51e235855c722c5ca8ddba1b25838d70469c2ae4089aca77b48394e5aca52dbcfdb9ef0706892a61437a3eaf8e7a9
+  metadata.gz: 2503111ae618310fe827d5622f988cd98ae06f4626e39fd1fcbeb8d1b2da8ace07ba3a358a05c048c62a0c463556e4e58c5ba32241a5e2a0ddcdb316b42bc349
+  data.tar.gz: 0e5eb0798fce0f39a4b777f80e5aeda939a5185e8da1fbd254b6d1e176f27708bd10787757a2c294c1469826c0bec6d20cbc36f73e5912b0a0d0e589d35900b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.2.9)
+    kuber_kit (0.3.0)
       cli-ui
       contracts-lite
       dry-auto_inject
@@ -35,23 +35,25 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     rake (10.5.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    simplecov (0.19.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thor (1.0.1)
 
 PLATFORMS

data/TODO.md

@@ -3,7 +3,6 @@
 - 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
-- allow setting default configuration for kuberkit using env variable
 - add ability to set container health checks
 - implement interactive shell.exec!
 - template should be able to set default attributes

data/lib/kuber_kit.rb

@@ -88,6 +88,7 @@ module KuberKit
     module Commands
       autoload :BashCommands, 'shell/commands/bash_commands'
       autoload :DockerCommands, 'shell/commands/docker_commands'
+      autoload :DockerComposeCommands, 'shell/commands/docker_compose_commands'
       autoload :GitCommands, 'shell/commands/git_commands'
       autoload :RsyncCommands, 'shell/commands/rsync_commands'
       autoload :KubectlCommands, 'shell/commands/kubectl_commands'
@@ -145,6 +146,7 @@ module KuberKit
 
     module Strategies
       autoload :Abstract, 'service_deployer/strategies/abstract'
+      autoload :DockerCompose, 'service_deployer/strategies/docker_compose'
       autoload :Kubernetes, 'service_deployer/strategies/kubernetes'
       autoload :KubernetesRunner, 'service_deployer/strategies/kubernetes_runner'
     end

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -27,7 +27,7 @@ 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   = options[:configuration]
+    configuration_name   = ENV["KUBER_KIT_CONFIGURATION"] || options[:configuration]
 
     logger.info "Launching kuber_kit with:"
     logger.info "  Root path: #{root_path.to_s.yellow}"

data/lib/kuber_kit/container.rb

@@ -117,6 +117,10 @@ class KuberKit::Container
     KuberKit::Shell::Commands::DockerCommands.new
   end
 
+  register "shell.docker_compose_commands" do
+    KuberKit::Shell::Commands::DockerComposeCommands.new
+  end
+
   register "shell.git_commands" do
     KuberKit::Shell::Commands::GitCommands.new
   end
@@ -233,6 +237,10 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::Strategies::KubernetesRunner.new
   end
 
+  register "service_deployer.strategies.docker_compose" do
+    KuberKit::ServiceDeployer::Strategies::DockerCompose.new
+  end
+
   register "service_reader.action_handler" do
     KuberKit::ServiceReader::ActionHandler.new
   end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -94,10 +94,23 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
-  def enabled_services(services_hash)
-    @enabled_services += services_hash.keys.map(&:to_sym)
-    @services_attributes = @services_attributes.merge(services_hash)
+  def enabled_services(services)
+    if services.is_a?(Hash)
+      @enabled_services += services.keys.map(&:to_sym)
+      @services_attributes = @services_attributes.merge(services)
+      return self
+    end
+
+    if services.is_a?(Array)
+      @enabled_services += services.map(&:to_sym)
+      return self
+    end
+
+    raise KuberKit::Error, "#enabled_services method accepts only Array or Hash"
+  end
 
+  def service_attributes(services)
+    @services_attributes = @services_attributes.merge(services)
     self
   end
 

data/lib/kuber_kit/service_deployer/deployer.rb

@@ -4,7 +4,8 @@ class KuberKit::ServiceDeployer::Deployer
   include KuberKit::Import[
     "core.service_store",
     "service_deployer.strategies.kubernetes",
-    "service_deployer.strategies.kubernetes_runner"
+    "service_deployer.strategies.kubernetes_runner",
+    "service_deployer.strategies.docker_compose"
   ]
 
   def initialize(**injected_deps)
@@ -39,5 +40,6 @@ class KuberKit::ServiceDeployer::Deployer
     def add_default_strategies
       register_strategy(:kubernetes, kubernetes)
       register_strategy(:kubernetes_runner, kubernetes_runner)
+      register_strategy(:docker_compose, docker_compose)
     end
 end

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

@@ -0,0 +1,19 @@
+class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDeployer::Strategies::Abstract
+  include KuberKit::Import[
+    "service_reader.reader",
+    "shell.docker_compose_commands",
+    "configs",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
+  def deploy(shell, service)
+    service_config = reader.read(shell, service)
+    config_path    = "#{configs.service_config_dir}/#{service.name}.yml"
+    shell.write(config_path, service_config)
+
+    deployment_service_name = service.attribute(:deployment_service_name, default: service.name.to_s)
+    deployment_command_name = service.attribute(:deployment_command_name, default: "bash")
+
+    docker_compose_commands.run(shell, config_path, service: deployment_service_name, command: deployment_command_name)
+  end
+end

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

@@ -0,0 +1,5 @@
+class KuberKit::Shell::Commands::DockerComposeCommands
+  def run(shell, path, service:, command:)
+    shell.exec!(%Q{docker-compose -f #{path} run #{service} #{command}})
+  end
+end

data/lib/kuber_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -258,6 +258,7 @@ files:
 - lib/kuber_kit/service_deployer/deployer.rb
 - lib/kuber_kit/service_deployer/service_list_resolver.rb
 - lib/kuber_kit/service_deployer/strategies/abstract.rb
+- lib/kuber_kit/service_deployer/strategies/docker_compose.rb
 - lib/kuber_kit/service_deployer/strategies/kubernetes.rb
 - lib/kuber_kit/service_deployer/strategies/kubernetes_runner.rb
 - lib/kuber_kit/service_deployer/strategy_detector.rb
@@ -267,6 +268,7 @@ files:
 - lib/kuber_kit/shell/command_counter.rb
 - lib/kuber_kit/shell/commands/bash_commands.rb
 - lib/kuber_kit/shell/commands/docker_commands.rb
+- lib/kuber_kit/shell/commands/docker_compose_commands.rb
 - lib/kuber_kit/shell/commands/git_commands.rb
 - lib/kuber_kit/shell/commands/kubectl_commands.rb
 - lib/kuber_kit/shell/commands/rsync_commands.rb