diff --git a/Gemfile b/Gemfile index 605a46d0e..08cd9f256 100644 --- a/Gemfile +++ b/Gemfile @@ -53,6 +53,10 @@ end group(:omnibus_package) do gem "appbundler" + ## Until we resolve https://github.com/inspec/train/issues/548 + gem "train", "=3.2.0" + gem "train-core", "=3.2.0" + # Expeditor manages the version of chef released to Rubygems. We only release 'stable' chef # gems to Rubygems now, so letting this float on latest should always give us the latest # stable release. May have to re-pin around major version bumping time, or during patch @@ -67,8 +71,8 @@ group(:omnibus_package) do gem "fauxhai", "~> 7.4" # inspec - gem "inspec-bin", "= 4.18.39" # the actual inspec CLI binary - gem "inspec", "= 4.18.39" + gem "inspec-bin", "~> 4.18" # the actual inspec CLI binary + gem "inspec", "~> 4.18" # test-kitchen and plugins gem "test-kitchen", ">= 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 3aadd25d5..206ec5613 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,6 +303,11 @@ GEM mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-sugar (5.1.9) + chef-telemetry (1.0.2) + chef-config + concurrent-ruby (~> 1.0) + ffi-yajl (~> 2.2) + http (~> 2.2) chef-utils (15.7.31) chef-vault (4.0.1) chef-zero (14.0.17) @@ -380,7 +385,7 @@ GEM faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) + faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) fauxhai (7.4.0) net-ssh @@ -443,18 +448,26 @@ GEM hashie (3.6.0) highline (1.7.10) htmlentities (4.3.4) + http (2.2.2) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) + http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) + http-form_data (1.0.3) + http_parser.rb (0.6.0) httpclient (2.8.3) i18n (1.8.2) concurrent-ruby (~> 1.0) ice_nine (0.11.2) inifile (3.0.0) iniparse (1.4.4) - inspec (4.18.39) + inspec (4.18.51) addressable (~> 2.4) + chef-telemetry (~> 1.0) faraday (>= 0.9.0) - faraday_middleware (~> 0.12.2) + faraday_middleware (~> 0.12) hashie (~> 3.4) htmlentities json-schema (~> 2.8) @@ -465,7 +478,7 @@ GEM parallel (~> 1.9) parslet (~> 1.5) pry (~> 0) - rspec (~> 3.0, < 3.9) + rspec (~> 3.9) rspec-its (~> 1.2) rubyzip (~> 1.2, >= 1.2.2) semverse @@ -479,8 +492,8 @@ GEM train-winrm (~> 0.2) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-bin (4.18.39) - inspec (= 4.18.39) + inspec-bin (4.18.51) + inspec (= 4.18.51) ipaddress (0.8.3) iso8601 (0.12.1) jaro_winkler (1.5.4) @@ -712,22 +725,22 @@ GEM addressable (>= 2.3.6, < 3.0.0) retriable (3.1.2) retryable (3.0.5) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.6) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) + rspec-support (~> 3.9.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.8.2) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.3) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) rubocop (0.75.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -980,8 +993,8 @@ DEPENDENCIES ffi-rzmq-core foodcritic (>= 16.0) guard - inspec (= 4.18.39) - inspec-bin (= 4.18.39) + inspec (~> 4.18) + inspec-bin (~> 4.18) kitchen-azurerm (>= 0.14) kitchen-digitalocean (>= 0.10.0) kitchen-dokken (>= 2.8.1)