chef 13.10.0 → 13.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755e33dfeebb4f7feb8c20fe62c5149cf80e379a
-  data.tar.gz: dd6572e44c36e13278ed9ea09fe43733a70de874
+  metadata.gz: 07f498ba61d7d87850edd566e87e5942aee2480c
+  data.tar.gz: 0faa34027b9c99b7ca406925b0da04b8d7fc4b6c
 SHA512:
-  metadata.gz: 6c88eaa977890d5d3e06a6ec083153827b894117fa37ef45cf29936c745fbf5e765da56970903bd39964c7004a705c71d20883f2c51282902142a68421e0bb86
-  data.tar.gz: dddf42b637ced664c9e9d48c578c49039b28f43e9a1cd7846e2fee4d158da838c42e7752701fe64e806f2ed31b3b5d35a1af261134b14355cf35b6544e0e152a
+  metadata.gz: 78d41a3824835af322fd9657639e49db6db2d41e0ed59add5a661af8ae498495b0c8b411f80d79e2447447a23d3d84aca8d66da75f442e4c160ce3bfae9977e6
+  data.tar.gz: 043a6e1077f34577914b6217454d07b8ed2bc82e65db65c84f59c1d1465baf866dc1e8cea6f5440ce6e073aadd675b52015c8cdfee7248ab48ee14ac8aa4cf3c

data/VERSION

@@ -1 +1 @@
-13.10.0
+13.10.4

data/chef.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   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" }
+  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5", "< 3.8" }
   s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
   s.add_dependency "serverspec", "~> 2.7"
   s.add_dependency "specinfra", "~> 2.10"

data/lib/chef/application/client.rb

@@ -529,14 +529,14 @@ class Chef::Application::Client < Chef::Application
 
   def fetch_recipe_tarball(url, path)
     Chef::Log.debug("Download recipes tarball from #{url} to #{path}")
-    if url =~ URI.regexp
+    if File.exist?(url)
+      FileUtils.cp(url, path)
+    elsif url =~ URI.regexp
       File.open(path, "wb") do |f|
         open(url) do |r|
           f.write(r.read)
         end
       end
-    elsif File.exist?(url)
-      FileUtils.cp(url, path)
     else
       Chef::Application.fatal! "You specified --recipe-url but the value is neither a valid URL nor a path to a file that exists on disk." +
         "Please confirm the location of the tarball and try again."

data/lib/chef/file_content_management/tempfile.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -68,7 +68,7 @@ class Chef
         # the leading "[.]chef-" here should be considered a public API and should not be changed
         basename.insert 0, "chef-"
         basename.insert 0, "." unless Chef::Platform.windows? # dotfile if we're not on windows
-        basename
+        basename.scrub
       end
 
       # this is similar to File.extname() but greedy about the extension (from the first dot, not the last dot)
@@ -76,7 +76,7 @@ class Chef
         # complexity here is due to supporting mangling non-UTF8 strings (e.g. latin-1 filenames with characters that are illegal in UTF-8)
         b = File.basename(@new_resource.path)
         i = b.index(".")
-        i.nil? ? "" : b[i..-1]
+        i.nil? ? "" : b[i..-1].scrub
       end
 
       # Returns the possible directories for the tempfile to be created in.

data/lib/chef/provider/package/windows.rb

@@ -39,6 +39,14 @@ class Chef
             a.assertion { new_resource.source || msi? }
             a.failure_message Chef::Exceptions::NoWindowsPackageSource, "Source for package #{new_resource.name} must be specified in the resource's source property for package to be installed because the package_name property is used to test for the package installation state for this package type."
           end
+
+          unless uri_scheme?(new_resource.source)
+            requirements.assert(:install) do |a|
+              a.assertion { ::File.exist?(new_resource.source) }
+              a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.name} does not exist"
+              a.whyrun "Assuming source file #{new_resource.source} would have been created."
+            end
+          end
         end
 
         # load_current_resource is run in Chef::Provider#run_action when not in whyrun_mode?

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.10.0")
+  VERSION = Chef::VersionString.new("13.10.4")
 end
 
 #

data/spec/unit/provider/package/windows_spec.rb

@@ -394,6 +394,25 @@ describe Chef::Provider::Package::Windows, :windows_only do
         end
       end
     end
+
+    context "a missing local file is given" do
+      let(:resource_source) { "C:/a_missing_file.exe" }
+      let(:installer_type) { nil }
+      before do
+        allow(::File).to receive(:exist?).with(provider.new_resource.source).and_return(false)
+        provider.load_current_resource
+      end
+
+      it "raises a Package error" do
+        expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+      end
+
+      it "why_run mode doesn't raise an error" do
+        Chef::Config[:why_run] = true
+        expect { provider.run_action(:install) }.not_to raise_error
+        Chef::Config[:why_run] = false
+      end
+    end
   end
 
   shared_context "valid checksum" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 13.10.0
+  version: 13.10.4
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-08-08 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.10.0
+        version: 13.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.10.0
+        version: 13.10.4
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +313,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -320,6 +323,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -327,6 +333,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -334,6 +343,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -341,6 +353,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -348,6 +363,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement