chef-config 16.5.64 → 16.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98200061cdf7f6987f89d2810c4f4cf06e73e946703207b1e03270bed58c2a72
-  data.tar.gz: 4c97416eaa59a81959b65596d40efe4f24e10e6e8dc1e5f9f26d5467c0f13385
+  metadata.gz: cf7f580b78c3f5bd73acbd33fcdad8ac1759e9823bf081eb469e1af134a77885
+  data.tar.gz: 27c073a9cf24004bda689a60b4c46d06f930fc2eb528e29acb0a1999323e759c
 SHA512:
-  metadata.gz: 7a3923de2e675cd239dde70ac73595d043da585f5350f083c093fbefe6bd86a5fdd29165e7229fc2ba082018ac645420eb6991db993ea626735cd882ff0ac047
-  data.tar.gz: b0270e4feee69bde6219ec09e07529a40e0b1849ba42ea1066638b74754c7e45c6fdb6d73ec2fb0c78c727f77c131a86d4a0399d5f4fe1b46243a8765e1e6def
+  metadata.gz: 23bae699274292d926765683a8931fe9f9c80393a871668ea3e81ad80ff84754491f66e3e42d7d6a3bddd999602440809d317661a081d0e3136579ec1f098034
+  data.tar.gz: 3c91e2a4556f1dcee49df2781164670a87e1913608341adbb641d7ec5b8d38933b99f3f168731f915518e19c4632c81045d579fb94238c72186de37902235293

data/chef-config.gemspec

@@ -8,10 +8,20 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Adam Jacob"]
   spec.email         = ["adam@chef.io"]
 
