chef-config 16.0.257 → 16.2.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1967a23569bd6acc655afb4a46c884f487292399438ebef67c30753cddbae30
-  data.tar.gz: 8b0e0493a0a8b0ed27a8cdb9516e6910a8da60c6caf187a8953f52460dc9b1fa
+  metadata.gz: f95d6cbee8afbc2b5b6ceda9c6c18a75f542c545b9f01587f0f216c2d4cb735f
+  data.tar.gz: b373dd5fdf065d4b4cc9287d7d4254ba3b340b8b4ded5334c33939b596c6db8d
 SHA512:
-  metadata.gz: 6ae62cd75d740132b5ae1db4d9d967f1cde8529b8b5a73f82e80314e8a074cc9ad1d3403a2196fff3c7efb3c19c6aefeb927142810c7785cfd21e1416b0710e9
-  data.tar.gz: fbc6a73fb9db1a9d33314950b85bf358b7136630f6f2fa2ea0bcfc9e582e4a3e372ffd91d2a2e1b9292d98c0945365a22b1264ec272ad8113828dcb322e4bf64
+  metadata.gz: cd07d4b433d12ec1f9361c2d69ec07ecc3558aa5316ce07b546e8ee2b208247441621263045d0f5613c22e89f753eae817423d9036c8ca4b785322b4adeb665d
+  data.tar.gz: cbbb118a11769451ee5e40277e975465e43f49ca532deaea6521d2823982cf70a20468b5e348c7240514d312e4846d2fb77b295d95fb6d8fdd5270a53bee45fe

data/lib/chef-config/config.rb

@@ -450,7 +450,7 @@ module ChefConfig
     default :repo_mode do
       if local_mode && !chef_zero.osc_compat
         "hosted_everything"
-      elsif chef_server_url =~ %r{/+organizations/.+}
+      elsif %r{/+organizations/.+}.match?(chef_server_url)
         "hosted_everything"
       else
         "everything"
@@ -479,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
@@ -506,7 +506,7 @@ module ChefConfig
     default(:chef_server_root) do
       # if the chef_server_url is a path to an organization, aka
       # 'some_url.../organizations/*' then remove the '/organization/*' by default
-      if configuration[:chef_server_url] =~ %r{/organizations/\S*$}
+      if %r{/organizations/\S*$}.match?(configuration[:chef_server_url])
         configuration[:chef_server_url].split("/")[0..-3].join("/")
       elsif configuration[:chef_server_url] # default to whatever chef_server_url is
         configuration[:chef_server_url]
@@ -527,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.
@@ -847,33 +847,6 @@ 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
 
@@ -979,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).
@@ -1136,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
@@ -1145,7 +1118,7 @@ module ChefConfig
       # proxy before parsing. The regex /^.*:\/\// matches, for example, http://. Reusing proxy
       # here since we are really just trying to get the string built correctly.
       proxy = unless proxy_env_var.empty?
-                if proxy_env_var =~ %r{^.*://}
+                if %r{^.*://}.match?(proxy_env_var)
                   URI.parse(proxy_env_var)
                 else
                   URI.parse("#{scheme}://#{proxy_env_var}")

data/lib/chef-config/path_helper.rb

@@ -91,7 +91,7 @@ module ChefConfig
     def self.windows_max_length_exceeded?(path)
       # Check to see if paths without the \\?\ prefix are over the maximum allowed length for the Windows API
       # http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
-      unless path =~ /^\\\\?\\/
+      unless /^\\\\?\\/.match?(path)
         if path.length > WIN_MAX_PATH
           return true
         end
@@ -103,7 +103,7 @@ module ChefConfig
     def self.printable?(string)
       # returns true if string is free of non-printable characters (escape sequences)
       # this returns false for whitespace escape sequences as well, e.g. \n\t
-      if string =~ /[^[:print:]]/
+      if /[^[:print:]]/.match?(string)
         false
       else
         true
@@ -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
@@ -268,7 +268,7 @@ module ChefConfig
     # Determine if the given path is protected by macOS System Integrity Protection.
     def self.is_sip_path?(path, node)
       if ChefUtils.macos?
-          # @todo: parse rootless.conf for this?
+        # @todo: parse rootless.conf for this?
         sip_paths = [
           "/System", "/bin", "/sbin", "/usr"
         ]
@@ -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 = [

data/lib/chef-config/version.rb

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

data/spec/unit/config_spec.rb

@@ -175,40 +175,40 @@ 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
   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 default
+    #   log_level = info or default
+    # end
+    #
     it "has an empty list of formatters by default" do
       expect(ChefConfig::Config.formatters).to eq([])
     end

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: 16.0.257
+  version: 16.2.44
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-06-17 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.0.257
+        version: 16.2.44
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.0.257
+        version: 16.2.44
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement