chef-config 15.11.3 → 16.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f53ec80622768fb0e22e8ec5cecfaa0f3de70d34d03dd3abc660aa9288f3c3
-  data.tar.gz: 30cc338ec672b76d21881856718efedf61e54efd7fd1941c6844fced9feb7f5c
+  metadata.gz: 32625e6af835a08cd5a952e48585aa44e1ca1249a4ead9a905afc09bd6713cb8
+  data.tar.gz: 32ec2aec397191c65220a445eca899ed0ea6107de2114c3284ce59306c699aef
 SHA512:
-  metadata.gz: 2e1beef453edcdde7d8f3c58543380697c0dc71735677a91d0ee180a455a302721d7e89d41e8078f5dd0dcc849a41b8f0df7e313298f5f303c2b08b6fcaf93f5
-  data.tar.gz: 5f74739a9e17d875f6eede63b5819c68f8f98b485dbeebe1bf30fb981556b55da880591a19a545f05e60e77c222548e708ebc6812181922ee6fef74e776ebd74
+  metadata.gz: 3e9e5180cfeda09cbed3762343dd7382759e6c4979cecb99b3af983aecbf2ab190cc3d08e5e6182c0099d584a800e8f551e79152809649a75ce142b92c3af0fb
+  data.tar.gz: 9986d69845556dd4da7bd89b2ff4b5f5150e799a4a391d4a169c21268083445aab8621e23e65d095a8aed234596efe581604d232b0dcf07231d2b48f9dfd19ae

data/Rakefile

@@ -6,6 +6,7 @@ begin
   require "rspec/core/rake_task"
   desc "Run standard specs"
   RSpec::Core::RakeTask.new(:spec) do |t|
+    t.verbose = false
     t.pattern = FileList["spec/**/*_spec.rb"]
   end
 rescue LoadError

data/lib/chef-config/config.rb

@@ -278,15 +278,8 @@ module ChefConfig
 
     # Location of cookbooks on disk. String or array of strings.
     # Defaults to <chef_repo_path>/cookbooks.  If chef_repo_path
-    # is not specified, this is set to [/var/chef/cookbooks, /var/chef/site-cookbooks]).
-    default(:cookbook_path) do
-      if configuration[:chef_repo_path]
-        derive_path_from_chef_repo_path("cookbooks")
-      else
-        Array(derive_path_from_chef_repo_path("cookbooks")).flatten +
-          Array(derive_path_from_chef_repo_path("site-cookbooks")).flatten
-      end
-    end
+    # is not specified, this is set to /var/chef/cookbooks.
+    default(:cookbook_path) { derive_path_from_chef_repo_path("cookbooks") }
 
     # Location of data bags on disk. String or array of strings.
     # Defaults to <chef_repo_path>/data_bags.
@@ -399,7 +392,7 @@ module ChefConfig
     default :log_level, :auto
 
     # Logging location as either an IO stream or string representing log file path
-    default :log_location, STDOUT
+    default :log_location, nil
 
     # Using `force_formatter` causes chef to default to formatter output when STDOUT is not a tty
     default :force_formatter, false
@@ -407,6 +400,9 @@ module ChefConfig
     # Using `force_logger` causes chef to default to logger output when STDOUT is a tty
     default :force_logger, false
 
+    # When set to true always print the stacktrace even if we haven't done -l debug
+    default :always_dump_stacktrace, false
+
     # Using 'stream_execute_output' will have Chef always stream the execute output
     default :stream_execute_output, false
 
@@ -483,7 +479,7 @@ module ChefConfig
       # 11 (true) or Chef Server 12 (false). Chef Zero can still serve
       # policyfile objects in Chef 11 mode, as long as `repo_mode` is set to
       # "hosted_everything". The primary differences are:
-      # * Chef 11 mode doesn't support multi-tennant, so there is no
+      # * Chef 11 mode doesn't support multi-tenant, so there is no
       #   distinction between global and org-specific objects (since there are
       #   no orgs).
       # * Chef 11 mode doesn't expose RBAC objects
@@ -531,7 +527,7 @@ module ChefConfig
     # switching based on it is almost certainly doing the wrong thing and papering over
     # bugs that should be fixed in one or the other class, and will be brittle and destined
     # to break in the future (and not necessarily on a major version bump). Checking this value
-    # is also not sufficent to determine if we are not running against a server since this can
+    # is also not sufficient to determine if we are not running against a server since this can
     # be unset but :local_mode may be set.  It would be accurate to check both :solo and :local_mode
     # to determine if we're not running against a server, but the more semantically accurate test
     # is going to be combining :solo_legacy_mode and :local_mode.
@@ -838,7 +834,7 @@ module ChefConfig
 
     # Whether the resource count should be updated for log resource
     # on running chef-client
-    default :count_log_resource_updates, true
+    default :count_log_resource_updates, false
 
     # The selected profile when using credentials.
     default :profile, nil
@@ -956,7 +952,7 @@ module ChefConfig
     # distribution.
     #
     # The disadvantages of lazily loading files are that users some time find it
-    # confusing that their cookbooks are not fully synchronzied to the cache initially,
+    # confusing that their cookbooks are not fully synchronized to the cache initially,
     # and more importantly the time-sensitive URLs which are in the manifest may time
     # out on long Chef runs before the resource that uses the file is converged
     # (leading to many confusing 403 errors on template/cookbook_file resources).
@@ -1113,7 +1109,7 @@ module ChefConfig
     end
 
     # Given a scheme, host, and port, return the correct proxy URI based on the
-    # set environment variables, unless exluded by no_proxy, in which case nil
+    # set environment variables, unless excluded by no_proxy, in which case nil
     # is returned
     def self.proxy_uri(scheme, host, port)
       proxy_env_var = ENV["#{scheme}_proxy"].to_s.strip
@@ -1196,10 +1192,10 @@ module ChefConfig
     default :ruby_encoding, Encoding::UTF_8
 
     # can be set to a string or array of strings for URIs to set as rubygems sources
-    default :rubygems_url, "https://www.rubygems.org"
+    default :rubygems_url, nil
 
     # globally sets the default of the clear_sources property on the gem_package and chef_gem resources
-    default :clear_gem_sources, false
+    default :clear_gem_sources, nil
 
     # If installed via an omnibus installer, this gives the path to the
     # "embedded" directory which contains all of the software packaged with

data/lib/chef-config/path_helper.rb

@@ -130,16 +130,16 @@ module ChefConfig
     end
 
     # This is the INVERSE of Pathname#cleanpath, it converts forward
-    # slashes to backwhacks for Windows.  Since the Ruby API and the
+    # slashes to backslashes for Windows.  Since the Ruby API and the
     # Windows APIs all consume forward slashes, this helper function
     # should only be used for *DISPLAY* logic to send strings back
-    # to the user with backwhacks.  Internally, filename paths should
+    # to the user with backslashes.  Internally, filename paths should
     # generally be stored with forward slashes for consistency.  It is
     # not necessary or desired to blindly convert pathnames to have
-    # backwhacks on Windows.
+    # backslashes on Windows.
     #
     # Generally, if the user isn't going to be seeing it, you should be
-    # using Pathname#cleanpath intead of this function.
+    # using Pathname#cleanpath instead of this function.
     def self.cleanpath(path)
       path = Pathname.new(path).cleanpath.to_s
       # ensure all forward slashes are backslashes
@@ -265,15 +265,15 @@ module ChefConfig
       end
     end
 
-    # Determine if the given path is protected by OS X System Integrity Protection.
+    # Determine if the given path is protected by macOS System Integrity Protection.
     def self.is_sip_path?(path, node)
-      if node["platform"] == "mac_os_x" && Gem::Version.new(node["platform_version"]) >= Gem::Version.new("10.11")
+      if ChefUtils.macos?
         # @todo: parse rootless.conf for this?
         sip_paths = [
           "/System", "/bin", "/sbin", "/usr"
         ]
         sip_paths.each do |sip_path|
