kuber_kit 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185201d6f305a1e69b2d5ec982288234454404bb9b87501130f159fb58a3b97a
-  data.tar.gz: e411255031c65afe38e7b0faa20e9b578b2d3eca93a3bb9dc013766a59c7d2b1
+  metadata.gz: 9193e2d8c2f37a0ab10c3784fc353b2a7db990852aed41c12370624a4604eee3
+  data.tar.gz: e8effb3c080cdf273076f60998ef90fe70c0be31f36537edc06c1f6871b54541
 SHA512:
-  metadata.gz: 936fd6032488908db1fffe95f736dd05042c499f2995be2bc28566b2f65d9d5b35150acc0cf08de50442c16408d56d623292bb8e051215bfc15b8aba804266cc
-  data.tar.gz: c81b1a227cf5690d675b0b8d269382f0bb6d13ed71cfc3442679e1bd7471b995e02e7177b6c93bfb6955792bd591708c0ea017f9ea52291992bbbd0e5b33c0e2
+  metadata.gz: 2f9322e5dee8ef3385e4ceba437257bb7a549e0aba7804420fe44c7bb42731f9d22419a83e584a121226f1ea80192e1b9041b343756a947177e89f7be62f488c
+  data.tar.gz: 053c5fcbffe7c9246ede5e166abd17d7a62a20d0e63a5c5d10a21b63cf5ea9c02eacaee6f54ecab01c7c90f6f9d89b0300a9f9da38d213d7c512302cf5c4303c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**0.5.7**
+- Look for kuber_kit root path in parent folders, so kit command will work in sub-folders
+
 **0.5.6**
 - Pre-process env file if it has .erb extension
 - Allow attaching env file from configuration to docker container

data/Gemfile.lock

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

data/lib/kuber_kit.rb

@@ -82,6 +82,7 @@ module KuberKit
     autoload :FilePresenceChecker, 'tools/file_presence_checker'
     autoload :LoggerFactory, 'tools/logger_factory'
     autoload :ProcessCleaner, 'tools/process_cleaner'
+    autoload :WorkdirDetector, 'tools/workdir_detector'
   end
 
   module Shell

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -4,6 +4,7 @@ class KuberKit::Actions::ConfigurationLoader
     "core.image_store",
     "core.service_store",
     "core.configuration_store",
+    "tools.workdir_detector",
     "artifacts_sync.artifacts_updater",
     "shell.local_shell",
     "ui",
@@ -12,7 +13,7 @@ class KuberKit::Actions::ConfigurationLoader
 
   Contract Hash => Any
   def call(options)
-    root_path     = options[:path] || File.join(Dir.pwd, configs.kuber_kit_dirname)
+    root_path     = workdir_detector.call(options)
     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)

data/lib/kuber_kit/cli.rb

@@ -179,7 +179,7 @@ class KuberKit::CLI < Thor
       end
 
       # We should load config before loading any bean, to make sure that bean won't be built with default config
-      root_path     = options[:path] || File.join(Dir.pwd, KuberKit::Container['configs'].kuber_kit_dirname)
+      root_path = KuberKit::Container['tools.workdir_detector'].call(options)
       config_file_path = File.join(root_path, APP_CONFIG_FILENAME)
       if File.exists?(config_file_path)
         require config_file_path

data/lib/kuber_kit/container.rb

@@ -137,6 +137,10 @@ class KuberKit::Container
     KuberKit::Tools::ProcessCleaner.new
   end
 
+  register "tools.workdir_detector" do
+    KuberKit::Tools::WorkdirDetector.new
+  end
+
   register "shell.bash_commands" do
     KuberKit::Shell::Commands::BashCommands.new
   end

data/lib/kuber_kit/tools/workdir_detector.rb

@@ -0,0 +1,33 @@
+class KuberKit::Tools::WorkdirDetector
+  include KuberKit::Import[
+    "configs",
+    "tools.file_presence_checker"
+  ]
+
+  def call(options, current_dir: nil)
+    current_dir ||= Dir.pwd
+    default_dir   = File.join(current_dir, configs.kuber_kit_dirname)
+    workdir_path  = options[:path] || ENV['KUBER_KIT_PATH'] || default_dir
+
+    unless file_presence_checker.dir_exists?(workdir_path)
+      workdir_in_ancestors = find_workdir_in_ancestors(current_dir)
+      workdir_path = workdir_in_ancestors if workdir_in_ancestors
+    end
+
+    workdir_path
+  end
+
+  private
+    def find_workdir_in_ancestors(dir)
+      if dir == "/"
+        return nil
+      end
+
+      workdir_path = File.join(dir, configs.kuber_kit_dirname)
+      if file_presence_checker.dir_exists?(workdir_path)
+        return workdir_path
+      end
+
+      find_workdir_in_ancestors(File.dirname(dir))
+    end
+end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -316,6 +316,7 @@ files:
 - lib/kuber_kit/tools/file_presence_checker.rb
 - lib/kuber_kit/tools/logger_factory.rb
 - lib/kuber_kit/tools/process_cleaner.rb
+- lib/kuber_kit/tools/workdir_detector.rb
 - lib/kuber_kit/ui.rb
 - lib/kuber_kit/ui/api.rb
 - lib/kuber_kit/ui/debug.rb