kuber_kit 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c29f15c515fba96ece8e78533644f3a43a1d2549302599f745c676dedd47c5
-  data.tar.gz: dccbbc6c69d0cdfbb27dfb3f9ded0bdd1efb3609f1b8ba5fe1580d4cf65ed42b
+  metadata.gz: 5384a7795eb49fdf9beeb9481fc03e871fb001cda72d365a646f2ca3885309e9
+  data.tar.gz: 229512248e019960f5f178cdd4a5c7ca99ca808d70e7286884fc152570366e73
 SHA512:
-  metadata.gz: 110f8df5c9fa5767ee82ce03b5e482b96ba43f0394a7cc8349888df086adb663a68858fe49154c83913fc7a8be935a0494e84cf617a332f69e4553edc234024c
-  data.tar.gz: c1800c82bb31e7b17d12b033317ebffa554eee238c66d10141603ad42817ceb314cfd12cf01b4ccc010f701e9a3424a72ed10f2ed2611c7339e9a83d5ae45821
+  metadata.gz: 8ab657438fc9c8463528fed4938518365abda3b944416600ad3032deff7deb8afbd2c90cca99b1fea97f9d148d2b8df77759b11a10c441fa7d7c1f672897641e
+  data.tar.gz: 70824969dae53951c1ac194922dc76d3773d6f65e8c51ff3589c46de9ec702d027a55ad9516e9846b81cde969c2ebab7cdb84be5f5617b216854929fd56c6bdb

data/kuber_kit.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  if RUBY_VERSION >= '3.0.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 RUBY_VERSION >= '2.6.0'
+  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"
@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   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", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.0"

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/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, &block)
-    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/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, &block)
-    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/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.7.0"
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -108,6 +108,20 @@ 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
@@ -280,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