Merge pull request #202 from bwitt/add-os-filter-fix

Fix `add_supported_os` with os filter

Author: bastelfreak

lib/puppet_metadata/command/add_supported_os.rb

@@ -8,7 +8,7 @@ def self.parser(options)
       opts.on('--at DATE', Date, 'The date to use') do |value|
         options[:at] = value
       end
-      opts.on('--os operatingsystem', nil, 'Only honour the specific operating system') do |value|
+      opts.on('--os OPERATINGSYSTEM', 'Only honour the specific operating system') do |value|
         options[:os] = value
       end
     end

lib/puppet_metadata/metadata.rb

@@ -123,7 +123,11 @@ def add_supported_operatingsystems(at = nil, desired_os = nil)
 
         # desired_os is a filter
         # if set, we only care about this OS, otherwise we want all OSes from metadata.json
-        next if desired_os && desired_os != os
+        if desired_os && desired_os != os
+          # Preserve the original entry unchanged
+          result['operatingsystemrelease'] = releases unless releases.nil?
+          next result
+        end
 
         unless releases.nil?
           supported = OperatingSystem.supported_releases(os, at)
@@ -134,6 +138,9 @@ def add_supported_operatingsystems(at = nil, desired_os = nil)
         result
       end
 
+      # Clear the memoized operatingsystems so it gets recalculated
+      @operatingsystems = nil
+
       added
     end
 

spec/metadata_spec.rb

@@ -229,11 +229,19 @@
         end
 
         it 'with OS' do
+          # Only Debian should be in the added hash
           expect(subject.add_supported_operatingsystems(nil, desired_os)).to eq({ 'Debian' => ['11', '12', '13'] })
+          # Other OSes should remain unchanged
+          expect(subject.operatingsystems['CentOS']).to eq(['7', '8', '9'])
+          expect(subject.operatingsystems['RedHat']).to eq(['7', '8', '9'])
         end
 
         it 'with date & OS' do
+          # Only Debian should be in the added hash
           expect(subject.add_supported_operatingsystems(date, desired_os)).to eq({ 'Debian' => ['12', '13'] })
+          # Other OSes should remain unchanged
+          expect(subject.operatingsystems['CentOS']).to eq(['7', '8', '9'])
+          expect(subject.operatingsystems['RedHat']).to eq(['7', '8', '9'])
         end
       end
     end