chef 12.17.44-universal-mingw32 → 12.18.31-universal-mingw32

data/spec/unit/runner_spec.rb

@@ -101,6 +101,7 @@ describe Chef::Runner do
   context "when we fall through to old Chef::Platform resolution" do
     let(:provider_resolver) { Chef::ProviderResolver.new(node, first_resource, nil) }
     before do
+      Chef::Config[:treat_deprecation_warnings_as_errors] = false
       # set up old Chef::Platform resolution instead of provider_resolver
       Chef::Platform.set(
         :resource => :cat,

data/tasks/bin/bundle-platform

@@ -6,7 +6,7 @@ platforms = platforms.split(" ").map { |p| Gem::Platform.new(p) }
 Gem::Platform.instance_eval { @local = platforms.last }
 old_platforms = Gem.platforms
 Gem.platforms = platforms
-puts "bundle-platform set Gem.platforms to #{Gem.platforms.map { |p| p.to_s }} (was #{old_platforms.map { |p| p.to_s } })"
+puts "bundle-platform set Gem.platforms to #{Gem.platforms.map { |p| p.to_s }} (was #{old_platforms.map { |p| p.to_s }})"
 
 desired_version = ARGV.shift.delete("_")
 

data/tasks/gemfile_util.rb

@@ -255,8 +255,8 @@ module GemfileUtil
       result = {}
       gems.each do |name, g|
         dep_groups = g[:declared_groups] - [ :only_a_runtime_dependency_of_other_gems ]
-        dep_groups = dep_groups & groups if groups
-        dep_groups = dep_groups - without_groups if without_groups
+        dep_groups &= groups if groups
+        dep_groups -= without_groups if without_groups
         if dep_groups.any?
           result[name] ||= g
           g[:dependencies].each do |dep|

data/tasks/templates/prerelease.md.erb

@@ -9,7 +9,7 @@ We have selected <%= @version %> as our Chef v<%= @maj_minor %> release candidat
 Please see the [CHANGELOG](https://github.com/chef/chef/blob/master/CHANGELOG.md) for the complete list of changes.
 
 # Get the Build
-As always, you can download binaries directly from [downloads.chef.io](https://downloads.chef.io/chef-client) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
+As always, you can download binaries directly from [downloads.chef.io](https://downloads.chef.io/chef/current/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
 
 ```shell
 $ mixlib-install download chef -v <%= @version %> -c current
@@ -24,12 +24,3 @@ $ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef -v <%= @ve
 # In Windows Powershell
 . { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version <%= @version %> -channel current
 ```
-
-If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
-
-```yaml
-provisioner:
-  product_name: chef
-  channel: current
-  product_version: <%= @version %>
-```

data/tasks/templates/release.md.erb

@@ -9,7 +9,7 @@ We're happy to announce the release of Chef v<%= @maj_minor %>!
 Please see the [CHANGELOG](https://github.com/chef/chef/blob/master/CHANGELOG.md) for the complete list of changes.
 
 # Get the Build
-As always, you can download binaries directly from [downloads.chef.io](https://downloads.chef.io/chef-client) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
+As always, you can download binaries directly from [downloads.chef.io](https://downloads.chef.io/chef/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
 
 ```shell
 $ mixlib-install download chef -v <%= @version %>
@@ -24,11 +24,3 @@ $ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef -v <%= @ve
 # In Windows Powershell
 . { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version <%= @version %>
 ```
-
-If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
-
-```yaml
-provisioner:
-  product_name: chef
-  product_version: <%= @version %>
-```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.17.44
+  version: 12.18.31
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.17.44
+        version: 12.18.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.17.44
+        version: 12.18.31
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -1353,7 +1353,6 @@ files:
 - lib/chef/null_logger.rb
 - lib/chef/org.rb
 - lib/chef/platform.rb
-- lib/chef/platform/handler_map.rb
 - lib/chef/platform/priority_map.rb
 - lib/chef/platform/provider_handler_map.rb
 - lib/chef/platform/provider_mapping.rb
@@ -1425,6 +1424,10 @@ files:
 - lib/chef/provider/package/apt.rb
 - lib/chef/provider/package/cab.rb
 - lib/chef/provider/package/chocolatey.rb
+- lib/chef/provider/package/dnf.rb
+- lib/chef/provider/package/dnf/dnf_helper.py
+- lib/chef/provider/package/dnf/python_helper.rb
+- lib/chef/provider/package/dnf/version.rb
 - lib/chef/provider/package/dpkg.rb
 - lib/chef/provider/package/easy_install.rb
 - lib/chef/provider/package/freebsd/base.rb
@@ -1530,6 +1533,7 @@ files:
 - lib/chef/resource/deploy.rb
 - lib/chef/resource/deploy_revision.rb
 - lib/chef/resource/directory.rb
+- lib/chef/resource/dnf_package.rb
 - lib/chef/resource/dpkg_package.rb
 - lib/chef/resource/dsc_resource.rb
 - lib/chef/resource/dsc_script.rb
@@ -2025,6 +2029,19 @@ files:
 - spec/functional/assets/mytest-1.0-1.noarch.rpm
 - spec/functional/assets/mytest-2.0-1.noarch.rpm
 - spec/functional/assets/testchefsubsys
+- spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.i686.rpm
+- spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.src.rpm
+- spec/functional/assets/yumrepo/chef_rpm-1.10-1.fc24.x86_64.rpm
+- spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.i686.rpm
+- spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.src.rpm
+- spec/functional/assets/yumrepo/chef_rpm-1.2-1.fc24.x86_64.rpm
+- spec/functional/assets/yumrepo/repodata/313329137b55fd333b2dc66394a6661a2befa6cc535d8460d92a4a78a9c581f0-primary.sqlite.bz2
+- spec/functional/assets/yumrepo/repodata/31ac4db5d5ac593728fcc26aef82b7b93c4cc4dbec843786b1845b939b658553-other.xml.gz
+- spec/functional/assets/yumrepo/repodata/4ac40fa3c6728c1401318e2e20a997436624e83dcf7a5f952b851ef422637773-filelists.sqlite.bz2
+- spec/functional/assets/yumrepo/repodata/66391e53f0510b98b3f0b79f40ba1048026d9a1ef20905d9c40ba6f5411f3243-primary.xml.gz
+- spec/functional/assets/yumrepo/repodata/8b34697595fcc87928e12d24644dda9462c3857bd932861e28bc77ae1f31be16-filelists.xml.gz
+- spec/functional/assets/yumrepo/repodata/b97cca3fe14bcf06c52be4449b6108f7731239ff221111dcce8aada5467f60dc-other.sqlite.bz2
+- spec/functional/assets/yumrepo/repodata/repomd.xml
 - spec/functional/audit/rspec_formatter_spec.rb
 - spec/functional/audit/runner_spec.rb
 - spec/functional/dsl/reboot_pending_spec.rb
@@ -2055,6 +2072,7 @@ files:
 - spec/functional/resource/cron_spec.rb
 - spec/functional/resource/deploy_revision_spec.rb
 - spec/functional/resource/directory_spec.rb
+- spec/functional/resource/dnf_package_spec.rb
 - spec/functional/resource/dpkg_package_spec.rb
 - spec/functional/resource/dsc_resource_spec.rb
 - spec/functional/resource/dsc_script_spec.rb
@@ -2620,6 +2638,7 @@ files:
 - spec/unit/resource/deploy_revision_spec.rb
 - spec/unit/resource/deploy_spec.rb
 - spec/unit/resource/directory_spec.rb
+- spec/unit/resource/dnf_package_spec.rb
 - spec/unit/resource/dpkg_package_spec.rb
 - spec/unit/resource/dsc_resource_spec.rb
 - spec/unit/resource/dsc_script_spec.rb

data/lib/chef/platform/handler_map.rb

@@ -1,40 +0,0 @@
-#
-# Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2015-2016, 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/node_map"
-
-class Chef
-  class Platform
-    class HandlerMap < Chef::NodeMap
-      #
-      # "provides" lines with identical filters sort by class name (ascending).
-      #
-      def compare_matchers(key, new_matcher, matcher)
-        cmp = super
-        if cmp == 0
-          # Sort by class name (ascending) as well, if all other properties
-          # are exactly equal
-          if new_matcher[:value].is_a?(Class) && !new_matcher[:override]
-            cmp = compare_matcher_properties(new_matcher, matcher) { |m| m[:value].name }
-          end
-        end
-        cmp
-      end
-    end
-  end
-end