helmsnap 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc691f40a8c6b4f4d28d2379e21e45cc032bf743f71d5cf0df9de0a35f69fe4
-  data.tar.gz: b50966b9642e57d6a286e0e20e8dd323711aafeb4723a245125d9e522b05547b
+  metadata.gz: d5e21c78125566f4355ae0679100331a32322034be84fcde8f72ba44397de8e2
+  data.tar.gz: da348e3a0651dd69d20e33555ddf547b8097057169eac3b1e678d4006ce90ff7
 SHA512:
-  metadata.gz: 2f4bb8e9617bc866856f5160933fc7a755b441ed397374a57ed7cf9b01625b795163a448154af200af5b830bbf46107d45397fe35380d236a45e978ee66c09dd
-  data.tar.gz: b63cab9f3767a79586beec2279a4b490c3ff144b426482504233e7a19741dd168bb90c8f21b96a2fc83b32e5ea962f7a970faecf043bf1880e3ce461cf2ed101
+  metadata.gz: cb09555b7dc60d769d5a54df05740b9f50fe9e0542a6f1b3a85ce9c1cfcbba1a630bd079109e468620345757ca693b41b79345e737f8ce0a4a5f8f3272a3d02d
+  data.tar.gz: 59237f6806aa14d80335ccd6afaa08dd4f11398c930e5b3f491058d1cfc96a67f1303a22af3094e172cdb7b5ec43a1a1cc312799dd4fc245c932b47beb62600e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    helmsnap (0.7.3)
+    helmsnap (0.7.4)
       colorize
 
 GEM

data/lib/helmsnap/command.rb

@@ -7,8 +7,8 @@ class Helmsnap::Command < Helmsnap::Service
     super()
     self.cmd = cmd
     self.output = +""
-    self.stdout = stdout
-    self.stderr = stderr
+    self.stdout = stdout || null_file
+    self.stderr = stderr || null_file
     self.allow_failure = allow_failure
   end
 
@@ -21,6 +21,10 @@ class Helmsnap::Command < Helmsnap::Service
 
   attr_accessor :cmd, :output, :stdout, :stderr, :allow_failure
 
+  def null_file
+    File.open(File::NULL, "w")
+  end
+
   def run_command
     Open3.popen3(cmd) do |_in, out, err, wait_thr|
       while (chunk = out.gets)

data/lib/helmsnap/generate.rb

@@ -8,10 +8,10 @@ class Helmsnap::Generate < Helmsnap::Service
   end
 
   def call
-    FileUtils.rmtree(snapshots_path)
-
     Helmsnap::SetupDependencies.call(config)
 
+    FileUtils.rmtree(snapshots_path)
+
     config.envs.each do |env|
       run_cmd(
         "helmfile",

data/lib/helmsnap/setup_dependencies.rb

@@ -20,22 +20,20 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
     dep_list = get_dependency_list(chart_path)
 
     dep_list.scan(%r{file://(.+?)\t}) do |dep_path|
-      run_cmd("helm", "dependency", "update", chart_path.join(dep_path.first))
+      update_deps!(chart_path.join(dep_path.first))
     end
 
     dep_list.scan(%r{(https?://.+?)\t}) do |dep_path|
       run_cmd("helm", "repo", "add", Digest::MD5.hexdigest(dep_path.first), dep_path.first)
     end
 
-    run_cmd("helm", "dependency", "update", chart_path)
+    update_deps!(chart_path)
   end
 
   def get_dependency_list(chart_path)
     base_cmd = ["helm", "dependency", "list", chart_path]
 
-    result = run_cmd(
-      *base_cmd, "--max-col-width", 0, allow_failure: true, stderr: File.open(File::NULL, "w")
-    )
+    result = run_cmd(*base_cmd, "--max-col-width", 0, allow_failure: true, stderr: nil)
 
     if result.success
       result.output
@@ -47,4 +45,11 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
       end
     end
   end
+
+  def update_deps!(chart_path)
+    base_cmd = ["helm", "dependency", "update", chart_path]
+    result = run_cmd(*base_cmd, "--skip-refresh", allow_failure: true)
+    run_cmd(*base_cmd) unless result.success # Try with deps refresh in case of any failure
+    true
+  end
 end

data/lib/helmsnap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Helmsnap
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helmsnap
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize