ruby-pwsh 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 350652f7e3803a522f6ad56512a75778277bef24bb3963fa9713522517f511cc
-  data.tar.gz: '02500121972f8b43463d6e3db9d37ab7324bcecb521b0fc482a9540d1c7bb88b'
+  metadata.gz: bdcbcec4cceaa40f4fabaad50f9d7409382c14eb1a98a345af5770aa1ae78f31
+  data.tar.gz: 48f16a70a2305b398a9098d453ae743a6c2630a94cdc8d6716250e1e4ee83464
 SHA512:
-  metadata.gz: 5f3e181119fc56713f3f326081ec0f84540308f8918425afc7b10e89baa6813456b3e369b98b7c7ae255484ba425dee0e00239cce5d98683b013d8971ad5d27a
-  data.tar.gz: 0eaa28aeb753b121d46cd83127ff0dffdaa4cbf8bb0463b07b069fea0a339461a71d1746232e9cc3ad49413daa07b315c0a11b55eb85700f54bcda5667606db4
+  metadata.gz: 7c19486fd5452d81c71e7939fddaa78c66972ddb425806fc894b1aeecf0cb94b917955d29245130095ee5c4c85d63f2ba12176b6ef8fe4ce7e6f9f653bb0224c
+  data.tar.gz: b12c1ab52269745152a29ce446876a3e06f3b9f9aab1d254157d8f93c6cccb1e7f997c118488229e22d8800a1a1a17af0557a8c0af2ea386d3e80e80c2f5bfd0

data/.gitignore

@@ -18,4 +18,6 @@ Gemfile.lock
 /ruby-pwsh-*.gem
 
 # Acceptance Testing fixtures
-/spec/fixtures/modules/
+/spec/fixtures/modules/
+/spec/fixtures/test.pp
+/spec/fixtures/website/

data/CHANGELOG.md

