From b0c8c7332184853a1d83eebfe8393ffc84873471 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 27 Jul 2026 13:08:07 +0100 Subject: [PATCH] Upgrade Gems and add Time#iso8601 workaround --- Gemfile | 6 ++++- Gemfile.lock | 70 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index 772c0e492..2a21f0599 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,10 @@ +# Work around test-kitchen 4.1.0 not loading Time#iso8601. +# https://github.com/test-kitchen/test-kitchen/pull/2083 +require "time" + source "https://rubygems.org" -gem "cinc-auditor-bin", "< 7.0.0", :source => "https://rubygems.cinc.sh" +gem "cinc-auditor-bin", :source => "https://rubygems.cinc.sh" gem "cookstyle" gem "kitchen-dokken", ">= 2.23.0" gem "kitchen-inspec" diff --git a/Gemfile.lock b/Gemfile.lock index 2de60b616..8c5fa4ce4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,30 +1,32 @@ GEM remote: https://rubygems.cinc.sh/ specs: - cinc-auditor-bin (5.23.6) - inspec (= 5.23.6) - inspec (5.23.6) - faraday_middleware (>= 0.12.2, < 1.3) - inspec-core (= 5.23.6) - mongo (= 2.21.3) + cinc-auditor-bin (7.1.7) + inspec (= 7.1.7) + inspec (7.1.7) + faraday_middleware (~> 1.2, >= 1.2.1) + inspec-core (= 7.1.7) progress_bar (~> 1.3.3) - rake - train (~> 3.13, >= 3.13.4) + rake (>= 12.3.3) + train (~> 3.16, >= 3.16.1) train-aws (~> 0.2) train-habitat (~> 0.1) - train-kubernetes (< 0.3.1) + train-kubernetes (>= 0.3.1) train-winrm (~> 0.4.0) - inspec-core (5.23.6) - addressable (~> 2.4) + inspec-core (7.1.7) + addressable (~> 2.9) + chef-licensing (>= 1.2.0) chef-telemetry (~> 1.0, >= 1.0.8) cookstyle + csv (~> 3.0) faraday (>= 1, < 3) faraday-follow_redirects (~> 0.3) hashie (>= 3.4, < 6.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) - mixlib-log (~> 3.0, < 3.2) + mixlib-log (~> 3.0) multipart-post (~> 2.0) + ostruct (>= 0.1, < 0.7) parallel (~> 1.9) parslet (>= 1.5, < 3.0) pry (~> 0.13) @@ -33,9 +35,10 @@ GEM rubyzip (>= 1.2.2, < 4.0) semverse (~> 3.0) sslshake (~> 1.2) + syslog (~> 0.1) thor (>= 0.20, < 1.5.0) - tomlrb (>= 1.2, < 2.1) - train-core (~> 3.13, >= 3.13.4) + tomlrb (>= 1.3, < 2.1) + train-core (~> 3.16, >= 3.16.1) tty-prompt (~> 0.17) tty-table (~> 0.10) @@ -321,7 +324,6 @@ GEM bcrypt_pbkdf (1.1.2-x86_64-darwin) benchmark (0.5.0) bigdecimal (4.1.2) - bson (5.2.0) builder (3.3.0) chef-config (19.3.15) addressable @@ -334,6 +336,15 @@ GEM chef-gyoku (1.5.0) builder (>= 2.1.2) rexml (~> 3.4) + chef-licensing (1.4.1) + chef-config (>= 15) + faraday (>= 1, < 3) + faraday-http-cache + mixlib-log (~> 3.0) + ostruct (~> 0.6.0) + pstore (~> 0.1.1) + tty-prompt (~> 0.23) + tty-spinner (~> 0.9.3) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) @@ -365,7 +376,7 @@ GEM connection_pool (3.0.2) cookstyle (8.7.6) rubocop (= 1.86.1) - csv (3.3.5) + csv (3.3.6) declarative (0.0.20) diff-lcs (1.6.2) docker-api (2.4.0) @@ -422,6 +433,8 @@ GEM faraday-excon (1.1.0) faraday-follow_redirects (0.5.0) faraday (>= 1, < 3) + faraday-http-cache (2.7.0) + faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.2.0) multipart-post (~> 2.0) @@ -494,7 +507,7 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) jmespath (1.6.2) - json (2.20.0) + json (2.21.1) jsonpath (1.1.5) multi_json jwt (2.10.3) @@ -524,7 +537,7 @@ GEM mixlib-install (>= 3.14) mixlib-shellout (>= 1.2, < 4.0) test-kitchen (>= 4.0) - language_server-protocol (3.17.0.5) + language_server-protocol (3.17.0.6) license-acceptance (2.1.13) pastel (~> 0.7) tomlrb (>= 1.2, < 3.0) @@ -546,13 +559,11 @@ GEM mixlib-versioning ostruct thor - mixlib-log (3.0.9) + mixlib-log (3.2.3) + ffi (>= 1.15.5) mixlib-shellout (3.4.10) chef-utils mixlib-versioning (1.2.12) - mongo (2.21.3) - base64 - bson (>= 4.14.1, < 6.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -577,7 +588,7 @@ GEM os (1.1.4) ostruct (0.6.3) parallel (1.28.0) - parser (3.3.11.1) + parser (3.3.12.0) ast (~> 2.4.1) racc parslet (2.0.0) @@ -594,11 +605,12 @@ GEM coderay (~> 1.1) method_source (~> 1.0) reline (>= 0.6.0) + pstore (0.1.4) public_suffix (7.0.5) racc (1.8.1) rainbow (3.1.1) rake (13.4.2) - rbs (4.0.3) + rbs (4.1.0) logger prism (>= 1.6.0) tsort @@ -645,7 +657,7 @@ GEM rubocop-ast (>= 1.49.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.49.1) + rubocop-ast (1.50.0) parser (>= 3.3.7.2) prism (~> 1.7) ruby-progressbar (1.13.0) @@ -799,8 +811,8 @@ GEM net-scp (>= 1.2, < 5.0) net-ssh (>= 2.9, < 8.0) train-habitat (0.2.22) - train-kubernetes (0.1.7) - k8s-ruby (~> 0.10) + train-kubernetes (0.3.1) + k8s-ruby (>= 0.17.2) train (~> 3.0) train-winrm (0.4.3) chef-winrm (>= 2.4.4, < 3.0) @@ -822,6 +834,8 @@ GEM tty-screen (~> 0.8) wisper (~> 2.0) tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) tty-table (0.12.0) pastel (~> 0.8) strings (~> 0.2.0) @@ -850,7 +864,7 @@ PLATFORMS x86_64-linux-musl DEPENDENCIES - cinc-auditor-bin (< 7.0.0)! + cinc-auditor-bin! cookstyle kitchen-dokken (>= 2.23.0) kitchen-inspec -- 2.47.3