kuber_kit 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c60b8fd02854d59ccad27ac3e512b726049d55f87f41d9c0ac0256344705ba
-  data.tar.gz: e60f2f47da61e2b5c3942878c19c863c2537bd5a6513476bb4a26aea81259674
+  metadata.gz: d5c29f15c515fba96ece8e78533644f3a43a1d2549302599f745c676dedd47c5
+  data.tar.gz: dccbbc6c69d0cdfbb27dfb3f9ded0bdd1efb3609f1b8ba5fe1580d4cf65ed42b
 SHA512:
-  metadata.gz: 85bfd81c3419a8a44960c89e9e31d06a4775aa143141fdc8da8f46ea207d60a2be53310213a5cc96cf1fe034097c13f09d10256a72d0535bb6ee363d0a12c987
-  data.tar.gz: 7182215530a9ee4908e4e483c578764c3bbc63f4d510c89b68bf8a2cb15a5e41bf714eb553b1497ad2236af4e585feb0e6aa810b00bb8e0f3b3ff1357e9717bf
+  metadata.gz: 110f8df5c9fa5767ee82ce03b5e482b96ba43f0394a7cc8349888df086adb663a68858fe49154c83913fc7a8be935a0494e84cf617a332f69e4553edc234024c
+  data.tar.gz: c1800c82bb31e7b17d12b033317ebffa554eee238c66d10141603ad42817ceb314cfd12cf01b4ccc010f701e9a3424a72ed10f2ed2611c7339e9a83d5ae45821

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,16 @@
+**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
+
 **0.6.1**
 - Improve performance of artifacts update by updating in threads.
 - Added an ability to define default services

data/kuber_kit.gemspec

@@ -23,15 +23,25 @@ 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 RUBY_VERSION >= '3.0.0'
+    spec.add_dependency "contracts", '0.17.0'
+  else
+    spec.add_dependency "contracts", '0.16.0'
+  end
+
+  if RUBY_VERSION >= '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_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,10 +99,14 @@ 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
-    artifacts.each do |artifact|
+    not_local_artifacts.each do |artifact|
       artifact_task_group.add("Updating #{artifact.name.to_s.yellow}") do |task|
         artifact_updater.update(local_shell, artifact)
         task.update_title("Updated #{artifact.name.to_s.green}")

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

@@ -1,23 +1,52 @@
 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 read(*variable_names)
+    result = self
+    variable_names.each do |var|
+      result = result.get_variable_value(var)
+    end
+    result
+  end
+
+  def variable_defined?(*variable_names)
+    read(*variable_names) 
+    return true
+  rescue BuildArgUndefined
+    return false
+  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}")
+    read(name)
+  end
+
+  def to_h
+    if @context_vars.is_a?(Hash)
+      return @context_vars
+    else
+      return {value: @context_vars}
+    end
+  end
+
+  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
 
     if value.is_a?(Hash)
-      return self.class.new(value, name, self)
+      return self.class.new(value, variable_name, self)
     end
 
     value
@@ -25,15 +54,15 @@ class KuberKit::Core::ContextHelper::ContextVars
 
   private
 
-  def format_arg(name)
-    string = [@parent_name, name].compact.join(".")
-    parent = @parent
+    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
+      while parent do
+        string = [parent.parent_name, string].compact.join(".")
+        parent = parent.parent
+      end
 
-    string
-  end
+      string
+    end
 end

data/lib/kuber_kit/env_file_reader/reader.rb

@@ -6,8 +6,8 @@ class KuberKit::EnvFileReader::Reader
     "env_file_reader.strategies.env_group",
   ]
 
-  def initialize(**injected_deps)
-    super(injected_deps)
+  def initialize(**injected_deps, &block)
+    super(**injected_deps)
     add_default_strategies
   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

@@ -5,8 +5,8 @@ class KuberKit::TemplateReader::Reader
     "template_reader.strategies.artifact_file",
   ]
 
-  def initialize(**injected_deps)
-    super(injected_deps)
+  def initialize(**injected_deps, &block)
+    super(**injected_deps)
     add_default_strategies
   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.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-08-28 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
@@ -114,14 +114,14 @@ dependencies:
     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 +181,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -362,7 +361,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.1)
-      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