@@ -2,7 +2,16 @@
 
 All notable changes to this project will be documented in this file.The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [0.10.0](https://github.com/puppetlabs/ruby-pwsh/tree/0.10.0) (2021-07-01)
+## [0.10.1](https://github.com/puppetlabs/ruby-pwsh/tree/0.10.1) (2021-08-23)
+
+[Full Changelog](https://github.com/puppetlabs/ruby-pwsh/compare/0.10.0...0.10.1)
+
+### Fixed
+
+- \(GH-180\) Ensure instance\_key respects full uniqueness of options [\#181](https://github.com/puppetlabs/ruby-pwsh/pull/181) ([michaeltlombardi](https://github.com/michaeltlombardi))
+- \(GH-165\) Ensure null-value nested cim instance arrays are appropriately munged [\#177](https://github.com/puppetlabs/ruby-pwsh/pull/177) ([michaeltlombardi](https://github.com/michaeltlombardi))
+
+## [0.10.0](https://github.com/puppetlabs/ruby-pwsh/tree/0.10.0) (2021-07-02)
 
 [Full Changelog](https://github.com/puppetlabs/ruby-pwsh/compare/0.9.0...0.10.0)
 

data/Rakefile

@@ -99,6 +99,63 @@ task :build_module do
   File.open('README.md', 'wb') { |file| file.write(actual_readme_content) }
 end
 
+# Used in vendor_dsc_module
+TAR_LONGLINK = '././@LongLink'
+
+# Vendor a Puppetized DSC Module to spec/fixtures/modules.
+#
+# This is necessary because `puppet module install` fails on modules with
+# long file paths, like xpsdesiredstateconfiguration
+#
+# @param command [String] command to execute.
+# @return [Object] the standard out stream.
+def vendor_dsc_module(name, version, destination)
+  require 'open-uri'
+  require 'rubygems/package'
+  require 'zlib'
+
+  module_uri = "https://forge.puppet.com/v3/files/dsc-#{name}-#{version}.tar.gz"
+  tar_gz_archive = File.expand_path("#{name}.tar.gz", ENV['TEMP'])
+
+  # Download the archive from the forge
+  File.open(tar_gz_archive, 'wb') do |file|
+    file.write(URI.open(module_uri).read) # rubocop:disable Security/Open
+  end
+
+  # Unzip to destination
+  # Taken directly from StackOverflow:
+  # - https://stackoverflow.com/a/19139114
+  Gem::Package::TarReader.new(Zlib::GzipReader.open(tar_gz_archive)) do |tar|
+    dest = nil
+    tar.each do |entry|
+      if entry.full_name == TAR_LONGLINK
+        dest = File.join(destination, entry.read.strip)
+        next
+      end
+      dest ||= File.join(destination, entry.full_name)
+      if entry.directory?
+        File.delete(dest) if File.file?(dest)
+        FileUtils.mkdir_p(dest, mode: entry.header.mode, verbose: false)
+      elsif entry.file?
+        FileUtils.rm_rf(dest) if File.directory?(dest)
+        File.open(dest, 'wb') do |f|
+          f.print(entry.read)
+        end
+        FileUtils.chmod(entry.header.mode, dest, verbose: false)
+      elsif entry.header.typeflag == '2' # Symlink!
+        File.symlink(entry.header.linkname, dest)
+      end
+      dest = nil
+    end
+  end
+
+  # Rename folder to just the module name, as needed by Puppet
+  Dir.glob("#{destination}/*#{name}*").each do |existing_folder|
+    new_folder = File.expand_path(name, destination)
+    FileUtils.mv(existing_folder, new_folder)
+  end
+end
+
 namespace :dsc do
   namespace :acceptance do
     desc 'Prep for running DSC acceptance tests'
@@ -107,24 +164,21 @@ namespace :dsc do
       modules_folder = File.expand_path('spec/fixtures/modules', File.dirname(__FILE__))
       FileUtils.mkdir_p(modules_folder) unless Dir.exist?(modules_folder)
       # symlink the parent folder to the modules folder for puppet
-      File.symlink(File.dirname(__FILE__), File.expand_path('pwshlib', modules_folder))
+      symlink_path = File.expand_path('pwshlib', modules_folder)
+      File.symlink(File.dirname(__FILE__), symlink_path) unless Dir.exist?(symlink_path)
       # Install each of the required modules for acceptance testing
       # Note: This only works for modules in the dsc namespace on the forge.
       puppetized_dsc_modules = [
         { name: 'powershellget', version: '2.2.5-0-1' },
-        { name: 'jeadsc', version: '0.7.2-0-2' } # update to 0.7.2-0-3 on release
+        { name: 'jeadsc', version: '0.7.2-0-2' }, # update to 0.7.2-0-3 on release
+        { name: 'xpsdesiredstateconfiguration', version: '9.1.0-0-1' },
+        { name: 'xwebadministration', version: '3.2.0-0-2' },
+        { name: 'accesscontroldsc', version: '1.4.1-0-3' }
       ]
       puppetized_dsc_modules.each do |puppet_module|
         next if Dir.exist?(File.expand_path(puppet_module[:name], modules_folder))
 
-        install_command = [
-          'bundle exec puppet module install',
-          "dsc-#{puppet_module[:name]}",
-          "--version #{puppet_module[:version]}",
-          '--ignore-dependencies',
-          "--target-dir #{modules_folder}"
-        ].join(' ')
-        run_local_command(install_command)
+        vendor_dsc_module(puppet_module[:name], puppet_module[:version], modules_folder)
       end
     end
     RSpec::Core::RakeTask.new(:spec) do |t|

data/lib/puppet/provider/dsc_base_provider/invoke_dsc_resource_functions.ps1

@@ -115,7 +115,7 @@ Function ConvertTo-CanonicalResult {
       }
 
       if ($Property.Definition -match 'InstanceArray') {
-          If ($Value.GetType().Name -notmatch '\[\]') { $Value = @($Value) }
+          If ($null -eq $Value -or $Value.GetType().Name -notmatch '\[\]') { $Value = @($Value) }
       }
 
       $ResultObject.$PropertyName = $Value

data/lib/pwsh/version.rb

@@ -2,5 +2,5 @@
 
 module Pwsh
   # The version of the ruby-pwsh gem
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-pwshlib",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "author": "puppetlabs",
   "summary": "Provide library code for interoperating with PowerShell.",
   "license": "MIT",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pwsh
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies: []
 description: PowerShell code manager for ruby.
 email: