fix powershellcore install issues

Author: hbuckle

.rubocop.yml

@@ -14,7 +14,7 @@ Metrics/BlockLength:
   Max: 50
 
 Metrics/LineLength:
-  Max: 130
+  Max: 135
 
 EndOfLine:
   Enabled: false

Gemfile

@@ -6,6 +6,7 @@ gem 'metadata-json-lint'
 gem 'puppet', puppetversion
 gem 'puppet-lint', '>= 1.0.0'
 gem 'puppetlabs_spec_helper', '>= 1.0.0'
+gem 'semantic_puppet', '>= 1.0.0'
 
 # rspec must be v2 for ruby 1.8.7
 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'

README.md

@@ -11,36 +11,60 @@
 
 ## Description
 
-This module adds a new type and provider for registering PowerShell repositories
-and a new package provider for installing PowerShell modules.
+This module allows PowerShell repositories to be registered as package sources
+and PowerShell modules to be installed using the Puppet Package type.
+
+The module supports Windows PowerShell (PowerShell 5) and PowerShell Core (PowerShell 6)
 
 ## Setup
 
 ### Setup Requirements
 
-The PowerShellGet PowerShell module must be installed as well as the NuGet package
-provider. PowerShellGet is included with WMF5 or can be installed for earlier
+For Windows PowerShell the PowerShellGet PowerShell module must be installed as well as
+the NuGet package provider. PowerShellGet is included with WMF5 or can be installed for earlier
 versions here http://go.microsoft.com/fwlink/?LinkID=746217&clcid=0x409
+
 NuGet can be installed by running
-Install-PackageProvider Nuget –Force
 
-### Beginning with powershellmodule
+`Install-PackageProvider Nuget –Force`
 
 ## Usage
 
+### Windows PowerShell
+
+~~~ puppet
+psrepository { 'my-internal-repo':
+  ensure              => present,
+  source_location     => 'http://myrepo.corp.com/api/nuget/powershell',
+  installation_policy => 'trusted',
+  provider            => 'windowspowershell',
+}
+~~~
+
+~~~ puppet
+package { 'Pester':
+  ensure   => '4.0.3',
+  source   => 'PSGallery',
+  provider => 'windowspowershell',
+}
+~~~
+
+### PowerShell Core
+
 ~~~ puppet
 psrepository { 'my-internal-repo':
   ensure              => present,
   source_location     => 'http://myrepo.corp.com/api/nuget/powershell',
   installation_policy => 'trusted',
+  provider            => 'powershellcore',
 }
 ~~~
 
 ~~~ puppet
-package { 'pester':
+package { 'Pester':
   ensure   => '4.0.3',
   source   => 'PSGallery',
-  provider => 'psmodule',
+  provider => 'powershellcore',
 }
 ~~~
 

lib/puppet/feature/powershellgetcore.rb

@@ -7,6 +7,7 @@
   commands pwsh: 'pwsh'
 
   def self.invoke_ps_command(command)
+    # override_locale is necessary otherwise the Install-Module commands silently fails on Linux
     result = Puppet::Util::Execution.execute(['pwsh', '-NoProfile', '-NonInteractive', '-NoLogo', '-Command',
                                               "$ProgressPreference = 'SilentlyContinue'; $ErrorActionPreference = 'Stop'; #{command}"],
                                              override_locale: false)
@@ -59,13 +60,13 @@ def self.instances_command
 
   def install_command
     command = "Install-Module #{@resource[:name]} -Scope AllUsers -Force"
-    command << " -RequiredVersion #{@resource[:ensure]}" unless [:present, :latest].include? @resource[:ensure]
+    command << " -RequiredVersion #{@resource[:ensure]}" unless %i[present latest].include? @resource[:ensure]
     command << " -Repository #{@resource[:source]}" if @resource[:source]
     command
   end
 
   def uninstall_command
-    "Uninstall-Module #{@resource[:name]} -AllVersions -Scope AllUsers -Force"
+    "Uninstall-Module #{@resource[:name]} -AllVersions -Force"
   end
 
   def latest_command

lib/puppet/provider/package/powershellcore.rb

@@ -5,7 +5,8 @@
   commands powershell: 'powershell'
 
   def self.invoke_ps_command(command)
-    result = powershell(['-noprofile', '-executionpolicy', 'bypass', '-command', command])
+    result = powershell(['-NoProfile', '-ExecutionPolicy', 'Bypass', '-NonInteractive', '-NoLogo', '-Command',
+                         "$ProgressPreference = 'SilentlyContinue'; $ErrorActionPreference = 'Stop'; #{command}"])
     result.lines
   end
 end

lib/puppet/provider/package/windowspowershell.rb

@@ -1,13 +1,17 @@
 {
   "name": "hbuckle-powershellmodule",
-  "version": "0.2.0",
+  "version": "1.0.0",
   "author": "Henry Buckle",
   "summary": "Manage PowerShell modules and repositories",
   "license": "Apache-2.0",
   "source": "https://github.com/hbuckle/puppet-powershellmodule",
   "project_page": "https://github.com/hbuckle/puppet-powershellmodule",
   "issues_url": "https://github.com/hbuckle/puppet-powershellmodule/issues",
-  "tags": ["powershell", "microsoft", "package"],
+  "tags": [
+    "powershell",
+    "microsoft",
+    "package"
+  ],
   "dependencies": [],
   "operatingsystem_support": [
     {
@@ -22,7 +26,52 @@
         "8.1",
         "10"
       ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "8.7+",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "14.04",
+        "16.04",
+        "17.04"
+      ]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Fedora",
+      "operatingsystemrelease": [
+        "25",
+        "26"
+      ]
+    },
+    {
+      "operatingsystem": "OpenSUSE",
+      "operatingsystemrelease": [
+        "42.2"
+      ]
+    },
+    {
+      "operatingsystem": "osx",
+      "operatingsystemrelease": [
+        "10.12+"
+      ]
     }
   ]
-}
-
+}

metadata.json

@@ -14,13 +14,13 @@
       provider_class.instances_command
     ).and_return(
       [
-        '{"name":"Repo1","source_location":"https://repo1.com","installation_policy":"untrusted"}',
-        '{"name":"Repo2","source_location":"https://repo2.com","installation_policy":"trusted"}'
+        '{"name":"Repo1","source_location":"https://repo1.com","installation_policy":"untrusted","provider":"windowspowershell"}',
+        '{"name":"Repo2","source_location":"https://repo2.com","installation_policy":"trusted","provider":"windowspowershell"}'
       ]
     )
   end
   describe :instances do
-    specify 'returns an array of :windows providers' do
+    specify 'returns an array of :windowspowershell providers' do
       instances = provider_class.instances
       expect(instances.count).to eq(2)
       expect(instances).to all(be_instance_of(provider_class))
@@ -29,11 +29,11 @@
       instances = provider_class.instances
       expect(instances[0].instance_variable_get('@property_hash')).to eq(
         name: 'Repo1', ensure: :present, source_location: 'https://repo1.com',
-        installation_policy: 'untrusted'
+        installation_policy: 'untrusted', provider: 'windowspowershell'
       )
       expect(instances[1].instance_variable_get('@property_hash')).to eq(
         name: 'Repo2', ensure: :present, source_location: 'https://repo2.com',
-        installation_policy: 'trusted'
+        installation_policy: 'trusted', provider: 'windowspowershell'
       )
     end
   end