-  spec.summary       = %q{Chef's default configuration and config loading}
+  spec.summary       = %q{Chef Infra's default configuration and config loading library}
   spec.homepage      = "https://github.com/chef/chef"
   spec.license       = "Apache-2.0"
 
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata = {
+    "bug_tracker_uri" => "https://github.com/chef/chef/issues",
+    "changelog_uri" => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
+    "documentation_uri" => "https://github.com/chef/chef/tree/master/chef-config/README.md",
+    "homepage_uri" => "https://github.com/chef/chef/tree/master/chef-config",
+    "source_code_uri" => "https://github.com/chef/chef/tree/master/chef-config",
+  }
+
   spec.require_paths = ["lib"]
 
   spec.add_dependency "chef-utils", "= #{ChefConfig::VERSION}"
@@ -21,12 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "tomlrb", "~> 1.2"
 
-  spec.add_development_dependency "rake"
-
-  %w{rspec-core rspec-expectations rspec-mocks}.each do |rspec|
-    spec.add_development_dependency(rspec, "~> 3.2")
-  end
-
   spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 

data/lib/chef-config/config.rb

@@ -33,7 +33,9 @@ module Mixlib
   autoload :ShellOut, "mixlib/shellout"
 end
 autoload :URI, "uri"
-autoload :Addressable, "addressable/uri"
+module Addressable
+  autoload :URI, "addressable/uri"
+end
 autoload :OpenSSL, "openssl"
 autoload :YAML, "yaml"
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
@@ -647,7 +649,7 @@ module ChefConfig
     # credentials toml files which doesn't allow ruby symbol values
     configurable(:ssl_verify_mode).writes_value do |value|
       if value.is_a?(String) && value[0] == ":"
-        value[1..-1].to_sym
+        value[1..].to_sym
       else
         value.to_sym
       end
@@ -1205,7 +1207,7 @@ module ChefConfig
           # Transform into the form en_ZZ.UTF-8
           guessed_locale.gsub(/UTF-?8$/i, "UTF-8")
         else
-          ChefConfig.logger.warn "Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support."
+          ChefConfig.logger.warn "Please install an English UTF-8 locale for #{ChefUtils::Dist::Infra::PRODUCT} to use, falling back to C locale and disabling UTF-8 support."
           "C"
         end
       end
@@ -1258,9 +1260,9 @@ module ChefConfig
     # @api private
     def self.enable_fips_mode
       OpenSSL.fips_mode = true
-      require "digest"
-      require "digest/sha1"
-      require "digest/md5"
+      require "digest" unless defined?(Digest)
+      require "digest/sha1" unless defined?(Digest::SHA1)
+      require "digest/md5" unless defined?(Digest::MD5)
       # Remove pre-existing constants if they do exist to reduce the
       # amount of log spam and warnings.
       Digest.send(:remove_const, "SHA1") if Digest.const_defined?("SHA1")

data/lib/chef-config/mixin/dot_d.rb

@@ -20,6 +20,7 @@ module ChefConfig
   module Mixin
     module DotD
       # Find available configuration files in a `.d/` style include directory.
+      # Make sure we exclude anything that's not a file so we avoid directories ending in .rb (just in case)
       #
       # @api internal
       # @param path [String] Base .d/ path to load from.

data/lib/chef-config/mixin/fuzzy_hostname_matcher.rb

@@ -20,8 +20,16 @@ module ChefConfig
   module Mixin
     module FuzzyHostnameMatcher
 
+      #
+      # Check to see if a hostname matches a match string. Used to see if hosts fall under our no_proxy config
+      #
+      # @param [String] hostname the hostname to check
+      # @param [String] matches the pattern to match
+      #
+      # @return [Boolean]
+      #
       def fuzzy_hostname_match_any?(hostname, matches)
-        if (!hostname.nil?) && (!matches.nil?)
+        if hostname && matches
           return matches.to_s.split(/\s*,\s*/).compact.any? do |m|
             fuzzy_hostname_match?(hostname, m)
           end

data/lib/chef-config/mixin/train_transport.rb

@@ -44,7 +44,7 @@ module ChefConfig
 
         # host names must be specified in credentials file as ['foo.example.org'] with quotes
         if !credentials.nil? && !credentials[profile].nil?
-          credentials[profile].map { |k, v| [k.to_sym, v] }.to_h # return symbolized keys to match Train.options()
+          credentials[profile].transform_keys(&:to_sym) # return symbolized keys to match Train.options()
         else
           nil
         end

data/lib/chef-config/version.rb

@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "16.5.64".freeze
+  VERSION = "16.8.14".freeze
 end

data/lib/chef-config/workstation_config_loader.rb

@@ -166,7 +166,7 @@ module ChefConfig
         when "client_key"
           extract_key(value, :client_key, :client_key_contents)
         when "knife"
-          Config.knife.merge!(Hash[value.map { |k, v| [k.to_sym, v] }])
+          Config.knife.merge!(value.transform_keys(&:to_sym))
         else
           Config[key.to_sym] = value
         end
@@ -195,8 +195,8 @@ module ChefConfig
       message = ""
       message << "You have invalid ruby syntax in your config file #{config_file_path}\n\n"
       message << "#{e.class.name}: #{e.message}\n"
-      if file_line = e.message[/#{Regexp.escape(config_file_path)}:[\d]+/]
-        line = file_line[/:([\d]+)$/, 1].to_i
+      if file_line = e.message[/#{Regexp.escape(config_file_path)}:\d+/]
+        line = file_line[/:(\d+)$/, 1].to_i
         message << highlight_config_error(config_file_path, line)
       end
       raise ChefConfig::ConfigurationError, message
@@ -206,7 +206,7 @@ module ChefConfig
       filtered_trace = e.backtrace.grep(/#{Regexp.escape(config_file_path)}/)
       filtered_trace.each { |bt_line| message << "  " << bt_line << "\n" }
       unless filtered_trace.empty?
-        line_nr = filtered_trace.first[/#{Regexp.escape(config_file_path)}:([\d]+)/, 1]
+        line_nr = filtered_trace.first[/#{Regexp.escape(config_file_path)}:(\d+)/, 1]
         message << highlight_config_error(config_file_path, line_nr.to_i)
       end
       raise ChefConfig::ConfigurationError, message

data/spec/unit/config_spec.rb

@@ -931,7 +931,7 @@ RSpec.describe ChefConfig::Config do
 
         shared_examples_for "a suitable locale" do
           it "returns an English UTF-8 locale" do
-            expect(ChefConfig.logger).to_not receive(:warn).with(/Please install an English UTF-8 locale for Chef to use/)
+            expect(ChefConfig.logger).to_not receive(:warn).with(/Please install an English UTF-8 locale for Chef Infra Client to use/)
             expect(ChefConfig.logger).to_not receive(:trace).with(/Defaulting to locale en_US.UTF-8 on Windows/)
             expect(ChefConfig.logger).to_not receive(:trace).with(/No usable locale -a command found/)
             expect(ChefConfig::Config.guess_internal_locale).to eq expected_locale
@@ -984,7 +984,7 @@ RSpec.describe ChefConfig::Config do
           let(:locale_array) { ["af_ZA", "af_ZA.ISO8859-1", "af_ZA.ISO8859-15", "af_ZA.UTF-8"] }
 
           it "should fall back to C locale" do
-            expect(ChefConfig.logger).to receive(:warn).with("Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support.")
+            expect(ChefConfig.logger).to receive(:warn).with("Please install an English UTF-8 locale for Chef Infra Client to use, falling back to C locale and disabling UTF-8 support.")
             expect(ChefConfig::Config.guess_internal_locale).to eq "C"
           end
         end

data/spec/unit/fips_spec.rb

@@ -20,7 +20,7 @@ require "chef-config/fips"
 require "spec_helper"
 
 begin
-  require "win32/registry"
+  require "win32/registry" unless defined?(Win32::Registry)
 rescue LoadError
   # not on unix
 end

data/spec/unit/workstation_config_loader_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-require "tempfile"
+require "tempfile" unless defined?(Tempfile)
 
 require "chef-config/exceptions"
 require "chef-utils"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 16.5.64
+  version: 16.8.14
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.5.64
+        version: 16.8.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.5.64
+        version: 16.8.14
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -106,62 +106,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 description: 
 email:
 - adam@chef.io
@@ -193,7 +137,12 @@ files:
 homepage: https://github.com/chef/chef
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/chef/chef/issues
+  changelog_uri: https://github.com/chef/chef/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/chef/chef/tree/master/chef-config/README.md
+  homepage_uri: https://github.com/chef/chef/tree/master/chef-config
+  source_code_uri: https://github.com/chef/chef/tree/master/chef-config
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -202,15 +151,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Chef's default configuration and config loading
+summary: Chef Infra's default configuration and config loading library
 test_files: []