kuber_kit 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ac91299a59af0f2eec1d7382f3b55f0946931e1d4f87de909d76631242f441
-  data.tar.gz: d0737d6d217a9c4107fb77536fd36e2c3d59e71adb9dd8c68b6dbc2c12e2eb8f
+  metadata.gz: 0635a0f1e358b5f29f44badbd6571e0a54c98f16072656c5edb8a19769c7bd92
+  data.tar.gz: 3c81a6c67d14c5ca7852a856c10e3acb22b57cac835ad26a922c020609e57ea1
 SHA512:
-  metadata.gz: d9feedc39ab9959d1a3e4bd38a5b6703f6d93f16d03bbd4805732166266e64c4dc9798d6e5d173de2e5058f1ccfc8ad86143c793916efd9936768279eedff14f
-  data.tar.gz: a9bf6386c3bac7c75c894f82464af2e9e83dd94e56dec4be9da87fd092c81e9cbff568c4432921ff601c11831127f497651beb835d21edc8379675dffc6c0e1a
+  metadata.gz: 0aa582e58931303efe8a60dfebaa4f1550d3e7f962ac6b1d758ff5398ffc2d61c31288699b931e0127720ff67d8e9de750ea005758282539fb6f37d15509abb6
+  data.tar.gz: d676378c03ce31d7812edb3c760cbc5b99df7daf54de7109485691634dd173c55ced342c3c87a77ee6fc6e2b969b7d505b950b0fd62cb29dbe7d321d56867fef

data/Gemfile.lock

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

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::ConfigurationLoader
   include KuberKit::Import[
     "core.registry_store",
     "core.image_store",
+    "core.service_store",
     "core.configuration_store",
     "artifacts_sync.artifacts_updater",
     "tools.logger",
@@ -12,15 +13,17 @@ class KuberKit::Actions::ConfigurationLoader
 
   Contract Hash => Any
   def call(options)
-    root_path   = options[:path] || File.join(Dir.pwd, configs.kuber_kit_dirname)
-    images_path = options[:images_path] || File.join(root_path, configs.images_dirname)
-    infra_path  = options[:infra_path]  || File.join(root_path, configs.infra_dirname)
+    root_path     = options[:path] || File.join(Dir.pwd, configs.kuber_kit_dirname)
+    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)
     configurations_path  = options[:configurations_path]  || File.join(root_path, configs.configurations_dirname)
     configuration_name   = options[: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}"
@@ -42,6 +45,11 @@ class KuberKit::Actions::ConfigurationLoader
       files = image_store.load_definitions(images_path)
       task.update_title("Loaded #{files.count} image definitions")
     end
+
+    ui.create_task("Loading service definitions") do |task|
+      files = service_store.load_definitions(services_path)
+      task.update_title("Loaded #{files.count} service definitions")
+    end
   end
   
   def load_configurations(configurations_path, configuration_name)

data/lib/kuber_kit/configs.rb

@@ -14,8 +14,9 @@ class KuberKit::Configs
     'tmp',
     'logs'
   ]
-  INDOCKER_DIRNAME       = "kuber_kit".freeze
+  KUBER_KIT_DIRNAME      = "kuber_kit".freeze
   IMAGES_DIRNAME         = "images".freeze
+  SERVICES_DIRNAME       = "services".freeze
   INFRA_DIRNAME          = "infrastructure".freeze
   CONFIGURATIONS_DIRNAME = "configurations".freeze
   ARTIFACT_CLONE_DIR     = "/tmp/kuber_kit/artifacts"
@@ -23,7 +24,7 @@ class KuberKit::Configs
 
   attr_accessor :image_dockerfile_name, :image_build_context_dir, :image_tag,
                 :docker_ignore_list, :image_compile_dir, 
-                :kuber_kit_dirname, :images_dirname, :infra_dirname, :configurations_dirname,
+                :kuber_kit_dirname, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
                 :artifact_clone_dir, :service_config_dir
 
   def initialize
@@ -32,8 +33,9 @@ class KuberKit::Configs
     @image_tag               = IMAGE_TAG
     @image_compile_dir       = IMAGE_COMPILE_DIR
     @docker_ignore_list      = DOCKER_IGNORE_LIST
-    @kuber_kit_dirname        = INDOCKER_DIRNAME
+    @kuber_kit_dirname       = KUBER_KIT_DIRNAME
     @images_dirname          = IMAGES_DIRNAME
+    @services_dirname        = SERVICES_DIRNAME
     @infra_dirname           = INFRA_DIRNAME
     @configurations_dirname  = CONFIGURATIONS_DIRNAME
     @artifact_clone_dir      = ARTIFACT_CLONE_DIR

data/lib/kuber_kit/core/service_store.rb

@@ -5,7 +5,8 @@ class KuberKit::Core::ServiceStore
   include KuberKit::Import[
     "core.service_factory",
     "core.service_definition_factory",
-    "shell.local_shell"
+    "shell.local_shell",
+    "tools.logger"
   ]
 
   def define(service_name)
@@ -44,6 +45,9 @@ class KuberKit::Core::ServiceStore
     files = local_shell.recursive_list_files(dir_path, name: "*.rb").each do |path|
       load_definition(path)
     end
+  rescue KuberKit::Shell::AbstractShell::DirNotFoundError
+    logger.warn("Directory with services not found: #{dir_path}")
+    []
   end
 
   def load_definition(file_path)

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Iskander Khaziev
@@ -162,8 +162,8 @@ files:
 - example/infrastructure/artifacts.rb
 - example/infrastructure/env_files.rb
 - example/infrastructure/registries.rb
-- example/infrastructure/services.rb
 - example/infrastructure/templates.rb
+- example/services/auth_app.rb
 - kuber_kit.gemspec
 - lib/kuber_kit.rb
 - lib/kuber_kit/actions/configuration_loader.rb