support powershellcore

Author: hbuckle

examples/init.pp

@@ -17,6 +17,12 @@
 
 package { 'PSExcel':
   ensure   => latest,
-  provider => 'psmodule',
+  provider => 'windowspowershell',
   source   => 'PSGallery',
 }
+
+package { 'Pester':
+  ensure   => latest,
+  provider => 'powershellcore',
+  source   => 'PSGallery',
+}

lib/puppet/feature/powershellgetcore.rb

@@ -0,0 +1,7 @@
+require 'puppet/util/feature'
+
+Puppet.features.add(:powershellgetcore) do
+  command = '"Import-Module powershellget; $mod = Get-Module powershellget; $mod.Name"'
+  output = `pwsh -noprofile -executionpolicy bypass -command #{command}`
+  output.downcase.strip == 'powershellget'
+end

lib/puppet/feature/powershellget.rb renamed to lib/puppet/feature/powershellgetwindows.rb

@@ -1,6 +1,6 @@
 require 'puppet/util/feature'
 
-Puppet.features.add(:powershellget) do
+Puppet.features.add(:powershellgetwindows) do
   command = '"Import-Module powershellget; $mod = Get-Module powershellget; $mod.Name"'
   output = `powershell.exe -noprofile -executionpolicy bypass -command #{command}`
   output.downcase.strip == 'powershellget'

lib/puppet/provider/package/psmodule.rb renamed to lib/puppet/provider/package/powershellcore.rb

@@ -1,26 +1,15 @@
 require 'puppet/provider/package'
 require 'json'
 
-Puppet::Type.type(:package).provide :psmodule, parent: Puppet::Provider::Package do
-  confine operatingsystem: :windows
-  confine feature: :powershellget
-
-  has_feature :installable
-  has_feature :uninstallable
-  has_feature :upgradeable
-  has_feature :versionable
-
-  commands powershell:
-              if File.exist?("#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe")
-                "#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe"
-              elsif File.exist?("#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe")
-                "#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe"
-              else
-                'powershell.exe'
-              end
+Puppet::Type.type(:package).provide :powershellcore, parent: Puppet::Provider::Package do
+  initvars
+  has_feature :installable, :uninstallable, :upgradeable, :versionable
+  commands pwsh: 'pwsh'
 
   def self.invoke_ps_command(command)
-    result = powershell(['-noprofile', '-executionpolicy', 'bypass', '-command', command])
+    result = pwsh(['-NoProfile', '-NonInteractive', '-NoLogo', '-Command', "$ProgressPreference = 'SilentlyContinue'; #{command}"])
+    Puppet.debug result.exitstatus
+    Puppet.debug result.lines
     result.lines
   end
 
@@ -62,29 +51,29 @@ def self.instances_command
       [ordered]@{
         'name' = $_.Name
         'ensure' = @(($_.Group).Version)
-        'provider' = 'psmodule'
+        'provider' = '#{name}'
       } | ConvertTo-Json -Depth 99 -Compress
     }
     COMMAND
   end
 
   def install_command
-    command = "Install-Module #{@resource[:name]} -Force"
+    command = "Install-Module #{@resource[:name]} -Scope AllUsers -Force"
     command << " -RequiredVersion #{@resource[:ensure]}" unless [:present, :latest].include? @resource[:ensure]
     command << " -Repository #{@resource[:source]}" if @resource[:source]
     command
   end
 
   def uninstall_command
-    "Uninstall-Module #{@resource[:name]} -AllVersions -Force"
+    "Uninstall-Module #{@resource[:name]} -AllVersions -Scope AllUsers -Force"
   end
 
   def latest_command
     "$mod = Find-Module #{@resource[:name]}; $mod.Version.ToString()"
   end
 
   def update_command
-    command = "Install-Module #{@resource[:name]} -Force"
+    command = "Install-Module #{@resource[:name]} -Scope AllUsers -Force"
     command << " -Repository #{@resource[:source]}" if @resource[:source]
     command
   end

