helmsnap 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae526f7e855d2833a340fc35f9363f212fcfe687aebca504dc0e99e704c6393e
-  data.tar.gz: 41787e81ec544fc491d2273763a837594415a7792c823faf07fab94e72388845
+  metadata.gz: 5f9aee0530e4f99cd1d96fbc07be33606ed5462ebbc08540c568a30848274b85
+  data.tar.gz: e2937f100b5e2008d3db5d720a3e4d79393cc760da004bb1453ddab3485a5d50
 SHA512:
-  metadata.gz: 65fc8371b350ab030be1503d392b0a2fd5abbe9d68c64bffa1b44662d1c8339e3358b3e15d63de723498732e67540c8d1768272983213cbd7d0f0be47a6c4b1b
-  data.tar.gz: 3370e09e93f1a0d6b43eb2913046ce44c73905c8f61f6ce79601b627795b2aa69f67c1f7f110fa0f9ef39e0eabe6bf926633d2431d7250ac714d94ed819db3b0
+  metadata.gz: 872efd529c6367ca4dfe4468eae9a9d2164e844273a14e9cacea55e07c5c5a795509c7ece536c83e0be75e319651f44ef55d05816e967c4e841b4007d74d67c2
+  data.tar.gz: fdb9c9d45daea1554f0d03083e582b6f57be0f78da265b39e4eb11f62e54a0b02fdb5e5abc91f6881c041aad3c47e5501736bd97bc244e0341342d6a4c33dce5

data/Gemfile.lock

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

data/lib/helmsnap/check.rb

@@ -1,35 +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 = Helmsnap.run_cmd("which", "colordiff", allow_failure: true)
-      util = result.success ? "colordiff" : "diff"
+    result = 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 = run_cmd(*cmd_parts, 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,11 +1,8 @@
 # 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
 

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.4.0"
+  VERSION = "0.5.1"
 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.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-04 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: