chef-powershell 18.6.3 → 18.6.6

data/ext/chef-powershell/extconf.rb

@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+#
+# Author:: John McCrae (<john.mccrae@progress.com>)
+# Copyright:: Copyright, Chef Software Inc.
+# Copyright:: Copyright, Progress Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# Post-install extension to copy required DLL files to Chef's embedded bin directory.
+# This ensures that the PowerShell wrapper DLLs are available to Chef even when
+# chef-powershell gem is updated independently of Chef releases.
+#
+
+require "fileutils"
+require "rbconfig"
+
+# Only run on Windows platforms
+if RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+
+  # Required DLL files that must be present in chef\embedded\bin
+  REQUIRED_DLLS = [
+    "vcruntime140.dll",
+    "vcruntime140_1.dll",
+    "ijwhost.dll",
+    "msvcp140.dll",
+  ].freeze
+
+  def log(message)
+    puts "[chef-powershell] #{message}"
+  end
+
+  def find_chef_embedded_bin
+    # Use RbConfig to find the embedded bin directory
+    # This works because Chef installs gems into its embedded Ruby
+    embedded_bin_path = RbConfig::CONFIG["bindir"]
+
+    # Verify the path exists and normalize it
+    if embedded_bin_path && File.directory?(embedded_bin_path)
+      return embedded_bin_path.tr("\\", "/")
+    end
+
+    nil
+  end
+
+  def find_source_dlls
+    # Look for DLLs in the gem's bin directory structure
+    # They should be in bin/ruby_bin_folder/<ARCH>/
+    gem_bin_dir = File.expand_path("../../bin", __dir__)
+    arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
+
+    possible_locations = [
+      File.join(gem_bin_dir, "ruby_bin_folder", arch),
+      gem_bin_dir,
+    ]
+
+    possible_locations.each do |location|
+      if File.directory?(location)
+        # Check if at least one required DLL exists here
+        if REQUIRED_DLLS.any? { |dll| File.exist?(File.join(location, dll)) }
+          return location
+        end
+      end
+    end
+
+    nil
+  end
+
+  def file_needs_update?(source, dest)
+    return true unless File.exist?(dest)
+
+    # Compare file sizes and modification times
+    source_stat = File.stat(source)
+    dest_stat = File.stat(dest)
+
+    # Update if sizes differ or source is newer
+    source_stat.size != dest_stat.size || source_stat.mtime > dest_stat.mtime
+  end
+
+  def install_dlls
+    log "Checking for required PowerShell DLL files..."
+
+    # Find the Chef embedded bin directory
+    target_dir = find_chef_embedded_bin
+
+    unless target_dir
+      log "WARNING: Could not locate Chef embedded bin directory."
+      log "DLL files will not be installed automatically."
+      log "If you are using Chef, please ensure the following DLLs are in chef/embedded/bin:"
+      REQUIRED_DLLS.each { |dll| log "  - #{dll}" }
+      return
+    end
+
+    log "Found Chef embedded bin directory: #{target_dir}"
+
+    # Find source DLLs
+    source_dir = find_source_dlls
+
+    unless source_dir
+      arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
+      log "WARNING: Could not locate source DLL files in gem installation."
+      log "Expected location: bin/ruby_bin_folder/#{arch}/"
+      log "DLL files will not be installed."
+      return
+    end
+
+    log "Found source DLLs in: #{source_dir}"
+
+    # Copy each required DLL if present and needs updating
+    installed = []
+    updated = []
+    missing = []
+    skipped = []
+
+    REQUIRED_DLLS.each do |dll|
+      source_file = File.join(source_dir, dll)
+      dest_file = File.join(target_dir, dll)
+
+      unless File.exist?(source_file)
+        missing << dll
+        next
+      end
+
+      begin
+        if File.exist?(dest_file)
+          if file_needs_update?(source_file, dest_file)
+            FileUtils.cp(source_file, dest_file, preserve: true)
+            updated << dll
+            log "Updated: #{dll}"
+          else
+            skipped << dll
+          end
+        else
+          FileUtils.cp(source_file, dest_file, preserve: true)
+          installed << dll
+          log "Installed: #{dll}"
+        end
+      rescue => e
+        log "ERROR: Failed to copy #{dll}: #{e.message}"
+      end
+    end
+
+    # Summary
+    log "Installation complete:"
+    log "  - Newly installed: #{installed.length}" unless installed.empty?
+    log "  - Updated: #{updated.length}" unless updated.empty?
+    log "  - Already up-to-date: #{skipped.length}" unless skipped.empty?
+    log "  - Missing from source: #{missing.length}" unless missing.empty?
+
+    if missing.any?
+      log "WARNING: The following DLL files were not found in the gem:"
+      missing.each { |dll| log "  - #{dll}" }
+    end
+  end
+
+  begin
+    install_dlls
+  rescue => e
+    log "ERROR: Post-install script failed: #{e.message}"
+    log e.backtrace.join("\n") if ENV["DEBUG"]
+  end
+
+else
+  puts "[chef-powershell] Skipping DLL installation (non-Windows platform)"
+end
+
+# Create a dummy Makefile to satisfy RubyGems extension mechanism
+File.open("Makefile", "w") do |f|
+  f.puts "# Dummy Makefile for chef-powershell post-install extension"
+  f.puts "install:"
+  f.puts "\t@echo 'No compilation needed'"
+  f.puts "clean:"
+  f.puts "\t@echo 'Nothing to clean'"
+  f.puts "all:"
+  f.puts "\t@echo 'Nothing to build'"
+end

data/lib/chef-powershell/exceptions.rb

@@ -24,4 +24,4 @@ class ChefPowerShell
       class ParseError < RuntimeError; end
     end
   end
-end
+end

data/lib/chef-powershell/powershell.rb

@@ -54,11 +54,11 @@ class ChefPowerShell
           searched << hab_dll
           return hab_dll if File.exist?(hab_dll)
         end
-      rescue => e
+      rescue
         # ignore any hab errors, just proceed
       end
 
-      raise LoadError, "Chef.PowerShell wrapper DLL not found. Searched: #{searched.join(', ')}. Populate binaries via 'rake update_chef_powershell_dlls' or set CHEF_POWERSHELL_BIN."
+      raise LoadError, "Chef.PowerShell wrapper DLL not found. Searched: #{searched.join(", ")}. Populate binaries via 'rake update_chef_powershell_dlls' or set CHEF_POWERSHELL_BIN."
     end
 
     # Run a command under PowerShell via FFI
@@ -86,7 +86,7 @@ class ChefPowerShell
     # @return [Boolean]
     #
     def error?
-      return true if errors.count > 0
+      return true if errors.any?
 
       false
     end
@@ -175,11 +175,11 @@ class ChefPowerShell
 
       # Set it every time because the test suite actually switches
       # the DLL pointed to.
-  PowerMod.set_ps_dll(@powershell_dll)
+      PowerMod.set_ps_dll(@powershell_dll)
       PowerMod.set_ps_timeout(timeout)
 
       PowerMod.set_ps_command(script)
-      execution = PowerMod.do_work
+      PowerMod.do_work
       # we returned "true" to escape retry, but we still need to check the
       # exception and raise it if it exists.
       raise PowerMod.exception if PowerMod.exception

data/lib/chef-powershell/powershell_exec.rb

@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "./powershell"
-require_relative "./pwsh"
+require_relative "powershell"
+require_relative "pwsh"
 
 # The Chef-PowerShell gem provides in-process access to the PowerShell engine.
 #
@@ -102,19 +102,23 @@ class ChefPowerShell
       # We don't want to move files around so we're setting the variable here to keep everything tidy.
       # file_path = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/"
       # ENV["CHEF_POWERSHELL_BIN"] = file_path
-      file_path = File.join(Gem.loaded_specs["chef-powershell"].full_gem_path, "bin", "ruby_bin_folder", ENV["PROCESSOR_ARCHITECTURE"] || "AMD64")
-      if File.directory?(file_path)
-        ENV["CHEF_POWERSHELL_BIN"] = file_path
-      else
-        # Habitat fallback: try locating the built package and use its bin directory
-        begin
-          hab_path = `hab pkg path chef/chef-powershell-shim 2>NUL`.strip
-          if hab_path != "" && File.directory?(hab_path)
-            candidate = File.join(hab_path, "bin")
-            ENV["CHEF_POWERSHELL_BIN"] = candidate if File.directory?(candidate)
+      gem_spec = Gem.loaded_specs["chef-powershell"]
+      if gem_spec
+        arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
+        file_path = File.join(gem_spec.full_gem_path, "bin", "ruby_bin_folder", arch)
+        if File.directory?(file_path)
+          ENV["CHEF_POWERSHELL_BIN"] = file_path
+        else
+          # Habitat fallback: try locating the built package and use its bin directory
+          begin
+            hab_path = `hab pkg path chef/chef-powershell-shim 2>NUL`.strip
+            if hab_path != "" && File.directory?(hab_path)
+              candidate = File.join(hab_path, "bin")
+              ENV["CHEF_POWERSHELL_BIN"] = candidate if File.directory?(candidate)
+            end
+          rescue
+            # ignore habitat lookup failures
           end
-        rescue
-          # ignore habitat lookup failures
         end
       end
       # Run a command under PowerShell via a managed (.NET) API.
@@ -145,4 +149,4 @@ class ChefPowerShell
       end
     end
   end
-end
+end

data/lib/chef-powershell/pwsh.rb

@@ -19,18 +19,23 @@ class ChefPowerShell
   class Pwsh < ChefPowerShell::PowerShell
 
     def self.resolve_core_wrapper_dll
-      base = Gem.loaded_specs["chef-powershell"].full_gem_path
+      gem_spec = Gem.loaded_specs["chef-powershell"]
       arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
-      dll_path = File.join(base, "bin", "ruby_bin_folder", arch, "shared", "Microsoft.NETCore.App", "8.0.0", "Chef.PowerShell.Wrapper.Core.dll")
-      return dll_path if File.exist?(dll_path)
+
+      if gem_spec
+        base = gem_spec.full_gem_path
+        dll_path = File.join(base, "bin", "ruby_bin_folder", arch, "shared", "Microsoft.NETCore.App", "8.0.0", "Chef.PowerShell.Wrapper.Core.dll")
+        return dll_path if File.exist?(dll_path)
+      end
 
       override = ENV["CHEF_POWERSHELL_BIN"]
       candidate = override && File.join(override, "shared", "Microsoft.NETCore.App", "8.0.0", "Chef.PowerShell.Wrapper.Core.dll")
       return candidate if candidate && File.exist?(candidate)
 
+      dll_path = gem_spec ? File.join(gem_spec.full_gem_path, "bin", "ruby_bin_folder", arch, "shared", "Microsoft.NETCore.App", "8.0.0", "Chef.PowerShell.Wrapper.Core.dll") : File.join("bin", "ruby_bin_folder", arch, "shared", "Microsoft.NETCore.App", "8.0.0", "Chef.PowerShell.Wrapper.Core.dll")
       raise LoadError, "Pwsh Core wrapper DLL not found at #{dll_path}. Populate binaries via rake update_chef_powershell_dlls"
     end
-    
+
     # Run a command under pwsh (powershell core) via FFI
     # This implementation requires the managed dll, native wrapper and a
     # published, self contained dotnet core directory tree to exist in the
@@ -44,8 +49,6 @@ class ChefPowerShell
       super
     end
 
-    protected
-
     def exec(script, timeout: -1)
       # Note that we need to override the location of the shared dotnet core library
       # location. With most .net core applications, you can simply publish them as a
@@ -60,17 +63,13 @@ class ChefPowerShell
       original_dotnet_root = ENV["DOTNET_ROOT"]
       original_dotnet_root_x86 = ENV["DOTNET_ROOT(x86)"]
 
-      # ENV["DOTNET_MULTILEVEL_LOOKUP"] = "0"
-      # ENV["DOTNET_ROOT"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/AMD64"
-      # ENV["DOTNET_ROOT(x86)"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/x86"
-
-      # @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/8.0.0/Chef.PowerShell.Wrapper.Core.dll"
-
-      # super
       ENV["DOTNET_MULTILEVEL_LOOKUP"] = "0"
-      arch_root = File.join(Gem.loaded_specs["chef-powershell"].full_gem_path, "bin", "ruby_bin_folder", "AMD64")
-      ENV["DOTNET_ROOT"] = arch_root
-      ENV["DOTNET_ROOT(x86)"] = File.join(Gem.loaded_specs["chef-powershell"].full_gem_path, "bin", "ruby_bin_folder", "x86")
+      gem_spec = Gem.loaded_specs["chef-powershell"]
+      if gem_spec
+        arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
+        arch_root = File.join(gem_spec.full_gem_path, "bin", "ruby_bin_folder", arch)
+        ENV["DOTNET_ROOT"] = arch_root
+      end
 
       @powershell_dll = self.class.resolve_core_wrapper_dll
       super
@@ -88,8 +87,6 @@ class ChefPowerShell
       # ensures that the correct architecture binaries are installed into the path.
       # Also note that the version of pwsh is determined by which assemblies the dll was
       # built with. To update powershell, those dependencies must be bumped.
-      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/8.0.0/Chef.PowerShell.Wrapper.Core.dll"
-      # @dll ||= @powershell_dll
       @dll ||= resolve_core_wrapper_dll
     end
   end

data/lib/chef-powershell/version.rb

@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.6.3"
+  VERSION = "18.6.6"
 end

data/lib/chef-powershell.rb

@@ -20,4 +20,4 @@ require_relative "chef-powershell/powershell_exec"
 
 module ChefPowerShellModule
   include ChefPowerShell::ChefPowerShellModule::PowerShellExec
-end
+end

data/spec/unit/powershell_exec_spec.rb

@@ -23,8 +23,12 @@ describe ChefPowerShell::ChefPowerShellModule::PowerShellExec, :windows_only do
   subject(:object) { powershell_mixin.new }
 
   before do
-    file_path = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/"
-    ENV["CHEF_POWERSHELL_BIN"] = file_path
+    gem_spec = Gem.loaded_specs["chef-powershell"]
+    if gem_spec
+      arch = ENV["PROCESSOR_ARCHITECTURE"] || "AMD64"
+      file_path = File.join(gem_spec.full_gem_path, "bin", "ruby_bin_folder", arch)
+      ENV["CHEF_POWERSHELL_BIN"] = file_path
+    end
   end
 
   describe "#powershell_exec" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-powershell
 version: !ruby/object:Gem::Version
-  version: 18.6.3
+  version: 18.6.6
 platform: ruby
 authors:
 - Chef Software, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-24 00:00:00.000000000 Z
+date: 2025-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -38,16 +38,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-description: 
+description:
 email:
 - oss@chef.io
 executables: []
-extensions: []
+extensions:
+- ext/chef-powershell/extconf.rb
 extra_rdoc_files: []
 files:
 - LICENSE
 - Rakefile
-- bin/ruby_bin_folder/AMD64/.keep
 - bin/ruby_bin_folder/AMD64/Chef.PowerShell.dll
 - bin/ruby_bin_folder/AMD64/Chef.Powershell.Wrapper.dll
 - bin/ruby_bin_folder/AMD64/Ijwhost.dll
@@ -297,7 +297,7 @@ files:
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/microsoft.management.infrastructure.native.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/microsoft.management.infrastructure.native.unmanaged.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/mscordaccore.dll
-- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/mscordaccore_amd64_amd64_8.0.724.31311.dll
+- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/mscordaccore_amd64_amd64_8.0.824.36612.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/mscordbi.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/mscorlib.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/8.0.0/mscorrc.dll
@@ -321,6 +321,7 @@ files:
 - bin/ruby_bin_folder/AMD64/vcruntime140_1.dll
 - bin/ruby_bin_folder/AMD64/vcruntime140_threads.dll
 - chef-powershell.gemspec
+- ext/chef-powershell/extconf.rb
 - lib/chef-powershell.rb
 - lib/chef-powershell/exceptions.rb
 - lib/chef-powershell/powershell.rb
@@ -339,7 +340,7 @@ metadata:
   documentation_uri: https://github.com/chef/chef-powershell-shim/chef-powershell/README.md
   homepage_uri: https://github.com/chef/chef/tree/18-Stable/chef-powershell
   source_code_uri: https://github.com/chef/chef-powershell-shim/chef-powershell
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -356,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: External Chef module for accessing and utilizing PowerShell
 test_files: []