From 8520add49984693febfd1a7e546c548b6972e147 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 15 Dec 2023 17:36:33 +0530 Subject: [PATCH 1/4] updated the undo path for windows Signed-off-by: nikhil2611 --- lib/chef-cli/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef-cli/helpers.rb b/lib/chef-cli/helpers.rb index 9cdabd46..6c72237e 100644 --- a/lib/chef-cli/helpers.rb +++ b/lib/chef-cli/helpers.rb @@ -144,7 +144,7 @@ def expected_omnibus_root def default_package_home if Chef::Platform.windows? - File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME) + File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME).gsub("\\", "/") else File.expand_path("~/.#{ChefCLI::Dist::PRODUCT_PKG_HOME}") end From dc7913c7a85d893b53838c27243242ee4a75b976 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 15 Dec 2023 18:21:54 +0530 Subject: [PATCH 2/4] updated the chef dependency Signed-off-by: nikhil2611 --- chef-cli.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef-cli.gemspec b/chef-cli.gemspec index 08328483..2badc276 100644 --- a/chef-cli.gemspec +++ b/chef-cli.gemspec @@ -46,7 +46,7 @@ Gem::Specification.new do |gem| if RUBY_VERSION.match?(/3.1/) gem.add_dependency "chef", "~> 18.0" else - gem.add_dependency "chef", ">= 16.0" + gem.add_dependency "chef", "~> 17.0" end gem.add_dependency "solve", "< 5.0", "> 2.0" gem.add_dependency "addressable", ">= 2.3.5", "< 2.9" From c074665ecd7b1fd4adeff7e876106ec12d2e6183 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 15 Dec 2023 18:33:31 +0530 Subject: [PATCH 3/4] updated the test-kitchen dependency Signed-off-by: nikhil2611 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0319f14f..11648662 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ group :test do gem "rspec-mocks", "~> 3.8" gem "cookstyle", "=7.7.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command gem "chefstyle", "=1.6.2" - gem "test-kitchen", ">= 2.11.1" + gem "test-kitchen", "=3.5.1" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6") gem "chef-zero", "~> 14" From 4722e32a20914670eb5c969efb1a37e87623abb2 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 15 Dec 2023 19:29:55 +0530 Subject: [PATCH 4/4] added comment for the test-kitchen dependency Signed-off-by: nikhil2611 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 11648662..b6918aaa 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ group :test do gem "rspec-mocks", "~> 3.8" gem "cookstyle", "=7.7.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command gem "chefstyle", "=1.6.2" - gem "test-kitchen", "=3.5.1" + gem "test-kitchen", "=3.5.1" # pinning test-kitchen to 3.5.1 which supports ruby < 3.1 . Need to update this to latest once we update the ruby to 3.1 and chef to 18.x in chef-cli if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6") gem "chef-zero", "~> 14"