chef 13.9.4 → 13.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a0a3b0e99d63bab3ec6bb3bca48a6429c698aa4
-  data.tar.gz: b3b7f067508a950eee10f5567929f875c94b6563
+  metadata.gz: 755e33dfeebb4f7feb8c20fe62c5149cf80e379a
+  data.tar.gz: dd6572e44c36e13278ed9ea09fe43733a70de874
 SHA512:
-  metadata.gz: 62bd331eb4c8faf34229dbf79f6615ccd5e157bb42e699d65081a2b3988b17000e9c802e96ef7b38516d329bd929cd371f13fc02481c91205150a7312ef418e2
-  data.tar.gz: 50b3e0b6bbd81489ee62c2b6d758eb5860883b5ecf5a772183cd5dc4ef008f2ec0cff009e982c84ee414178e8f28c65731a578505a5cf6b7d78dc0277959a98d
+  metadata.gz: 6c88eaa977890d5d3e06a6ec083153827b894117fa37ef45cf29936c745fbf5e765da56970903bd39964c7004a705c71d20883f2c51282902142a68421e0bb86
+  data.tar.gz: dddf42b637ced664c9e9d48c578c49039b28f43e9a1cd7846e2fee4d158da838c42e7752701fe64e806f2ed31b3b5d35a1af261134b14355cf35b6544e0e152a

data/VERSION

@@ -1 +1 @@
-13.9.4
+13.10.0

data/chef-universal-mingw32.gemspec

@@ -12,7 +12,7 @@ gemspec.add_dependency "win32-eventlog", "0.6.3"
 gemspec.add_dependency "win32-mmap", "~> 0.4.1"
 gemspec.add_dependency "win32-mutex", "~> 0.4.2"
 gemspec.add_dependency "win32-process", "~> 0.8.2"
-gemspec.add_dependency "win32-service", "~> 0.8.7"
+gemspec.add_dependency "win32-service", "~> 1.0"
 gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.extensions << "ext/win32-eventlog/Rakefile"

data/lib/chef/application.rb

@@ -177,7 +177,7 @@ class Chef
     # Based on config and whether or not STDOUT is a tty, should we setup a
     # secondary logger for stdout?
     def want_additional_logger?
-      !( Chef::Config[:log_location].is_a?(IO) && Chef::Config[:log_location].tty? ) && !Chef::Config[:daemonize]
+      Chef::Config.is_default?(:log_location) && Chef::Config[:log_location].tty? && !Chef::Config[:daemonize]
     end
 
     def configure_stdout_logger

data/lib/chef/application/client.rb

@@ -28,6 +28,7 @@ require "chef/workstation_config_loader"
 require "chef/mixin/shell_out"
 require "chef-config/mixin/dot_d"
 require "mixlib/archive"
+require "uri"
 
 class Chef::Application::Client < Chef::Application
   include Chef::Mixin::ShellOut
@@ -528,10 +529,17 @@ class Chef::Application::Client < Chef::Application
 
   def fetch_recipe_tarball(url, path)
     Chef::Log.debug("Download recipes tarball from #{url} to #{path}")
-    File.open(path, "wb") do |f|
-      open(url) do |r|
-        f.write(r.read)
+    if 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."
     end
   end
 end

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

data/spec/integration/client/client_spec.rb

@@ -553,6 +553,12 @@ EOM
       result = shell_out("#{chef_client} --recipe-url=http://localhost:9000/recipes.tgz", :cwd => tmp_dir)
       expect(result.exitstatus).not_to eq(0)
     end
+
+    it "should fail when passed --recipe-url with a file that doesn't exist" do
+      broken_path = File.join(CHEF_SPEC_DATA, "recipes_dont_exist.tgz")
+      result = shell_out("#{chef_client} --recipe-url=#{broken_path}", :cwd => tmp_dir)
+      expect(result.exitstatus).not_to eq(0)
+    end
   end
 
   when_the_repository "has a cookbook with broken metadata.rb, but has metadata.json" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 13.9.4
+  version: 13.10.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-07-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: 13.9.4
+        version: 13.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.9.4
+        version: 13.10.0
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement