chef 12.22.5 → 13.0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39f071c176f5d19dbb3ec0b84d10a1a33590517
-  data.tar.gz: 64246792c9c4185575591cc81d5abe33c88f7ed8
+  metadata.gz: f46e5f55a88b5f7ba62cfdb9c64a35da20dc47bd
+  data.tar.gz: f28379e3d74c563280dfe35a1b976594fcec9032
 SHA512:
-  metadata.gz: 5a448138e876becb85a8fb69112bdac4d4b149fa77c1b3b65495db9695edcead9268a0aeb07757ff6a9485b6c20fd08a19d81be06443b69aee24f19873b92603
-  data.tar.gz: 1820cfd7b9bfb09d181dfecfc0ef7f934e9cf4ff1c834905f9c7c2cf55e47ec6fcfdf0fb718ce348bbe70a345ae0694ab96472f33932da4d2b6d74f264b52ff3
+  metadata.gz: 8cbd3e9985046633e62cde3cc2dc1e8c4d303a70935274c7060b2fff85930e4f9e9ec27557e44cf9eab692593a77d616b347dc02f74dacf83faa7504eaa92e4c
+  data.tar.gz: 62109447668258c3cf9dd54373b9a6c8f7f1d8768b4190dd6af793500853ecd60df5fded81f7e544d58eb3ef67d3d70cf78570159efce006dce2bd480feb0ef3

data/Gemfile

@@ -11,15 +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__))
 gem "rake"
 gem "bundler"
-gem "cheffish" # required for rspec tests
+gem "cheffish", "~> 13" # required for rspec tests
 
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "nokogiri", "~> 1.7.2"
+  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
@@ -31,12 +35,11 @@ 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
@@ -74,10 +77,10 @@ group(:development, :test) do
 
   # for testing new chefstyle rules
   # gem 'chefstyle', github: 'chef/chefstyle'
-  gem "chefstyle", "= 0.5.0"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 
-group(:changelog) do
+group(:ci) do
   gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
   gem "mixlib-install"
 end

data/README.md

@@ -3,6 +3,7 @@
 [![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)
 
@@ -38,7 +39,7 @@ Install these via your platform's preferred method (`apt`, `yum`, `ports`,
 * git
 * C compiler, header files, etc. On Ubuntu/Debian, use the
   `build-essential` package.
-* ruby 2.2.2 or later
+* ruby 2.3.0 or later
 * rubygems
 * bundler gem
 
@@ -291,7 +292,7 @@ Chef - A configuration management system
 |                      |                                          |
 |:---------------------|:-----------------------------------------|
 | **Author:**          | Adam Jacob (<adam@chef.io>)
-| **Copyright:**       | Copyright 2008-2017, Chef Software, Inc.
+| **Copyright:**       | Copyright 2008-2016, Chef Software, Inc.
 | **License:**         | Apache License, Version 2.0
 
 ```

data/Rakefile

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -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.22.5
+13.0.113

data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml

@@ -19,7 +19,6 @@ driver:
   subnet_id: subnet-19ac017c
   security_group_ids: ["sg-e401eb83", "sg-96274af3"]
   instance_type: m3.large
-  retryable_tries: 120
 #  associate_public_ip: true  # Don't enable public IP, as subnet specified is behind VPN
 
 # busser installation relies on this

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,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "rake" # required to build some native extensions
-gem "chef-acceptance", github: "chef/chef-acceptance"
+gem "chef-acceptance", git: "https://github.com/chef/chef-acceptance.git"
 gem "kitchen-ec2"
 gem "inspec"
 gem "kitchen-vagrant"
@@ -14,3 +14,6 @@ gem "berkshelf"
 # 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,18 +9,18 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.6.0)
-    aws-sdk (2.7.5)
-      aws-sdk-resources (= 2.7.5)
-    aws-sdk-core (2.7.5)
+    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.7.5)
-      aws-sdk-core (= 2.7.5)
+    aws-sdk-resources (2.9.1)
+      aws-sdk-core (= 2.9.1)
     aws-sigv4 (1.0.0)
-    berkshelf (5.6.2)
+    berkshelf (5.6.4)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -40,6 +40,7 @@ GEM
       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)
@@ -54,7 +55,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.18.31)
+    chef-config (12.19.36)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -69,34 +70,36 @@ GEM
     excon (0.55.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.17)
+    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.5.1)
+    hashie (3.5.5)
     hitimes (1.2.4)
     httpclient (2.8.3)
-    inspec (1.14.1)
+    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.3)
-    kitchen-ec2 (1.2.0)
+    kitchen-ec2 (1.3.2)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -106,13 +109,14 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.0.0)
+    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)
+    mini_portile2 (2.1.0)
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
@@ -126,19 +130,23 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.6)
+    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 (4.0.1)
+    net-ssh (4.1.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     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)
@@ -181,9 +189,6 @@ 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.1)
     safe_yaml (1.0.4)
@@ -195,19 +200,21 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    sslshake (1.0.13)
-    test-kitchen (1.15.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, < 5.0)
       net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
-      thor (~> 0.18)
+      thor (~> 0.19, < 0.19.2)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.22.1)
+    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)
@@ -220,7 +227,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.1.2)
+    winrm (2.1.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -244,6 +251,7 @@ PLATFORMS
 DEPENDENCIES
   berkshelf
   chef-acceptance!
+  chef-config (< 13.0)
   inspec
   kitchen-ec2
   kitchen-inspec
@@ -255,4 +263,4 @@ DEPENDENCIES
   winrm-elevated
 
 BUNDLED WITH
-   1.12.5
+   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'