ruby-pwsh 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e217873cdddb9b32ba467e0a9f5de6977c04b11a1c0788613dda6181e96a62bd
-  data.tar.gz: 8dc82dfad8869d7c632ba3d902b4e22c375aeb5988f84e359269163da885b604
+  metadata.gz: 106716635e03eef49ab00c8dd35cf16a5674a27452968b16ba7756ba252b97be
+  data.tar.gz: 4bd6c34343347a1d705cea410346028bbb91446bf5983e75409f16c7730f1000
 SHA512:
-  metadata.gz: a7e02f1cee48fa49316c133268a16f9bc3b8f195927834854c81eee134cdb7056710cd1be04eaf992ca036aa2b014175d06ebf8684eef6354ef8d10a07a62e31
-  data.tar.gz: da78f276002b67faf3716ce0b8157fe3cf0edbbeb5da3ae1145c3ed696e386838285138fdd0c75b8a592b677b7631c66ce07355a25788dee58354af0ecdd9eaa
+  metadata.gz: f8b6c0c4ff6eabbc9a842cc863d76128dbccca74fabfef02b4aea6ba54f3a01ffd3d97447df4ccc027a8f22cf6a7b430b0893e34d0de7989e742442cf56b5ef9
+  data.tar.gz: 2404be74308d1b80c5d8f775f49f0f0ac6ae7deab47fe7c38e25e79852aac42f87e16b5cea5e4a4617cdde6eac1236cc8407a0e10fe2c9198bcfd0d6e88a7548

data/README.md

@@ -85,6 +85,7 @@ The following platforms are supported:
 - OSX
 - RedHat
 - Ubuntu
+- AlmaLinux
 
 ## Limitations
 

data/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb

@@ -682,16 +682,16 @@ class Puppet::Provider::DscBaseProvider # rubocop:disable Metrics/ClassLength
     context.type.attributes.select { |_attribute, properties| properties[:mandatory_for_set] }.keys
   end
 
-  # Parses the DSC resource type definition to retrieve the names of any attributes which are specified as required strings
-  # This is used to ensure that any nil values are converted to empty strings to match puppets expected value
+  # Parses the DSC resource type definition to retrieve the names of any attributes which are specifed as required strings
+  # This is used to ensure that any nil values are converted to empty strings to match puppets expecetd value
   # @param context [Object] the Puppet runtime context to operate in and send feedback to
   # @param data [Hash] the hash of properties returned from the DSC resource
   # @return [Hash] returns a data hash with any nil values converted to empty strings
   def stringify_nil_attributes(context, data)
-    nil_attributes = data.select { |_name, value| value.nil? }.keys
-    nil_attributes.each do |nil_attr|
-      attribute_type = context.type.attributes[nil_attr][:type]
-      data[nil_attr] = '' if (attribute_type.include?('Enum[') && enum_values(context, nil_attr).include?('')) || attribute_type == 'String'
+    nil_strings = data.select { |_name, value| value.nil? }.keys
+    string_attrs = context.type.attributes.select { |_name, properties| properties[:type] == 'String' }.keys
+    string_attrs.each do |attribute|
+      data[attribute] = '' if nil_strings.include?(attribute)
     end
     data
   end

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

@@ -123,4 +123,4 @@ Function ConvertTo-CanonicalResult {
 
   # Output the final result
   $ResultObject
-}
+}

data/lib/pwsh/util.rb

@@ -15,20 +15,16 @@ module Pwsh
       !!(host_os =~ /mswin|mingw/)
     end
 
-    # Verify paths specified are valid directories which exist.
-    #
-    # @return [Bool] true if any directories specified do not exist
+    # Verify paths specified are valid directories.
+    # Skips paths which do not exist.
+    # @return [Bool] true if any paths specified are not valid directories
     def invalid_directories?(path_collection)
-      invalid_paths = false
-
-      return invalid_paths if path_collection.nil? || path_collection.empty?
+      return false if path_collection.nil? || path_collection.empty?
 
-      paths = on_windows? ? path_collection.split(';') : path_collection.split(':')
-      paths.each do |path|
-        invalid_paths = true unless File.directory?(path) || path.empty?
-      end
+      delimiter = on_windows? ? ';' : ':'
+      paths = path_collection.split(delimiter)
 
-      invalid_paths
+      paths.any? { |path| !path.empty? && File.exist?(path) && !File.directory?(path) }
     end
 
     # Return a string or symbol converted to snake_case

data/lib/pwsh/version.rb

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

data/lib/pwsh.rb

@@ -108,7 +108,7 @@ module Pwsh
       @powershell_command = cmd
       @powershell_arguments = args
 
-      raise "Bad configuration for ENV['lib']=#{ENV['lib']} - invalid path" if Pwsh::Util.invalid_directories?(ENV['lib'])
+      warn "Bad configuration for ENV['lib']=#{ENV['lib']} - invalid path" if Pwsh::Util.invalid_directories?(ENV['lib'])
 
       if Pwsh::Util.on_windows?
         # Named pipes under Windows will automatically be mounted in \\.\pipe\...

data/spec/unit/pwsh/util_spec.rb

@@ -87,13 +87,15 @@ RSpec.describe Pwsh::Util do
   end
 
   describe '.invalid_directories?' do
-    let(:valid_path_a)  { 'C:/some/folder' }
-    let(:valid_path_b)  { 'C:/another/folder' }
-    let(:valid_paths)   { 'C:/some/folder;C:/another/folder' }
-    let(:invalid_path)  { 'C:/invalid/path' }
-    let(:mixed_paths)   { 'C:/some/folder;C:/invalid/path;C:/another/folder' }
-    let(:empty_string)  { '' }
-    let(:empty_members) { 'C:/some/folder;;C:/another/folder' }
+    let(:valid_path_a)     { 'C:/some/folder' }
+    let(:valid_path_b)     { 'C:/another/folder' }
+    let(:valid_paths)      { 'C:/some/folder;C:/another/folder' }
+    let(:invalid_path)     { 'C:/invalid/path' }
+    let(:mixed_paths)      { 'C:/some/folder;C:/another/folder;C:/invalid/path' }
+    let(:empty_string)     { '' }
+    let(:file_path)        { 'C:/some/folder/file.txt' }
+    let(:non_existent_dir) { 'C:/some/dir/that/doesnt/exist' }
+    let(:empty_members)    { 'C:/some/folder;;C:/another/folder' }
 
     it 'returns false if passed nil' do
       expect(described_class.invalid_directories?(nil)).to be false
@@ -103,8 +105,16 @@ RSpec.describe Pwsh::Util do
       expect(described_class.invalid_directories?('')).to be false
     end
 
+    it 'returns true if a file path is provided' do
+      expect(described_class).to receive(:on_windows?).and_return(true)
+      expect(File).to receive(:exist?).with(file_path).and_return(true)
+      expect(File).to receive(:directory?).with(file_path).and_return(false)
+      expect(described_class.invalid_directories?(file_path)).to be true
+    end
+
     it 'returns false if one valid path is provided' do
       expect(described_class).to receive(:on_windows?).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_a).and_return(true)
       expect(File).to receive(:directory?).with(valid_path_a).and_return(true)
       expect(described_class.invalid_directories?(valid_path_a)).to be false
     end
@@ -112,31 +122,56 @@ RSpec.describe Pwsh::Util do
     it 'returns false if a collection of valid paths is provided' do
       expect(described_class).to receive(:on_windows?).and_return(true)
       expect(File).to receive(:directory?).with(valid_path_a).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_a).and_return(true)
       expect(File).to receive(:directory?).with(valid_path_b).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_b).and_return(true)
       expect(described_class.invalid_directories?(valid_paths)).to be false
     end
 
     it 'returns true if there is only one path and it is invalid' do
       expect(described_class).to receive(:on_windows?).and_return(true)
+      expect(File).to receive(:exist?).with(invalid_path).and_return(true)
       expect(File).to receive(:directory?).with(invalid_path).and_return(false)
       expect(described_class.invalid_directories?(invalid_path)).to be true
     end
 
     it 'returns true if the collection has on valid and one invalid member' do
       expect(described_class).to receive(:on_windows?).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_a).and_return(true)
       expect(File).to receive(:directory?).with(valid_path_a).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_b).and_return(true)
       expect(File).to receive(:directory?).with(valid_path_b).and_return(true)
+      expect(File).to receive(:exist?).with(invalid_path).and_return(true)
       expect(File).to receive(:directory?).with(invalid_path).and_return(false)
       expect(described_class.invalid_directories?(mixed_paths)).to be true
     end
 
     it 'returns false if collection has empty members but other entries are valid' do
       expect(described_class).to receive(:on_windows?).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_a).and_return(true)
       expect(File).to receive(:directory?).with(valid_path_a).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_b).and_return(true)
       expect(File).to receive(:directory?).with(valid_path_b).and_return(true)
       allow(File).to receive(:directory?).with('')
       expect(described_class.invalid_directories?(empty_members)).to be false
     end
+
+    it 'returns true if a collection has valid members but also contains a file path' do
+      expect(described_class).to receive(:on_windows?).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_a).and_return(true)
+      expect(File).to receive(:directory?).with(valid_path_a).and_return(true)
+      expect(File).to receive(:exist?).with(file_path).and_return(true)
+      expect(File).to receive(:directory?).with(file_path).and_return(false)
+      expect(described_class.invalid_directories?("#{valid_path_a};#{file_path}")).to be true
+    end
+
+    it 'returns false if a collection has valid members but contains a non-existent dir path' do
+      expect(described_class).to receive(:on_windows?).and_return(true)
+      expect(File).to receive(:exist?).with(valid_path_a).and_return(true)
+      expect(File).to receive(:directory?).with(valid_path_a).and_return(true)
+      expect(File).to receive(:exist?).with(non_existent_dir).and_return(false)
+      expect(described_class.invalid_directories?("#{valid_path_a};#{non_existent_dir}")).to be false
+    end
   end
 
   describe '.snake_case' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pwsh
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies: []
 description: PowerShell code manager for ruby.
 email: