kuber_kit 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9436f738b564585856ce6daa51aae3b55eeb0b33e68710c6d8be4b8a9cfa465
-  data.tar.gz: 12ed77727bfb8af6d719576e2676e5f3d12d9d5ab1b9a69b77c3804f4e64e175
+  metadata.gz: 5384a7795eb49fdf9beeb9481fc03e871fb001cda72d365a646f2ca3885309e9
+  data.tar.gz: 229512248e019960f5f178cdd4a5c7ca99ca808d70e7286884fc152570366e73
 SHA512:
-  metadata.gz: 31b571193f5130591b1f2bcfc73e42bb01bb5285beffbab26909e4ebccc765bc161b73897cc3d46e70ed2bc5975e445e02e6a0855493bb8ecad19f7b638d8685
-  data.tar.gz: 306aa5f9f87e075abc9fa65884ae211b9235039950dc1985c2f789d85b518f72d46a44c67def3f8af134b7cb1e6fc023b8755dd509f28721fa412bba3fa982ab
+  metadata.gz: 8ab657438fc9c8463528fed4938518365abda3b944416600ad3032deff7deb8afbd2c90cca99b1fea97f9d148d2b8df77759b11a10c441fa7d7c1f672897641e
+  data.tar.gz: 70824969dae53951c1ac194922dc76d3773d6f65e8c51ff3589c46de9ec702d027a55ad9516e9846b81cde969c2ebab7cdb84be5f5617b216854929fd56c6bdb

data/.github/workflows/rspec.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.7']
+        ruby-version: ['2.5', '2.7', '3.0']
 
     steps:
     - uses: actions/checkout@v2

data/.gitignore

@@ -9,4 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
-.DS_Store
+.DS_Store
+Gemfile.lock

data/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.6.8

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+**0.7.0**
+- Added Ruby 3.0 support
+
+**0.6.4**
+- Improve context vars, allow checking if variable is defined
+
+**0.6.3**
+- Fix updating artifacts when there is only local artifacts
+
 **0.6.2**
 - Added an ability to return build vars as a hash value.
 - Skip local artifacts while updating configuration, it sometimes produce an error

data/kuber_kit.gemspec

@@ -23,15 +23,26 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "contracts-lite"
-  spec.add_dependency "dry-auto_inject", "~> 0.7.0"
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+    spec.add_dependency "contracts", '0.17.0'
+  else
+    spec.add_dependency "contracts", '0.16.0'
+  end
+
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
+    spec.add_dependency "dry-auto_inject", "~> 0.8.0"
+  else
+    spec.add_dependency "dry-auto_inject", "~> 0.7.0"
+  end
+
   spec.add_dependency "thor"
   spec.add_dependency "cli-ui"
   spec.add_dependency "net-ssh"
   spec.add_dependency "tty-prompt"
   spec.add_dependency "dry-container", "~> 0.7.2"
+  spec.add_dependency "dry-configurable", "~> 0.12.1"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -99,12 +99,12 @@ class KuberKit::Actions::ConfigurationLoader
   end
 
   def update_artifacts(artifacts)
-    return unless artifacts.any?
-
     # Skip local artifacts, they sometimes produce error in CLI::UI::SpinGroup task,
     # because the task is executed too quickly
     not_local_artifacts = artifacts.reject{ |a| a.is_a?(KuberKit::Core::Artifacts::Local) }
 
+    return unless not_local_artifacts.any?
+
     artifact_task_group = ui.create_task_group
     not_local_artifacts.each do |artifact|
       artifact_task_group.add("Updating #{artifact.name.to_s.yellow}") do |task|

data/lib/kuber_kit/artifacts_sync/artifact_updater.rb

@@ -2,9 +2,6 @@ class KuberKit::ArtifactsSync::ArtifactUpdater
   ResolverNotFoundError = Class.new(KuberKit::NotFoundError)
 
   include KuberKit::Import[
-    "artifacts_sync.git_artifact_resolver",
-    "artifacts_sync.null_artifact_resolver",
-
     "ui"
   ]
 
@@ -19,8 +16,6 @@ class KuberKit::ArtifactsSync::ArtifactUpdater
   end
 
   def update(shell, artifact)
-    add_default_resolvers
-
     resolver = @@resolvers[artifact.class]
 
     ui.print_debug "ArtifactUpdater", "Updating artifact #{artifact.name.to_s.green}"
@@ -29,13 +24,4 @@ class KuberKit::ArtifactsSync::ArtifactUpdater
 
     resolver.resolve(shell, artifact)
   end
-
-  def add_default_resolvers
-    use_resolver(git_artifact_resolver, artifact_class: KuberKit::Core::Artifacts::Git)
-    use_resolver(null_artifact_resolver, artifact_class: KuberKit::Core::Artifacts::Local)
-  end
-
-  def reset!
-    @@resolvers = {}
-  end
 end

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

@@ -1,26 +1,35 @@
 class KuberKit::Core::ContextHelper::ContextVars
   attr_reader :parent, :parent_name
 
+  BuildArgUndefined = Class.new(KuberKit::Error)
+
   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")
+  def read(*variable_names)
+    result = self
+    variable_names.each do |var|
+      result = result.get_variable_value(var)
     end
+    result
+  end
 
-    value = @context_vars.fetch(name) do
-      raise(KuberKit::Error, "build arg '#{format_arg(name)}' is not defined, available args: #{@context_vars.inspect}")
-    end
+  def variable_defined?(*variable_names)
+    read(*variable_names) 
+    return true
+  rescue BuildArgUndefined
+    return false
+  end
 
-    if value.is_a?(Hash)
-      return self.class.new(value, name, self)
+  def method_missing(name, *args)
+    if args.size > 0
+      raise ArgumentError.new("context args does not accept any arguments")
     end
 
-    value
+    read(name)
   end
 
   def to_h
@@ -31,17 +40,29 @@ class KuberKit::Core::ContextHelper::ContextVars
     end
   end
 
-  private
-
-  def format_arg(name)
-    string = [@parent_name, name].compact.join(".")
-    parent = @parent
+  def get_variable_value(variable_name)
+    value = @context_vars.fetch(variable_name) do
+      raise(BuildArgUndefined, "build arg '#{format_arg(variable_name)}' is not defined, available args: #{@context_vars.inspect}")
+    end
 
-    while parent do
-      string = [parent.parent_name, string].compact.join(".")
-      parent = parent.parent
+    if value.is_a?(Hash)
+      return self.class.new(value, variable_name, self)
     end
 
-    string
+    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/defaults.rb

@@ -0,0 +1,32 @@
+class KuberKit::Defaults
+  class << self
+    def init
+      return if @_initialized
+      @_initialized = true
+      init!
+    end
+
+    def init!
+      KuberKit::Container["artifacts_sync.artifact_updater"].use_resolver(
+        KuberKit::Container["artifacts_sync.git_artifact_resolver"], 
+        artifact_class: KuberKit::Core::Artifacts::Git
+      )
+      KuberKit::Container["artifacts_sync.artifact_updater"].use_resolver(
+        KuberKit::Container["artifacts_sync.null_artifact_resolver"], 
+        artifact_class: KuberKit::Core::Artifacts::Local
+      )
+      KuberKit::Container["env_file_reader.reader"].use_reader(
+        KuberKit::Container["env_file_reader.strategies.artifact_file"], 
+        env_file_class: KuberKit::Core::EnvFiles::ArtifactFile
+      )
+      KuberKit::Container["env_file_reader.reader"].use_reader(
+        KuberKit::Container["env_file_reader.strategies.env_group"], 
+        env_file_class: KuberKit::Core::EnvFiles::EnvGroup
+      )
+      KuberKit::Container["template_reader.reader"].use_reader(
+        KuberKit::Container["template_reader.strategies.artifact_file"], 
+        template_class: KuberKit::Core::Templates::ArtifactFile
+      )
+    end
+  end
+end

data/lib/kuber_kit/env_file_reader/reader.rb

@@ -1,16 +1,6 @@
 class KuberKit::EnvFileReader::Reader
   ReaderNotFoundError = Class.new(KuberKit::NotFoundError)
-
-  include KuberKit::Import[
-    "env_file_reader.strategies.artifact_file",
-    "env_file_reader.strategies.env_group",
-  ]
-
-  def initialize(**injected_deps)
-    super(injected_deps)
-    add_default_strategies
-  end
-
+  
   def use_reader(env_file_reader, env_file_class:)
     @@readers ||= {}
 
@@ -28,14 +18,4 @@ class KuberKit::EnvFileReader::Reader
 
     reader.read(shell, env_file)
   end
-
-  def reset!
-    @@readers = {}
-  end
-
-  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/service_deployer/deployer.rb

@@ -8,8 +8,8 @@ class KuberKit::ServiceDeployer::Deployer
     "service_deployer.strategies.docker_compose"
   ]
 
-  def initialize(**injected_deps)
-    super(injected_deps)
+  def initialize(**injected_deps, &block)
+    super(**injected_deps)
     add_default_strategies
   end
 

data/lib/kuber_kit/template_reader/reader.rb

@@ -1,15 +1,6 @@
 class KuberKit::TemplateReader::Reader
   ReaderNotFoundError = Class.new(KuberKit::NotFoundError)
 
-  include KuberKit::Import[
-    "template_reader.strategies.artifact_file",
-  ]
-
-  def initialize(**injected_deps)
-    super(injected_deps)
-    add_default_strategies
-  end
-
   def use_reader(template_reader, template_class:)
     @@readers ||= {}
 
@@ -27,13 +18,4 @@ class KuberKit::TemplateReader::Reader
 
     reader.read(shell, template)
   end
-
-  def reset!
-    @@readers = {}
-  end
-
-  private
-    def add_default_strategies
-      use_reader(artifact_file, template_class: KuberKit::Core::Templates::ArtifactFile)
-    end
 end

data/lib/kuber_kit/ui/simple.rb

@@ -46,6 +46,7 @@ class KuberKit::UI::Simple
   class TaskGroup
     def initialize(task_class)
       @task_class = task_class
+      @tasks
     end
 
     def add(task_title, &task_block)

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.6.2"
+  VERSION = "0.7.1"
 end

data/lib/kuber_kit.rb

@@ -208,6 +208,7 @@ module KuberKit
   autoload :CLI, 'cli'
   autoload :Container, 'container'
   autoload :Configs, 'configs'
+  autoload :Defaults, 'defaults'
 
   Import = Dry::AutoInject(Container)
 
@@ -297,4 +298,6 @@ module KuberKit
   end
 end
 
+KuberKit::Defaults.init
+
 require 'kuber_kit/extensions/indocker_compat'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: contracts-lite
+  name: contracts
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: dry-auto_inject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +195,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -281,6 +294,7 @@ files:
 - lib/kuber_kit/core/templates/abstract_template.rb
 - lib/kuber_kit/core/templates/artifact_file.rb
 - lib/kuber_kit/core/templates/template_store.rb
+- lib/kuber_kit/defaults.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
@@ -362,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Docker Containers Build & Deployment

data/Gemfile.lock

@@ -1,84 +0,0 @@
-PATH
-  remote: .
-  specs:
-    kuber_kit (0.6.2)
-      cli-ui
-      contracts-lite
-      dry-auto_inject (~> 0.7.0)
-      dry-container (~> 0.7.2)
-      net-ssh
-      thor
-      tty-prompt
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    cli-ui (1.5.1)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    contracts-lite (0.15.0)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    dry-auto_inject (0.7.0)
-      dry-container (>= 0.3.4)
-    dry-configurable (0.12.1)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.6.0)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    net-ssh (6.1.0)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    rake (10.5.0)
-    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.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.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.1.0)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.1)
-    wisper (2.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  kuber_kit!
-  pry
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  simplecov
-
-BUNDLED WITH
-   1.17.3