helmsnap 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306405fefdd0a806b1e89fd691a7412686218ffaeb981a9685e40ee6ff5a8880
-  data.tar.gz: 644a72cc622dcefe774bea2acc8cd9816f770290e4704b28aafa3b6311dae122
+  metadata.gz: 7bfa93a759d6c9f6d753c3989f07c7f82d79d8de5f5f805e7c7a7cda55f9ef1e
+  data.tar.gz: 4d2dda18ef0b4de8dbc9d015f90bc35b8e93b6217a9c9d62a25864414b46b10a
 SHA512:
-  metadata.gz: d6c09ccb98572852ee4877afbe6c3371cb03e9a6df5476057770bee762e9f0a6f9eb3dab20e0c3d2de97c827ce1d4e2b1b524214f671ffe0c58c81fb1d40a00b
-  data.tar.gz: b0d4ba70df6544b282ba24b3dbefe8882f0a2cafe0634f60666ed8ca05209462e73303bc5a82fbb6edebb64fb8dbe3a7dfdc660df59b2566bdcc67dae670acb1
+  metadata.gz: 07d92385f7f114b15e7dcd3ca25ac2d05b614d63cc91922878b868551e4b69c06ddc7511b7b3e2e0166c3ec3a0547b4b7a18a1825c1c922b4ed939e3fe405529
+  data.tar.gz: 034226de8b3c1008bfd9ae95ce7a5fa161a49a8ee52e9c6974db260775eed3e19715eeab670e3e1668c4014a1142317bee3e300410b910ee68a007284c9bd2ae

data/Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "logger"
 gem "pry"
 gem "rake"
 gem "rspec"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    helmsnap (1.2.1)
+    helmsnap (1.3.0)
       colorize
 
 GEM
@@ -30,6 +30,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    logger (1.6.6)
     method_source (1.1.0)
     minitest (5.25.1)
     mutex_m (0.2.0)
@@ -107,6 +108,7 @@ PLATFORMS
 
 DEPENDENCIES
   helmsnap!
+  logger
   pry
   rake
   rspec

data/README.md

@@ -49,6 +49,8 @@ credentials: # [] by default
   password: somepassword
 ```
 
+Credentials will be matched by prefix, so if your repo URL is `https://example.com/some/path/to/repo`, you can also put values like `https://example.com/some/path` or `https://example.com` in `credentials.[].repo`.
+
 You can also override configuration file location using `--config` option.
 
 ## Dependencies

data/lib/helmsnap/args_parser.rb

@@ -3,7 +3,7 @@
 class Helmsnap::ArgsParser
   InvalidConfigPath = Class.new(RuntimeError)
 
-  Args = Struct.new(:config_path)
+  Args = Struct.new(:config_path, :skip_repo_cleanup)
 
   DEFAULT_CONFIG_PATH = Pathname.new(".helmsnap.yaml")
   CONFIG_PATH_HELP = %{Path to config (default: "#{DEFAULT_CONFIG_PATH}")}.freeze
@@ -38,14 +38,12 @@ class Helmsnap::ArgsParser
       opts.separator("")
       opts.separator("Specific options:")
 
-      opts.on("-c", "--config CONFIG_PATH", CONFIG_PATH_HELP) do |val|
-        path = Pathname.new(val)
-
-        unless path.file? && path.readable?
-          raise InvalidConfigPath, "Not a readable file: #{val}"
-        end
+      opts.on("-c", "--config CONFIG_PATH", CONFIG_PATH_HELP) do |value|
+        set_config!(value)
+      end
 
-        args.config_path = path
+      opts.on("--skip-repo-cleanup", "Skip cleaning up existing helmsnap-related helm repos") do
+        args.skip_repo_cleanup = true
       end
 
       opts.on("-v", "--version", "Show version") do
@@ -59,4 +57,14 @@ class Helmsnap::ArgsParser
       end
     end
   end
+
+  def set_config!(value)
+    path = Pathname.new(value)
+
+    unless path.file? && path.readable?
+      raise InvalidConfigPath, "Not a readable file: #{value}"
+    end
+
+    args.config_path = path
+  end
 end

data/lib/helmsnap/check.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 class Helmsnap::Check < Helmsnap::Service
-  def initialize(config)
+  def initialize(config, options)
     super()
     self.config = config
+    self.options = options
   end
 
   def call
     temp_dir_path = Pathname.new(Dir.mktmpdir)
 
-    Helmsnap::Generate.call(config, snapshots_path: temp_dir_path)
+    Helmsnap::Generate.call(config, options, snapshots_path: temp_dir_path)
 
     result = run_cmd("which", "colordiff", allow_failure: true)
     util = result.success ? "colordiff" : "diff"
@@ -24,5 +25,5 @@ class Helmsnap::Check < Helmsnap::Service
 
   private
 
-  attr_accessor :config
+  attr_accessor :config, :options
 end

data/lib/helmsnap/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Helmsnap::Config
-  Credentials = Struct.new(:username, :password)
+  Credentials = Struct.new(:repo, :username, :password)
 
   attr_reader :envs, :snapshots_path, :credentials
 
@@ -34,8 +34,8 @@ class Helmsnap::Config
   end
 
   def parse_credentials(yaml)
-    yaml.fetch("credentials", []).each_with_object({}) do |obj, credentials|
-      credentials[obj["repo"]] = Credentials.new(obj["username"], obj["password"])
+    yaml.fetch("credentials", []).map do |obj|
+      Credentials.new(obj["repo"], obj["username"], obj["password"])
     end
   end
 end

data/lib/helmsnap/generate.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 class Helmsnap::Generate < Helmsnap::Service
-  def initialize(config, snapshots_path: nil)
+  def initialize(config, options, snapshots_path: nil)
     super()
     self.config = config
+    self.options = options
     self.snapshots_path = snapshots_path || config.snapshots_path
   end
 
   def call
-    Helmsnap::SetupDependencies.call(config)
+    Helmsnap::SetupDependencies.call(config, options)
 
     Dir.mktmpdir do |tmpdir|
       tmp_path = Pathname.new(tmpdir)
@@ -18,7 +19,7 @@ class Helmsnap::Generate < Helmsnap::Service
 
   private
 
-  attr_accessor :config, :snapshots_path
+  attr_accessor :config, :options, :snapshots_path
 
   def generate!(tmp_path)
     config.envs.each do |env|

data/lib/helmsnap/runner.rb

@@ -38,12 +38,12 @@ class Helmsnap::Runner < Helmsnap::Service
   attr_accessor :args, :options, :config
 
   def generate!
-    Helmsnap::Generate.call(config)
+    Helmsnap::Generate.call(config, options)
     Helmsnap::Console.info($stdout, "Snapshots generated successfully.")
   end
 
   def check!
-    if Helmsnap::Check.call(config)
+    if Helmsnap::Check.call(config, options)
       Helmsnap::Console.info($stdout, "Snapshots are up-to-date.")
     else
       example_cmd = Shellwords.join(["helmsnap", "generate", "--config", options.config_path])
@@ -62,6 +62,6 @@ class Helmsnap::Runner < Helmsnap::Service
   end
 
   def setup_deps!
-    Helmsnap::SetupDependencies.call(config)
+    Helmsnap::SetupDependencies.call(config, options)
   end
 end

data/lib/helmsnap/setup_dependencies.rb

@@ -3,14 +3,15 @@
 class Helmsnap::SetupDependencies < Helmsnap::Service
   REPO_NAME_PREFIX = "helmsnap-"
 
-  def initialize(config)
+  def initialize(config, options)
     super()
     self.config = config
+    self.options = options
     self.processed_paths = Set.new
   end
 
   def call
-    clear_existing_repos!
+    clear_existing_repos! unless options.skip_repo_cleanup
 
     config.envs.flat_map(&:release_paths).each do |chart_path|
       setup!(chart_path)
@@ -19,7 +20,7 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
 
   private
 
-  attr_accessor :config, :processed_paths
+  attr_accessor :config, :options, :processed_paths
 
   def clear_existing_repos!
     result = run_cmd("helm", "repo", "ls", allow_failure: true).output
@@ -44,7 +45,7 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
     dep_list.scan(%r{(https?://.+?)\s}) do |dep_path|
       url = dep_path.first
 
-      if (credentials = config.credentials[url])
+      if (credentials = config.credentials.find { |x| url.start_with?(x.repo) })
         extra_args = ["--username", credentials.username, "--password", credentials.password]
       end
 

data/lib/helmsnap/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: helmsnap
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
-original_platform: ''
 authors:
 - Yuri Smirnov
 bindir: exe
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -76,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.1
+rubygems_version: 3.6.6
 specification_version: 4
 summary: A tool for creating and checking helm chart snapshots.
 test_files: []