chef-config 15.1.36 → 15.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15cf8762e25cc78ca11a3fd7d1d1e379814f4e024677feabf462cc33148ed9aa
-  data.tar.gz: cf678c279572b54359e996ed01efa545f7b8e0103cc7d2107cfaca5b39b97cfa
+  metadata.gz: cd822b0956f264dd0eea1108db04d7dbf7b0027a7611281d36c9bcb175f05b76
+  data.tar.gz: a301e799b27cf6f0e2d8a28baa65abf382cd72aab2b3c966a4cd8ff71dad5f5f
 SHA512:
-  metadata.gz: 22d0fc9b59e9d100c12a6caa58bbee563efc8b2547aa91483b8f9dbc146d34230c2157645e717ca1cf726797bc8cf2a89be5cea03b0f967d2cf3fbc7bd8d1740
-  data.tar.gz: 503712cb8b46d59660c223134b49116971c68a419ac09bb564fc9402a8732861f1fad0121076fa111760296ed04ddeb0ea5339e679edbe02d587b70381ed250c
+  metadata.gz: 44f600331b59e426dce352e7e82fd38025df87d980f81cacab529438aae564e2c588794fe4dc1b4d284c0550dea02334277e1b1eb6f6ac2aeef714a787f045c6
+  data.tar.gz: 01a2e003f89b9145669c53a2a5be365440be9567bb750293e737eb723ce4efdcb13e34e83eefa5e70f3e67805e52fb481a1232854675184d843538ef44c895f8

data/lib/chef-config/config.rb

@@ -103,6 +103,7 @@ module ChefConfig
           if option.empty? || !option.include?("=")
             raise UnparsableConfigOption, "Unparsable config option #{option.inspect}"
           end
+
           # Split including whitespace if someone does truly odd like
           # --config-option "foo = bar"
           key, value = option.split(/\s*=\s*/, 2)
@@ -133,7 +134,7 @@ module ChefConfig
     # @return [Boolean] is the URL valid
     def self.is_valid_url?(uri)
       url = uri.to_s.strip
-      /^http:\/\// =~ url || /^https:\/\// =~ url || /^chefzero:/ =~ url
+      %r{^http://} =~ url || %r{^https://} =~ url || /^chefzero:/ =~ url
     end
 
     # Override the config dispatch to set the value of multiple server options simultaneously
@@ -144,6 +145,7 @@ module ChefConfig
       unless is_valid_url? uri
         raise ConfigurationError, "#{uri} is an invalid chef_server_url. The URL must start with http://, https://, or chefzero://."
       end
+
       uri.to_s.strip
     end
 
@@ -160,7 +162,7 @@ module ChefConfig
     # etc.) work.
     default :chef_repo_path do
       if configuration[:cookbook_path]
-        if configuration[:cookbook_path].kind_of?(String)
+        if configuration[:cookbook_path].is_a?(String)
           File.expand_path("..", configuration[:cookbook_path])
         else
           configuration[:cookbook_path].map do |path|
@@ -192,7 +194,7 @@ module ChefConfig
 
     # @param child_path [String]
     def self.derive_path_from_chef_repo_path(child_path)
-      if chef_repo_path.kind_of?(String)
+      if chef_repo_path.is_a?(String)
         PathHelper.join(chef_repo_path, child_path)
       else
         chef_repo_path.uniq.map { |path| PathHelper.join(path, child_path) }
@@ -401,7 +403,7 @@ module ChefConfig
     default :repo_mode do
       if local_mode && !chef_zero.osc_compat
         "hosted_everything"
-      elsif chef_server_url =~ /\/+organizations\/.+/
+      elsif chef_server_url =~ %r{/+organizations/.+}
         "hosted_everything"
       else
         "everything"
@@ -457,7 +459,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] =~ /\/organizations\/\S*$/
+      if configuration[:chef_server_url] =~ %r{/organizations/\S*$}
         configuration[:chef_server_url].split("/")[0..-3].join("/")
       elsif configuration[:chef_server_url] # default to whatever chef_server_url is
         configuration[:chef_server_url]
@@ -1071,8 +1073,8 @@ module ChefConfig
       # Check if the proxy string contains a scheme. If not, add the url's scheme to the
       # 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 = if !proxy_env_var.empty?
-                if proxy_env_var =~ /^.*:\/\//
+      proxy = unless proxy_env_var.empty?
+                if proxy_env_var =~ %r{^.*://}
                   URI.parse(proxy_env_var)
                 else
                   URI.parse("#{scheme}://#{proxy_env_var}")

data/lib/chef-config/logger.rb

@@ -21,32 +21,23 @@ module ChefConfig
   # logger for `ChefConfig.logger`
   class NullLogger
 
-    def <<(_msg)
-    end
+    def <<(_msg); end
 
-    def add(_severity, _message = nil, _progname = nil)
-    end
+    def add(_severity, _message = nil, _progname = nil); end
 
-    def trace(_progname = nil, &block)
-    end
+    def trace(_progname = nil, &block); end
 
-    def debug(_progname = nil, &block)
-    end
+    def debug(_progname = nil, &block); end
 
-    def info(_progname = nil, &block)
-    end
+    def info(_progname = nil, &block); end
 
-    def warn(_progname = nil, &block)
-    end
+    def warn(_progname = nil, &block); end
 
-    def deprecation(_progname = nil, &block)
-    end
+    def deprecation(_progname = nil, &block); end
 
-    def error(_progname = nil, &block)
-    end
+    def error(_progname = nil, &block); end
 
-    def fatal(_progname = nil, &block)
-    end
+    def fatal(_progname = nil, &block); end
 
   end
 

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

@@ -65,6 +65,7 @@ module ChefConfig
       def parse_credentials_file
         credentials_file = credentials_file_path
         return nil unless File.file?(credentials_file)
+
         begin
           Tomlrb.load_file(credentials_file)
         rescue => e
@@ -85,10 +86,12 @@ module ChefConfig
         profile = credentials_profile(profile)
         config = parse_credentials_file
         return if config.nil? # No credentials, nothing to do here.
+
         if config[profile].nil?
           # Unknown profile name. For "default" just silently ignore, otherwise
           # raise an error.
           return if profile == "default"
+
           raise ChefConfig::ConfigurationError, "Profile #{profile} doesn't exist. Please add it to #{credentials_file}."
         end
         apply_credentials(config[profile], profile)

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

@@ -32,7 +32,7 @@ module ChefConfig
 
       def fuzzy_hostname_match?(hostname, match)
         # Do greedy matching by adding wildcard if it is not specified
-        match = "*" + match if !match.start_with?("*")
+        match = "*" + match unless match.start_with?("*")
         Fuzzyurl.matches?(Fuzzyurl.mask(hostname: match), hostname)
       end
 

data/lib/chef-config/path_helper.rb

@@ -63,7 +63,7 @@ module ChefConfig
       trailing_slashes = /[#{path_separator_regex}]+$/
       leading_slashes = /^[#{path_separator_regex}]+/
 
-      args.flatten.inject() do |joined_path, component|
+      args.flatten.inject do |joined_path, component|
         joined_path = joined_path.sub(trailing_slashes, "")
         component = component.sub(leading_slashes, "")
         joined_path + "#{path_separator}#{component}"

data/lib/chef-config/version.rb

@@ -21,7 +21,7 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.1.36".freeze
+  VERSION = "15.2.20".freeze
 end
 
 #

data/lib/chef-config/workstation_config_loader.rb

@@ -155,6 +155,7 @@ module ChefConfig
       if creds.key?("node_name") && creds.key?("client_name")
         raise ChefConfig::ConfigurationError, "Do not specify both node_name and client_name. You should prefer client_name."
       end
+
       # Load credentials data into the Chef configuration.
       creds.each do |key, value|
         case key.to_s

data/spec/unit/config_spec.rb

@@ -195,7 +195,7 @@ RSpec.describe ChefConfig::Config do
 
   [ false, true ].each do |is_windows|
 
-    context "On #{is_windows ? 'Windows' : 'Unix'}" do
+    context "On #{is_windows ? "Windows" : "Unix"}" do
       def to_platform(*args)
         ChefConfig::Config.platform_specific_path(*args)
       end
@@ -618,7 +618,7 @@ RSpec.describe ChefConfig::Config do
         # On Windows, we'll detect an omnibus build and set this to the
         # cacert.pem included in the package, but it's nil if you're on Windows
         # w/o omnibus (e.g., doing development on Windows, custom build, etc.)
-        if !is_windows
+        unless is_windows
           it "ChefConfig::Config[:ssl_ca_file] defaults to nil" do
             expect(ChefConfig::Config[:ssl_ca_file]).to be_nil
           end

data/spec/unit/workstation_config_loader_spec.rb

@@ -375,7 +375,8 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
       before do
         ChefConfig::Config[:config_d_dir] = tempdir
         allow(config_loader).to receive(:path_exists?).with(
-          an_instance_of(String)).and_return(false)
+          an_instance_of(String)
+        ).and_return(false)
       end
 
       after do
@@ -516,7 +517,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
             -----BEGIN RSA PRIVATE KEY-----
             foo
           EOH
-)
+                                                              )
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 15.1.36
+  version: 15.2.20
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -158,9 +158,7 @@ files:
 - LICENSE
 - Rakefile
 - chef-config.gemspec
-- lib/.DS_Store
 - lib/chef-config.rb
-- lib/chef-config/.DS_Store
 - lib/chef-config/config.rb
 - lib/chef-config/exceptions.rb
 - lib/chef-config/fips.rb