kuber_kit 0.2.7 → 0.3.2

data/lib/kuber_kit/core/configuration.rb

@@ -1,6 +1,7 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deploy_strategy, :deploy_namespace, :services_attributes, :build_servers
+              :deployer_strategy, :deployer_namespace, :services_attributes, :build_servers,
+              :global_build_vars
 
   Contract KeywordArgs[
     name:            Symbol,
@@ -9,26 +10,36 @@ class KuberKit::Core::Configuration
     env_files:       Hash,
     templates:       Hash,
     kubeconfig_path: Maybe[String],
-    deploy_strategy:  Symbol,
-    deploy_namespace: Maybe[Symbol],
+    deployer_strategy:  Symbol,
+    deployer_namespace: Maybe[Symbol],
     services_attributes: HashOf[Symbol => Hash],
-    build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer]
+    build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
+    global_build_vars:   HashOf[Symbol => Any],
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deploy_strategy:, deploy_namespace:, services_attributes:, build_servers:)
+                 deployer_strategy:, deployer_namespace:, services_attributes:, build_servers:, 
+                 global_build_vars:)
     @name             = name
     @artifacts        = artifacts
     @registries       = registries
     @env_files        = env_files
     @templates        = templates
     @kubeconfig_path  = kubeconfig_path
-    @deploy_strategy  = deploy_strategy
-    @deploy_namespace = deploy_namespace
-    @services_attributes = services_attributes
+    @deployer_strategy  = deployer_strategy
+    @deployer_namespace = deployer_namespace
     @build_servers    = build_servers
+    @services_attributes  = services_attributes
+    @global_build_vars    = global_build_vars
   end
 
   def service_attributes(service_name)
     services_attributes[service_name.to_sym] || {}
   end
+
+  def global_build_args
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "DEPRECATION: global_build_args is deprecated, please use global_build_vars instead"
+    end
+    global_build_vars
+  end
 end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -23,11 +23,12 @@ class KuberKit::Core::ConfigurationDefinition
       env_files:        @env_files,
       templates:        @templates,
       kubeconfig_path:  @kubeconfig_path,
-      deploy_strategy:  @deploy_strategy,
-      deploy_namespace: @deploy_namespace,
+      deployer_strategy:  @deployer_strategy,
+      deployer_namespace: @deployer_namespace,
       enabled_services: @enabled_services,
       build_servers:    @build_servers,
-      services_attributes: @services_attributes,
+      services_attributes:  @services_attributes,
+      global_build_vars:    @global_build_vars,
     )
   end
 
@@ -81,21 +82,40 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
-  def deploy_namespace(namespace)
-    @deploy_namespace = namespace
+  def deployer_namespace(namespace)
+    @deployer_namespace = namespace
 
     self
   end
 
-  def deploy_strategy(path)
-    @deploy_strategy = path
+  def deployer_strategy(path)
+    @deployer_strategy = path
 
     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
+
+  def global_build_vars(variables)
+    @global_build_vars = variables
 
     self
   end

data/lib/kuber_kit/core/configuration_factory.rb

@@ -20,16 +20,17 @@ class KuberKit::Core::ConfigurationFactory
     build_servers = fetch_build_servers(configuration_attrs.build_servers)
 
     KuberKit::Core::Configuration.new(
-      name:             configuration_attrs.name,
-      artifacts:        artifacts,
-      registries:       registries,
-      env_files:        env_files,
-      templates:        templates,
-      kubeconfig_path:  configuration_attrs.kubeconfig_path,
-      deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy,
-      deploy_namespace: configuration_attrs.deploy_namespace,
-      services_attributes: configuration_attrs.services_attributes,
-      build_servers:    build_servers
+      name:               configuration_attrs.name,
+      artifacts:          artifacts,
+      registries:         registries,
+      env_files:          env_files,
+      templates:          templates,
+      kubeconfig_path:    configuration_attrs.kubeconfig_path,
+      deployer_strategy:  configuration_attrs.deployer_strategy || configs.deployer_strategy,
+      deployer_namespace: configuration_attrs.deployer_namespace,
+      build_servers:      build_servers,
+      services_attributes:  configuration_attrs.services_attributes,
+      global_build_vars:    configuration_attrs.global_build_vars || {},
     )
   end
 

data/lib/kuber_kit/core/context_helper/base_helper.rb

@@ -29,6 +29,10 @@ class KuberKit::Core::ContextHelper::BaseHelper
     KuberKit.current_configuration.name
   end
 
+  def global_build_vars
+    KuberKit.global_build_vars
+  end
+
   def get_binding
     binding
   end

data/lib/kuber_kit/core/context_helper/context_helper_factory.rb

@@ -5,12 +5,13 @@ class KuberKit::Core::ContextHelper::ContextHelperFactory
     env_file_reader: "env_file_reader.action_handler"
   ]
 
-  def build_image_context(shell)
+  def build_image_context(shell, image)
     KuberKit::Core::ContextHelper::ImageHelper.new(
       image_store:      image_store,
       artifact_store:   artifact_store,
       shell:            shell,
-      env_file_reader:  env_file_reader
+      env_file_reader:  env_file_reader,
+      image:            image
     )
   end
 

data/lib/kuber_kit/core/context_helper/context_vars.rb

@@ -0,0 +1,39 @@
+class KuberKit::Core::ContextHelper::ContextVars
+  attr_reader :parent, :parent_name
+
+  def initialize(context_vars, parent_name = nil, parent = nil)
+    @context_vars = context_vars
+    @parent_name  = parent_name
+    @parent = parent
+  end
+
+  def method_missing(name, *args)
+    if args.size > 0
+      raise ArgumentError.new("context args does not accept any arguments")
+    end
+
+    value = @context_vars.fetch(name) do
+      raise(KuberKit::Error, "build arg '#{format_arg(name)}' is not defined, available args: #{@context_vars.inspect}")
+    end
+
+    if value.is_a?(Hash)
+      return self.class.new(value, name, self)
+    end
+
+    value
+  end
+
+  private
+
+  def format_arg(name)
+    string = [@parent_name, name].compact.join(".")
+    parent = @parent
+
+    while parent do
+      string = [parent.parent_name, string].compact.join(".")
+      parent = parent.parent
+    end
+
+    string
+  end
+end

data/lib/kuber_kit/core/context_helper/image_helper.rb

@@ -1,2 +1,19 @@
 class KuberKit::Core::ContextHelper::ImageHelper < KuberKit::Core::ContextHelper::BaseHelper
+  def initialize(image_store:, artifact_store:, shell:, env_file_reader:, image:)
+    super(
+      image_store:      image_store, 
+      artifact_store:   artifact_store, 
+      shell:            shell,
+      env_file_reader:  env_file_reader
+    )
+    @image = image
+  end
+
+  def image_name
+    @image.name.to_s
+  end
+
+  def build_vars
+    KuberKit::Core::ContextHelper::ContextVars.new(@image.build_vars)
+  end
 end

data/lib/kuber_kit/core/image.rb

@@ -33,7 +33,9 @@ class KuberKit::Core::Image
   end
 
   def build_args
-    puts "WARNING: build_args is deprecated, please use build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "WARNING: build_args is deprecated, please use build_vars instead"
+    end
     build_vars
   end
 end

data/lib/kuber_kit/core/image_definition.rb

@@ -44,7 +44,9 @@ class KuberKit::Core::ImageDefinition
   end
 
   def build_args(value = nil, &block)
-    puts "WARNING: build_args is deprecated, please use build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "WARNING: build_args is deprecated, please use build_vars instead"
+    end
     build_vars(value, *block)
   end
 
@@ -66,14 +68,14 @@ class KuberKit::Core::ImageDefinition
     self
   end
 
-  def before_build(&block)
-    @before_build_callback = block
+  def before_build(lambda_arg = nil, &block)
+    @before_build_callback = lambda_arg || block
 
     self
   end
 
-  def after_build(&block)
-    @after_build_callback = block
+  def after_build(lambda_arg = nil, &block)
+    @after_build_callback = lambda_arg || block
 
     self
   end

data/lib/kuber_kit/core/service.rb

@@ -1,7 +1,7 @@
 class KuberKit::Core::Service
   AttributeNotSet = Class.new(Indocker::Error)
 
-  attr_reader :name, :template_name, :tags, :images, :attributes, :deploy_strategy
+  attr_reader :name, :template_name, :tags, :images, :attributes, :deployer_strategy
 
   Contract KeywordArgs[
     name:             Symbol,
@@ -9,15 +9,15 @@ class KuberKit::Core::Service
     tags:             ArrayOf[Symbol],
     images:           ArrayOf[Symbol],
     attributes:       HashOf[Symbol => Any],
-    deploy_strategy:  Maybe[Symbol]
+    deployer_strategy:  Maybe[Symbol]
   ] => Any
-  def initialize(name:, template_name:, tags:, images:, attributes:, deploy_strategy:)
+  def initialize(name:, template_name:, tags:, images:, attributes:, deployer_strategy:)
     @name = name
     @template_name = template_name
     @tags = tags
     @images = images
     @attributes = attributes
-    @deploy_strategy = deploy_strategy
+    @deployer_strategy = deployer_strategy
   end
 
   def uri

data/lib/kuber_kit/core/service_definition.rb

@@ -13,7 +13,7 @@ class KuberKit::Core::ServiceDefinition
       tags:             Array(get_value(@tags)).map(&:to_sym),
       images:           Array(get_value(@images)).map(&:to_sym),
       attributes:       get_value(@attributes),
-      deploy_strategy:  get_value(@deploy_strategy),
+      deployer_strategy:  get_value(@deployer_strategy),
     )
   end
 
@@ -41,8 +41,8 @@ class KuberKit::Core::ServiceDefinition
     self
   end
 
-  def deploy_strategy(value = nil, &block)
-    @deploy_strategy = block_given? ? block : value
+  def deployer_strategy(value = nil, &block)
+    @deployer_strategy = block_given? ? block : value
 
     self
   end

data/lib/kuber_kit/core/service_factory.rb

@@ -12,12 +12,12 @@ class KuberKit::Core::ServiceFactory
     attributes = (service_attrs.attributes || {}).merge(configuration_attributes)
 
     KuberKit::Core::Service.new(
-      name:             service_attrs.name,
-      template_name:    service_attrs.template_name,
-      tags:             service_attrs.tags,
-      images:           service_attrs.images,
-      attributes:       attributes,
-      deploy_strategy:  service_attrs.deploy_strategy,
+      name:               service_attrs.name,
+      template_name:      service_attrs.template_name,
+      tags:               service_attrs.tags,
+      images:             service_attrs.images,
+      attributes:         attributes,
+      deployer_strategy:  service_attrs.deployer_strategy,
     )
   end
 end

data/lib/kuber_kit/env_file_reader/reader.rb

@@ -5,6 +5,11 @@ class KuberKit::EnvFileReader::Reader
     "env_file_reader.strategies.artifact_file",
   ]
 
+  def initialize(**injected_deps)
+    super(injected_deps)
+    add_default_strategies
+  end
+
   def use_reader(env_file_reader, env_file_class:)
     @@readers ||= {}
 
@@ -16,8 +21,6 @@ class KuberKit::EnvFileReader::Reader
   end
 
   def read(shell, env_file)
-    add_default_readers
-
     reader = @@readers[env_file.class]
 
     raise ReaderNotFoundError, "Can't find reader for env file #{env_file}" if reader.nil?
@@ -25,11 +28,12 @@ class KuberKit::EnvFileReader::Reader
     reader.read(shell, env_file)
   end
 
-  def add_default_readers
-    use_reader(artifact_file, env_file_class: KuberKit::Core::EnvFiles::ArtifactFile)
-  end
-
   def reset!
     @@readers = {}
   end
+
+  private
+    def add_default_strategies
+      use_reader(artifact_file, env_file_class: KuberKit::Core::EnvFiles::ArtifactFile)
+    end
 end

data/lib/kuber_kit/extensions/indocker_compat.rb

@@ -14,6 +14,10 @@ module KuberKit
     def build_configuration(configuration_name)
       define_configuration(configuration_name)
     end
+
+    def configuration
+      current_configuration
+    end
   end
 end
 Indocker = KuberKit

data/lib/kuber_kit/image_compiler/compiler.rb

@@ -9,7 +9,7 @@ class KuberKit::ImageCompiler::Compiler
   def compile(shell, image, builds_dir)
     image_build_dir = File.join(builds_dir, image.name.to_s)
 
-    context_helper = context_helper_factory.build_image_context(shell)
+    context_helper = context_helper_factory.build_image_context(shell, image)
     image_build_dir_creator.create(shell, image, image_build_dir, context_helper: context_helper)
 
     image_builder.build(shell, image, image_build_dir, context_helper: context_helper)

data/lib/kuber_kit/service_deployer/deployer.rb

@@ -4,9 +4,15 @@ 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)
+    super(injected_deps)
+    add_default_strategies
+  end
+
   def register_strategy(strategy_name, strategy)
     @@strategies ||= {}
 
@@ -19,8 +25,6 @@ class KuberKit::ServiceDeployer::Deployer
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service, Symbol => Any
   def deploy(shell, service, strategy_name)
-    add_default_strategies
-
     deployer = @@strategies[strategy_name]
 
     raise StrategyNotFoundError, "Can't find strategy with name #{strategy_name}" if deployer.nil?
@@ -28,12 +32,14 @@ class KuberKit::ServiceDeployer::Deployer
     deployer.deploy(shell, service)
   end
 
-  def add_default_strategies
-    register_strategy(:kubernetes, kubernetes)
-    register_strategy(:kubernetes_runner, kubernetes_runner)
-  end
-
   def reset!
     @@strategies = {}
   end
+
+  private
+    def add_default_strategies
+      register_strategy(:kubernetes, kubernetes)
+      register_strategy(:kubernetes_runner, kubernetes_runner)
+      register_strategy(:docker_compose, docker_compose)
+    end
 end