chef 13.8.3 → 13.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2019051c855875e303e9364fee1d00cc943d005
-  data.tar.gz: 65bb85db4544ae8da657c2a9b9c735d9e5579f5c
+  metadata.gz: 602145c02a746434f048e21221ad0931512ddde7
+  data.tar.gz: aa4effeeff6eab00e050fed1b27cff2200f28685
 SHA512:
-  metadata.gz: d7109bd2e5de772a7ff0718e8b633af048fc43529c4a03cdd93330730966387265e780d624886143e1b2b4e0e3ef66ad67de3ffffb81f0ddaa14908ce068ded1
-  data.tar.gz: 81af8481dac237e3afc79457c0bacd933a3122ecdc823e218c3cca52af99b4b8188f496b43c224e7be36609a71a6a9c64819ffc3aaaf0d25f7e1ee36b5d4c1c9
+  metadata.gz: e4cf4894e931a5771c233493c49ddcf00acfa5bb07783f050ddc485ecf27624a63838dcd882655118ceeff2f5046873d0f11b7bd1bf6702813a67722959b3866
+  data.tar.gz: 75cf9c3c5cbfccdd6866e96375ec3f700831762f7c792db600749ec2bad570066fd0d67eb6a5af38a8b7d0a6501a7b899c391373b6e15ed27ccb8b1944f0b1df

data/Gemfile

@@ -12,6 +12,8 @@ gem "ohai", "~> 13"
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
 gem "cheffish", "~> 13" # required for rspec tests
 
+# FFI crashes on EL6/7 on 1.9.22 and newer
+gem "ffi", "= 1.9.21"
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"

data/VERSION

@@ -1 +1 @@
-13.8.3
+13.8.5

data/lib/chef/knife/cookbook_site_download.rb

@@ -47,7 +47,12 @@ class Chef
       def run
         if current_cookbook_deprecated?
           message = "DEPRECATION: This cookbook has been deprecated. "
-          message << "It has been replaced by #{replacement_cookbook}."
+          replacement = replacement_cookbook
+          if !replacement.to_s.strip.empty?
+            message << "It has been replaced by #{replacement}."
+          else
+            message << "No replacement has been defined."
+          end
           ui.warn message
 
           unless config[:force]
@@ -105,7 +110,7 @@ class Chef
       end
 
       def replacement_cookbook
-        File.basename(current_cookbook_data["replacement"])
+        File.basename(current_cookbook_data["replacement"] || "")
       end
 
       def specific_cookbook_version_url

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("13.8.3")
+  VERSION = Chef::VersionString.new("13.8.5")
 end
 
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 13.8.3
+  version: 13.8.5
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.8.3
+        version: 13.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.8.3
+        version: 13.8.5
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement