chef-powershell 1.0.0 → 1.0.4

data/lib/chef-powershell/powershell.rb

@@ -23,7 +23,6 @@ require "chef-powershell"
 
 class Chef_PowerShell
   class PowerShell
-    extend FFI::Library
 
     attr_reader :result
     attr_reader :errors
@@ -36,16 +35,16 @@ class Chef_PowerShell
     # Requires: .NET Framework 4.0 or higher on the target machine.
     #
     # @param script [String] script to run
+    # @param timeout [Integer, nil] timeout in seconds.
     # @return [Object] output
-    def initialize(script)
+    def initialize(script, timeout: -1)
       # This Powershell DLL source lives here: https://github.com/chef/chef-powershell-shim
       # Every merge into that repo triggers a Habitat build and promotion. Running
       # the rake :update_chef_exec_dll task in this (chef/chef) repo will pull down
       # the built packages and copy the binaries to chef-powershell/bin/ruby_bin_folder. Bundle install
       # ensures that the correct architecture binaries are installed into the path.
-      powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
-      @dll ||= powershell_dll
-      exec(script)
+      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
+      exec(script, timeout: timeout)
     end
 
     #
@@ -60,24 +59,47 @@ class Chef_PowerShell
     end
 
     #
-    # @raise [Chef::ChefPowerShell::CommandFailed] raise if the command failed
+    # @raise [Chef_PowerShell::PowerShellExceptions::PowerShellCommandFailed] raise if the command failed
     #
     def error!
       raise Chef_PowerShell::PowerShellExceptions::PowerShellCommandFailed, "Unexpected exit in PowerShell command: #{@errors}" if error?
     end
 
-    # protected
-    private
+    module PowerMod
+      extend FFI::Library
+      @@powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/Chef.PowerShell.Wrapper.dll"
+      @@ps_command = ""
+      @@ps_timeout = -1
+
+      def self.set_ps_dll(value)
+        @@powershell_dll = value
+      end
+
+      def self.set_ps_command(value)
+        @@ps_command = value
+      end
 
-    def self.attach(dll, script)
-      ffi_lib dll
-      attach_function :execute_powershell, :ExecuteScript, [:string], :pointer
+      def self.set_ps_timeout(value)
+        @@ps_timeout = value
+      end
+
+      def self.do_work
+        ffi_lib @@powershell_dll
+        attach_function :execute_powershell, :ExecuteScript, %i{string int}, :pointer
+        execute_powershell(@@ps_command, @@ps_timeout)
+      end
     end
 
-    def exec(script)
-      self.class.attach(@dll, script)
-      execution = execute_powershell(script).read_utf16string
-      hashed_outcome = Chef::JSONCompat.parse(execution)
+    private
+
+    def exec(script, timeout: -1)
+      timeout = -1 if timeout == 0 || timeout.nil?
+      PowerMod.set_ps_dll(@powershell_dll)
+      PowerMod.set_ps_timeout(timeout)
+      PowerMod.set_ps_command(script)
+      execution = PowerMod.do_work
+      output = execution.read_utf16string
+      hashed_outcome = Chef::JSONCompat.parse(output)
       @result = Chef::JSONCompat.parse(hashed_outcome["result"])
       @errors = hashed_outcome["errors"]
       @verbose = hashed_outcome["verbose"]

data/lib/chef-powershell/powershell_exec.rb

@@ -18,12 +18,12 @@
 require_relative "./powershell"
 require_relative "./pwsh"
 
-# The powershell_exec mixin provides in-process access to the PowerShell engine.
+# The Chef-PowerShell gem provides in-process access to the PowerShell engine.
 #
 # powershell_exec is initialized with a string that should be set to the script
 # to run and also takes an optional interpreter argument which must be either
 # :powershell (Windows PowerShell which is the default) or :pwsh (PowerShell
-# Core). It will return a Chef::PowerShell object that provides 5 methods:
+# Core). It will return a Chef_PowerShell::PowerShell object that provides 5 methods:
 #
 # .result - returns a hash representing the results returned by executing the
 #           PowerShell script block
@@ -97,7 +97,7 @@ require_relative "./pwsh"
 
 class Chef_PowerShell
   module ChefPowerShell
-    module PowershellExec
+    module PowerShellExec
       # The Chef.PowerShell.Wrapper.dll file looks in the same folder as ruby.exe OR in the folder specified by the environment variable CHEF_POWERSHELL_BIN for other chef powershell dll's
       # 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"]}/"
@@ -108,22 +108,23 @@ class Chef_PowerShell
       #
       # @param script [String] script to run
       # @param interpreter [Symbol] the interpreter type, `:powershell` or `:pwsh`
+      # @param timeout [Integer, nil] timeout in seconds.
       # @return [Chef::PowerShell] output
-      def powershell_exec(script, interpreter = :powershell)
+      def powershell_exec(script, interpreter = :powershell, timeout: -1)
         case interpreter
         when :powershell
-          Chef_PowerShell::PowerShell.new(script)
+          Chef_PowerShell::PowerShell.new(script, timeout: timeout)
         when :pwsh
-          Chef_PowerShell::Pwsh.new(script)
+          Chef_PowerShell::Pwsh.new(script, timeout: timeout)
         else
           raise ArgumentError, "Expected interpreter of :powershell or :pwsh"
         end
       end
 
       # The same as the #powershell_exec method except this will raise
-      # Chef::PowerShell::CommandFailed if the command fails
-      def powershell_exec!(script, interpreter = :powershell)
-        cmd = powershell_exec(script, interpreter)
+      # Chef_PowerShell::PowerShellExceptions::PowerShellCommandFailed if the command fails
+      def powershell_exec!(script, interpreter = :powershell, **options)
+        cmd = powershell_exec(script, interpreter, **options)
         cmd.error!
         cmd
       end

data/lib/chef-powershell/pwsh.rb

@@ -23,15 +23,16 @@ class Chef_PowerShell
     # bindir directory.
     #
     # @param script [String] script to run
+    # @param timeout [Integer, nil] timeout in seconds.
     # @return [Object] output
-    def initialize(script)
+    def initialize(script, timeout: -1)
       @dll = Pwsh.dll
       super
     end
 
     protected
 
-    def exec(script)
+    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
       # "self-contained" application allowing consumers of the application to run them
@@ -46,8 +47,10 @@ class Chef_PowerShell
       original_dotnet_root_x86 = ENV["DOTNET_ROOT(x86)"]
 
       ENV["DOTNET_MULTILEVEL_LOOKUP"] = "0"
-      ENV["DOTNET_ROOT"] = RbConfig::CONFIG["bindir"]
-      ENV["DOTNET_ROOT(x86)"] = RbConfig::CONFIG["bindir"]
+      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/5.0.0/Chef.PowerShell.Wrapper.Core.dll"
 
       super
     ensure
@@ -64,7 +67,8 @@ class Chef_PowerShell
       # 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.
-      @dll ||= Dir.glob("#{RbConfig::CONFIG["bindir"]}/**/Chef.PowerShell.Wrapper.Core.dll").last
+      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll"
+      @dll ||= @powershell_dll
     end
   end
 end

data/lib/chef-powershell/version.rb

@@ -16,5 +16,5 @@
 
 module ChefPowerShell
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "1.0.0"
+  VERSION = "1.0.4"
 end

data/lib/chef-powershell.rb

@@ -19,5 +19,5 @@
 require_relative "chef-powershell/powershell_exec"
 
 module ChefPowerShell
-  include Chef_PowerShell::ChefPowerShell::PowershellExec
+  include Chef_PowerShell::ChefPowerShell::PowerShellExec
 end

data/spec/unit/powershell_exec_spec.rb

@@ -18,40 +18,45 @@
 
 require "chef-powershell"
 
-describe Chef_PowerShell::ChefPowerShell::PowershellExec, :windows_only do
-  let(:powershell_mixin) { Class.new { include Chef_PowerShell::ChefPowerShell::PowershellExec } }
+describe Chef_PowerShell::ChefPowerShell::PowerShellExec, :windows_only do
+  let(:powershell_mixin) { Class.new { include Chef_PowerShell::ChefPowerShell::PowerShellExec } }
   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
+  end
+
   describe "#powershell_exec" do
     context "not specifying an interpreter" do
       it "runs a basic command and returns a Chef::PowerShell object" do
-        expect(object.powershell_exec("$PSVersionTable")).to be_kind_of(Chef_PowerShell::PowerShell)
+        expect(object.powershell_exec("$PSVersionTable", :powershell, timeout: -1)).to be_kind_of(Chef_PowerShell::PowerShell)
       end
 
       it "uses less than version 6" do
-        execution = object.powershell_exec("$PSVersionTable")
+        execution = object.powershell_exec("$PSVersionTable", :powershell, timeout: -1)
         expect(execution.result["PSVersion"].to_s.to_i).to be < 6
       end
     end
 
     context "using pwsh interpreter" do
       it "runs a basic command and returns a Chef::PowerShell object" do
-        expect(object.powershell_exec("$PSVersionTable", :pwsh)).to be_kind_of(Chef_PowerShell::Pwsh)
+        expect(object.powershell_exec("$PSVersionTable", :pwsh, timeout: -1)).to be_kind_of(Chef_PowerShell::Pwsh)
       end
 
       it "uses greater than version 6" do
-        execution = object.powershell_exec("$PSVersionTable", :pwsh)
+        execution = object.powershell_exec("$PSVersionTable", :pwsh, timeout: -1)
         expect(execution.result["PSVersion"]["Major"]).to be >= 7
       end
     end
 
     context "using powershell interpreter" do
       it "runs a basic command and returns a Chef::PowerShell object" do
-        expect(object.powershell_exec("$PSVersionTable", :powershell)).to be_kind_of(Chef_PowerShell::PowerShell)
+        expect(object.powershell_exec("$PSVersionTable", :powershell, timeout: -1)).to be_kind_of(Chef_PowerShell::PowerShell)
       end
 
       it "uses less than version 6" do
-        execution = object.powershell_exec("$PSVersionTable", :powershell)
+        execution = object.powershell_exec("$PSVersionTable", :powershell, timeout: -1)
         expect(execution.result["PSVersion"].to_s.to_i).to be < 6
       end
     end
@@ -75,7 +80,7 @@ describe Chef_PowerShell::ChefPowerShell::PowershellExec, :windows_only do
 
   describe "#powershell_exec!" do
     it "runs a basic command and returns a Chef::PowerShell object" do
-      expect(object.powershell_exec!("$PSVersionTable")).to be_kind_of(Chef_PowerShell::PowerShell)
+      expect(object.powershell_exec!("$PSVersionTable", :powershell, timeout: -1)).to be_kind_of(Chef_PowerShell::PowerShell)
     end
 
     it "raises an error if the command fails" do

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: chef-powershell
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 description: 
 email:
 - oss@chef.io
@@ -48,11 +48,10 @@ files:
 - LICENSE
 - Rakefile
 - bin/powershell/chef/chef.psm1
-- bin/ruby_bin_folder/AMD64/Chef.PowerShell.Wrapper.dll
 - bin/ruby_bin_folder/AMD64/Chef.PowerShell.dll
+- bin/ruby_bin_folder/AMD64/Chef.Powershell.Wrapper.dll
 - bin/ruby_bin_folder/AMD64/Ijwhost.dll
 - bin/ruby_bin_folder/AMD64/Newtonsoft.Json.dll
-- bin/ruby_bin_folder/AMD64/canary.txt
 - bin/ruby_bin_folder/AMD64/concrt140.dll
 - bin/ruby_bin_folder/AMD64/host/fxr/5.0.0/hostfxr.dll
 - bin/ruby_bin_folder/AMD64/msvcp140.dll
@@ -331,7 +330,7 @@ files:
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mi.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/miutils.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore.dll
-- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore_amd64_amd64_5.0.20.51904.dll
+- bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordaccore_amd64_amd64_5.0.521.16609.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscordbi.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscorlib.dll
 - bin/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/mscorrc.dll
@@ -693,8 +692,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: Extneral module for accessing and utilizing PowerShell
+summary: External Chef module for accessing and utilizing PowerShell
 test_files: []

data/bin/ruby_bin_folder/AMD64/canary.txt

@@ -1 +0,0 @@
-The file copy is working!