-          ChefConfig.logger.info("This is a SIP path, checking if it in exceptions list.")
+          ChefConfig.logger.info("#{sip_path} is a SIP path, checking if it is in the exceptions list.")
           return true if path.start_with?(sip_path)
         end
         false
@@ -282,7 +282,7 @@ module ChefConfig
       end
     end
 
-    # Determine if the given path is on the exception list for OS X System Integrity Protection.
+    # Determine if the given path is on the exception list for macOS System Integrity Protection.
     def self.writable_sip_path?(path)
       # todo: parse rootless.conf for this?
       sip_exceptions = [
@@ -293,7 +293,7 @@ module ChefConfig
       sip_exceptions.each do |exception_path|
         return true if path.start_with?(exception_path)
       end
-      ChefConfig.logger.error("Cannot write to a SIP Path on OS X 10.11+")
+      ChefConfig.logger.error("Cannot write to a SIP path #{path} on macOS!")
       false
     end
 

data/lib/chef-config/version.rb

@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.11.3".freeze
+  VERSION = "16.1.16".freeze
 end

data/spec/unit/config_spec.rb

@@ -175,11 +175,11 @@ RSpec.describe ChefConfig::Config do
       end
 
       context "when passes multiple cookbook_paths in config options" do
-        let(:extra_config_options) { ["cookbook_path=[first_cookbook, secound_cookbooks]"] }
+        let(:extra_config_options) { ["cookbook_path=[first_cookbook, second_cookbooks]"] }
 
         it "expanded paths" do
           apply_config
-          expect(described_class[:cookbook_path]).to eq(["#{current_directory}/first_cookbook", "#{current_directory}/secound_cookbooks"])
+          expect(described_class[:cookbook_path]).to eq(["#{current_directory}/first_cookbook", "#{current_directory}/second_cookbooks"])
         end
       end
     end
@@ -205,8 +205,8 @@ RSpec.describe ChefConfig::Config do
     #   end
     # else
     #   formatter = "null"
-    #   log_location = configured-value or defualt
-    #   log_level = info or defualt
+    #   log_location = configured-value or default
+    #   log_level = info or default
     # end
     #
     it "has an empty list of formatters by default" do

data/spec/unit/workstation_config_loader_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
     end
 
     it "tests a path's existence" do
-      expect(config_loader.path_exists?("/nope/nope/nope/nope/frab/jab/nab")).to be(false)
+      expect(config_loader.path_exists?("/nope/nope/nope/nope/slab/jab/nab")).to be(false)
       expect(config_loader.path_exists?(__FILE__)).to be(true)
     end
 
@@ -214,7 +214,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
 
   describe "loading the config file" do
 
-    context "when no explicit config is specifed and no implicit config is found" do
+    context "when no explicit config is specified and no implicit config is found" do
 
       before do
         allow(config_loader).to receive(:path_exists?).with(an_instance_of(String)).and_return(false)
@@ -230,7 +230,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
 
     context "when an explicit config is given but it doesn't exist" do
 
-      let(:explicit_config_location) { "/nope/nope/nope/frab/jab/nab" }
+      let(:explicit_config_location) { "/nope/nope/nope/slab/jab/nab" }
 
       it "raises a configuration error" do
         expect { config_loader.load }.to raise_error(ChefConfig::ConfigurationError)
@@ -402,12 +402,12 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
       end
 
       context "has a non rb file" do
-        let(:sytax_error_content) { "{{{{{:{{" }
+        let(:syntax_error_content) { "{{{{{:{{" }
         let(:config_content) { "config_d_file_evaluated(true)" }
 
         let!(:not_confd_file) do
           Tempfile.new(["Chef-WorkstationConfigLoader-rspec-test", ".foorb"], tempdir).tap do |t|
-            t.print(sytax_error_content)
+            t.print(syntax_error_content)
             t.close
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 15.11.3
+  version: 16.1.16
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.11.3
+        version: 16.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.11.3
+        version: 16.1.16
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Chef's default configuration and config loading