Gemfile in chef-dk-3.13.1 vs Gemfile in chef-dk-4.0.60

@@ -1,7 +1,7 @@
 #
-# Copyright:: Copyright (c) 2014-2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -23,72 +23,78 @@
 
 group(:omnibus_package, :development, :test) do
   # we pin these gems as they are installed in the ruby source and if we let them
   # float we'll end up with 2 copies shipped in DK. When we bump Ruby we need to
   # look at these pins and adjust them
-  gem "rake", "<= 12.3.0"
+  gem "rake", "<= 12.3.2"
   gem "rdoc", "<= 6.0.1"
   gem "minitest", "<= 5.10.3"
 
   gem "pry"
   gem "yard"
   gem "guard"
-  gem "cookstyle", "~> 3.0" # bump this on the next DK major release
-  gem "foodcritic", "< 16"
-  gem "ffi-libarchive", ">= 0.4.0"
+  gem "cookstyle", "~> 4.0"
+  gem "foodcritic", ">= 16.0"
+  gem "ffi-libarchive"
 end
 
 group(:dep_selector) do
-  gem "dep_selector", ">= 1.0.0"
+  gem "dep_selector"
   gem "dep-selector-libgecode"
 end
 
 # We tend to track latest stable release without pinning.
 # In order to prevent the depsolver from downgrading we pin some floors with ">=".
 # We should only be using "~>" to work around bugs, or temporarily pinning some tech debt.
 # We equality pin the chef gem itself to assert which version we're shipping.
 group(:omnibus_package) do
-  gem "appbundler", "< 0.13"
-  gem "berkshelf", ">= 7.0.8"
-  gem "chef-provisioning", ">= 2.7.1", group: :provisioning
-  gem "chef-provisioning-aws", ">= 3.0.2", group: :provisioning
-  gem "chef-provisioning-fog", ">= 0.26.1", group: :provisioning
+  gem "appbundler"
+  gem "berkshelf", ">= 7.0.5"
   gem "chef-vault", ">= 3.4.1"
   # 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
   # fixes.
-  gem "chef", "= 14.14.29"
+  gem "chef", "= 15.0.300"
+  gem "chef-bin", "= 15.0.300"
   gem "cheffish", ">= 14.0.1"
-  gem "chefspec", ">= 7.3.0", "< 8.0.0" # 8.0 deps on chef-cli so we don't want that
-  gem "fauxhai", "~> 6.11" # bump this on the next DK major release
-  gem "inspec", "~> 3.9"
+  gem "chefspec", ">= 7.3.0"
+  gem "fauxhai", "~> 7.0"
+  gem "inspec-bin", "~> 4.3" # the actual inspec CLI binary
+  gem "inspec", "~> 4.3"
   gem "kitchen-azurerm", ">= 0.14"
-  gem "kitchen-ec2", ">= 2.3", "< 3.0"
+  gem "kitchen-ec2", ">= 3.0", "< 4"
   gem "kitchen-digitalocean", ">= 0.10.0"
   gem "kitchen-dokken", ">= 2.6.7"
   gem "kitchen-google", ">= 2.0.0"
   gem "kitchen-hyperv", ">= 0.5.1"
-  gem "kitchen-inspec", ">= 1.0", "< 1.2.0" # 1.2 starts warning on attributes vs. inputs
-  gem "kitchen-vagrant", ">= 1.6"
+  gem "kitchen-inspec", ">= 1.0"
+  gem "kitchen-vagrant", ">= 1.4"
   gem "knife-acl", ">= 1.0.3"
   gem "knife-ec2", ">= 0.19.10"
   gem "knife-google", ">= 3.3.3"
   gem "knife-tidy", ">= 1.2.0"
   gem "knife-windows", ">= 1.9.1"
   gem "knife-opc", ">= 0.4.0"
-  gem "knife-vsphere", ">= 3.0.1", "< 4.0"
+  gem "knife-vsphere", ">= 2.1.1"
   gem "mixlib-archive", ">= 0.4.16"
-  gem "ohai", "~> 14.0"
+  gem "ohai", ">= 14"
   gem "net-ssh", ">= 4.2.0"
-  gem "test-kitchen", ">= 1.23.0", "< 2"
+  gem "test-kitchen", ">= 1.23"
   gem "listen"
   gem "dco"
 
-  # this pin prevents pulling in 1.x that has breaking changes for our apps here
-  gem "chef-telemetry", "~> 0.1"
+  # many layers down these bring in ethon which uses ffi / libcurl and breaks on windows
+  # we want to get this working, but for now it's disabled so we can get a build out
+  # make sure to add curl back to the omnibus def before enabling this again
+  # gem "knife-vcenter", ">= 2.0"
+  # gem "kitchen-vcenter", ">= 2.0"
 
+  # ed25519 ssh key support done here as it's a native gem we can't put in train
+  gem "ed25519"
+  gem "bcrypt_pbkdf"
+
   # Right now we must import chef-apply as a gem into the ChefDK because this is where all the gem
   # dependency resolution occurs. Putting it elsewhere endangers older ChefDK issues of gem version
   # conflicts post-build.
   gem "chef-apply"
 
@@ -106,10 +112,11 @@
   gem "nokogiri"
   gem "pry-byebug"
   gem "pry-remote"
   gem "pry-stack_explorer"
   gem "rb-readline"
+  gem "rubocop"
   gem "winrm-fs"
   gem "winrm-elevated"
   gem "cucumber"
   gem "stove"
 end
@@ -117,17 +124,18 @@
 # Everything except AIX
 group(:ruby_prof) do
   gem "ruby-prof"
 end
 
-# Everything except Windows
+# Everything except AIX and Windows
 group(:ruby_shadow) do
   gem "ruby-shadow", platform: :ruby
 end
 
 gem "chefstyle", group: :test
 
-# Ensure support for push-client on Windows
+# TODO delete this when we figure out how to include the pushy windows dependencies
+# correctly
 platforms :mswin, :mingw do
   gem "rdp-ruby-wmi"
   gem "windows-pr"
   gem "win32-api"
   gem "win32-dir"