chef 15.4.45-universal-mingw32 → 15.5.9-universal-mingw32

data/spec/functional/resource/cookbook_file_spec.rb

@@ -68,11 +68,11 @@ describe Chef::Resource::CookbookFile do
     let(:path) { File.join(windows_non_temp_dir, make_tmpname(file_base)) }
 
     before do
-      FileUtils.mkdir_p(windows_non_temp_dir) if Chef::Platform.windows?
+      FileUtils.mkdir_p(windows_non_temp_dir) if ChefUtils.windows?
     end
 
     after do
-      FileUtils.rm_r(windows_non_temp_dir) if Chef::Platform.windows? && File.exists?(windows_non_temp_dir)
+      FileUtils.rm_r(windows_non_temp_dir) if ChefUtils.windows? && File.exists?(windows_non_temp_dir)
     end
 
   end

data/spec/functional/resource/template_spec.rb

@@ -203,7 +203,7 @@ describe Chef::Resource::Template do
         it "output should contain platform's line endings" do
           resource.run_action(:create)
           binread(path).each_line do |line|
-            expect(line).to end_with(Chef::Platform.windows? ? "\r\n" : "\n")
+            expect(line).to end_with(ChefUtils.windows? ? "\r\n" : "\n")
           end
         end
       end

data/spec/functional/version_spec.rb

@@ -21,7 +21,7 @@ require "chef/version"
 require "ohai/version"
 require "chef/dist"
 
-describe "Chef Versions" do
+describe "Chef Versions", :executables do
   include Chef::Mixin::ShellOut
   let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..") }
 

data/spec/functional/win32/crypto_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/crypto"
 end
 

data/spec/functional/win32/security_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 require "mixlib/shellout"
 require "chef/mixin/user_context"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/security"
 end
 

data/spec/functional/win32/service_manager_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/application/windows_service_manager"
 end
 

data/spec/functional/win32/sid_spec.rb

@@ -17,12 +17,12 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/security"
 end
 
 describe "Chef::ReservedNames::Win32::SID", :windows_only do
-  if Chef::Platform.windows?
+  if ChefUtils.windows?
     SID ||= Chef::ReservedNames::Win32::Security::SID
   end
 

data/spec/functional/win32/version_info_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/file/version_info"
 end
 

data/spec/functional/win32/versions_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/version"
 end
 

data/spec/integration/knife/config_get_profile_spec.rb

@@ -50,7 +50,7 @@ describe "knife config get-profile", :workstation do
       ENV["KNIFE_HOME"] = old_knife_home
       ENV["HOME"] = old_home
       Dir.chdir(old_wd)
-      ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+      ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
       ChefConfig::PathHelper.per_tool_home_environment = nil
     end
   end
@@ -60,7 +60,7 @@ describe "knife config get-profile", :workstation do
     # because it has to run after the before set in the "with a chef repo" shared context.
     directory("repo")
     Dir.chdir(path_to("repo"))
-    ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+    ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
     ENV["HOME"] = path_to(".")
   end
 

data/spec/integration/knife/config_get_spec.rb

@@ -54,7 +54,7 @@ describe "knife config get", :workstation do
       ENV["KNIFE_HOME"] = old_knife_home
       ENV["HOME"] = old_home
       Dir.chdir(old_wd)
-      ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+      ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
       ChefConfig::PathHelper.per_tool_home_environment = nil
     end
   end
@@ -64,7 +64,7 @@ describe "knife config get", :workstation do
     # because it has to run after the before set in the "with a chef repo" shared context.
     directory("repo")
     Dir.chdir(path_to("repo"))
-    ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+    ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
     ENV["HOME"] = path_to(".")
   end
 
@@ -110,6 +110,13 @@ describe "knife config get", :workstation do
     it { is_expected.to match(/^node_name:\s+one$/) }
   end
 
+  context "with a config dot d files" do
+    before { file(".chef/config.d/abc.rb", "node_name 'one'\n") }
+
+    it { is_expected.to match(%r{^Loading from .d/ configuration file .*/#{File.basename(path_to("."))}/.chef/config.d/abc.rb$}) }
+    it { is_expected.to match(/^node_name:\s+one$/) }
+  end
+
   context "with a credentials file and CHEF_HOME" do
     before do
       file(".chef/credentials", "[default]\nclient_name = \"three\"\n")

data/spec/integration/knife/config_list_profiles_spec.rb

@@ -44,7 +44,7 @@ describe "knife config list-profiles", :workstation do
     ensure
       ENV["HOME"] = old_home
       Dir.chdir(old_wd)
-      ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+      ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
     end
   end
 
@@ -53,7 +53,7 @@ describe "knife config list-profiles", :workstation do
     # because it has to run after the before set in the "with a chef repo" shared context.
     directory("repo")
     Dir.chdir(path_to("repo"))
-    ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+    ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
     ENV["HOME"] = path_to(".")
   end
 

data/spec/integration/knife/config_use_profile_spec.rb

@@ -51,7 +51,7 @@ describe "knife config use-profile", :workstation do
       ENV["KNIFE_HOME"] = old_knife_home
       ENV["HOME"] = old_home
       Dir.chdir(old_wd)
-      ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+      ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
       ChefConfig::PathHelper.per_tool_home_environment = nil
     end
   end
@@ -61,7 +61,7 @@ describe "knife config use-profile", :workstation do
     # because it has to run after the before set in the "with a chef repo" shared context.
     directory("repo")
     Dir.chdir(path_to("repo"))
-    ENV[ChefConfig.windows? ? "CD" : "PWD"] = Dir.pwd
+    ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
     ENV["HOME"] = path_to(".")
   end
 

data/spec/integration/knife/list_spec.rb

@@ -466,7 +466,7 @@ describe "knife list", :workstation do
         end
       end
 
-      when_the_repository "has a cookbooks directory and a symlinked cookbooks directory", skip: (Chef::Platform.windows?) do
+      when_the_repository "has a cookbooks directory and a symlinked cookbooks directory", skip: (ChefUtils.windows?) do
         before do
           directory "cookbooks"
           symlink "symlinked", "cookbooks"
@@ -503,7 +503,7 @@ describe "knife list", :workstation do
         end
       end
 
-      when_the_repository "has a real_cookbooks directory and a cookbooks symlink to it", skip: (Chef::Platform.windows?) do
+      when_the_repository "has a real_cookbooks directory and a cookbooks symlink to it", skip: (ChefUtils.windows?) do
         before do
           directory "real_cookbooks"
           symlink "cookbooks", "real_cookbooks"

data/spec/integration/solo/solo_spec.rb

@@ -4,7 +4,7 @@ require "chef/run_lock"
 require "chef/config"
 require "timeout"
 require "fileutils"
-require "chef/win32/security" if Chef::Platform.windows?
+require "chef/win32/security" if ChefUtils.windows?
 require "chef/dist"
 
 describe Chef::Dist::SOLOEXEC do

data/spec/support/matchers/leak.rb

@@ -60,7 +60,7 @@ module Matchers
 
     def profiler
       @profiler ||= begin
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           require File.join(File.dirname(__FILE__), "..", "platforms", "prof", "win32")
           RSpec::Prof::Win32::Profiler.new
         else

data/spec/support/mock/platform.rb

@@ -6,7 +6,7 @@
 # testing code that mixes in platform specific modules like +Chef::Mixin::Securable+
 # or +Chef::FileAccessControl+
 def platform_mock(platform = :unix)
-  allow(ChefConfig).to receive(:windows?).and_return(platform == :windows ? true : false)
+  allow(ChefUtils).to receive(:windows?).and_return(platform == :windows ? true : false)
   ENV["SYSTEMDRIVE"] = (platform == :windows ? "C:" : nil)
 
   if platform == :windows

data/spec/support/platform_helpers.rb

@@ -35,6 +35,8 @@ def ruby_32bit?
 end
 
 def windows?
+  # NOTE this deliberately does not use ChefUtils.windows? because otherwise it would
+  # pick up the node out of tests, while this tests the hosts running the specs.
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 

data/spec/support/shared/integration/integration_helper.rb

@@ -128,7 +128,7 @@ module IntegrationSupport
           # TODO: "force" actually means "silence all exceptions". this
           # silences a weird permissions error on Windows that we should track
           # down, but for now there's no reason for it to blow up our CI.
-          FileUtils.remove_entry_secure(@repository_dir, force = Chef::Platform.windows?)
+          FileUtils.remove_entry_secure(@repository_dir, force = ChefUtils.windows?)
         ensure
           @repository_dir = nil
         end

data/spec/support/shared/integration/knife_support.rb

@@ -181,7 +181,7 @@ module KnifeSupport
         expect(stderr_actual).to eq(expected[:stderr])
       end
       stdout_actual = @stdout
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         stderr_actual = stderr_actual.gsub("\r\n", "\n")
         stdout_actual = stdout_actual.gsub("\r\n", "\n")
       end

data/spec/support/shared/unit/provider/file.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");
@@ -256,7 +256,7 @@ shared_examples_for Chef::Provider::File do
     context "examining file security metadata on Unix with a file that exists" do
       before do
         # fake that we're on unix even if we're on windows
-        allow(ChefConfig).to receive(:windows?).and_return(false)
+        allow(ChefUtils).to receive(:windows?).and_return(false)
         # mock up the filesystem to behave like unix
         setup_normal_file
         stat_struct = double("::File.stat", mode: 0600, uid: 0, gid: 0, mtime: 10000)
@@ -332,7 +332,7 @@ shared_examples_for Chef::Provider::File do
     context "examining file security metadata on Unix with a file that does not exist" do
       before do
         # fake that we're on unix even if we're on windows
-        allow(ChefConfig).to receive(:windows?).and_return(false)
+        allow(ChefUtils).to receive(:windows?).and_return(false)
         setup_missing_file
       end
 
@@ -381,7 +381,7 @@ shared_examples_for Chef::Provider::File do
 
     before do
       # fake that we're on unix even if we're on windows
-      allow(ChefConfig).to receive(:windows?).and_return(false)
+      allow(ChefUtils).to receive(:windows?).and_return(false)
       # mock up the filesystem to behave like unix
       setup_normal_file
       stat_struct = double("::File.stat", mode: 0600, uid: 0, gid: 0, mtime: 10000)

data/spec/unit/application/client_spec.rb

@@ -323,7 +323,7 @@ describe Chef::Application::Client, "reconfigure" do
 
     it "should terminate with message when interval is given" do
       Chef::Config[:interval] = 600
-      allow(ChefConfig).to receive(:windows?).and_return(false)
+      allow(ChefUtils).to receive(:windows?).and_return(false)
       expect(Chef::Application).to receive(:fatal!).with(
         /Unforked .* interval runs are disabled by default\.
 Configuration settings:
@@ -336,7 +336,7 @@ Enable .* interval runs by setting `:client_fork = true` in your config file or
     context "when interval is given on windows" do
       before do
         Chef::Config[:interval] = 600
-        allow(ChefConfig).to receive(:windows?).and_return(true)
+        allow(ChefUtils).to receive(:windows?).and_return(true)
       end
 
       it "should terminate" do

data/spec/unit/application/knife_spec.rb

@@ -77,6 +77,23 @@ describe Chef::Application::Knife do
     expect(Chef::Config[:color]).to be_truthy
   end
 
+  context "validate --format option" do
+    it "should set the default format summary" do
+      with_argv(*%w{noop knife command}) do
+        expect(@knife).to receive(:exit).with(0)
+        @knife.run
+        expect(@knife.default_config[:format]).to eq("summary")
+      end
+    end
+
+    it "should raise the error for invalid value" do
+      with_argv(*%w{noop knife command -F abc}) do
+        expect(STDOUT).to receive(:puts).at_least(2).times
+        expect { @knife.run }.to raise_error(SystemExit) { |e| expect(e.status).to eq(2) }
+      end
+    end
+  end
+
   context "when given fips flags" do
     context "when Chef::Config[:fips]=false" do
       before do

data/spec/unit/application_spec.rb

@@ -277,7 +277,7 @@ describe Chef::Application do
           end
         end
 
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           it_behaves_like "sets log_location", :win_evt, Chef::Log::WinEvt
           it_behaves_like "sets log_location", "win_evt", Chef::Log::WinEvt
         else

data/spec/unit/chef_fs/file_pattern_spec.rb

@@ -157,7 +157,7 @@ describe Chef::ChefFS::FilePattern do
     end
   end
 
-  context 'with simple pattern "a\*\b"', skip: (Chef::Platform.windows?) do
+  context 'with simple pattern "a\*\b"', skip: (ChefUtils.windows?) do
     let(:pattern) { Chef::ChefFS::FilePattern.new('a\*\b') }
     it "match?" do
       expect(pattern.match?("a*b")).to be_truthy
@@ -264,7 +264,7 @@ describe Chef::ChefFS::FilePattern do
     end
   end
 
-  context 'with star pattern "/abc/d[a-z][0-9]f/ghi"', skip: (Chef::Platform.windows?) do
+  context 'with star pattern "/abc/d[a-z][0-9]f/ghi"', skip: (ChefUtils.windows?) do
     let(:pattern) { Chef::ChefFS::FilePattern.new("/abc/d[a-z][0-9]f/ghi") }
     it "match?" do
       expect(pattern.match?("/abc/de1f/ghi")).to be_truthy

data/spec/unit/chef_fs/path_util_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kartik Null Cating-Subramanian (<ksubramanian@chef.io>)
-# Copyright:: Copyright 2015-2016, Chef Software Inc.
+# Copyright:: Copyright 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,7 +81,7 @@ describe Chef::ChefFS::PathUtils do
     end
 
     it "handles root correctly" do
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         expect(Chef::ChefFS::PathUtils.realest_path("C:/")).to eq("C:/")
       else
         expect(Chef::ChefFS::PathUtils.realest_path("/")).to eq("/")
@@ -91,7 +91,7 @@ describe Chef::ChefFS::PathUtils do
 
   context "invoking descendant_path" do
     it "handles paths with various casing on windows" do
-      allow(Chef::ChefFS).to receive(:windows?) { true }
+      allow(ChefUtils).to receive(:windows?) { true }
       expect(Chef::ChefFS::PathUtils.descendant_path("C:/ab/b/c", "C:/AB/B")).to eq("c")
       expect(Chef::ChefFS::PathUtils.descendant_path("C:/ab/b/c", "c:/ab/B")).to eq("c")
     end

data/spec/unit/client_spec.rb

@@ -670,7 +670,7 @@ describe Chef::Client do
   describe "windows_admin_check" do
     context "platform is not windows" do
       before do
-        allow(ChefConfig).to receive(:windows?).and_return(false)
+        allow(ChefUtils).to receive(:windows?).and_return(false)
       end
 
       it "shouldn't be called" do
@@ -681,7 +681,7 @@ describe Chef::Client do
 
     context "platform is windows" do
       before do
-        allow(ChefConfig).to receive(:windows?).and_return(true)
+        allow(ChefUtils).to receive(:windows?).and_return(true)
       end
 
       it "should be called" do

data/spec/unit/cookbook/chefignore_spec.rb

@@ -18,32 +18,52 @@
 require "spec_helper"
 
 describe Chef::Cookbook::Chefignore do
-  before do
-    @chefignore = Chef::Cookbook::Chefignore.new(File.join(CHEF_SPEC_DATA, "cookbooks"))
-  end
+  let(:chefignore) { described_class.new(File.join(CHEF_SPEC_DATA, "cookbooks")) }
 
   it "loads the globs in the chefignore file" do
-    expect(@chefignore.ignores).to match_array(%w{recipes/ignoreme.rb ignored})
+    expect(chefignore.ignores).to match_array(%w{recipes/ignoreme.rb ignored})
   end
 
   it "removes items from an array that match the ignores" do
     file_list = %w{ recipes/ignoreme.rb recipes/dontignoreme.rb }
-    expect(@chefignore.remove_ignores_from(file_list)).to eq(%w{recipes/dontignoreme.rb})
+    expect(chefignore.remove_ignores_from(file_list)).to eq(%w{recipes/dontignoreme.rb})
   end
 
   it "determines if a file is ignored" do
-    expect(@chefignore.ignored?("ignored")).to be_truthy
-    expect(@chefignore.ignored?("recipes/ignoreme.rb")).to be_truthy
-    expect(@chefignore.ignored?("recipes/dontignoreme.rb")).to be_falsey
+    expect(chefignore.ignored?("ignored")).to be_truthy
+    expect(chefignore.ignored?("recipes/ignoreme.rb")).to be_truthy
+    expect(chefignore.ignored?("recipes/dontignoreme.rb")).to be_falsey
   end
 
   context "when using the single cookbook pattern" do
-    before do
-      @chefignore = Chef::Cookbook::Chefignore.new(File.join(CHEF_SPEC_DATA, "standalone_cookbook"))
+    let(:chefignore) { described_class.new(File.join(CHEF_SPEC_DATA, "cookbooks/starter")) }
+
+    it "loads the globs in the chefignore file" do
+      expect(chefignore.ignores).to match_array(%w{recipes/default.rb ignored})
+    end
+  end
+
+  context "when cookbook has it's own chefignore" do
+    let(:chefignore) { described_class.new(File.join(CHEF_SPEC_DATA, "cookbooks/starter")) }
+
+    it "loads the globs in the chefignore file" do
+      expect(chefignore.ignores).to match_array(%w{recipes/default.rb ignored})
     end
+  end
+
+  context "when cookbook don't have own chefignore" do
+    let(:chefignore) { described_class.new(File.join(CHEF_SPEC_DATA, "cookbooks/apache2")) }
+
+    it "loads the globs in the chefignore file of cookbooks dir" do
+      expect(chefignore.ignores).to match_array(%w{recipes/ignoreme.rb ignored})
+    end
+  end
+
+  context "when using the single cookbook pattern" do
+    let(:chefignore) { described_class.new(File.join(CHEF_SPEC_DATA, "standalone_cookbook")) }
 
     it "loads the globs in the chefignore file" do
-      expect(@chefignore.ignores).to match_array(%w{recipes/ignoreme.rb ignored vendor/bundle/*})
+      expect(chefignore.ignores).to match_array(%w{recipes/ignoreme.rb ignored vendor/bundle/*})
     end
   end
 end