chef 12.18.31 → 13.0.118

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cec435e89dd405c5c2a14ae8e84a51167916cb0
-  data.tar.gz: 53971689e1e64f8805d3e09ea17bbbd40fed1b22
+  metadata.gz: ddba5afb089e75c4ca2a2d6bce050e4cef8a910d
+  data.tar.gz: 24ab29a58a459c736e15e3eaebffc8410c4c92fd
 SHA512:
-  metadata.gz: 877bb49bf2010f03d374bb24d9bec13e5cce3bad2cb8b5f98185c58485feb55c45073faad9dd8dde94c8c7f3c02165e87242eb98bf405659d3cfceb2a272b3bb
-  data.tar.gz: 5ff1e83cfd0c48cb9ad82de2d3a50aff2f2099e3d03189a27c01bc7346c6f3534b34fbce80ab7946a60b2cc01d49d8f8b408dc9cd923b654c7eeacd5e81eadbf
+  metadata.gz: 9751eb0cad1c134714737255549dac14d34b25b6aab93ae910434799349acfaca34fc6bc35b2c553604cf6d8df33d7e1be09a84560c950b5c0de73f1f9886cd0
+  data.tar.gz: 6fc2566b23eb23c6d50c00fe8b8c619a5b39e291b3b4a6769ea36e44cd18f00ecf967bdff2c84bba3d0b9159735c9576b585d155e444013b59b40a9ea3450a38

data/Gemfile

@@ -11,16 +11,19 @@ source "https://rubygems.org"
 # of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
 gem "chef", path: "."
 
+gem "ohai", "~> 13"
+
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
-# Ensure that we can always install rake, regardless of gem groups
-gem "rake", group: [ :default, :omnibus_package, :development ]
+gem "rake"
 gem "bundler"
-gem "cheffish"
+gem "cheffish", "~> 13" # required for rspec tests
 
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "nokogiri"
+  gem "inspec"
+  # nokogiri has no ruby-2.4 version for windows so it cannot go into our Gemfile.lock
+  #  gem "nokogiri", ">= 1.7.1"
 end
 
 group(:omnibus_package, :pry) do
@@ -29,14 +32,14 @@ group(:omnibus_package, :pry) do
   gem "pry-remote"
   gem "pry-stack_explorer"
 end
+
 # These are used for external tests
 group(:integration) do
-  gem "chef-provisioning"
   gem "chef-sugar"
   gem "chefspec"
-  gem "halite"
-  gem "poise"
-  gem "poise-boiler"
+  gem "halite", git: "https://github.com/poise/halite.git"
+  gem "poise", git: "https://github.com/poise/poise.git"
+  gem "poise-boiler", git: "https://github.com/poise/poise-boiler.git"
   gem "knife-windows"
   gem "foodcritic"
 
@@ -50,7 +53,7 @@ group(:docgen) do
   gem "yard"
 end
 
-group(:maintenance) do
+group(:maintenance, :ci) do
   gem "tomlrb"
 
   # To sync maintainers with github
@@ -63,6 +66,7 @@ group(:linux, :bsd, :mac_os_x, :solaris, :windows) do
   # may need to disable this in insolation on fussy builds like AIX, RHEL4, etc
   gem "ruby-prof"
 end
+
 # Everything except AIX and Windows
 group(:linux, :bsd, :mac_os_x, :solaris) do
   gem "ruby-shadow", platforms: :ruby
@@ -76,8 +80,8 @@ group(:development, :test) do
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 
-group(:changelog) do
-  gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping"
+group(:ci) do
+  gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
   gem "mixlib-install"
 end
 

data/README.md

@@ -3,14 +3,15 @@
 [![Build Status Master](https://travis-ci.org/chef/chef.svg?branch=master)](https://travis-ci.org/chef/chef)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef/branch/master)
 [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)
+[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)
 
 Want to try Chef? Get started with [learnchef](https://learn.chef.io)
 
-* Documentation: [https://docs.chef.io](https://docs.chef.io)
-* Source: [https://github.com/chef/chef/tree/master](https://github.com/chef/chef/tree/master)
-* Tickets/Issues: [https://github.com/chef/chef/issues](https://github.com/chef/chef/issues)
-* Slack: [Chef Community Slack](https://community-slack.chef.io/)
-* Mailing list: [https://discourse.chef.io](https://discourse.chef.io)
+- Documentation: <https://docs.chef.io>
+- Source: <https://github.com/chef/chef/tree/master>
+- Tickets/Issues: <https://github.com/chef/chef/issues>
+- Slack: [Chef Community Slack](https://community-slack.chef.io/)
+- Mailing list: <https://discourse.chef.io>
 
 Chef is a configuration management tool designed to bring automation to your
 entire infrastructure.
@@ -18,10 +19,10 @@ entire infrastructure.
 This README focuses on developers who want to modify Chef source code.
 If you just want to use Chef, check out these resources:
 
-* [learnchef](https://learn.chef.io): Getting started guide
-* [docs.chef.io](https://docs.chef.io): Comprehensive User Docs
-* [Installer Downloads](https://downloads.chef.io/chef/): Install Chef as a complete package
-* [chef/chef](https://hub.docker.com/r/chef/chef): Docker image for use with [kitchen-dokken](https://github.com/someara/kitchen-dokken)
+- [learnchef](https://learn.chef.io): Getting started guide
+- [docs.chef.io](https://docs.chef.io): Comprehensive User Docs
+- [Installer Downloads](https://downloads.chef.io/chef/): Install Chef as a complete package
+- [chef/chef](https://hub.docker.com/r/chef/chef): Docker image for use with [kitchen-dokken](https://github.com/someara/kitchen-dokken)
 
 ## Installing From Git
 
@@ -74,8 +75,7 @@ The general development process is:
 1. Fork this repo and clone it to your workstation.
 2. Create a feature branch for your change.
 3. Write code and tests.
-4. Push your feature branch to github and open a pull request against
-   master.
+4. Push your feature branch to github and open a pull request against master.
 
 Once your repository is set up, you can start working on the code. We do utilize
 RSpec for test driven development, so you'll need to get a development
@@ -92,7 +92,7 @@ Note that this repository is primarily for reporting chef-client issues.
 For reporting issues against other Chef projects, please look up the appropriate repository
 to report issues against in the Chef docs in the
 [community contributions section](https://docs.chef.io/community_contributions.html#issues-and-bug-reports).
-If you can't detemine the appropriate place to report an issue, then please open it
+If you can't determine the appropriate place to report an issue, then please open it
 against the repository you think best fits and it will be directed to the appropriate project.
 
 ## Testing
@@ -244,7 +244,7 @@ bundle install
 bundle exec omnibus build chef
 ```
 
-This causes the [chef project definition](omnibus/config/projects/chef.rb) to load, which runs the [chef-complete](omnibus/config/software/chef-complete.rb) software definition, the primary software definition driving the whole build process. The reason we embed it all in a software definiton instead of the project is to take advantage of omnibus caching: omnibus will invalidate the entire project (and recompile ruby, openssl, and everything else) if you change anything at all in the project file. Not so with a software definition.
+This causes the [chef project definition](omnibus/config/projects/chef.rb) to load, which runs the [chef-complete](omnibus/config/software/chef-complete.rb) software definition, the primary software definition driving the whole build process. The reason we embed it all in a software definition instead of the project is to take advantage of omnibus caching: omnibus will invalidate the entire project (and recompile ruby, openssl, and everything else) if you change anything at all in the project file. Not so with a software definition.
 
 ### Installing the Gems
 

data/Rakefile

@@ -29,30 +29,12 @@ require_relative "tasks/cbgb"
 require_relative "tasks/dependencies"
 require_relative "tasks/changelog"
 require_relative "tasks/announce"
+require_relative "tasks/version"
 
 ChefConfig::PackageTask.new(File.expand_path("..", __FILE__), "Chef", "chef") do |package|
   package.component_paths = ["chef-config"]
   package.generate_version_class = true
 end
-# Add conservative dependency update to version:bump (which was created by PackageTask)
-task "version:bump" => %w{version:bump_patch version:update}
-task "version:bump" => %w{version:bump_patch version:update}
-
-task "version:bump_minor" do
-  Rake::Task["changelog:archive"].invoke
-  maj, min, _build = Chef::VERSION.split(".")
-  File.open("VERSION", "w+") { |f| f.write("#{maj}.#{min.to_i + 1}.0") }
-  Rake::Task["version"].invoke
-  Rake::Task["bundle:install"].invoke
-end
-
-task "version:bump_major" do
-  Rake::Task["changelog:archive"].invoke
-  maj, _min, _build = Chef::VERSION.split(".")
-  File.open("VERSION", "w+") { |f| f.write("#{maj.to_i + 1}.0.0") }
-  Rake::Task["version"].invoke
-  Rake::Task["bundle:install"].invoke
-end
 
 task :pedant, :chef_zero_spec
 

data/VERSION

@@ -1 +1 @@
-12.18.31
+13.0.118

data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb

@@ -32,7 +32,7 @@ module KitchenAcceptance
     property :artifactory_username, String, default: lazy { ENV["ARTIFACTORY_USERNAME"] ? ENV["ARTIFACTORY_USERNAME"] : "" }
     property :artifactory_password, String, default: lazy { ENV["ARTIFACTORY_PASSWORD"] ? ENV["ARTIFACTORY_PASSWORD"] : "" }
     property :env, Hash, default: {}
-    property :kitchen_options, String, default: lazy { ENV["PROJECT_NAME"] ? "-c -l debug" : "-c" }
+    property :kitchen_options, String, default: "-c"
 
     action :run do
 

data/acceptance/Gemfile

@@ -1,16 +1,19 @@
 source "https://rubygems.org"
 
-gem "chef-acceptance", github: "chef/chef-acceptance"
+gem "rake" # required to build some native extensions
+gem "chef-acceptance", git: "https://github.com/chef/chef-acceptance.git"
 gem "kitchen-ec2"
 gem "inspec"
-# Pinning to github for kitchen-vagrant because 0.19.0 incorrectly
-# puts in a box_url for bento when a vagrant box in atlas is specified
 gem "kitchen-vagrant"
 gem "windows_chef_zero"
 gem "kitchen-inspec"
 gem "test-kitchen"
 gem "winrm-elevated"
-gem "berkshelf", "4.3.5"
+gem "berkshelf"
 
-# until 2.0.0 is fixed for unstable packages
+# Pin to 1.2.3 because current mixlib-install has a problem where unstable
+# packages are not always immediately available via the omnitruck API.
 gem "mixlib-install", "1.2.3"
+
+# for chef-13 development - pin to the released rubygems version
+gem "chef-config", "< 13.0"

data/acceptance/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
-  remote: git://github.com/chef/chef-acceptance.git
-  revision: e92ddae46d2126864698b9c8e4fc4ec2dcc46c55
+  remote: https://github.com/chef/chef-acceptance.git
+  revision: 3877c344098021ac66134e8edb5eb805d14d4643
   specs:
     chef-acceptance (0.2.0)
       mixlib-shellout (~> 2.0)
@@ -9,95 +9,97 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.5.1)
-    aws-sdk (2.6.44)
-      aws-sdk-resources (= 2.6.44)
-    aws-sdk-core (2.6.44)
+    artifactory (2.8.1)
+    aws-sdk (2.9.1)
+      aws-sdk-resources (= 2.9.1)
+    aws-sdk-core (2.9.1)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.44)
-      aws-sdk-core (= 2.6.44)
+    aws-sdk-resources (2.9.1)
+      aws-sdk-core (= 2.9.1)
     aws-sigv4 (1.0.0)
-    berkshelf (4.3.5)
+    berkshelf (5.6.4)
       addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (~> 2.0, >= 2.0.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-shell_out (~> 0.1)
-      celluloid (= 0.16.0)
-      celluloid-io (~> 0.16.1)
+      berkshelf-api-client (>= 2.0.2, < 4.0)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
+      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
-      mixlib-archive (~> 0.1)
+      mixlib-archive (~> 0.4)
       octokit (~> 4.0)
       retryable (~> 2.0)
-      ridley (~> 4.5)
-      solve (~> 2.0)
-      thor (~> 0.19)
-    berkshelf-api-client (2.0.2)
-      faraday (~> 0.9.1)
-      httpclient (~> 2.7.0)
-      ridley (~> 4.5)
-    buff-config (1.0.1)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.2.0)
-      buff-ruby_engine (~> 0.1.0)
-    builder (3.2.2)
+      ridley (~> 5.0)
+      solve (> 2.0, < 4.0)
+      thor (~> 0.19, < 0.19.2)
+    berkshelf-api-client (3.0.0)
+      faraday (~> 0.9)
+      httpclient (~> 2.7)
+      ridley (>= 4.5, < 6.0)
+    blankslate (2.1.2.4)
+    buff-config (2.0.0)
+      buff-extensions (~> 2.0)
+      varia_model (~> 0.6)
+    buff-extensions (2.0.0)
+    buff-ignore (1.2.0)
+    buff-ruby_engine (1.0.0)
+    buff-shell_out (1.1.0)
+      buff-ruby_engine (~> 1.0)
+    builder (3.2.3)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.17.44)
+    chef-config (12.19.36)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    diff-lcs (1.2.5)
-    docker-api (1.33.1)
+    diff-lcs (1.3)
+    docker-api (1.33.2)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.54.0)
+    excon (0.55.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.14)
+    ffi (1.9.18)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.4.6)
+    hashie (3.5.5)
     hitimes (1.2.4)
-    httpclient (2.7.2)
-    inspec (1.8.0)
+    httpclient (2.8.3)
+    inspec (1.18.0)
+      addressable (~> 2.5)
+      faraday (>= 0.9.0)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
+      nokogiri (~> 1.6)
       parallel (~> 1.9)
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
-      rspec_junit_formatter (~> 0.2.3)
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
+      toml (~> 0.1)
       train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
-    json (2.0.2)
-    kitchen-ec2 (1.2.0)
+    json (2.0.3)
+    kitchen-ec2 (1.3.2)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -107,15 +109,16 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (0.21.1)
+    kitchen-vagrant (1.0.2)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
-    logging (2.1.0)
+    logging (2.2.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
-    minitar (0.5.4)
-    mixlib-archive (0.2.0)
+    mini_portile2 (2.1.0)
+    minitar (0.6.1)
+    mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
@@ -127,32 +130,37 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.4.5)
+    molinillo (0.5.7)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
-    net-ssh-gateway (1.2.0)
+    net-ssh (4.1.0)
+    net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    nio4r (1.2.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
     nori (2.6.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.10.0)
+    parallel (1.11.1)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
     rainbow (2.2.1)
+    rake (12.0.0)
     retryable (2.0.4)
-    ridley (4.6.1)
+    ridley (5.1.0)
       addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1.1)
-      buff-shell_out (~> 0.1)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
+      buff-ignore (~> 1.2)
+      buff-shell_out (~> 1.0)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
@@ -163,8 +171,8 @@ GEM
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       retryable (~> 2.0)
-      semverse (~> 1.1)
-      varia_model (~> 0.4.0)
+      semverse (~> 2.0)
+      varia_model (~> 0.6)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -181,46 +189,45 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
     rubyntlm (0.6.1)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    semverse (1.2.1)
+    semverse (2.0.0)
     slop (3.6.0)
-    solve (2.0.3)
-      molinillo (~> 0.4.2)
-      semverse (~> 1.1)
-    sslshake (1.0.13)
-    test-kitchen (1.14.2)
+    solve (3.1.0)
+      molinillo (>= 0.5)
+      semverse (>= 1.1, < 3.0)
+    sslshake (1.1.0)
+    test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-gateway (~> 1.2.0)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
-      thor (~> 0.18)
-    thor (0.19.4)
+      thor (~> 0.19, < 0.19.2)
+    thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.22.0)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    train (0.23.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
       net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
+      net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    varia_model (0.4.1)
-      buff-extensions (~> 1.0)
+    varia_model (0.6.0)
+      buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.1.1)
+    winrm (2.1.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -242,16 +249,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf (= 4.3.5)
+  berkshelf
   chef-acceptance!
+  chef-config (< 13.0)
   inspec
   kitchen-ec2
   kitchen-inspec
   kitchen-vagrant
   mixlib-install (= 1.2.3)
+  rake
   test-kitchen
   windows_chef_zero
   winrm-elevated
 
 BUNDLED WITH
-   1.13.6
+   1.14.6

data/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb

@@ -2,7 +2,7 @@
 require "spec_helper"
 
 gem_path = "/opt/chef/embedded/bin/gem"
-white_list = %w{chef-config json rake}
+white_list = %w{addressable chef-config json rake}
 
 describe "gem list" do
   it "should not have non-whitelisted duplicate gems" do

data/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb

@@ -1,7 +1,7 @@
 name 'data-collector-test'
 maintainer 'Adam Leff'
 maintainer_email 'adamleff@chef.io'
-license 'Apache 2.0'
+license 'Apache-2.0'
 description 'Installs/Configures data-collector-test'
 long_description 'Installs/Configures data-collector-test'
 version '0.1.0'

data/acceptance/data-collector/test/integration/default/serverspec/default_spec.rb

@@ -108,6 +108,8 @@ shared_examples_for "run_converge.success payload check" do
         node
         node_name
         organization_name
+        policy_name
+        policy_group
         resources
         run_id
         run_list
@@ -145,6 +147,8 @@ shared_examples_for "run_converge.failure payload check" do
         node
         node_name
         organization_name
+        policy_name
+        policy_group
         resources
         run_id
         run_list

data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb

@@ -12,15 +12,16 @@ class TopCookbooks < Chef::Resource
     cookbook_kitchen "#{command} git" do
     end
 
-    cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
-      repository "learn-chef/learn-chef-acceptance"
-      cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu"
-    end
+    # FIXME: waiting for https://github.com/learn-chef/learn-chef-acceptance/pull/23
+    # cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
+    #   repository "learn-chef/learn-chef-acceptance"
+    #   cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu"
+    # end
 
-    cookbook_kitchen "#{command} learn-the-basics-windows" do
-      repository "learn-chef/learn-chef-acceptance"
-      cookbook_relative_dir "cookbooks/learn-the-basics-windows"
-    end
+    # cookbook_kitchen "#{command} learn-the-basics-windows" do
+    #   repository "learn-chef/learn-chef-acceptance"
+    #   cookbook_relative_dir "cookbooks/learn-the-basics-windows"
+    # end
 
     cookbook_kitchen "#{command} powershell" do
     end

data/chef-universal-mingw32.gemspec

@@ -6,9 +6,8 @@ gemspec.add_dependency "ffi", "~> 1.9"
 gemspec.add_dependency "win32-api", "~> 1.5.3"
 gemspec.add_dependency "win32-dir", "~> 0.5.0"
 gemspec.add_dependency "win32-event", "~> 0.6.1"
-# Hard pin on win32-eventlog until djberg96/win32-eventlog#20 is resolved.
-# win32-eventlog was stomping over the CreateEvent FFI bindings that
-# win32-service needed, causing the chef service to not run.
+# TODO: Relax this pin and make the necessary updaets. The issue originally
+# leading to this pin has been fixed in 0.6.5.
 gemspec.add_dependency "win32-eventlog", "0.6.3"
 gemspec.add_dependency "win32-mmap", "~> 0.4.1"
 gemspec.add_dependency "win32-mutex", "~> 0.4.2"

data/chef.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.license = "Apache-2.0"
   s.author = "Adam Jacob"
   s.email = "adam@chef.io"
-  s.homepage = "http://www.chef.io"
+  s.homepage = "https://www.chef.io"
 
-  s.required_ruby_version = ">= 2.2.0"
+  s.required_ruby_version = ">= 2.3.0"
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
 
@@ -21,22 +21,23 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-log", "~> 1.3"
   s.add_dependency "mixlib-authentication", "~> 1.4"
   s.add_dependency "mixlib-shellout", "~> 2.0"
-  s.add_dependency "mixlib-archive", ">= 0.2.0"
-  s.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 9"
+  s.add_dependency "mixlib-archive", "~> 0.4"
+  s.add_dependency "ohai", "~> 13.0"
 
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "net-ssh", ">= 2.9", "< 4.0"
-  s.add_dependency "net-ssh-multi", "~> 1.1"
+  s.add_dependency "net-ssh", ">= 2.9", "< 5.0"
+  s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
   s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
   s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
 
-  s.add_dependency "chef-zero", ">= 4.8"
+  s.add_dependency "chef-zero", ">= 13.0"
 
   s.add_dependency "plist", "~> 3.2"
   s.add_dependency "iniparse", "~> 1.4"
   s.add_dependency "addressable"
+  s.add_dependency "iso8601", "~> 0.9.1"
 
   # Audit mode requires these, so they are non-developmental dependencies now
   %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" }