Moving powershell_exec to a new gem

Signed-off-by: John McCrae <john.mccrae@progress.com>

3 files changed, 7 insertions, 93 deletions

diff --git a/chef.gemspec b/chef.gemspec
index 8957d3b393..179876059a 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,7 +26,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
-  s.add_dependency "chef-powershell", ">= 17.7.5"
+  if Gem.win_platform?
+    s.add_dependency "chef-powershell", ">= 17.7.5"
+  end
   s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
   s.add_dependency "train-winrm", ">= 0.2.5"
 
diff --git a/lib/chef/dsl/universal.rb b/lib/chef/dsl/universal.rb
index 972ebacc7e..b9b37f8950 100644
--- a/lib/chef/dsl/universal.rb
+++ b/lib/chef/dsl/universal.rb
@@ -26,10 +26,11 @@ require_relative "secret"
 require_relative "reader_helpers"
 require_relative "render_helpers"
 require_relative "toml"
-require_relative "../mixin/powershell_exec"
+# require_relative "../mixin/powershell_exec"
 require_relative "../mixin/powershell_out"
 require_relative "../mixin/shell_out"
 require_relative "../mixin/lazy_module_include"
+require "chef-powershell"
 
 class Chef
   module DSL
@@ -54,7 +55,8 @@ class Chef
       include Chef::DSL::ReaderHelpers
       include Chef::DSL::RenderHelpers
       include Chef::DSL::Secret
-      include Chef::Mixin::PowershellExec
+      include ChefPowerShell::PowershellExec
+      # include Chef::Mixin::PowershellExec
       include Chef::Mixin::PowershellOut
       include Chef::Mixin::ShellOut
       extend Chef::Mixin::LazyModuleInclude
diff --git a/spec/unit/mixin/powershell_exec_spec.rb b/spec/unit/mixin/powershell_exec_spec.rb
deleted file mode 100644
index 92e92dc2a1..0000000000
--- a/spec/unit/mixin/powershell_exec_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Author:: Stuart Preston (<stuart@chef.io>)
-# Copyright:: Copyright (c) Chef 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.
-#
-
-require "spec_helper"
-require "chef/mixin/powershell_exec"
-
-describe Chef::Mixin::PowershellExec, :windows_only do
-  let(:powershell_mixin) { Class.new { include Chef::Mixin::PowershellExec } }
-  subject(:object) { powershell_mixin.new }
-
-  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)
-      end
-
-      it "uses less than version 6" do
-        execution = object.powershell_exec("$PSVersionTable")
-        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::Pwsh)
-      end
-
-      it "uses greater than version 6" do
-        execution = object.powershell_exec("$PSVersionTable", :pwsh)
-        expect(execution.result["PSVersion"]["Major"]).to be > 6
-      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)
-      end
-
-      it "uses less than version 6" do
-        execution = object.powershell_exec("$PSVersionTable", :powershell)
-        expect(execution.result["PSVersion"].to_s.to_i).to be < 6
-      end
-    end
-
-    it "runs a command that fails with a non-terminating error and can trap the error via .error?" do
-      execution = object.powershell_exec("this-should-error")
-      expect(execution.error?).to eql(true)
-    end
-
-    it "runs a command that fails with a non-terminating error and can list the errors" do
-      execution = object.powershell_exec("this-should-error")
-      expect(execution.errors).to be_a_kind_of(Array)
-      expect(execution.errors[0]).to be_a_kind_of(String)
-      expect(execution.errors[0]).to include("The term 'this-should-error' is not recognized")
-    end
-
-    it "raises an error if the interpreter is invalid" do
-      expect { object.powershell_exec("this-should-error", :powerfart) }.to raise_error(ArgumentError)
-    end
-  end
-
-  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)
-    end
-
-    it "raises an error if the command fails" do
-      expect { object.powershell_exec!("this-should-error") }.to raise_error(Chef::PowerShell::CommandFailed)
-    end
-
-    it "raises an error if the interpreter is invalid" do
-      expect { object.powershell_exec!("this-should-error", :powerfart) }.to raise_error(ArgumentError)
-    end
-  end
-end