kuber_kit 0.5.2 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 485e80726d7350ce239a165860ba4096b3549178d10e5ff8abdc918df983ab4c
-  data.tar.gz: 480a475c88bf4a6626a182ade7909e0a08143a978d96471faf0c2495021abf6a
+  metadata.gz: 9193e2d8c2f37a0ab10c3784fc353b2a7db990852aed41c12370624a4604eee3
+  data.tar.gz: e8effb3c080cdf273076f60998ef90fe70c0be31f36537edc06c1f6871b54541
 SHA512:
-  metadata.gz: d285c169ea188e3c8d4679db94ea74a7c3b5cabc993fbd41e675d590505d1f714836de4b052cd1b1793d810069b1d61f2520d78bcc8c538a6efaa95730f0dc2d
-  data.tar.gz: b645418d23a5e68f5bebf571dcd2853d460cadd42247ccc749b5c938825b08671059fedd3cbb83fd960cc3deb8a6eb0a121c11468e4dc7e365dc89b803046383
+  metadata.gz: 2f9322e5dee8ef3385e4ceba437257bb7a549e0aba7804420fe44c7bb42731f9d22419a83e584a121226f1ea80192e1b9041b343756a947177e89f7be62f488c
+  data.tar.gz: 053c5fcbffe7c9246ede5e166abd17d7a62a20d0e63a5c5d10a21b63cf5ea9c02eacaee6f54ecab01c7c90f6f9d89b0300a9f9da38d213d7c512302cf5c4303c

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+**0.5.7**
+- Look for kuber_kit root path in parent folders, so kit command will work in sub-folders
+
+**0.5.6**
+- Pre-process env file if it has .erb extension
+- Allow attaching env file from configuration to docker container
+- Change default data paths to use home directory
+- Add env groups support to combine multiple env files
+
+**0.5.5**
+- Added ability to skip services during deployment using -S option
+
+**0.5.4**
+- Added disabled services support
+
+**0.5.3**
+- Change the symbol to exclude service from "-" to "!", you can pass "-s !auth_app" to exclude "auth_app"
+- Added kit get command to find pods
+ 
 **0.5.2**
 - Added dependencies support to services
 - Added an option to deploy all services in `kit deloy`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.5.2)
+    kuber_kit (0.5.7)
       cli-ui
       contracts-lite
       dry-auto_inject
@@ -12,9 +12,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cli-ui (1.4.0)
+    cli-ui (1.5.1)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     contracts-lite (0.15.0)
     diff-lcs (1.4.4)
     docile (1.3.2)
@@ -26,7 +26,7 @@ GEM
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     net-ssh (6.1.0)
@@ -58,7 +58,7 @@ GEM
     thor (1.1.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.23.0)
+    tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
     tty-reader (0.9.0)

data/TODO.md

@@ -1,4 +1,3 @@
-- do not show result for images list, if list is too large (Mikhail)
 - add kit get method for more interactive kubernetes
 - env files should use a separate deployment method (with change detection)
 - add automatical confirmation support for service deployer

data/example/services/docker_app.rb

@@ -7,6 +7,7 @@ KuberKit
       detached:         false,
       image_name:       :ruby_app,
       container_name:   "test_docker_app",
-      delete_if_exists: true
+      delete_if_exists: true,
+      env_file_names:   [:test]
     }
   )

data/example/services/env_file.rb

@@ -1,7 +1,7 @@
 KuberKit
   .define_service(:env_file)
   .template(:env_file)
-  .tags("env_file")
+  .tags("env_file", "minimal")
   .attributes(
     deployer_restart_enabled: false
   )

data/example/services/ruby_app.rb

@@ -3,4 +3,4 @@ KuberKit
   .depends_on(:env_file)
   .template(:service)
   .images(:ruby_app)
-  .tags("app")
+  .tags("app", "minimal")

data/lib/kuber_kit.rb

@@ -54,6 +54,7 @@ module KuberKit
       autoload :EnvFileStore, 'core/env_files/env_file_store'
       autoload :AbstractEnvFile, 'core/env_files/abstract_env_file'
       autoload :ArtifactFile, 'core/env_files/artifact_file'
+      autoload :EnvGroup, 'core/env_files/env_group'
     end
 
     module ContextHelper
@@ -81,6 +82,7 @@ module KuberKit
     autoload :FilePresenceChecker, 'tools/file_presence_checker'
     autoload :LoggerFactory, 'tools/logger_factory'
     autoload :ProcessCleaner, 'tools/process_cleaner'
+    autoload :WorkdirDetector, 'tools/workdir_detector'
   end
 
   module Shell
@@ -127,10 +129,13 @@ module KuberKit
   module EnvFileReader
     autoload :ActionHandler, 'env_file_reader/action_handler'
     autoload :Reader, 'env_file_reader/reader'
+    autoload :EnvFileParser, 'env_file_reader/env_file_parser'
+    autoload :EnvFileTempfileCreator, 'env_file_reader/env_file_tempfile_creator'
 
     module Strategies
       autoload :Abstract, 'env_file_reader/strategies/abstract'
       autoload :ArtifactFile, 'env_file_reader/strategies/artifact_file'
+      autoload :EnvGroup, 'env_file_reader/strategies/env_group'
     end
   end
 
@@ -176,6 +181,7 @@ module KuberKit
     autoload :KubectlAttacher, 'actions/kubectl_attacher'
     autoload :KubectlConsole, 'actions/kubectl_console'
     autoload :KubectlDescribe, 'actions/kubectl_describe'
+    autoload :KubectlGet, 'actions/kubectl_get'
     autoload :KubectlLogs, 'actions/kubectl_logs'
     autoload :KubectlEnv, 'actions/kubectl_env'
   end

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -4,6 +4,7 @@ class KuberKit::Actions::ConfigurationLoader
     "core.image_store",
     "core.service_store",
     "core.configuration_store",
+    "tools.workdir_detector",
     "artifacts_sync.artifacts_updater",
     "shell.local_shell",
     "ui",
@@ -12,7 +13,7 @@ class KuberKit::Actions::ConfigurationLoader
 
   Contract Hash => Any
   def call(options)
-    root_path     = options[:path] || File.join(Dir.pwd, configs.kuber_kit_dirname)
+    root_path     = workdir_detector.call(options)
     images_path   = options[:images_path] || File.join(root_path, configs.images_dirname)
     services_path = options[:services_path] || File.join(root_path, configs.services_dirname)
     infra_path    = options[:infra_path]  || File.join(root_path, configs.infra_dirname)

data/lib/kuber_kit/actions/kubectl_get.rb

@@ -0,0 +1,32 @@
+class KuberKit::Actions::KubectlGet
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "kubernetes.resource_selector",
+    "ui"
+  ]
+
+  Contract Maybe[String], Hash => Any
+  def call(resource_name, options)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+
+    resources = kubectl_commands.get_resources(
+      local_shell, "pod",
+      kubeconfig_path: kubeconfig_path, 
+      namespace: deployer_namespace
+    )
+    
+    if resource_name
+      resources = resources.select{|r| r.include?(resource_name) }
+    end
+
+    ui.print_info("Pods", resources.join("\n"))
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/service_checker.rb

@@ -15,6 +15,11 @@ class KuberKit::Actions::ServiceChecker
       services = services.select{ |s| enabled_services.include?(s) }
     end
 
+    disabled_services  = KuberKit.current_configuration.disabled_services.map(&:to_s)
+    if disabled_services.any?
+      services = services.select{ |s| !disabled_services.include?(s) }
+    end
+
     resources = resources_fetcher.call("deployments") + resources_fetcher.call("cronjobs")
 
     missing_services = services.select{ |s| !resources.include?(s.gsub("_", "-")) }

data/lib/kuber_kit/actions/service_deployer.rb

@@ -14,18 +14,26 @@ class KuberKit::Actions::ServiceDeployer
   Contract KeywordArgs[
     services:             Maybe[ArrayOf[String]],
     tags:                 Maybe[ArrayOf[String]],
+    skip_services:        Maybe[ArrayOf[String]],
     skip_compile:         Maybe[Bool],
     require_confirmation: Maybe[Bool],
   ] => Any
-  def call(services:, tags:, skip_compile: false, require_confirmation: false)
+  def call(services:, tags:, skip_services: nil, skip_compile: false, require_confirmation: false)
+    current_configuration = KuberKit.current_configuration
+
     if services.empty? && tags.empty?
       services, tags = show_tags_selection
     end
 
+
+    disabled_services = current_configuration.disabled_services.map(&:to_s)
+    disabled_services += skip_services if skip_services
+
     service_names = service_list_resolver.resolve(
       services:         services || [],
       tags:             tags || [],
-      enabled_services: KuberKit.current_configuration.enabled_services.map(&:to_s)
+      enabled_services:   current_configuration.enabled_services.map(&:to_s),
+      disabled_services:  disabled_services
     ).map(&:to_sym)
 
     # Return the list of services with all dependencies.

data/lib/kuber_kit/cli.rb

@@ -30,9 +30,10 @@ class KuberKit::CLI < Thor
     end
   end
 
-  desc "deploy -t CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
+  desc "deploy -t TAG_NAME", "Deploy CONTEXT_NAME with kubectl"
   method_option :services,              :type => :array,    aliases: ["-s"], repeatable: true
   method_option :tags,                  :type => :array,    aliases: ["-t"], repeatable: true
+  method_option :skip_services,         :type => :array,    aliases: ["-S"], repeatable: true
   method_option :skip_compile,          :type => :boolean,  aliases: ["-B"]
   method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
   def deploy
@@ -46,6 +47,7 @@ class KuberKit::CLI < Thor
       result = KuberKit::Container['actions.service_deployer'].call(
         services:             (options[:services] || []).flatten.uniq, 
         tags:                 (options[:tags] || []).flatten.uniq,
+        skip_services:        (options[:skip_services] || []).flatten.uniq, 
         skip_compile:         options[:skip_compile] || false,
         require_confirmation: require_confirmation
       )
@@ -59,8 +61,8 @@ class KuberKit::CLI < Thor
     end
   end
 
-  desc "env ENV_FILE_NAME", "Return content of Env File ENV_FILE_NAME"
-  def env(env_file_name)
+  desc "envfile ENV_FILE_NAME", "Return content of Env File ENV_FILE_NAME"
+  def envfile(env_file_name)
     setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
@@ -150,6 +152,15 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "get RESOURCE_NAME", "List pods matching RESOURCE_NAME using kubectl"
+  def get(pod_name = nil)
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
+      KuberKit::Container['actions.kubectl_get'].call(pod_name, options)
+    end
+  end
+
   desc "version", "Print current version"
   def version
     puts KuberKit::VERSION
@@ -168,7 +179,7 @@ class KuberKit::CLI < Thor
       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)
+      root_path = KuberKit::Container['tools.workdir_detector'].call(options)
       config_file_path = File.join(root_path, APP_CONFIG_FILENAME)
       if File.exists?(config_file_path)
         require config_file_path

data/lib/kuber_kit/configs.rb

@@ -5,7 +5,7 @@ class KuberKit::Configs
     :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, 
     :kuber_kit_dirname, :kuber_kit_min_version, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
     :artifact_clone_dir, :service_config_dir, :deployer_strategy, :compile_simultaneous_limit, :deploy_simultaneous_limit,
-    :additional_images_paths, :deprecation_warnings_disabled, :log_file_path
+    :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir
   ]
   DOCKER_IGNORE_LIST = [
     'Dockerfile',
@@ -34,10 +34,12 @@ class KuberKit::Configs
   end
 
   def add_default_configs
+    home_kuber_kit_path = File.expand_path(File.join("~", ".kuber_kit"))
+    
     set :image_dockerfile_name,   "Dockerfile"
     set :image_build_context_dir, "build_context"
     set :image_tag,               'latest'
-    set :image_compile_dir,       "/tmp/kuber_kit/image_builds"
+    set :image_compile_dir,       File.join(home_kuber_kit_path, "image_builds")
     set :docker_ignore_list,      DOCKER_IGNORE_LIST
     set :kuber_kit_dirname,       "kuber_kit"
     set :kuber_kit_min_version,   KuberKit::VERSION
@@ -45,14 +47,15 @@ class KuberKit::Configs
     set :services_dirname,        "services"
     set :infra_dirname,           "infrastructure"
     set :configurations_dirname,  "configurations"
-    set :artifact_clone_dir,      "/tmp/kuber_kit/artifacts"
-    set :service_config_dir,      "/tmp/kuber_kit/services"
+    set :artifact_clone_dir,      File.join(home_kuber_kit_path, "artifacts")
+    set :service_config_dir,      File.join(home_kuber_kit_path, "services")
     set :deployer_strategy,         :kubernetes
     set :compile_simultaneous_limit, 5
     set :deploy_simultaneous_limit,  5
     set :additional_images_paths, []
     set :deprecation_warnings_disabled, false
-    set :log_file_path,           "/tmp/kuber_kit.log"
+    set :log_file_path,           File.join(home_kuber_kit_path, "deploy.log")
+    set :env_file_compile_dir,    File.join(home_kuber_kit_path, "env_files")
   end
 
   def items

data/lib/kuber_kit/container.rb

@@ -45,6 +45,10 @@ class KuberKit::Container
     KuberKit::Actions::KubectlDescribe.new
   end
 
+  register "actions.kubectl_get" do
+    KuberKit::Actions::KubectlGet.new
+  end
+
   register "actions.kubectl_logs" do
     KuberKit::Actions::KubectlLogs.new
   end
@@ -133,6 +137,10 @@ class KuberKit::Container
     KuberKit::Tools::ProcessCleaner.new
   end
 
+  register "tools.workdir_detector" do
+    KuberKit::Tools::WorkdirDetector.new
+  end
+
   register "shell.bash_commands" do
     KuberKit::Shell::Commands::BashCommands.new
   end
@@ -225,10 +233,22 @@ class KuberKit::Container
     KuberKit::EnvFileReader::Reader.new
   end
 
+  register "env_file_reader.env_file_parser" do
+    KuberKit::EnvFileReader::EnvFileParser.new
+  end
+
+  register "env_file_reader.env_file_tempfile_creator" do
+    KuberKit::EnvFileReader::EnvFileTempfileCreator.new
+  end
+
   register "env_file_reader.strategies.artifact_file" do
     KuberKit::EnvFileReader::Strategies::ArtifactFile.new
   end
 
+  register "env_file_reader.strategies.env_group" do
+    KuberKit::EnvFileReader::Strategies::EnvGroup.new
+  end
+
   register "template_reader.action_handler" do
     KuberKit::TemplateReader::ActionHandler.new
   end

data/lib/kuber_kit/core/artifacts/artifact_store.rb

@@ -3,6 +3,7 @@ class KuberKit::Core::Artifacts::ArtifactStore
     store.add(artifact.name, artifact)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Artifacts::AbstractArtifact]
   def get(artifact_name)
     artifact = get_from_configuration(artifact_name) || 
                get_global(artifact_name)
@@ -10,10 +11,12 @@ class KuberKit::Core::Artifacts::ArtifactStore
     artifact
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Artifacts::AbstractArtifact]
   def get_global(artifact_name)
     store.get(artifact_name)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Artifacts::AbstractArtifact]
   def get_from_configuration(artifact_name)
     artifacts = KuberKit.current_configuration.artifacts
     artifacts[artifact_name]

data/lib/kuber_kit/core/configuration.rb

@@ -1,6 +1,6 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :services_attributes, :enabled_services, :build_servers, :global_build_vars,
+              :services_attributes, :enabled_services, :disabled_services, :build_servers, :global_build_vars,
               :deployer_strategy, :deployer_namespace, :deployer_require_confirimation
 
   Contract KeywordArgs[
@@ -12,6 +12,7 @@ class KuberKit::Core::Configuration
     kubeconfig_path:      Maybe[String],
     services_attributes:  HashOf[Symbol => Hash],
     enabled_services:     ArrayOf[Symbol],
+    disabled_services:    ArrayOf[Symbol],
     build_servers:        ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
     global_build_vars:    HashOf[Symbol => Any],
     deployer_strategy:              Symbol,
@@ -19,7 +20,7 @@ class KuberKit::Core::Configuration
     deployer_require_confirimation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 services_attributes:, enabled_services:, build_servers:, global_build_vars:,
+                 services_attributes:, enabled_services:, disabled_services:, build_servers:, global_build_vars:,
                  deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
     @name                 = name
     @artifacts            = artifacts
@@ -30,6 +31,7 @@ class KuberKit::Core::Configuration
     @build_servers        = build_servers
     @services_attributes  = services_attributes
     @enabled_services     = enabled_services
+    @disabled_services    = disabled_services
     @global_build_vars    = global_build_vars
     @deployer_strategy              = deployer_strategy
     @deployer_namespace             = deployer_namespace

data/lib/kuber_kit/core/configuration_definition.rb

@@ -12,6 +12,7 @@ class KuberKit::Core::ConfigurationDefinition
     @templates  = {}
     @build_servers      = []
     @enabled_services   = []
+    @disabled_services  = []
     @services_attributes = {}
   end
 
@@ -24,6 +25,7 @@ class KuberKit::Core::ConfigurationDefinition
       templates:            @templates,
       kubeconfig_path:      @kubeconfig_path,
       enabled_services:     @enabled_services,
+      disabled_services:    @disabled_services,
       build_servers:        @build_servers,
       services_attributes:  @services_attributes,
       global_build_vars:    @global_build_vars,
@@ -116,6 +118,11 @@ class KuberKit::Core::ConfigurationDefinition
     raise KuberKit::Error, "#enabled_services method accepts only Array or Hash"
   end
 
+  def disabled_services(services)
+    @disabled_services += services.map(&:to_sym)
+    return self
+  end
+
   def service_attributes(services)
     @services_attributes = @services_attributes.merge(services)
     self

data/lib/kuber_kit/core/configuration_factory.rb

@@ -29,6 +29,7 @@ class KuberKit::Core::ConfigurationFactory
       build_servers:        build_servers,
       services_attributes:  configuration_attrs.services_attributes,
       enabled_services:     configuration_attrs.enabled_services,
+      disabled_services:    configuration_attrs.disabled_services,
       global_build_vars:    configuration_attrs.global_build_vars || {},
       deployer_strategy:              configuration_attrs.deployer_strategy || configs.deployer_strategy,
       deployer_namespace:             configuration_attrs.deployer_namespace,

data/lib/kuber_kit/core/env_files/abstract_env_file.rb

@@ -6,4 +6,8 @@ class KuberKit::Core::EnvFiles::AbstractEnvFile
   def initialize(env_file_name)
     @name = env_file_name
   end
+
+  def uniq_name
+    @name.to_s
+  end
 end

data/lib/kuber_kit/core/env_files/artifact_file.rb

@@ -6,4 +6,8 @@ class KuberKit::Core::EnvFiles::ArtifactFile < KuberKit::Core::EnvFiles::Abstrac
     @artifact_name = artifact_name
     @file_path = file_path
   end
+
+  def uniq_name
+    [@artifact_name.to_s, @name.to_s].join("-")
+  end
 end

data/lib/kuber_kit/core/env_files/env_file_store.rb

@@ -3,6 +3,7 @@ class KuberKit::Core::EnvFiles::EnvFileStore
     store.add(env_file.name, env_file)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::EnvFiles::AbstractEnvFile]
   def get(env_file_name)
     env_file = get_from_configuration(env_file_name) || 
                get_global(env_file_name)
@@ -10,10 +11,12 @@ class KuberKit::Core::EnvFiles::EnvFileStore
     env_file
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::EnvFiles::AbstractEnvFile]
   def get_global(env_file_name)
     store.get(env_file_name)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::EnvFiles::AbstractEnvFile]
   def get_from_configuration(env_file_name)
     env_files = KuberKit.current_configuration.env_files
     env_files[env_file_name]

data/lib/kuber_kit/core/env_files/env_group.rb

@@ -0,0 +1,12 @@
+class KuberKit::Core::EnvFiles::EnvGroup < KuberKit::Core::EnvFiles::AbstractEnvFile
+  attr_reader :env_files
+
+  def initialize(env_group_name, env_files:)
+    super(env_group_name)
+    @env_files = env_files
+  end
+
+  def uniq_name
+    "env-group-#{@name.to_s}"
+  end
+end

data/lib/kuber_kit/core/registries/registry_store.rb

@@ -3,6 +3,7 @@ class KuberKit::Core::Registries::RegistryStore
     store.add(registry.name, registry)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Registries::AbstractRegistry]
   def get(registry_name)
     registry = get_from_configuration(registry_name) || 
                get_global(registry_name)
@@ -10,10 +11,12 @@ class KuberKit::Core::Registries::RegistryStore
     registry
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Registries::AbstractRegistry]
   def get_global(registry_name)
     store.get(registry_name)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Registries::AbstractRegistry]
   def get_from_configuration(registry_name)
     registries = KuberKit.current_configuration.registries
     registries[registry_name]

data/lib/kuber_kit/core/templates/template_store.rb

@@ -3,6 +3,7 @@ class KuberKit::Core::Templates::TemplateStore
     store.add(template.name, template)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Templates::AbstractTemplate]
   def get(template_name)
     template = get_from_configuration(template_name) || 
                get_global(template_name)
@@ -10,10 +11,12 @@ class KuberKit::Core::Templates::TemplateStore
     template
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Templates::AbstractTemplate]
   def get_global(template_name)
     store.get(template_name)
   end
 
+  Contract Symbol => Maybe[KuberKit::Core::Templates::AbstractTemplate]
   def get_from_configuration(template_name)
     templates = KuberKit.current_configuration.templates
     templates[template_name]

data/lib/kuber_kit/env_file_reader/env_file_parser.rb

@@ -0,0 +1,51 @@
+class KuberKit::EnvFileReader::EnvFileParser
+  # Parser is based on:
+  # https://github.com/bkeepers/dotenv/blob/master/lib/dotenv/parser.rb
+  LINE = /
+    (?:^|\A)              # beginning of line
+    \s*                   # leading whitespace
+    (?:export\s+)?        # optional export
+    ([\w\.]+)             # key
+    (?:\s*=\s*?|:\s+?)    # separator
+    (                     # optional value begin
+      \s*'(?:\\'|[^'])*'  #   single quoted value
+      |                   #   or
+      \s*"(?:\\"|[^"])*"  #   double quoted value
+      |                   #   or
+      [^\#\r\n]+          #   unquoted value
+    )?                    # value end
+    \s*                   # trailing whitespace
+    (?:\#.*)?             # optional comment
+    (?:$|\z)              # end of line
+  /x
+
+  Contract String => Hash
+  def call(string)
+    hash = {}
+    string.gsub(/\r\n?/, "\n").scan(LINE).each do |key, value|
+      hash[key] = parse_value(value || "")
+    end
+    hash
+  end
+
+  private
+
+  def parse_value(value)
+    # Remove surrounding quotes
+    value = value.strip.sub(/\A(['"])(.*)\1\z/m, '\2')
+
+    if Regexp.last_match(1) == '"'
+      value = unescape_characters(expand_newlines(value))
+    end
+
+    value
+  end
+
+  def unescape_characters(value)
+    value.gsub(/\\([^$])/, '\1')
+  end
+
+  def expand_newlines(value)
+    value.gsub('\n', "\n").gsub('\r', "\r")
+  end
+end

data/lib/kuber_kit/env_file_reader/env_file_tempfile_creator.rb

@@ -0,0 +1,17 @@
+class KuberKit::EnvFileReader::EnvFileTempfileCreator
+  include KuberKit::Import[
+    "env_file_reader.reader",
+    "configs"
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::EnvFiles::AbstractEnvFile => String
+  def call(shell, env_file)
+    env_file_hash = reader.read(shell, env_file)
+    env_file_raw  = env_file_hash.to_a.map{|k,v| "#{k}=#{v}"}.join("\r\n")
+    temp_file_path = File.join(configs.env_file_compile_dir, env_file.uniq_name)
+
+    shell.write(temp_file_path, env_file_raw)
+
+    temp_file_path
+  end
+end

data/lib/kuber_kit/env_file_reader/reader.rb

@@ -3,6 +3,7 @@ class KuberKit::EnvFileReader::Reader
 
   include KuberKit::Import[
     "env_file_reader.strategies.artifact_file",
+    "env_file_reader.strategies.env_group",
   ]
 
   def initialize(**injected_deps)
@@ -35,5 +36,6 @@ class KuberKit::EnvFileReader::Reader
   private
     def add_default_strategies
       use_reader(artifact_file, env_file_class: KuberKit::Core::EnvFiles::ArtifactFile)
+      use_reader(env_group, env_file_class: KuberKit::Core::EnvFiles::EnvGroup)
     end
 end

data/lib/kuber_kit/env_file_reader/strategies/artifact_file.rb

@@ -1,8 +1,12 @@
 class KuberKit::EnvFileReader::Strategies::ArtifactFile < KuberKit::EnvFileReader::Strategies::Abstract
   include KuberKit::Import[
-    "core.artifact_store"
+    "core.artifact_store",
+    "env_file_reader.env_file_parser",
+    "preprocessing.text_preprocessor"
   ]
 
+  PREPROCESS_EXTENSIONS = [".erb"]
+
   def read(shell, env_file)
     artifact = artifact_store.get(env_file.artifact_name)
 
@@ -16,71 +20,11 @@ class KuberKit::EnvFileReader::Strategies::ArtifactFile < KuberKit::EnvFileReade
     def read_file(shell, file_path)
       result = {}
       content = shell.read(file_path)
-      Parser.call(content)
-    end
-
-  # Parser is based on:
-  # https://github.com/bkeepers/dotenv/blob/master/lib/dotenv/parser.rb
-  class Parser
-    LINE = /
-      (?:^|\A)              # beginning of line
-      \s*                   # leading whitespace
-      (?:export\s+)?        # optional export
-      ([\w\.]+)             # key
-      (?:\s*=\s*?|:\s+?)    # separator
-      (                     # optional value begin
-        \s*'(?:\\'|[^'])*'  #   single quoted value
-        |                   #   or
-        \s*"(?:\\"|[^"])*"  #   double quoted value
-        |                   #   or
-        [^\#\r\n]+          #   unquoted value
-      )?                    # value end
-      \s*                   # trailing whitespace
-      (?:\#.*)?             # optional comment
-      (?:$|\z)              # end of line
-    /x
-
-    class << self
-      def call(string, is_load = false)
-        new(string, is_load).call
+      enable_preprocessing = PREPROCESS_EXTENSIONS.any?{ |e| e == File.extname(file_path) }
+      if enable_preprocessing
+        content = text_preprocessor.compile(content)
       end
-    end
 
-    def initialize(string, is_load = false)
-      @string = string
-      @hash = {}
-      @is_load = is_load
+      env_file_parser.call(content)
     end
-
-    def call
-      # Convert line breaks to same format
-      lines = @string.gsub(/\r\n?/, "\n")
-      # Process matches
-      lines.scan(LINE).each do |key, value|
-        @hash[key] = parse_value(value || "")
-      end
-      @hash
-    end
-
-    private
-
-    def parse_value(value)
-      # Remove surrounding quotes
-      value = value.strip.sub(/\A(['"])(.*)\1\z/m, '\2')
-
-      if Regexp.last_match(1) == '"'
-        value = unescape_characters(expand_newlines(value))
-      end
-
-      value
-    end
-
-    def unescape_characters(value)
-      value.gsub(/\\([^$])/, '\1')
-    end
-
-    def expand_newlines(value)
-      value.gsub('\n', "\n").gsub('\r', "\r")
-    end
-  end
 end

data/lib/kuber_kit/env_file_reader/strategies/env_group.rb

@@ -0,0 +1,21 @@
+class KuberKit::EnvFileReader::Strategies::EnvGroup < KuberKit::EnvFileReader::Strategies::Abstract
+  include KuberKit::Import[
+    "env_file_reader.strategies.artifact_file",
+    "core.env_file_store",
+  ]
+
+  def read(shell, env_group)
+    content = {}
+    env_group.env_files.each do |env_file_name|
+      env_file = env_file_store.get(env_file_name)
+
+      if env_file.is_a?(KuberKit::Core::EnvFiles::EnvGroup)
+        raise "EnvGroup inside another EnvGroup is not supported"
+      end
+
+      result   = artifact_file.read(shell, env_file)
+      content  = content.merge(result)
+    end
+    content
+  end
+end

data/lib/kuber_kit/service_deployer/service_list_resolver.rb

@@ -4,11 +4,12 @@ class KuberKit::ServiceDeployer::ServiceListResolver
   ]
 
   Contract KeywordArgs[
-    services:         Optional[ArrayOf[String]],
-    tags:             Optional[ArrayOf[String]],
-    enabled_services: Optional[ArrayOf[String]]
+    services:           Optional[ArrayOf[String]],
+    tags:               Optional[ArrayOf[String]],
+    enabled_services:   Optional[ArrayOf[String]],
+    disabled_services:  Optional[ArrayOf[String]]
   ] => ArrayOf[String]
-  def resolve(services: [], tags: [], enabled_services: [])
+  def resolve(services: [], tags: [], enabled_services: [], disabled_services: [])
     all_definitions = service_store.all_definitions.values
 
     included_services, excluded_services = split_by_inclusion(services)
@@ -36,14 +37,18 @@ class KuberKit::ServiceDeployer::ServiceListResolver
       included_services = included_services.select{ |s| enabled_services.include?(s) }
     end
 
+    if disabled_services.any?
+      included_services = included_services.select{ |s| !disabled_services.include?(s) }
+    end
+
     included_services
   end
 
   Contract Array => Array
   def split_by_inclusion(array)
-    excluded, included = array.partition{|e| e.start_with?('-') }
+    excluded, included = array.partition{|e| e.start_with?('^') }
 
-    excluded.map!{ |item| item.gsub(/^\-/, "") }
+    excluded.map!{ |item| item.gsub(/^\^/, "") }
 
     [included, excluded]
   end

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

@@ -1,6 +1,8 @@
 class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer::Strategies::Abstract
   include KuberKit::Import[
+    "env_file_reader.env_file_tempfile_creator",
     "shell.docker_commands",
+    "core.env_file_store",
     "core.image_store",
     "configs",
   ]
@@ -18,6 +20,7 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     :networks,
     :expose,
     :publish,
+    :env_file_names
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -28,16 +31,19 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       raise KuberKit::Error, "Unknow options for deploy strategy: #{unknown_options}. Available options: #{STRATEGY_OPTIONS}"
     end
     
-    namespace      = strategy_options.fetch(:namespace, nil)
-    container_name = strategy_options.fetch(:container_name, [namespace, service.name].compact.join("_"))
-    command_name   = strategy_options.fetch(:command_name, nil)
-    env_file       = strategy_options.fetch(:env_file, nil)
-    custom_args    = strategy_options.fetch(:custom_args, nil)
-    networks       = strategy_options.fetch(:networks, [])
-    volumes        = strategy_options.fetch(:volumes, [])
-    expose_ports   = strategy_options.fetch(:expose, [])
-    publish_ports  = strategy_options.fetch(:publish, [])
-    hostname       = strategy_options.fetch(:hostname, container_name)
+    namespace       = strategy_options.fetch(:namespace, nil)
+    container_name  = strategy_options.fetch(:container_name, [namespace, service.name].compact.join("_"))
+    command_name    = strategy_options.fetch(:command_name, nil)
+    custom_env_file = strategy_options.fetch(:env_file, nil)
+    custom_args     = strategy_options.fetch(:custom_args, nil)
+    networks        = strategy_options.fetch(:networks, [])
+    volumes         = strategy_options.fetch(:volumes, [])
+    expose_ports    = strategy_options.fetch(:expose, [])
+    publish_ports   = strategy_options.fetch(:publish, [])
+    hostname        = strategy_options.fetch(:hostname, container_name)
+
+    env_file_names  = strategy_options.fetch(:env_file_names, [])
+    env_files       = prepare_env_files(shell, env_file_names)
 
     image_name = strategy_options.fetch(:image_name, nil)
     if image_name.nil?
@@ -54,8 +60,8 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     if container_name
       custom_args << "--name #{container_name}"
     end
-    if env_file
-      custom_args << "--env-file #{env_file}"
+    if custom_env_file
+      custom_args << "--env-file #{custom_env_file}"
     end
     if hostname
       custom_args << "--hostname #{hostname}"
@@ -75,6 +81,9 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     Array(publish_ports).each do |publish_port|
       custom_args << "--publish #{publish_port}"
     end
+    Array(env_files).each do |env_file|
+      custom_args << "--env-file #{env_file}"
+    end
 
     docker_commands.run(
       shell, image.remote_registry_url, 
@@ -84,4 +93,14 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       interactive:  !strategy_options[:detached]
     )
   end
+
+  private
+    def prepare_env_files(shell, env_file_names)
+      env_files = env_file_names.map do |env_file_name|
+        env_file_store.get(env_file_name)
+      end
+      env_files.map do |env_file|
+        env_file_tempfile_creator.call(shell, env_file)
+      end
+    end
 end

data/lib/kuber_kit/shell/local_shell.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 
 class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
+  MAX_LINES_TO_PRINT = 50
+
   include KuberKit::Import[
     "shell.command_counter",
     "shell.rsync_commands",
@@ -20,7 +22,19 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
 
     if result && result != "" && log_command
-      ui.print_debug("LocalShell", "Finished [#{command_number}] with result: \n  ----\n#{result.grey}\n  ----")
+      print_result = result
+      print_result_lines = print_result.split("\n")
+
+      if print_result_lines.count >= MAX_LINES_TO_PRINT
+        print_result = [
+          "[Result is too long, showing only first and last items]".yellow, 
+          print_result_lines.first, 
+          "[#{print_result_lines.count - 2} lines not showing]".yellow, 
+          print_result_lines.last
+      ].join("\n")
+      end
+
+      ui.print_debug("LocalShell", "Finished [#{command_number}] with result: \n  ----\n#{print_result.grey}\n  ----")
     end
 
     if $?.exitstatus != 0

data/lib/kuber_kit/template_reader/strategies/artifact_file.rb

@@ -3,10 +3,10 @@ class KuberKit::TemplateReader::Strategies::ArtifactFile < KuberKit::TemplateRea
     "core.artifact_store"
   ]
 
-  def read(shell, env_file)
-    artifact = artifact_store.get(env_file.artifact_name)
+  def read(shell, template)
+    artifact = artifact_store.get(template.artifact_name)
 
-    file_parts = [artifact.cloned_path, env_file.file_path].compact
+    file_parts = [artifact.cloned_path, template.file_path].compact
     file_path  = File.join(*file_parts)
 
     shell.read(file_path)

data/lib/kuber_kit/tools/logger_factory.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'fileutils'
 
 class KuberKit::Tools::LoggerFactory
   SEVERITY_COLORS_BY_LEVEL = {
@@ -14,6 +15,10 @@ class KuberKit::Tools::LoggerFactory
   ]
 
   def create(stdout = nil, level = nil)
+    if !stdout
+      prepare_log_file(configs.log_file_path)
+    end
+    
     logger = Logger.new(stdout || configs.log_file_path)
 
     logger.level = level || Logger::DEBUG
@@ -35,4 +40,13 @@ class KuberKit::Tools::LoggerFactory
 
     logger
   end
+
+  private
+    def prepare_log_file(file_path)
+      dir_path = File.dirname(file_path)
+      unless Dir.exists?(dir_path)
+        FileUtils.mkdir_p(dir_path)
+      end
+      FileUtils.touch(file_path)
+    end
 end

data/lib/kuber_kit/tools/workdir_detector.rb

@@ -0,0 +1,33 @@
+class KuberKit::Tools::WorkdirDetector
+  include KuberKit::Import[
+    "configs",
+    "tools.file_presence_checker"
+  ]
+
+  def call(options, current_dir: nil)
+    current_dir ||= Dir.pwd
+    default_dir   = File.join(current_dir, configs.kuber_kit_dirname)
+    workdir_path  = options[:path] || ENV['KUBER_KIT_PATH'] || default_dir
+
+    unless file_presence_checker.dir_exists?(workdir_path)
+      workdir_in_ancestors = find_workdir_in_ancestors(current_dir)
+      workdir_path = workdir_in_ancestors if workdir_in_ancestors
+    end
+
+    workdir_path
+  end
+
+  private
+    def find_workdir_in_ancestors(dir)
+      if dir == "/"
+        return nil
+      end
+
+      workdir_path = File.join(dir, configs.kuber_kit_dirname)
+      if file_presence_checker.dir_exists?(workdir_path)
+        return workdir_path
+      end
+
+      find_workdir_in_ancestors(File.dirname(dir))
+    end
+end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.5.2"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.7
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -211,6 +211,7 @@ files:
 - lib/kuber_kit/actions/kubectl_console.rb
 - lib/kuber_kit/actions/kubectl_describe.rb
 - lib/kuber_kit/actions/kubectl_env.rb
+- lib/kuber_kit/actions/kubectl_get.rb
 - lib/kuber_kit/actions/kubectl_logs.rb
 - lib/kuber_kit/actions/service_checker.rb
 - lib/kuber_kit/actions/service_deployer.rb
@@ -244,6 +245,7 @@ files:
 - lib/kuber_kit/core/env_files/abstract_env_file.rb
 - lib/kuber_kit/core/env_files/artifact_file.rb
 - lib/kuber_kit/core/env_files/env_file_store.rb
+- lib/kuber_kit/core/env_files/env_group.rb
 - lib/kuber_kit/core/image.rb
 - lib/kuber_kit/core/image_definition.rb
 - lib/kuber_kit/core/image_definition_factory.rb
@@ -262,9 +264,12 @@ files:
 - lib/kuber_kit/core/templates/artifact_file.rb
 - lib/kuber_kit/core/templates/template_store.rb
 - lib/kuber_kit/env_file_reader/action_handler.rb
+- lib/kuber_kit/env_file_reader/env_file_parser.rb
+- lib/kuber_kit/env_file_reader/env_file_tempfile_creator.rb
 - lib/kuber_kit/env_file_reader/reader.rb
 - lib/kuber_kit/env_file_reader/strategies/abstract.rb
 - lib/kuber_kit/env_file_reader/strategies/artifact_file.rb
+- lib/kuber_kit/env_file_reader/strategies/env_group.rb
 - lib/kuber_kit/extensions/colored_string.rb
 - lib/kuber_kit/extensions/contracts.rb
 - lib/kuber_kit/extensions/indocker_compat.rb
@@ -311,6 +316,7 @@ files:
 - lib/kuber_kit/tools/file_presence_checker.rb
 - lib/kuber_kit/tools/logger_factory.rb
 - lib/kuber_kit/tools/process_cleaner.rb
+- lib/kuber_kit/tools/workdir_detector.rb
 - lib/kuber_kit/ui.rb
 - lib/kuber_kit/ui/api.rb
 - lib/kuber_kit/ui/debug.rb