chef 13.10.0-universal-mingw32 → 13.10.4-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89c6a36f4f7dbeae1494ac2918ef036411e49400
-  data.tar.gz: 2b956f4ba5625c7f96481f3f492e99c27bade935
+  metadata.gz: 71b376cc98c42bfb134d99cdd659f2ed2baddde9
+  data.tar.gz: d474de3ea197e5eb40c6433bcf3e00c15312b0a6
 SHA512:
-  metadata.gz: 4e47eb7672fe3265a195925bcf173176d1ca9cccbd307e05e00ce2412d73c3e0dc95c79271c22701ebe6ac257f2317801575baf341c5b1425b4e632c15ba2c61
-  data.tar.gz: d129a23cf27e284959bc721f1bc544e50be54032a498e9a9fc8a7f472d0706a682c05ff90d342f46298e62aeb1646fb72790d7d842e19b68e783e1e9a03b1df8
+  metadata.gz: bdd8afee7966b66bebc36dc0b45ec731764f61ee1a45b9d56b70ab9e4c3c0405a5036a24d011d32943c32ee9a6e8b3284489c2df43fc88c4f5fbba8bf7204f4d
+  data.tar.gz: fa3a479a268b80986f1665e99995a901c599e11f4ed51b1188cc4953703c86b7276dde33f6b06ca4e45c5ccf07560fb8f8a191fdf962283c02d7c3e2f5ddf1c3

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: universal-mingw32
 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