chef-config 15.8.23 → 15.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d855e981ca189727e91f36ef2f23cd54b0c9f8626826874971746d2ce0392aff
-  data.tar.gz: f63b6b59c420a08ca172b34808c3bdbe2e299f41c67a601e043ea5da08c84e9f
+  metadata.gz: d567109bfd4a892e019a2d5cf147441dea0d9cc9c6af4645a2d836b3bc955bb6
+  data.tar.gz: a99c0e9c7f4ba703b7af980960aebee9b69c915aff11fc318b8de19e79c3ed46
 SHA512:
-  metadata.gz: 831a382085dc473ee33b8c09adc1ca64b3421d7d5aa544232356ab761548682a203c203e536ae4b86765c2653a912feb8633c8d66b0769accd7d159ee39b3389
-  data.tar.gz: 637219bf7c47dc0d099f6e3d6e8e08261981e0dd3017a7a4873d91ebd07184060dd89167d30339ba2ed32c375d79feabdac79182f3223b822cc2f17591cc6173
+  metadata.gz: d0cc00d27d348329252481ad13ba300ed599527b995f0e774fe62277ed6562132c5016096e4afeb60ad2bb56c3d59e9d64da64d79de82cab643769533f3b2502
+  data.tar.gz: ce0ac74ebe93dd11d2806197aeb45271e112a8f2101cd50ca23943daaafdca616ebed3156fb58751866f13b9ac2d4cc19fce0ec1493e826e2e0d25591e55b85a

data/lib/chef-config/config.rb

@@ -75,20 +75,20 @@ module ChefConfig
     end
 
     # On *nix, /etc/chef
-    def self.etc_chef_dir
-      path = ChefUtils.windows? ? c_chef_dir : PathHelper.join("/etc", ChefConfig::Dist::DIR_SUFFIX)
+    def self.etc_chef_dir(is_windows = ChefUtils.windows?)
+      path = is_windows ? c_chef_dir : PathHelper.join("/etc", ChefConfig::Dist::DIR_SUFFIX)
       PathHelper.cleanpath(path)
     end
 
     # On *nix, /var/chef
-    def self.var_chef_dir
-      path = ChefUtils.windows? ? c_chef_dir : PathHelper.join("/var", ChefConfig::Dist::DIR_SUFFIX)
+    def self.var_chef_dir(is_windows = ChefUtils.windows?)
+      path = is_windows ? c_chef_dir : PathHelper.join("/var", ChefConfig::Dist::DIR_SUFFIX)
       PathHelper.cleanpath(path)
     end
 
     # On *nix, the root of /var/, used to test if we can create and write in /var/chef
-    def self.var_root_dir
-      path = ChefUtils.windows? ? c_chef_dir : "/var"
+    def self.var_root_dir(is_windows = ChefUtils.windows?)
+      path = is_windows ? c_chef_dir : "/var"
       PathHelper.cleanpath(path)
     end
 
@@ -99,6 +99,12 @@ module ChefConfig
       PathHelper.cleanpath(path)
     end
 
+    def self.c_opscode_dir
+      drive = windows_installation_drive || "C:"
+      path = PathHelper.join(drive, ChefConfig::Dist::LEGACY_CONF_DIR, ChefConfig::Dist::DIR_SUFFIX)
+      PathHelper.cleanpath(path)
+    end
+
     # the drive where Chef is installed on a windows host. This is determined
     # either by the drive containing the current file or by the SYSTEMDRIVE ENV
     # variable

data/lib/chef-config/dist.rb

@@ -15,5 +15,9 @@ module ChefConfig
 
     # The user's configuration directory
     USER_CONF_DIR = ".chef".freeze
+
+    # 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
   end
 end

data/lib/chef-config/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 15.8.23
+  version: 15.9.17
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-04-03 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.8.23
+        version: 15.9.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.8.23
+        version: 15.9.17
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement