chef-powershell 3.0.19 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 796f6e2c68755a378d7cb48342ecaa453eb956e8128de2d37fa8a871bd18952b
-  data.tar.gz: d164064ae694c3851becb226d7f5f778477ba54dd8cf0e25b66a497f050a79dc
+  metadata.gz: 34a8f11c745dcc80ae9c958bb64ee978274627e916db91b9f175ffa7a5584dc8
+  data.tar.gz: a80ed1e45f558e0fd742ab055f8cc91417881bf83f727ea1403d055d4e94f898
 SHA512:
-  metadata.gz: a64d1b650bfae1e2590903620a186fe29f58756f7b627f595a88f0d729d570181b41abd54d542fd7dad18ee98261666df2fdd9beceeb455b5a759d8c37f9dabc
-  data.tar.gz: 73c0a22ba95ade251b30f16edd836f7bdb35b3bfa7f406610d974028908f33cb624802a3f9dd43d66bd4b3b00a3e71745e80a49fd44c432ec865731ec7cf41e2
+  metadata.gz: 4c83d7d8ea23fa9eb2d00c7f8ec090a4b2e13c5bc451a03da5fcb43cb70179f9d8bf291f588977196bdec05765e6745a473c0966a5e5fe2131b9a1a2cff15cf5
+  data.tar.gz: 2e9a08ab539a0d68fece5e76f4f4ca291d6671ad17a4f525b0c5867fb240d05324e1293de12be87f1b8cc3452e8e793784a3a9a9260bd06f04fceb10002e7bf5

data/lib/chef-powershell/powershell.rb

@@ -47,6 +47,9 @@ class ChefPowerShell
       exec(script, timeout: timeout)
     end
 
+    def power_mod
+      ChefPowerShell::PowerShell::PowerShellMod
+    end
     #
     # Was there an error running the command
     #
@@ -63,7 +66,7 @@ class ChefPowerShell
       raise ChefPowerShell::PowerShellExceptions::PowerShellCommandFailed, "Unexpected exit in PowerShell command: #{@errors}" if error?
     end
 
-    module PowerMod
+    module PowerShellMod
       extend FFI::Library
 
       def self.load_powershell_dll(powershell_dll)
@@ -82,13 +85,22 @@ class ChefPowerShell
     private
 
     def exec(script, timeout: -1)
-      PowerMod.load_powershell_dll(@powershell_dll)
-      execution = PowerMod.do_work(script, timeout)
-      output = execution.read_utf16string
-      hashed_outcome = FFI_Yajl::Parser.parse(output)
-      @result = FFI_Yajl::Parser.parse(hashed_outcome["result"])
-      @errors = hashed_outcome["errors"]
-      @verbose = hashed_outcome["verbose"]
+      power_mod.load_powershell_dll(@powershell_dll)
+      begin
+        execution = power_mod.do_work(script, timeout)
+        output = execution.read_utf16string
+        hashed_outcome = FFI_Yajl::Parser.parse(output)
+        @result = FFI_Yajl::Parser.parse(hashed_outcome["result"])
+        @errors = hashed_outcome["errors"]
+        @verbose = hashed_outcome["verbose"]
+      rescue => e
+        if File.exist?("C:\\chef-powershell-output.txt")
+          message=[e.inspect, File.read("C:\\chef-powershell-output.txt")].join("\n")
+          raise message
+        else
+          raise
+        end
+      end
     end
   end
 end

data/lib/chef-powershell/pwsh.rb

@@ -30,7 +30,25 @@ class ChefPowerShell
       super
     end
 
-    protected
+    def power_mod
+      ChefPowerShell::Pwsh::PwshMod
+    end
+
+    module PwshMod
+      extend FFI::Library
+
+      def self.load_powershell_dll(powershell_dll)
+        @dlls ||= []
+        return if @dlls.include?(powershell_dll)
+        ffi_lib powershell_dll
+        @dlls << powershell_dll
+      end
+
+      def self.do_work(ps_command, timeout = -1)
+        attach_function(:execute_powershell, :ExecuteScript, %i{string int}, :pointer) unless method_defined?(:execute_powershell)
+        execute_powershell(ps_command, timeout)
+      end
+    end
 
     def exec(script, timeout: -1)
       # Note that we need to override the location of the shared dotnet core library

data/lib/chef-powershell/version.rb

@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "3.0.19".freeze
+  VERSION = "3.0.21".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-powershell
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.21
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi