chef-utils 19.3.15 → 19.4.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aff6821bcd46b7f59bf738a59af9d2166b3af867786ea474a059e62b6508d21
-  data.tar.gz: cbba59b495a1b9850b95617dc747f8bc93f823e33ce91bc8e1918c3d9780c2e8
+  metadata.gz: e446f182d09c3b793a7deabde425f761ed3dafe680abb2b6ec438c9f82b11182
+  data.tar.gz: 32a13986d1bd2e311617bc5ef7414cbcffbed25f9e173ec7efa955614a36e512
 SHA512:
-  metadata.gz: 06b654492b85895cf1ccb4188f486d5bafeb96b832f1867a72785ffaad9c72df9dd2a9186fa689a91c5fdb69aa90367d7b468dc897e6aee66ebb9cc72f66940b
-  data.tar.gz: 2c92e9614af786104870db19d87f6b051147b14b53772db30c0f9ba35540c6270b9c5b2ca258c465db5030e1c1b37a175587493c466dbfe6f8d252cb4d92dac0
+  metadata.gz: 70e1e7d84daf1ca99ff734d42504afe9c677d11fc10cfc3c2775358784261d58634fa073eee68930ed65d31ab8bb59db0f6869a9af0f95acdc44700406e0c948
+  data.tar.gz: e8b0b0972a16dcaaf898ff8d3ec5fc3dba7268c5c0f68c12a62f7709def601d05c160519a800f57262aa5c5c48affe26ab0630339f6c36b15801fe734bd7f224

data/chef-utils.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
 
   # concurrent-ruby is: 1. lightweight, 2. has zero deps, 3. is external to chef
   # this is used for the parallel_map enumerable extension for lightweight threading
-  spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "concurrent-ruby", ">= 1.3.7"
 
   spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }

data/lib/chef-utils/dsl/default_paths.rb

@@ -43,7 +43,25 @@ module ChefUtils
       private
 
       def __default_paths
-        ChefUtils.windows? ? %w{} : %w{/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin}
+        if ChefUtils.windows?
+          # On Windows with Habitat-based packaging (Chef 19+), the Habitat launcher
+          # overwrites the process PATH with only the package's bin dirs, stripping
+          # standard Windows system directories. We restore them here using SystemRoot
+          # (an OS-level env var set by Windows itself, always present and unaffected
+          # by Habitat's PATH overwrite), mirroring what Linux already does for
+          # /usr/bin, /sbin, etc.
+          # Note: we intentionally do NOT add WindowsPowerShell here because Chef 19
+          # (Habitat-based) ships its own bundled PowerShell and adding the system
+          # PowerShell path could cause version conflicts.
+          system_root = ENV.fetch("SystemRoot", 'C:\Windows')
+          [
+            "#{system_root}\\System32",
+            system_root,
+            "#{system_root}\\System32\\Wbem",
+          ]
+        else
+          %w{/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin}
+        end
       end
 
       def __ruby_bindir

data/lib/chef-utils/dsl/train_helpers.rb

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "stringio" unless defined?(StringIO)
 require_relative "../internal"
 
 module ChefUtils
@@ -54,6 +53,8 @@ module ChefUtils
       #
       def file_open(*args, &block)
         if __transport_connection
+          require "stringio" unless defined?(StringIO)
+
           content = __transport_connection.file(args[0]).content
           string_io = StringIO.new content
           yield string_io if block_given?

data/lib/chef-utils/version.rb

@@ -16,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "19.3.15"
+  VERSION = "19.4.46"
 end

data/spec/unit/dsl/path_sanity_spec.rb

@@ -59,28 +59,44 @@ RSpec.describe ChefUtils::DSL::DefaultPaths do
   context "on windows" do
     before do
       allow(ChefUtils).to receive(:windows?).and_return(true)
+      # Simulate SystemRoot as set by Windows itself (always present)
+      stub_const("ENV", ENV.to_hash.merge("SystemRoot" => 'C:\Windows'))
     end
 
     let(:test_instance) { DefaultPathsTestClass.new }
 
+    # Chef 19 (Habitat-based) strips Windows system dirs from PATH; they must be restored.
+    let(:win_sys_dirs) { 'C:\Windows\System32;C:\Windows;C:\Windows\System32\Wbem' }
+
     it "works with no path" do
       env = {}
-      expect(test_instance.default_paths(env)).to eql("#{Gem.bindir};#{RbConfig::CONFIG["bindir"]}")
+      expect(test_instance.default_paths(env)).to eql("#{Gem.bindir};#{RbConfig::CONFIG["bindir"]};#{win_sys_dirs}")
     end
 
     it "works with nil path" do
       env = { "PATH" => nil }
-      expect(test_instance.default_paths(env)).to eql("#{Gem.bindir};#{RbConfig::CONFIG["bindir"]}")
+      expect(test_instance.default_paths(env)).to eql("#{Gem.bindir};#{RbConfig::CONFIG["bindir"]};#{win_sys_dirs}")
     end
 
     it "works with empty path" do
       env = { "PATH" => "" }
-      expect(test_instance.default_paths(env)).to eql("#{Gem.bindir};#{RbConfig::CONFIG["bindir"]}")
+      expect(test_instance.default_paths(env)).to eql("#{Gem.bindir};#{RbConfig::CONFIG["bindir"]};#{win_sys_dirs}")
+    end
+
+    it "prepends gem/ruby bindirs and appends missing system dirs to an existing path" do
+      # Simulate a realistic Habitat-stripped PATH that already has System32
+      env = { "PATH" => 'C:\Windows\System32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\\' }
+      expect(test_instance.default_paths(env)).to eql(
+        "#{Gem.bindir};#{RbConfig::CONFIG["bindir"]};C:\\Windows\\System32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\"
+      )
     end
 
-    it "prepends to an existing path" do
-      env = { "PATH" => "%SystemRoot%\\system32;%SystemRoot%;%SystemRoot%\\System32\\Wbem;%SYSTEMROOT%\\System32\\WindowsPowerShell\\v1.0\\" }
-      expect(test_instance.default_paths(env)).to eql("#{Gem.bindir};#{RbConfig::CONFIG["bindir"]};%SystemRoot%\\system32;%SystemRoot%;%SystemRoot%\\System32\\Wbem;%SYSTEMROOT%\\System32\\WindowsPowerShell\\v1.0\\")
+    it "does not duplicate system dirs already present in PATH" do
+      env = { "PATH" => "#{Gem.bindir};C:\\Windows\\System32;C:\\Windows;C:\\Windows\\System32\\Wbem" }
+      path_entries = test_instance.default_paths(env).split(";")
+      expect(path_entries.count('C:\Windows\System32')).to eq(1)
+      expect(path_entries.count('C:\Windows')).to eq(1)
+      expect(path_entries.count('C:\Windows\System32\Wbem')).to eq(1)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-utils
 version: !ruby/object:Gem::Version
-  version: 19.3.15
+  version: 19.4.46
 platform: ruby
 authors:
 - Chef Software, Inc
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.7
 email:
 - oss@chef.io
 executables: []