From efb68226773a4fd8e50703f5ec8852cfc73934e4 Mon Sep 17 00:00:00 2001 From: Yuri Smirnov Date: Tue, 27 Dec 2022 11:17:17 +0600 Subject: [PATCH] fix helm dependency list regexp --- Gemfile.lock | 68 +++++++++++++++--------------- lib/helmsnap/setup_dependencies.rb | 4 +- lib/helmsnap/version.rb | 2 +- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 20fa3ef..da16472 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ PATH remote: . specs: - helmsnap (1.0.0) + helmsnap (1.0.1) colorize GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -17,69 +17,71 @@ GEM colorize (0.8.1) concurrent-ruby (1.1.10) diff-lcs (1.5.0) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) + json (2.6.3) method_source (1.0.0) - minitest (5.15.0) + minitest (5.16.3) parallel (1.22.1) - parser (3.1.2.0) + parser (3.1.3.0) ast (~> 2.4.1) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - rack (2.2.3.1) + rack (3.0.3) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) + regexp_parser (2.6.1) rexml (3.2.5) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - rubocop (1.30.1) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rubocop (1.35.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.20.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) + rubocop-ast (1.24.0) parser (>= 3.1.1.0) - rubocop-config-umbrellio (1.30.0.65) - rubocop (~> 1.30.0) + rubocop-config-umbrellio (1.35.0.69) + rubocop (~> 1.35.0) rubocop-performance (~> 1.14.0) - rubocop-rails (~> 2.14.2) + rubocop-rails (~> 2.15.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.11.1) + rubocop-rspec (~> 2.12.0) rubocop-sequel (~> 0.3.3) - rubocop-performance (1.14.2) + rubocop-performance (1.14.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) + rubocop-rails (2.15.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.11.1) - rubocop (~> 1.19) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) rubocop-sequel (0.3.4) rubocop (~> 1.0) ruby-progressbar (1.11.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (2.1.0) + unicode-display_width (2.3.0) PLATFORMS arm64-darwin-21 @@ -96,4 +98,4 @@ DEPENDENCIES rubocop-config-umbrellio BUNDLED WITH - 2.3.15 + 2.4.1 diff --git a/lib/helmsnap/setup_dependencies.rb b/lib/helmsnap/setup_dependencies.rb index 9308c7b..f281d5b 100644 --- a/lib/helmsnap/setup_dependencies.rb +++ b/lib/helmsnap/setup_dependencies.rb @@ -24,12 +24,12 @@ def setup!(chart_path) dep_list = get_dependency_list(chart_path) - dep_list.scan(%r{file://(.+?)\t}) do |dep_path| + dep_list.scan(%r{file://(.+?)\s}) do |dep_path| subchart_path = chart_path.join(dep_path.first) setup!(subchart_path) end - dep_list.scan(%r{(https?://.+?)\t}) do |dep_path| + dep_list.scan(%r{(https?://.+?)\s}) do |dep_path| run_cmd("helm", "repo", "add", Digest::MD5.hexdigest(dep_path.first), dep_path.first) end diff --git a/lib/helmsnap/version.rb b/lib/helmsnap/version.rb index c5576c5..9e15a4d 100644 --- a/lib/helmsnap/version.rb +++ b/lib/helmsnap/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Helmsnap - VERSION = "1.0.0" + VERSION = "1.0.1" end