helmsnap 0.7.1 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06eb415d8391af30d789fdf0a28d93c1fd3eeec961927623ee124f4a97c27da
-  data.tar.gz: 1955829609e08db79e13150e4fc96c3cd30df8242f08e00976040c407d2fba0d
+  metadata.gz: 76745aa695bb329e8e8d8cdf2a7c35fddd42cb24cc41f5ae15ac7f79a1513bb3
+  data.tar.gz: 532988aa8e92b3d48de4f9393bb88cb50506345c10d9645f56cdd2491141f671
 SHA512:
-  metadata.gz: 8f58ea04641722e5adc18e604eb770e8bc1cf64b3db94fc450cd932d7e79e779c00fe88abbf676377499f6e4ec6179a1831f0688fee26fd77dbdc1d21fc99448
-  data.tar.gz: 11a731bf61117fbd8671b56993860b3fc35367d16699297bd962a61d990b187491199a4b06646c911ead81cb5677d8d259b6917737b9b0b6f48d3cca865ef7e8
+  metadata.gz: ccedd03bea5461c576bc5e146180a83d5a201eb25b29ea483bafc610f74736a8691e6890261dcd33f7b376d51c7558e7dc620bb9b9d50fb204fd44e1ec1c0e6a
+  data.tar.gz: ca3c0246e70ce001454364556596b35376ea69ac12d4e8ca72191050d11275810ba5c8ab98954afcd82946af28b7ea87157ddda6040322d44c60657f4eb84b3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    helmsnap (0.7.1)
+    helmsnap (0.7.5)
       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/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

@@ -4,29 +4,58 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
   def initialize(config)
     super()
     self.config = config
+    self.processed_paths = Set.new
   end
 
   def call
-    config.envs.flat_map(&:release_paths).uniq.each do |chart_path|
+    config.envs.flat_map(&:release_paths).each do |chart_path|
       setup!(chart_path)
     end
   end
 
   private
 
-  attr_accessor :config
+  attr_accessor :config, :processed_paths
 
   def setup!(chart_path)
-    dep_list = run_cmd("helm", "dependency", "list", "--max-col-width", 0, chart_path).output
+    normalized_path = chart_path.expand_path
+    return if processed_paths.include?(normalized_path)
+    processed_paths << normalized_path
+
+    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))
+      subchart_path = chart_path.join(dep_path.first)
+      setup!(subchart_path)
     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.1"
+  VERSION = "0.7.5"
 end

data/lib/helmsnap.rb

@@ -6,6 +6,7 @@ require "open3"
 require "optparse"
 require "pathname"
 require "shellwords"
+require "set"
 require "tmpdir"
 require "yaml"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helmsnap
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.5
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-09 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.