diff --git a/.ruby-version b/.ruby-version index cb2b00e..75a22a2 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.1 +3.0.3 diff --git a/Gemfile b/Gemfile index 3b515f4..1e6db66 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,9 @@ group :development do gem "rake" gem "pry" gem "pry-byebug" + gem "ruby-debug-ide" + gem "debase" + gem "solargraph" end # test dependencies diff --git a/Gemfile.lock b/Gemfile.lock index 2189199..6da2002 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,10 +22,13 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + ast (2.4.2) async (1.29.1) console (~> 1.10) nio4r (~> 2.3) timers (~> 4.1) + backport (1.2.0) + benchmark (0.1.1) byebug (11.1.3) clamp (1.3.2) codecov (0.5.2) @@ -36,10 +39,14 @@ GEM fiber-local crack (0.4.5) rexml + debase (0.2.5.beta2) + debase-ruby_core_source (>= 0.10.12) + debase-ruby_core_source (0.10.12) diff-lcs (1.4.4) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) + e2mmap (0.1.0) faraday (1.5.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -78,8 +85,13 @@ GEM ffi-compiler (>= 1.0, < 2.0) i18n (1.8.10) concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4) jsonpath (1.1.0) multi_json + kramdown (2.3.1) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) kubeclient (4.9.2) http (>= 3.0, < 5.0) jsonpath (~> 1.0) @@ -99,6 +111,13 @@ GEM multipart-post (2.1.1) netrc (0.11.0) nio4r (2.5.7) + nokogiri (1.12.5-arm64-darwin) + racc (~> 1.4) + nokogiri (1.12.5-x86_64-darwin) + racc (~> 1.4) + parallel (1.20.1) + parser (3.0.1.1) + ast (~> 2.4.1) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) @@ -106,13 +125,18 @@ GEM byebug (~> 11.0) pry (~> 0.10) public_suffix (4.0.6) + racc (1.5.2) + rainbow (3.0.0) rake (13.0.4) recursive-open-struct (1.1.3) + regexp_parser (2.1.1) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) + reverse_markdown (2.0.0) + nokogiri rexml (3.2.5) rspec (3.10.0) rspec-core (~> 3.10.0) @@ -127,6 +151,20 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) + rubocop (1.18.2) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.7.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.7.0) + parser (>= 3.0.1.1) + ruby-debug-ide (0.7.1.beta3) + rake (>= 0.8.1) + ruby-progressbar (1.11.0) ruby2_keywords (0.0.4) simplecov (0.21.2) docile (~> 1.1) @@ -134,20 +172,42 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.3) + solargraph (0.44.2) + backport (~> 1.2) + benchmark + bundler (>= 1.17.2) + diff-lcs (~> 1.4) + e2mmap + jaro_winkler (~> 1.5) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + parser (~> 3.0) + reverse_markdown (>= 1.0.5, < 3) + rubocop (>= 0.52) + thor (~> 1.0) + tilt (~> 2.0) + yard (~> 0.9, >= 0.9.24) + thor (1.1.0) + tilt (2.0.10) timers (4.3.3) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.7) + unicode-display_width (2.0.0) vcr (6.0.0) webmock (3.13.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.7.0) + yard (0.9.27) + webrick (~> 1.7.0) zeitwerk (2.4.2) PLATFORMS + arm64-darwin-21 x86_64-darwin-20 DEPENDENCIES @@ -156,6 +216,7 @@ DEPENDENCIES clamp cloudtruth-client! codecov + debase gem_logger kubeclient liquid @@ -164,10 +225,12 @@ DEPENDENCIES pry-byebug rake rspec + ruby-debug-ide simplecov + solargraph vcr webmock yaml-safe_load_stream! BUNDLED WITH - 2.2.15 + 2.2.32 diff --git a/Rakefile b/Rakefile index 77fe79f..03477cc 100644 --- a/Rakefile +++ b/Rakefile @@ -266,7 +266,8 @@ task :client => "#{CLIENT_DIR}/Gemfile" task :install do build_type = get_var(:build_type, prompt: false, required: false, default: "development") namespace = get_var(:namespace, prompt: false, required: false) - values_file = get_var(:values_file, prompt: false, required: false, default: "local/values.yaml") + values_file = get_var(:values_file, prompt: false, required: false) + helm_args = get_var(:helm_args, prompt: false, required: false) system("minikube version", [:out, :err] => "/dev/null") || fail("dev dependency not installed - minikube") system("minikube status", [:out, :err] => "/dev/null") || fail("dev dependency not running - minikube") @@ -285,7 +286,9 @@ task :install do cmd = "helm install" cmd << " --create-namespace --namespace #{namespace}" if namespace - cmd << " --values #{values_file}" if File.exist?(values_file) + cmd << " --set image.repository=kubetruth --set image.tag=#{build_type} --set image.pullPolicy=Never" + cmd << " --values #{values_file}" if values_file && File.exist?(values_file) + cmd << " #{helm_args}" cmd << " kubetruth helm/kubetruth/" sh cmd end