kuber_kit 0.9.2 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d12070a68a28af618ebe127fd4b5bc6e8091e5eda80d97b02bdc5811250a50a5
-  data.tar.gz: 1596fe61bafd254762585d87cfb72081c4149305d2754c80fb11d032f8deaf70
+  metadata.gz: 6f981c4a56cdd8e79c87d9ad0005930ddf68f54df5208be13bceaeeab48e935d
+  data.tar.gz: daf378968fba31265645d1e3695f42b0682c9335413cce1e43d28df0545ea458
 SHA512:
-  metadata.gz: 5a9ba53c902b8d7b24f84752c2fa71f37e1ed65e017f7a1cb1769590bea8fcbb662e1bd1e1223e44f2edcd3fe9697777054f6beccb777d909a8b704c6f121fc4
-  data.tar.gz: 10885940c62eac245e82522cad006f3709e10d53bbc9b1b9e33fb6917664ed77f353030bd2aeab315722aeb66386e7f465691b5f16d19ded2e14e0672249574b
+  metadata.gz: 599602af81d2936fe7d0a2629bc758ae3dfd83d20cc408bb2a23f6cf4eb1cfcee236587f6f23e30406a34d6e4f7adb02fb8bc4a3033d3fa2ef21f22b269deef7
+  data.tar.gz: b5e95e8abbbae885b7fa3c0ab010673a55ab57b36e7badb25f477a22812788783591d020684b03f2c3d03f88d41e9d0724312d53ec3a50dcb65047b1e32b3d01

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-**0.9.0-0.9.2**
+**0.9.0-0.9.4**
 - Allow skipping confirmation during deployment
 - Added `kit sh` command to create a new shell
 - Use tmp dir as image builds parent dir for remote compilation

data/lib/kuber_kit/configs.rb

@@ -41,7 +41,7 @@ class KuberKit::Configs
     set :image_build_context_dir, "build_context"
     set :image_tag,               'latest'
     set :image_compile_dir,         File.join(absolute_kuber_kit_path, "image_builds")
-    set :remote_image_compile_dir,  File.join("tmp", "kuber_kit", "image_builds")
+    set :remote_image_compile_dir,  File.join("/tmp", "kuber_kit", "image_builds")
     set :docker_ignore_list,      DOCKER_IGNORE_LIST
     set :kuber_kit_dirname,       "kuber_kit"
     set :kuber_kit_min_version,   KuberKit::VERSION

data/lib/kuber_kit/core/configuration_definition.rb

@@ -117,7 +117,7 @@ class KuberKit::Core::ConfigurationDefinition
   alias_method :deployer_require_confirimation, :deployer_require_confirmation
 
   def shell_launcher_strategy(strategy)
-    @shell_launcher_strategy = path
+    @shell_launcher_strategy = strategy
 
     self
   end

data/lib/kuber_kit/image_compiler/action_handler.rb

@@ -12,7 +12,7 @@ class KuberKit::ImageCompiler::ActionHandler
 
     image = image_store.get_image(image_name)
 
-    build_dir_cleaner.call(parent_dir: parent_dir)
+    build_dir_cleaner.call(shell, parent_dir: parent_dir)
     
     compile_dir = generate_compile_dir(parent_dir: parent_dir, build_id: build_id)
 
@@ -25,10 +25,10 @@ class KuberKit::ImageCompiler::ActionHandler
     end
 
     def get_image_compile_parent_dir_for_shell(shell)
-      if shell.is_a?(KuberKit::Shell::LocalShell)
-        configs.image_compile_dir
-      else
+      if shell.is_a?(KuberKit::Shell::SshShell)
         configs.remote_image_compile_dir
+      else
+        configs.image_compile_dir
       end
     end
 end

data/lib/kuber_kit/shell/commands/bash_commands.rb

@@ -1,3 +1,4 @@
+require 'time'
 class KuberKit::Shell::Commands::BashCommands
   def rm(shell, path)
     shell.exec!(%Q{rm "#{path}"})
@@ -22,4 +23,9 @@ class KuberKit::Shell::Commands::BashCommands
   def mkdir_p(shell, path)
     shell.exec!(%Q{mkdir -p "#{path}"})
   end
+
+  def ctime(shell, path)
+    result = shell.exec!(%Q{date -r "#{path}"})
+    Time.parse(result)
+  end
 end

data/lib/kuber_kit/shell/local_shell.rb

@@ -112,8 +112,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
   end
 
   def list_dirs(path)
-    command = %Q{find -L #{path}  -type f}
-    command += " -name '#{name}'" if name
+    command = %Q{find -L #{path} -maxdepth 0 -type d}
     exec!(command).split(/[\r\n]+/)
   rescue => e
     if e.message.include?("No such file or directory")

data/lib/kuber_kit/shell_launcher/strategies/kubernetes.rb

@@ -1,6 +1,6 @@
 class KuberKit::ShellLauncher::Strategies::Kubernetes < KuberKit::ShellLauncher::Strategies::Abstract
   include KuberKit::Import[
-    "service_reader.reader",
+    "core.artifact_path_resolver",
     "shell.kubectl_commands",
     "configs",
   ]

data/lib/kuber_kit/tools/build_dir_cleaner.rb

@@ -1,24 +1,25 @@
 class KuberKit::Tools::BuildDirCleaner
   include KuberKit::Import[
     "shell.bash_commands",
-    "shell.local_shell",
   ]
 
   KEEP_DIRS_COUNT = 10
 
-  def call(parent_dir:)
-    dirs_to_delete = get_ancient_builds_dirs(parent_dir: parent_dir)
+  Contract KuberKit::Shell::AbstractShell, KeywordArgs[parent_dir: String] => Any
+  def call(shell, parent_dir:)
+    dirs_to_delete = get_ancient_builds_dirs(shell, parent_dir: parent_dir)
 
     dirs_to_delete.each do |dir|
-      bash_commands.rm_rf(local_shell, dir)
+      bash_commands.rm_rf(shell, dir)
     end
   end
 
   private
-    def get_ancient_builds_dirs(parent_dir:)
-      all_dirs  = Dir.glob("#{parent_dir}/*")
+    def get_ancient_builds_dirs(shell, parent_dir:)
+      all_dirs  = shell.list_dirs("#{parent_dir}/*")
+
       skip_dirs = all_dirs
-        .sort_by{ |f| File.ctime(f) }
+        .sort_by{ |f| bash_commands.ctime(shell, f) }
         .reverse[0...KEEP_DIRS_COUNT]
 
       all_dirs - skip_dirs

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.9.2"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.5
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts