Merge pull request #2 from hbuckle/fixparam

Fixparam

Author: hbuckle

examples/init.pp

@@ -18,4 +18,5 @@
 package { 'PSExcel':
   ensure   => latest,
   provider => 'psmodule',
-}
+  source   => 'PSGallery',
+}

lib/puppet/provider/package/psmodule.rb

@@ -1,4 +1,5 @@
 require 'puppet/provider/package'
+require 'json'
 
 Puppet::Type.type(:package).provide :psmodule, parent: Puppet::Provider::Package do
   confine operatingsystem: :windows
@@ -25,12 +26,8 @@ def self.invoke_ps_command(command)
 
   def self.instances
     result = invoke_ps_command instances_command
-    result.each_slice(2).collect do |mod|
-      new(
-        name: mod[0].strip,
-        ensure: mod[1].strip.split(','),
-        provider: 'psmodule'
-      )
+    result.each.collect do |line|
+      new(JSON.parse(line.strip, symbolize_names: true))
     end
   end
 
@@ -61,17 +58,20 @@ def self.instances_command
     # Get-Package is way faster than Get-InstalledModule
     <<-COMMAND
     Get-Package -AllVersions -ProviderName PowerShellGet -Scope AllUsers -Type Module |
-      Group-Object -Property Name | % {
-        $_.Name
-        ($_.Group).Version -join ','
+    Group-Object -Property Name | % {
+      [ordered]@{
+        'name' = $_.Name
+        'ensure' = @(($_.Group).Version)
+        'provider' = 'psmodule'
+      } | ConvertTo-Json -Depth 99 -Compress
     }
     COMMAND
   end
 
   def install_command
     command = "Install-Module #{@resource[:name]} -Force"
     command << " -RequiredVersion #{@resource[:ensure]}" unless [:present, :latest].include? @resource[:ensure]
-    command << " -Source #{@resource[:source]}" if @resource[:source]
+    command << " -Repository #{@resource[:source]}" if @resource[:source]
     command
   end
 
@@ -85,7 +85,7 @@ def latest_command
 
   def update_command
     command = "Install-Module #{@resource[:name]} -Force"
-    command << " -Source #{@resource[:source]}" if @resource[:source]
+    command << " -Repository #{@resource[:source]}" if @resource[:source]
     command
   end
 end

lib/puppet/provider/psrepository/windows.rb

@@ -25,13 +25,10 @@ def self.invoke_ps_command(command)
 
   def self.instances
     result = invoke_ps_command instances_command
-    result.each.collect do |repo|
-      new(
-        name: repo.split(',')[0].strip,
-        ensure: :present,
-        source_location: repo.split(',')[1].downcase.strip,
-        installation_policy: repo.split(',')[2].downcase.strip
-      )
+    result.each.collect do |line|
+      repo = JSON.parse(line.strip, symbolize_names: true)
+      repo[:ensure] = :present
+      new(repo)
     end
   end
 
@@ -77,7 +74,15 @@ def flush
   end
 
   def self.instances_command
-    '@(Get-PSRepository).foreach({\"$($_.Name),$($_.SourceLocation),$($_.InstallationPolicy)\"})'
+    <<-COMMAND
+    @(Get-PSRepository).foreach({
+      [ordered]@{
+        'name' = $_.Name
+        'source_location' = $_.SourceLocation.ToLower()
+        'installation_policy' = $_.InstallationPolicy.ToLower()
+      } | ConvertTo-Json -Depth 99 -Compress
+    })
+    COMMAND
   end
 
   def create_command

metadata.json

@@ -1,13 +1,14 @@
 {
   "name": "hbuckle-powershellmodule",
-  "version": "0.1.0",
+  "version": "0.2.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"],
+  "dependencies": [],
   "operatingsystem_support": [
     {
       "operatingsystem": "Windows",

spec/unit/puppet/provider/psmodule_spec.rb

@@ -10,15 +10,17 @@
     @provider_instance = provider_class.new(type)
     allow(provider_class).to receive(:invoke_ps_command).with(
       provider_class.instances_command).and_return(
-        ['PackageManagement', '1.1.1.0', 'Pester', '4.0.2', 'Posh-SSH',
-         '1.7.7', 'PowerShellGet', '1.1.2.0', 'PSDeployTools', '1.0.6',
-         'PSExcel', '1.0,1.0.2']
+        [
+          '{"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"}'
+        ]
       )
   end
   describe :instances do
     specify 'returns an array of :psmodule providers' do
       instances = provider_class.instances
-      expect(instances.count).to eq(6)
+      expect(instances.count).to eq(3)
       expect(instances).to all(be_instance_of(provider_class))
     end
   end

spec/unit/puppet/provider/psrepository_spec.rb

@@ -12,10 +12,12 @@
     allow(provider_class).to receive(:invoke_ps_command).and_return(nil)
     allow(provider_class).to receive(:invoke_ps_command).with(
       provider_class.instances_command
-    ).and_return([
-      'Repo1,https://repo1.com,Untrusted',
-      'Repo2,https://repo2.com,Trusted'
-    ])
+    ).and_return(
+      [
+        '{"name":"Repo1","source_location":"https://repo1.com","installation_policy":"untrusted"}',
+        '{"name":"Repo2","source_location":"https://repo2.com","installation_policy":"trusted"}'
+      ]
+    )
   end
   describe :instances do
     specify 'returns an array of :windows providers' do