chef-config 15.4.45 → 15.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d40b49537155945f51eda6a762b794f00a82c9dff824b0dabbb58fcabd3e0b
-  data.tar.gz: f07e392b7ce953e6c71121099c39512d6a1902c8f350a748e2484a7890861e14
+  metadata.gz: f91e769432580aaa6c4c2b62564b354c848ece00d6cf2fe587f9cf96d7f27fca
+  data.tar.gz: a11b03cfe07fb1d428adeed60f9577532ec56f8330d15cbdc52c35b74dfe6a3a
 SHA512:
-  metadata.gz: c3291e0dba33d3eecf69fe9e201290b13c3e4c4ade964c7bf6d38836f84f6235cf5b21f18bd43d5671d8998d31c107705acf49565669cc1f9f5b6f19082cf1bf
-  data.tar.gz: 2a6ab1f73ea1ada4ef3be785d8eec3036eba88f087b6b50eb153f8bcd9dd8f31f036cac3a68ab80dfe5dc98529fed3d373e58d54290d1483d9d1265419813ac5
+  metadata.gz: 4aed9e8baaed79001003ae6424fe7e1eb84f0ab28d06ee6ce66af1aaaddf2758f9f983c2d469ea7686c58ec025d361939bd3f434e077374ab5fc0f5d3573ec4e
+  data.tar.gz: 5ddd80cf0ac7fc5b1fd7f546b8cc7fe5a593c921b3d773ef993f802b9b34b5ecc7b31b8fe82e624cf474b1cd9679cdb0a5bdb0b52079bfc05ed9d51e48e490a0

data/chef-config.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "chef-utils", "= #{ChefConfig::VERSION}"
   spec.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   spec.add_dependency "mixlib-config", ">= 2.2.12", "< 4.0"
   spec.add_dependency "fuzzyurl"

data/lib/chef-config/config.rb

@@ -21,6 +21,7 @@
 
 require "mixlib/config" unless defined?(Mixlib::Config)
 require "pathname" unless defined?(Pathname)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 require_relative "fips"
 require_relative "logger"
@@ -60,7 +61,7 @@ module ChefConfig
     # @return [String] a platform specific path
     def self.platform_specific_path(path)
       path = PathHelper.cleanpath(path)
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         # turns \etc\chef\client.rb and \var\chef\client.rb into C:/chef/client.rb
         # Some installations will be on different drives so use the drive that
         # the expanded path to __FILE__ is found.
@@ -78,7 +79,7 @@ module ChefConfig
     #
     # @return [String] the drive letter
     def self.windows_installation_drive
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         drive = File.expand_path(__FILE__).split("/", 2)[0]
         drive = ENV["SYSTEMDRIVE"] if drive.to_s == ""
         drive
@@ -573,7 +574,7 @@ module ChefConfig
     # Path to the default CA bundle files.
     default :ssl_ca_path, nil
     default(:ssl_ca_file) do
-      if ChefConfig.windows? && embedded_dir
+      if ChefUtils.windows? && embedded_dir
         cacert_path = File.join(embedded_dir, "ssl/certs/cacert.pem")
         cacert_path if File.exist?(cacert_path)
       else
@@ -841,7 +842,7 @@ module ChefConfig
 
     # Those lists of regular expressions define what chef considers a
     # valid user and group name
-    if ChefConfig.windows?
+    if ChefUtils.windows?
       set_defaults_for_windows
     else
       set_defaults_for_nix
@@ -1138,7 +1139,7 @@ module ChefConfig
         end
       end
     rescue
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         ChefConfig.logger.trace "Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else."
       else
         ChefConfig.logger.trace "No usable locale -a command found, assuming you have en_US.UTF-8 installed."

data/lib/chef-config/exceptions.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef-config/fips.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2016-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +16,12 @@
 # limitations under the License.
 #
 
+require "chef-utils" unless defined?(ChefUtils::CANARY)
+
 module ChefConfig
 
   def self.fips?
-    if ChefConfig.windows?
+    if ChefUtils.windows?
       begin
         require "win32/registry" unless defined?(Win32::Registry)
       rescue LoadError

data/lib/chef-config/path_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright 2014-2018, Chef Software, Inc.
+# Copyright:: Copyright 2014-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 require_relative "windows"
 require_relative "logger"
 require_relative "exceptions"
@@ -26,7 +27,7 @@ module ChefConfig
     WIN_MAX_PATH = 259
 
     def self.dirname(path)
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         # Find the first slash, not counting trailing slashes
         end_slash = path.size
         loop do
@@ -47,7 +48,7 @@ module ChefConfig
     BACKSLASH = '\\'.freeze
 
     def self.path_separator
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         File::ALT_SEPARATOR || BACKSLASH
       else
         File::SEPARATOR
@@ -71,7 +72,7 @@ module ChefConfig
     end
 
     def self.validate_path(path)
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         unless printable?(path)
           msg = "Path '#{path}' contains non-printable characters. Check that backslashes are escaped with another backslash (e.g. C:\\\\Windows) in double-quoted strings."
           ChefConfig.logger.error(msg)
@@ -114,7 +115,7 @@ module ChefConfig
       # First remove extra separators and resolve any relative paths
       abs_path = File.absolute_path(path)
 
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         # Add the \\?\ API prefix on Windows unless add_prefix is false
         # Downcase on Windows where paths are still case-insensitive
         abs_path.gsub!(::File::SEPARATOR, path_separator)
@@ -142,7 +143,7 @@ module ChefConfig
     def self.cleanpath(path)
       path = Pathname.new(path).cleanpath.to_s
       # ensure all forward slashes are backslashes
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         path = path.gsub(File::SEPARATOR, path_separator)
       end
       path
@@ -219,7 +220,7 @@ module ChefConfig
       paths = []
       paths << ENV[@@per_tool_home_environment] if defined?(@@per_tool_home_environment) && @@per_tool_home_environment && ENV[@@per_tool_home_environment]
       paths << ENV["CHEF_HOME"] if ENV["CHEF_HOME"]
-      if ChefConfig.windows?
+      if ChefUtils.windows?
         # By default, Ruby uses the the following environment variables to determine Dir.home:
         # HOME
         # HOMEDRIVE HOMEPATH

data/lib/chef-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright 2010-2016, Chef Software, Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,22 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# NOTE: This file is generated by running `rake version` in the top level of
-# this repo. Do not edit this manually. Edit the VERSION file and run the rake
-# task instead.
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.4.45".freeze
+  VERSION = "15.5.9".freeze
 end
-
-#
-# NOTE: the Chef::Version class is defined in version_class.rb
-#
-# NOTE: DO NOT Use the Chef::Version class on ChefConfig::VERSIONs.  The
-#       Chef::Version class is for _cookbooks_ only, and cannot handle
-#       pre-release versions like "10.14.0.rc.2".  Please use Rubygem's
-#       Gem::Version class instead.
-#

data/lib/chef-config/windows.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +15,10 @@
 # limitations under the License.
 #
 
-module ChefConfig
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
+module ChefConfig
   def self.windows?
-    if RUBY_PLATFORM =~ /mswin|mingw|windows/
-      true
-    else
-      false
-    end
+    ChefUtils.windows?
   end
-
 end

data/lib/chef-config/workstation_config_loader.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 require_relative "config"
 require_relative "exceptions"
 require_relative "logger"
@@ -139,7 +140,7 @@ module ChefConfig
     end
 
     def working_directory
-      a = if ChefConfig.windows?
+      a = if ChefUtils.windows?
             env["CD"]
           else
             env["PWD"]

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require "chef-config/windows"
+require "chef-utils"
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -32,8 +32,8 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
-  config.filter_run_excluding windows_only: true unless ChefConfig.windows?
-  config.filter_run_excluding unix_only: true if ChefConfig.windows?
+  config.filter_run_excluding windows_only: true unless ChefUtils.windows?
+  config.filter_run_excluding unix_only: true if ChefUtils.windows?
 
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:

data/spec/unit/config_spec.rb

@@ -201,7 +201,7 @@ RSpec.describe ChefConfig::Config do
       end
 
       before :each do
-        allow(ChefConfig).to receive(:windows?).and_return(is_windows)
+        allow(ChefUtils).to receive(:windows?).and_return(is_windows)
       end
       describe "class method: windows_installation_drive" do
         before do

data/spec/unit/fips_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@ RSpec.describe "ChefConfig.fips?" do
     let(:fips_path) { "/proc/sys/crypto/fips_enabled" }
 
     before(:each) do
-      allow(ChefConfig).to receive(:windows?).and_return(false)
+      allow(ChefUtils).to receive(:windows?).and_return(false)
       allow(::File).to receive(:exist?).with(fips_path).and_return(true)
       allow(::File).to receive(:read).with(fips_path).and_return(enabled)
     end
@@ -69,7 +69,7 @@ RSpec.describe "ChefConfig.fips?" do
     let(:win_reg_entry) { { "Enabled" => enabled } }
 
     before(:each) do
-      allow(ChefConfig).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
       allow(Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).with(fips_key, arch).and_yield(win_reg_entry)
     end
 

data/spec/unit/path_helper_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,7 +58,7 @@ RSpec.describe ChefConfig::PathHelper do
   context "on windows" do
 
     before(:each) do
-      allow(ChefConfig).to receive(:windows?).and_return(true)
+      allow(ChefUtils).to receive(:windows?).and_return(true)
     end
 
     include_examples("common_functionality")
@@ -106,7 +106,7 @@ RSpec.describe ChefConfig::PathHelper do
   context "on unix" do
 
     before(:each) do
-      allow(ChefConfig).to receive(:windows?).and_return(false)
+      allow(ChefUtils).to receive(:windows?).and_return(false)
     end
 
     include_examples("common_functionality")
@@ -144,7 +144,7 @@ RSpec.describe ChefConfig::PathHelper do
     context "on windows" do
       before(:each) do
         # pass by default
-        allow(ChefConfig).to receive(:windows?).and_return(true)
+        allow(ChefUtils).to receive(:windows?).and_return(true)
         allow(path_helper).to receive(:printable?).and_return(true)
         allow(path_helper).to receive(:windows_max_length_exceeded?).and_return(false)
       end
@@ -254,7 +254,7 @@ RSpec.describe ChefConfig::PathHelper do
     context "when given more than one argument" do
       it "joins, cleanpaths, and escapes characters reserved by glob" do
         args = ["this/*path", "[needs]", "escaping?"]
-        escaped_path = if ChefConfig.windows?
+        escaped_path = if ChefUtils.windows?
                          "this\\\\\\*path\\\\\\[needs\\]\\\\escaping\\?"
                        else
                          "this/\\*path/\\[needs\\]/escaping\\?"
@@ -286,7 +286,7 @@ RSpec.describe ChefConfig::PathHelper do
   describe "all_homes" do
     before do
       stub_const("ENV", env)
-      allow(ChefConfig).to receive(:windows?).and_return(is_windows)
+      allow(ChefUtils).to receive(:windows?).and_return(is_windows)
     end
 
     context "on windows" do

data/spec/unit/workstation_config_loader_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 require "tempfile"
 
 require "chef-config/exceptions"
-require "chef-config/windows"
+require "chef-utils"
 require "chef-config/workstation_config_loader"
 
 RSpec.describe ChefConfig::WorkstationConfigLoader do
@@ -98,7 +98,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
             let(:env_pwd) { "/path/to/cwd" }
 
             before do
-              if ChefConfig.windows?
+              if ChefUtils.windows?
                 env["CD"] = env_pwd
               else
                 env["PWD"] = env_pwd
@@ -431,7 +431,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
   end
 
   describe "when loading a credentials file" do
-    if ChefConfig.windows?
+    if ChefUtils.windows?
       let(:home) { "C:/Users/example.user" }
     else
       let(:home) { "/Users/example.user" }

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 15.4.45
+  version: 15.5.9
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 15.5.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 15.5.9
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement