helmsnap 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b55e83c50e04e5cba9d2a16b4e805a1427f0de01fb7e00fcbf00aab0a105b4a8
-  data.tar.gz: 443d1fb5af1df2471a9d521c216c0199a7f005a10c94ae0c14b71d01bedf6de7
+  metadata.gz: 16b948e025e8c80533fc75ac8d97dc0ff3e4fc4996df3fdf9f8c65957c4dd8a4
+  data.tar.gz: b551e8a5570cedb694e8d19ae9143d9d100eb29c0d4956ed2d02ab2d9c1a8711
 SHA512:
-  metadata.gz: 78819d406edbdda47378143189c28b2f83c227f3f5ed1e0d8834bb81441a81200bb6f77b0413cd5903b0e25960515717016d67bc1021bc0e66eca5912cde543b
-  data.tar.gz: d599a6a266c749ca60c50a05b383a425e198b67200993eb97009ccac91ab75c67952f2795f3b11f0de56dcfe7916e5f6f10217ebaea18311675563489ffc0026
+  metadata.gz: f706419bc87c20f4d29baabb8e64678d5565b8ba3c889aefe68f44eaf91b7798e8802fadffd819260f2fea00c98d483a063a1c903f8b31db227bbf903391067c
+  data.tar.gz: a6e48a1928f2af7ff6da52efd48b7578d80143c6ef7866fbcaaeb37bf47cec5cfdb618c3f91a85a2cea40b93415730248a675c2fa3280125b51c4aa893584f6b

data/Gemfile.lock

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

data/lib/helmsnap/check.rb

@@ -1,32 +1,31 @@
 # frozen_string_literal: true
 
-class Helmsnap::Check
-  def self.call(...)
-    new(...).call
-  end
-
+class Helmsnap::Check < Helmsnap::Service
   def initialize(chart_path:, snapshots_path:, values_path:)
+    super()
     self.chart_path = chart_path
     self.snapshots_path = snapshots_path
     self.values_path = values_path
   end
 
   def call
-    Dir.mktmpdir do |temp_dir|
-      temp_dir_path = Pathname.new(temp_dir)
+    temp_dir_path = Pathname.new(Dir.mktmpdir)
+
+    Helmsnap::Generate.call(
+      chart_path: chart_path,
+      snapshots_path: temp_dir_path,
+      values_path: values_path,
+    )
 
-      Helmsnap::Generate.call(
-        chart_path: chart_path,
-        snapshots_path: temp_dir_path,
-        values_path: values_path,
-      )
+    result = run_cmd("which", "colordiff", allow_failure: true)
+    util = result.success ? "colordiff" : "diff"
 
-      result = Helmsnap.run_cmd("which", "colordiff", allow_failure: true)
-      util = result.success ? "colordiff" : "diff"
+    cmd_parts = [util, "--unified", "--recursive", snapshots_path, temp_dir_path]
+    diff = run_cmd(*cmd_parts, allow_failure: true).output
 
-      diff = Helmsnap.run_cmd(util, "-r", temp_dir_path, snapshots_path, allow_failure: true).output
-      diff.strip.empty?
-    end
+    diff.strip.empty?
+  ensure
+    FileUtils.rmtree(temp_dir_path)
   end
 
   private

data/lib/helmsnap/command.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-class Helmsnap::Command
+class Helmsnap::Command < Helmsnap::Service
   Result = Struct.new(:success, :output)
 
-  def self.call(...)
-    new(...).call
-  end
-
   def initialize(cmd, stdout: $stdout, stderr: $stderr, allow_failure: false)
+    super()
     self.cmd = cmd
+    self.output = +""
     self.stdout = stdout
     self.stderr = stderr
     self.allow_failure = allow_failure
@@ -21,12 +19,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 +30,24 @@ 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}")
-        abort
-      end
+      handle_error!(exit_status, err.read) unless success
 
       Helmsnap::Console.print(stdout, "\n")
       Result.new(success, output)
     end
+  rescue SystemCallError => error
+    handle_error!(error.errno, error.message)
+    Result.new(false, error.message)
+  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/generate.rb

@@ -1,28 +1,15 @@
 # frozen_string_literal: true
 
-class Helmsnap::Generate
-  def self.call(...)
-    new(...).call
-  end
-
+class Helmsnap::Generate < Helmsnap::Service
   def initialize(chart_path:, snapshots_path:, values_path:)
+    super()
     self.chart_path = chart_path
     self.snapshots_path = snapshots_path
     self.values_path = values_path
   end
 
   def call
-    dep_list = run_cmd("helm", "dependency", "list", "--max-col-width", 0, chart_path).output
-
-    dep_list.scan(%r{file://(.+?)\t}) do |dep_path|
-      run_cmd("helm", "dependency", "update", "--skip-refresh", 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)
+    Helmsnap::SetupDependencies.call(chart_path)
 
     FileUtils.rmtree(snapshots_path)
 
@@ -40,8 +27,4 @@ class Helmsnap::Generate
   private
 
   attr_accessor :chart_path, :snapshots_path, :values_path
-
-  def run_cmd(...)
-    Helmsnap.run_cmd(...)
-  end
 end

data/lib/helmsnap/runner.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-class Helmsnap::Runner
-  def self.call(...)
-    new(...).call
-  end
-
+class Helmsnap::Runner < Helmsnap::Service
   def initialize(args)
+    super()
     self.args = args.dup
   end
 
   def call
+    super()
+
     parser = Helmsnap::ArgsParser.new(args)
     self.options = parser.get_options!
 

data/lib/helmsnap/service.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Helmsnap::Service
+  def self.call(...)
+    new(...).call
+  end
+
+  private
+
+  def run_cmd(...)
+    Helmsnap.run_cmd(...)
+  end
+end

data/lib/helmsnap/setup_dependencies.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Helmsnap::SetupDependencies < Helmsnap::Service
+  def initialize(chart_path)
+    super()
+    self.chart_path = Pathname.new(chart_path)
+  end
+
+  def call
+    dep_list = run_cmd("helm", "dependency", "list", "--max-col-width", 0, chart_path).output
+
+    dep_list.scan(%r{file://(.+?)\t}) do |dep_path|
+      run_cmd("helm", "dependency", "update", "--skip-refresh", 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)
+  end
+
+  private
+
+  attr_accessor :chart_path
+end

data/lib/helmsnap/version.rb

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

data/lib/helmsnap.rb

@@ -11,13 +11,16 @@ require "tmpdir"
 require "colorized_string"
 
 module Helmsnap
+  require_relative "helmsnap/service"
+  require_relative "helmsnap/version"
+
   require_relative "helmsnap/args_parser"
   require_relative "helmsnap/check"
-  require_relative "helmsnap/console"
   require_relative "helmsnap/command"
+  require_relative "helmsnap/console"
   require_relative "helmsnap/generate"
   require_relative "helmsnap/runner"
-  require_relative "helmsnap/version"
+  require_relative "helmsnap/setup_dependencies"
 
   class Error < StandardError; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helmsnap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -66,6 +66,8 @@ files:
 - lib/helmsnap/console.rb
 - lib/helmsnap/generate.rb
 - lib/helmsnap/runner.rb
+- lib/helmsnap/service.rb
+- lib/helmsnap/setup_dependencies.rb
 - lib/helmsnap/version.rb
 homepage: https://github.com/tycooon/helmsnap
 licenses: