Ensured we are uniformly using Ruby 2.7

Signed-off-by: John <john.mccrae@progress.com>

8 files changed, 27 insertions, 25 deletions

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2ff15e762b..e5377e001a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
         bundler-cache: true
     - uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR
     - run: bundle exec chefstyle -c .rubocop.yml
diff --git a/.rubocop.yml b/.rubocop.yml
index b88ed74196..84bbcc8191 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - "spec/data/**/*"
     - "vendor/**/*"
diff --git a/Gemfile b/Gemfile
index 187a2e54de..de389a1f2b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 gem "ffi", ">=1.15"
 
 # Nwed to file a bug with rest-client. In the meantime, we can use this until they accept the update.
-gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1"
+gem "rest-client", ">=2.1.0"
 
 # Note we do not use the gemspec DSL which restricts to the
 # gemspec for the current platform and filters out other platforms
diff --git a/Gemfile.lock b/Gemfile.lock
index b65691c2b1..0c5c44b156 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,23 +17,6 @@ GIT
       train-core
       wmi-lite (~> 1.0)
 
-GIT
-  remote: https://github.com/chef/rest-client
-  revision: badd0bea3c31a2ed1f49590760d2e4b665ecbce3
-  branch: jfm/ucrt_update1
-  specs:
-    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)
-    rest-client (2.1.0-x64-mingw32)
-      ffi (~> 1.15)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-
 PATH
   remote: .
   specs:
@@ -316,6 +299,23 @@ GEM
     rake (13.0.6)
     rb-readline (0.5.5)
     regexp_parser (2.6.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)
+    rest-client (2.1.0-x64-mingw32)
+      ffi (~> 1.9)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rest-client (2.1.0-x86-mingw32)
+      ffi (~> 1.9)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -471,7 +471,7 @@ DEPENDENCIES
   pry-stack_explorer
   rake
   rb-readline
-  rest-client!
+  rest-client (>= 2.1.0)
   rspec
   ruby-prof (< 1.3.0)
   ruby-shadow
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 08086ff25b..878cd75584 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/chef/chef"
   spec.license       = "Apache-2.0"
 
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec
index 836fef1ff9..4dc7a39513 100644
--- a/chef-utils/chef-utils.gemspec
+++ b/chef-utils/chef-utils.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/chef/chef/tree/master/chef-utils"
   spec.license       = "Apache-2.0"
 
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
diff --git a/chef.gemspec b/chef.gemspec
index 0103a6d9e6..4a5cb9d785 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://www.chef.io"
 
-  s.required_ruby_version = ">= 2.6.0"
+  s.required_ruby_version = ">= 2.7"
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index 8269e436a5..5061cc9108 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -85,9 +85,11 @@ function Invoke-Build {
         Write-BuildLine " ** 'rake install' any gem sourced as a git reference so they'll look like regular gems."
         foreach($git_gem in (Get-ChildItem "$env:GEM_HOME/bundler/gems")) {
             try {
+                Write-Output "We are here: $PWD"
+                Write-Output "Here is my gem : $git_gem"
                 Push-Location $git_gem
                 Write-BuildLine " -- installing $git_gem"
-                rake install # this needs to NOT be 'bundle exec'd else bundler complains about dev deps not being installed
+                rake install --verbose # this needs to NOT be 'bundle exec'd else bundler complains about dev deps not being installed
                 if (-not $?) { throw "unable to install $git_gem as a plain old gem" }
             } finally {
                 Pop-Location