chef-config 15.17.4 → 16.0.257

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d697a88df4c02fc512d6d43d3f21bfd383ff5b4f4c8cc6865bf7d24281813f94
-  data.tar.gz: 83a43360acc21fe53b71fc1d7afa696fe072675057fadc2d20a38ca65b3402aa
+  metadata.gz: d1967a23569bd6acc655afb4a46c884f487292399438ebef67c30753cddbae30
+  data.tar.gz: 8b0e0493a0a8b0ed27a8cdb9516e6910a8da60c6caf187a8953f52460dc9b1fa
 SHA512:
-  metadata.gz: 15ff1bdf0321d368825b17c603bb72d6dbb5130e9e192a554ac6c1ff4bd0543155e9eb5179399d7965e53f7ae6e59473692883381b2fa54174ac3f50638472c9
-  data.tar.gz: 51e5b805acac7b79ba8cdca3fa018b1200e3029b36a27c629cb9e3242b80496f3c0f9d253c89efa034dbb609071c1ff6244de73fb035725618b87bd97f50a862
+  metadata.gz: 6ae62cd75d740132b5ae1db4d9d967f1cde8529b8b5a73f82e80314e8a074cc9ad1d3403a2196fff3c7efb3c19c6aefeb927142810c7785cfd21e1416b0710e9
+  data.tar.gz: fbc6a73fb9db1a9d33314950b85bf358b7136630f6f2fa2ea0bcfc9e582e4a3e372ffd91d2a2e1b9292d98c0945365a22b1264ec272ad8113828dcb322e4bf64

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/chef-config.gemspec

@@ -1,4 +1,5 @@
-lib = File.expand_path("lib", __dir__)
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "chef-config/version"
 

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.
@@ -359,7 +352,7 @@ module ChefConfig
     #
     # @param path [String]
     def self.path_accessible?(path)
-      File.exist?(path) && File.readable?(path) && File.writable?(path)
+      File.exists?(path) && File.readable?(path) && File.writable?(path)
     end
 
     # Where cookbook files are stored on the server (by content checksum)
@@ -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-tenant, so there is no
+      # * Chef 11 mode doesn't support multi-tennant, 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 sufficient to determine if we are not running against a server since this can
+    # is also not sufficent 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
@@ -851,6 +847,33 @@ module ChefConfig
 
     # knife configuration data
     config_context :knife do
+      # XXX: none of these default values are applied to knife (and would create a backcompat
+      # break in knife if this bug was fixed since many of the defaults below are wrong).  this appears
+      # to be the start of an attempt to be able to use config_strict_mode true?  if so, this approach
+      # is fraught with peril because this namespace is used by every knife plugin in the wild and
+      # we would need to validate every cli option in every knife attribute out there and list them all here.
+      #
+      # based on the way that people may define `knife[:foobar] = "something"` for the knife-foobar
+      # gem plugin i'm pretty certain we can never turn on anything like config_string_mode since
+      # any config value may be a typo or it may be in some gem in some knife plugin we don't know about.
+      #
+      # we do still need to maintain at least one of these so that the knife config hash gets
+      # created.
+      #
+      # this whole situation is deeply unsatisfying.
+      default :ssh_port, nil
+      default :ssh_user, nil
+      default :ssh_attribute, nil
+      default :ssh_gateway, nil
+      default :ssh_gateway_identity, nil
+      default :bootstrap_version, nil
+      default :bootstrap_proxy, nil
+      default :bootstrap_template, nil
+      default :secret, nil
+      default :secret_file, nil
+      default :host_key_verify, nil
+      default :forward_agent, nil
+      default :sort_status_reverse, nil
       default :hints, {}
     end
 
@@ -956,7 +979,7 @@ module ChefConfig
     # distribution.
     #
     # The disadvantages of lazily loading files are that users some time find it
-    # confusing that their cookbooks are not fully synchronized to the cache initially,
+    # confusing that their cookbooks are not fully synchronzied 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 +1136,7 @@ module ChefConfig
     end
 
     # Given a scheme, host, and port, return the correct proxy URI based on the
-    # set environment variables, unless excluded by no_proxy, in which case nil
+    # set environment variables, unless exluded 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 +1219,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/dist.rb

@@ -19,15 +19,5 @@ module ChefConfig
     # The legacy conf folder: C:/opscode/chef. Specifically the "opscode" part
     # DIR_SUFFIX is appended to it in code where relevant
     LEGACY_CONF_DIR = "opscode".freeze
-
-    # Enable forcing Chef EULA
-    ENFORCE_LICENSE = true
-
-    # The servers's alias (chef-server)
-    SERVER = "chef-server".freeze
-
-    # The server's configuration utility
-    SERVER_CTL = "chef-server-ctl".freeze
-
   end
 end

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 backslashes for Windows.  Since the Ruby API and the
+    # slashes to backwhacks 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 backslashes.  Internally, filename paths should
+    # to the user with backwhacks.  Internally, filename paths should
     # generally be stored with forward slashes for consistency.  It is
     # not necessary or desired to blindly convert pathnames to have
-    # backslashes on Windows.
+    # backwhacks on Windows.
     #
     # Generally, if the user isn't going to be seeing it, you should be
-    # using Pathname#cleanpath instead of this function.
+    # using Pathname#cleanpath intead of this function.
     def self.cleanpath(path)
       path = Pathname.new(path).cleanpath.to_s
       # ensure all forward slashes are backslashes
@@ -267,13 +267,13 @@ module ChefConfig
 
     # 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")
-        # @todo: parse rootless.conf for this?
+      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 macOS System Integrity Protection.
+    # Determine if the given path is on the exception list for OS X 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

@@ -14,6 +14,6 @@
 # limitations under the License.
 
 module ChefConfig
-  CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "15.17.4".freeze
+  CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
+  VERSION = "16.0.257".freeze
 end

data/spec/unit/config_spec.rb

@@ -186,29 +186,29 @@ RSpec.describe ChefConfig::Config do
   end
 
   describe "when configuring formatters" do
-    # if TTY and not(force-logger)
-    #   formatter = configured formatter or default formatter
-    #   formatter goes to STDOUT/ERR
-    #   if log file is writeable
-    #     log level is configured level or info
-    #     log location is file
-    #   else
-    #     log level is warn
-    #     log location is STDERR
-    #    end
-    # elsif not(TTY) and force formatter
-    #   formatter = configured formatter or default formatter
-    #   if log_location specified
-    #     formatter goes to log_location
-    #   else
-    #     formatter goes to STDOUT/ERR
-    #   end
-    # else
-    #   formatter = "null"
-    #   log_location = configured-value or defualt
-    #   log_level = info or defualt
-    # end
-    #
+      # if TTY and not(force-logger)
+      #   formatter = configured formatter or default formatter
+      #   formatter goes to STDOUT/ERR
+      #   if log file is writeable
+      #     log level is configured level or info
+      #     log location is file
+      #   else
+      #     log level is warn
+      #     log location is STDERR
+      #    end
+      # elsif not(TTY) and force formatter
+      #   formatter = configured formatter or default formatter
+      #   if log_location specified
+      #     formatter goes to log_location
+      #   else
+      #     formatter goes to STDOUT/ERR
+      #   end
+      # else
+      #   formatter = "null"
+      #   log_location = configured-value or defualt
+      #   log_level = info or defualt
+      # end
+      #
     it "has an empty list of formatters by default" do
       expect(ChefConfig::Config.formatters).to eq([])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 15.17.4
+  version: 16.0.257
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2020-04-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.17.4
+        version: 16.0.257
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.17.4
+        version: 16.0.257
 - !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.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Chef's default configuration and config loading