lib/puppet/provider/package/windowspowershell.rb

@@ -0,0 +1,11 @@
+Puppet::Type.type(:package).provide(:windowspowershell, parent: :powershellcore) do
+  initvars
+  confine operatingsystem: :windows
+  confine feature: :powershellgetwindows
+  commands powershell: 'powershell'
+
+  def self.invoke_ps_command(command)
+    result = powershell(['-noprofile', '-executionpolicy', 'bypass', '-command', command])
+    result.lines
+  end
+end

lib/puppet/provider/psrepository/windows.rb renamed to lib/puppet/provider/psrepository/powershellcore.rb

@@ -1,16 +1,6 @@
-Puppet::Type.type(:psrepository).provide(:windows) do
-  confine operatingsystem: :windows
-  confine feature: :powershellget
-
-  commands powershell:
-              if File.exist?("#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe")
-                "#{ENV['SYSTEMROOT']}\\sysnative\\WindowsPowershell\\v1.0\\powershell.exe"
-              elsif File.exist?("#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe")
-                "#{ENV['SYSTEMROOT']}\\system32\\WindowsPowershell\\v1.0\\powershell.exe"
-              else
-                'powershell.exe'
-              end
-
+Puppet::Type.type(:psrepository).provide(:powershellcore) do
+  initvars
+  commands pwsh: 'pwsh'
   mk_resource_methods
 
   def initialize(value = {})
@@ -19,7 +9,9 @@ def initialize(value = {})
   end
 
   def self.invoke_ps_command(command)
-    result = powershell(['-noprofile', '-executionpolicy', 'bypass', '-command', command])
+    result = pwsh(['-NoProfile', '-NonInteractive', '-NoLogo', '-Command', "$ProgressPreference = 'SilentlyContinue'; #{command}"])
+    Puppet.debug result.exitstatus
+    Puppet.debug result.lines
     result.lines
   end
 

lib/puppet/provider/psrepository/windowspowershell.rb

@@ -0,0 +1,11 @@
+Puppet::Type.type(:psrepository).provide(:windowspowershell, parent: :powershellcore) do
+  initvars
+  confine operatingsystem: :windows
+  confine feature: :powershellgetwindows
+  commands powershell: 'powershell'
+
+  def self.invoke_ps_command(command)
+    result = powershell(['-noprofile', '-executionpolicy', 'bypass', '-command', command])
+    result.lines
+  end
+end

spec/unit/puppet/provider/psmodule_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:psmodule)
+provider_class = Puppet::Type.type(:package).provider(:windowspowershell)
 
 describe provider_class do
   before(:each) do
@@ -11,14 +11,14 @@
     allow(provider_class).to receive(:invoke_ps_command).with(
       provider_class.instances_command).and_return(
         [
-          '{"name":"PackageManagement","ensure":["1.1.6.0","1.1.7.0"],"provider":"psmodule"}',
-          '{"name":"Pester","ensure":["4.0.8"],"provider":"psmodule"}',
-          '{"name":"PowerShellGet","ensure":["1.5.0.0"],"provider":"psmodule"}'
+          '{"name":"PackageManagement","ensure":["1.1.6.0","1.1.7.0"],"provider":"windowspowershell"}',
+          '{"name":"Pester","ensure":["4.0.8"],"provider":"windowspowershell"}',
+          '{"name":"PowerShellGet","ensure":["1.5.0.0"],"provider":"windowspowershell"}'
         ]
       )
   end
   describe :instances do
-    specify 'returns an array of :psmodule providers' do
+    specify 'returns an array of :windowspowershell providers' do
       instances = provider_class.instances
       expect(instances.count).to eq(3)
       expect(instances).to all(be_instance_of(provider_class))

spec/unit/puppet/provider/psrepository_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:psrepository).provider(:windows)
+provider_class = Puppet::Type.type(:psrepository).provider(:windowspowershell)
 
 describe provider_class do
   before(:each) do