helmsnap 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd784fcd78ea76eeb09743cf411b599c9cd6ab2299a1a647a037d0dcc667cdb0
-  data.tar.gz: a53928f8100827b1cd738840abff6ab43d875c0d44f5c7400023aa185d5ffeb3
+  metadata.gz: 8a5cb05f018581cbbccdfd9114f0ce1426457d63bd4fcd69864d558a6c790be5
+  data.tar.gz: c6ff86c42987cbebe2fb71889d05dd0d11e33d0ca164a89419c75b58a6b671ab
 SHA512:
-  metadata.gz: 9e5f7c1f7516cf65c9bcb3dde36977e739a5973ec7eaf7147380b797c9acc271b889a637fe6b9d3a6764839ed8362270e77c8160cc0fbcab1aee9775421c7c07
-  data.tar.gz: 12d305a44dfc9c07956aa84ad5c221a7bf2b404888be7750de6bdcd06617c69d13e9c0a1846e2f07157b029a55b23b867a541014e550f6d94e62989a569494a7
+  metadata.gz: 60bf1bbab69d1990b05d93bcc3b22b67318f665d431ea2b770a6eddf894a6df800d139b32cdd35d61905067fd7e52ae21d91b069d94a99736ea57d25f9968ee6
+  data.tar.gz: 804d6d566f1e6c546f1f94a9235b43ba69fb451f298987855c40a281033144fd1ee44ea53e0fdf764f1d6f2bfe29e6902fd1bb065d75f6b4eba3212feaca367a

data/Gemfile.lock

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

data/lib/helmsnap/check.rb

@@ -23,9 +23,8 @@ class Helmsnap::Check
     result = Helmsnap.run_cmd("which", "colordiff", allow_failure: true)
     util = result.success ? "colordiff" : "diff"
 
-    diff = Helmsnap.run_cmd(
-      util, "--unified", "--recursive", snapshots_path, temp_dir_path, allow_failure: true
-    ).output
+    cmd_parts = [util, "--unified", "--recursive", snapshots_path, temp_dir_path]
+    diff = Helmsnap.run_cmd(*cmd_parts, allow_failure: true).output
 
     diff.strip.empty?
   ensure

data/lib/helmsnap/command.rb

@@ -9,6 +9,7 @@ class Helmsnap::Command
 
   def initialize(cmd, stdout: $stdout, stderr: $stderr, allow_failure: false)
     self.cmd = cmd
+    self.output = +""
     self.stdout = stdout
     self.stderr = stderr
     self.allow_failure = allow_failure
@@ -21,12 +22,10 @@ class Helmsnap::Command
 
   private
 
-  attr_accessor :cmd, :stdout, :stderr, :allow_failure
+  attr_accessor :cmd, :output, :stdout, :stderr, :allow_failure
 
   def run_command
     Open3.popen3(cmd) do |_in, out, err, wait_thr|
-      output = +""
-
       while (chunk = out.gets)
         Helmsnap::Console.print(stdout, chunk)
         output << chunk
@@ -34,15 +33,21 @@ class Helmsnap::Command
 
       exit_status = wait_thr.value
       success = exit_status.success?
-
-      if !success && !allow_failure
-        Helmsnap::Console.error(stderr, err.read)
-        Helmsnap::Console.error(stderr, "Command failed with status #{exit_status.to_i}")
-        exit 1
-      end
+      handle_error!(exit_status, err.read) unless success
 
       Helmsnap::Console.print(stdout, "\n")
       Result.new(success, output)
     end
   end
+
+  def handle_error!(exit_status, err_output)
+    Helmsnap::Console.error(stderr, err_output)
+
+    if allow_failure
+      output << err_output
+    else
+      Helmsnap::Console.error(stderr, "Command failed with status #{exit_status.to_i}")
+      exit 1
+    end
+  end
 end

data/lib/helmsnap/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helmsnap
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Yuri Smirnov