From 5aca74379ca06f2ac0c098e62ffa953dbdd072b2 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 4 Oct 2023 13:14:25 +0530 Subject: [PATCH 1/5] updated chef dependency for ruby 3.1 Signed-off-by: nikhil2611 --- chef-apply.gemspec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 4f2621c09..50d7b0ea7 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -49,7 +49,11 @@ Gem::Specification.new do |spec| spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI - spec.add_dependency "chef", ">= 16.0" # Needed to load cookbooks + if RUBY_VERSION.match?(/3.1/) + spec.add_dependency "chef", "~> 18.0" + elsif + spec.add_dependency "chef", ">= 16.0" # Needed to load cookbooks + end spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3" From 2c1e5184b6d34811a8c7312ff413e06d644f4f67 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 4 Oct 2023 15:50:54 +0530 Subject: [PATCH 2/5] updated chefstyle Signed-off-by: nikhil2611 --- chef-apply.gemspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 50d7b0ea7..a7b18bfe2 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -51,8 +51,7 @@ Gem::Specification.new do |spec| spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI if RUBY_VERSION.match?(/3.1/) spec.add_dependency "chef", "~> 18.0" - elsif - spec.add_dependency "chef", ">= 16.0" # Needed to load cookbooks + elsif gem.add_dependency "chef", ">= 16.0" end spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" From f056f96e3d6ede200df04d751c446f441e9cb685 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 4 Oct 2023 15:54:23 +0530 Subject: [PATCH 3/5] correct the variable name Signed-off-by: nikhil2611 --- chef-apply.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index a7b18bfe2..2f5331413 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -51,7 +51,7 @@ Gem::Specification.new do |spec| spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI if RUBY_VERSION.match?(/3.1/) spec.add_dependency "chef", "~> 18.0" - elsif gem.add_dependency "chef", ">= 16.0" + elsif spec.add_dependency "chef", ">= 16.0" end spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" From ed02658501d861a5a8710b38e8a3cfec7d2dcefd Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 12 Oct 2023 13:07:24 +0530 Subject: [PATCH 4/5] updated elsif to else condition Signed-off-by: nikhil2611 --- chef-apply.gemspec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 2f5331413..ecdbacc57 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -50,8 +50,9 @@ Gem::Specification.new do |spec| spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI if RUBY_VERSION.match?(/3.1/) - spec.add_dependency "chef", "~> 18.0" - elsif spec.add_dependency "chef", ">= 16.0" + gem.add_dependency "chef", "~> 18.0" + else + gem.add_dependency "chef", ">= 16.0" end spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" From d8b6a3da112759a2d2ea7ea246293e10b903be1f Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 12 Oct 2023 13:25:49 +0530 Subject: [PATCH 5/5] spelling correction Signed-off-by: nikhil2611 --- chef-apply.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index ecdbacc57..7c95b641e 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -50,9 +50,9 @@ Gem::Specification.new do |spec| spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI if RUBY_VERSION.match?(/3.1/) - gem.add_dependency "chef", "~> 18.0" + spec.add_dependency "chef", "~> 18.0" else - gem.add_dependency "chef", ">= 16.0" + spec.add_dependency "chef", ">= 16.0" end spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2"