helmsnap 0.7.0 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82cc0b42f25f49c54cb4ec921c092f7a3e6cc9de565bc3e39e357e4129b5c3ff
-  data.tar.gz: 0fc97b6105f8a9ab5fb8360bf390be3cfaea21bc24b21edf42960b88658c54a8
+  metadata.gz: d5e21c78125566f4355ae0679100331a32322034be84fcde8f72ba44397de8e2
+  data.tar.gz: da348e3a0651dd69d20e33555ddf547b8097057169eac3b1e678d4006ce90ff7
 SHA512:
-  metadata.gz: f514cd9633fab8f88efac3ae96dda8579c9b8dbd2a90da8822979958c334681e0b882c498e1b4acfeda279814beeaf181fd942366b036da04100b62cbe1d9dc8
-  data.tar.gz: 5b9046c477241a66acbe1a2bc8b7f982205b49bbcf3f53edbeb1f4f516b4008f0ab4c52aeb5f829538796a1f717931588bea7abce9d33ecd9726031fe43c24dd
+  metadata.gz: cb09555b7dc60d769d5a54df05740b9f50fe9e0542a6f1b3a85ce9c1cfcbba1a630bd079109e468620345757ca693b41b79345e737f8ce0a4a5f8f3272a3d02d
+  data.tar.gz: 59237f6806aa14d80335ccd6afaa08dd4f11398c930e5b3f491058d1cfc96a67f1303a22af3094e172cdb7b5ec43a1a1cc312799dd4fc245c932b47beb62600e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    helmsnap (0.7.0)
+    helmsnap (0.7.4)
       colorize
 
 GEM
@@ -85,6 +85,7 @@ GEM
     zeitwerk (2.5.1)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-20
   x86_64-linux
 
@@ -97,4 +98,4 @@ DEPENDENCIES
   rubocop-config-umbrellio
 
 BUNDLED WITH
-   2.2.32
+   2.2.33

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/console.rb

@@ -12,6 +12,11 @@ module Helmsnap::Console
     stream.puts(msg)
   end
 
+  def warning(stream, msg)
+    msg = ColorizedString["WARNING: #{msg}"].colorize(:light_blue)
+    stream.puts(msg)
+  end
+
   def error(stream, msg)
     msg = ColorizedString[msg].colorize(:light_red)
     stream.puts(msg)

data/lib/helmsnap/env.rb

@@ -10,7 +10,7 @@ class Helmsnap::Env
   def release_paths
     @release_paths ||= begin
       json = Helmsnap.run_cmd("helmfile", "--environment", name, "list", "--output", "json").output
-      YAML.load(json).map { |x| x.fetch("chart") }
+      YAML.load(json).map { |x| Pathname.new(x.fetch("chart")) }
     end
   end
 

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

@@ -17,16 +17,39 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
   attr_accessor :config
 
   def setup!(chart_path)
-    dep_list = run_cmd("helm", "dependency", "list", "--max-col-width", 0, chart_path).output
+    dep_list = get_dependency_list(chart_path)
 
     dep_list.scan(%r{file://(.+?)\t}) do |dep_path|
-      run_cmd("helm", "dependency", "update", "--skip-refresh", 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", "--skip-refresh", 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: nil)
+
+    if result.success
+      result.output
+    else
+      run_cmd(*base_cmd).output.tap do
+        Helmsnap::Console.warning(
+          $stderr, "it looks like your Helm binary is outdated, please update.\n"
+        )
+      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.0"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helmsnap
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.4
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A tool for creating and checking helm chart snapshots.