puppet_litmus 0.36.1 → 0.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9a130b9a5ccaf0b18f53a163b9e65dd207eef1fbe23db2921df3b4b534f44ab
-  data.tar.gz: b2f1d8367e536d2f83104b839438e26e7cfc4da9f06ba714730e7dbbb2de6f6c
+  metadata.gz: 918f276058fbe47a9bbffbc01d7438cb45506aaa9fad277b7d0a6d6a19fd8f95
+  data.tar.gz: 5e98eb4401f9380d2ae31c87ea530c273faf177236f01b8b73d6b9cdb2c8f344
 SHA512:
-  metadata.gz: 9e5852a7557b51cf4ee81a50d169d58a7de90aebb6f4c0f53258274632b49f7e8d93175176b60b3435023326df6cabf27f68d10209d5bfdf100911f32a438869
-  data.tar.gz: 4c70b9fb01b6a32b374e287d2a8444896d31d9d38a0a8b7e18cc1cc10f5b531fcfad811a8269f707b9cc05f7085a5f94f94c28acf84a0a5858ebe5ef43db1e4f
+  metadata.gz: a60869765a8bdf0aea21b476daea6d69535daf39ab80de18895952c51b181d7783d103eff0d6300c67819a7073a7a5c67033bba4030a0a9411c758c1c2f62b9a
+  data.tar.gz: 8bc5ee4296050a3343b5312cbdcd774af7f4fb2186df4779b1779b921895edc65ba8f8893760a612517e137246474b827bd78ab0084c83903b219366154db653

data/exe/matrix_from_metadata_v2

@@ -32,7 +32,7 @@ IMAGE_TABLE = {
   'SLES-15' => 'sles-15',
   'Windows-2016' => 'windows-2016',
   'Windows-2019' => 'windows-2019',
-  'Windows-2022' => 'windows-2022',
+  'Windows-2022' => 'windows-2022'
 }.freeze
 
 DOCKER_PLATFORMS = {
@@ -53,44 +53,40 @@ DOCKER_PLATFORMS = {
   # 'Ubuntu-16.04' => 'litmusimage/ubuntu:16.04', Support Dropped
   'Ubuntu-18.04' => 'litmusimage/ubuntu:18.04',
   'Ubuntu-20.04' => 'litmusimage/ubuntu:20.04',
-  'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04',
+  'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04'
 }.freeze
 
 # This table uses the latest version in each collection for accurate
 # comparison when evaluating puppet requirements from the metadata
 COLLECTION_TABLE = [
-  {
-    puppet_maj_version: 6,
-    ruby_version: 2.5,
-  },
   {
     puppet_maj_version: 7,
-    ruby_version: 2.7,
+    ruby_version: 2.7
   },
   {
     puppet_maj_version: 8,
-    ruby_version: 3.2,
-  },
+    ruby_version: 3.2
+  }
 ].freeze
 
 matrix = {
   platforms: [],
-  collection: [],
+  collection: []
 }
 
 spec_matrix = {
-  include: [],
+  include: []
 }
 
 if ARGV.include?('--exclude-platforms')
-  exclude_platforms_occurencies = ARGV.select { |arg| arg == '--exclude-platforms' }.length
+  exclude_platforms_occurencies = ARGV.count { |arg| arg == '--exclude-platforms' }
   raise '--exclude-platforms argument should be present just one time in the command' unless exclude_platforms_occurencies <= 1
 
   exclude_platforms_list = ARGV[ARGV.find_index('--exclude-platforms') + 1]
   raise 'you need to provide a list of platforms in JSON format' if exclude_platforms_list.nil?
 
   begin
-    exclude_list = JSON.parse(exclude_platforms_list).map { |platform| platform.downcase }
+    exclude_list = JSON.parse(exclude_platforms_list).map(&:downcase)
   rescue JSON::ParserError
     raise 'the exclude platforms list must valid JSON'
   end
@@ -103,20 +99,20 @@ metadata = JSON.parse(File.read(metadata_path))
 # Set platforms based on declared operating system support
 metadata['operatingsystem_support'].sort_by { |a| a['operatingsystem'] }.each do |sup|
   os = sup['operatingsystem']
-  sup['operatingsystemrelease'].sort_by { |a| a.to_i }.each do |ver|
+  sup['operatingsystemrelease'].sort_by(&:to_i).each do |ver|
     image_key = "#{os}-#{ver}"
 
     if IMAGE_TABLE.key?(image_key) && !exclude_list.include?(image_key.downcase)
       matrix[:platforms] << {
         label: image_key,
         provider: 'provision::provision_service',
-        image: IMAGE_TABLE[image_key],
+        image: IMAGE_TABLE[image_key]
       }
     elsif DOCKER_PLATFORMS.key?(image_key) && !exclude_list.include?(image_key.downcase)
       matrix[:platforms] << {
         label: image_key,
         provider: 'provision::docker',
-        image: DOCKER_PLATFORMS[image_key],
+        image: DOCKER_PLATFORMS[image_key]
       }
     else
       puts "::warning::#{image_key} was excluded from testing" if exclude_list.include?(image_key.downcase)
@@ -130,7 +126,7 @@ if metadata.key?('requirements') && metadata['requirements'].length.positive?
   metadata['requirements'].each do |req|
     next unless req.key?('name') && req.key?('version_requirement') && req['name'] == 'puppet'
 
-    ver_regexp = %r{^([>=<]{1,2})\s*([\d.]+)\s+([>=<]{1,2})\s*([\d.]+)$}
+    ver_regexp = /^([>=<]{1,2})\s*([\d.]+)\s+([>=<]{1,2})\s*([\d.]+)$/
     match = ver_regexp.match(req['version_requirement'])
     if match.nil?
       puts "::warning::Didn't recognize version_requirement '#{req['version_requirement']}'"
@@ -146,22 +142,22 @@ if metadata.key?('requirements') && metadata['requirements'].length.positive?
       next unless Gem::Requirement.create(reqs).satisfied_by?(Gem::Version.new("#{collection[:puppet_maj_version]}.9999"))
 
       matrix[:collection] << "puppet#{collection[:puppet_maj_version]}-nightly"
-      spec_matrix[:include] << if collection[:puppet_maj_version] == 8
-                                 { puppet_version: 'https://github.com/puppetlabs/puppet', ruby_version: collection[:ruby_version] }
-                               else
-                                 { puppet_version: "~> #{collection[:puppet_maj_version]}.0", ruby_version: collection[:ruby_version] }
-                               end
+
+      include_version = {
+        8 => "~> #{collection[:puppet_maj_version]}.0",
+        7 => "~> #{collection[:puppet_maj_version]}.24",
+        6 => "~> #{collection[:puppet_maj_version]}.0"
+      }
+      spec_matrix[:include] << { puppet_version: include_version[collection[:puppet_maj_version]], ruby_version: collection[:ruby_version] }
     end
   end
 end
 
 # Set to defaults (all collections) if no matches are found
-if matrix[:collection].empty?
-  matrix[:collection] = COLLECTION_TABLE.map { |collection| "puppet#{collection[:puppet_maj_version]}-nightly" }
-end
+matrix[:collection] = COLLECTION_TABLE.map { |collection| "puppet#{collection[:puppet_maj_version]}-nightly" } if matrix[:collection].empty?
 
 # Just to make sure there aren't any duplicates
-matrix[:platforms] = matrix[:platforms].uniq.sort { |a, b| a[:label] <=> b[:label] }
+matrix[:platforms] = matrix[:platforms].uniq.sort_by { |a| a[:label] }
 matrix[:collection] = matrix[:collection].uniq.sort
 
 set_output('matrix', JSON.generate(matrix))

data/lib/puppet_litmus/version.rb

@@ -2,5 +2,5 @@
 
 # version of this gem
 module PuppetLitmus
-  VERSION ||= '0.36.1'
+  VERSION ||= '0.36.2'
 end

data/spec/exe/matrix_from_metadata_v2_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
     let(:github_output_content) { github_output.read }
     let(:result) { run_matrix_from_metadata_v2 }
 
-    before(:each) do
+    before do
       ENV['GITHUB_OUTPUT'] = github_output.path
     end
 
@@ -29,11 +29,11 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '"collection":[',
           '"puppet7-nightly","puppet8-nightly"',
           ']',
-          '}',
-        ].join,
+          '}'
+        ].join
       )
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 7.0","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}',
+        'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
       expect(result.stdout).to include("Created matrix with 8 cells:\n  - Acceptance Test Cells: 6\n  - Spec Test Cells: 2")
     end
@@ -44,7 +44,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
     let(:github_output_content) { github_output.read }
     let(:result) { run_matrix_from_metadata_v2({ '--exclude-platforms' => ['ubuntu-18.04'] }) }
 
-    before(:each) do
+    before do
       ENV['GITHUB_OUTPUT'] = github_output.path
     end
 
@@ -65,11 +65,11 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '"collection":[',
           '"puppet7-nightly","puppet8-nightly"',
           ']',
-          '}',
-        ].join,
+          '}'
+        ].join
       )
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 7.0","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}',
+        'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
       expect(result.stdout).to include("Created matrix with 6 cells:\n  - Acceptance Test Cells: 4\n  - Spec Test Cells: 2")
     end
@@ -80,7 +80,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
     let(:github_output_content) { github_output.read }
     let(:result) { run_matrix_from_metadata_v2({ '--exclude-platforms' => ['ubuntu-18.04', 'redhat-8'] }) }
 
-    before(:each) do
+    before do
       ENV['GITHUB_OUTPUT'] = github_output.path
     end
 
@@ -101,11 +101,11 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '"collection":[',
           '"puppet7-nightly","puppet8-nightly"',
           ']',
-          '}',
-        ].join,
+          '}'
+        ].join
       )
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 7.0","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}',
+        'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
       expect(result.stdout).to include("Created matrix with 4 cells:\n  - Acceptance Test Cells: 2\n  - Spec Test Cells: 2")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.36.2
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -215,17 +215,17 @@ specification_version: 4
 summary: Providing a simple command line tool for puppet content creators, to enable
   simple and complex test deployments.
 test_files:
-- spec/exe/matrix_from_metadata_v2_spec.rb
-- spec/exe/fake_metadata.json
+- spec/spec_helper.rb
+- spec/support/inventory.rb
+- spec/support/inventorytesting.yaml
+- spec/lib/puppet_litmus/rake_tasks_spec.rb
+- spec/lib/puppet_litmus/puppet_litmus_version_spec.rb
 - spec/lib/puppet_litmus/util_spec.rb
 - spec/lib/puppet_litmus/inventory_manipulation_spec.rb
-- spec/lib/puppet_litmus/rake_tasks_spec.rb
-- spec/lib/puppet_litmus/puppet_helpers_spec.rb
 - spec/lib/puppet_litmus/rake_helper_spec.rb
-- spec/lib/puppet_litmus/puppet_litmus_version_spec.rb
-- spec/spec_helper.rb
-- spec/support/inventorytesting.yaml
-- spec/support/inventory.rb
+- spec/lib/puppet_litmus/puppet_helpers_spec.rb
+- spec/exe/fake_metadata.json
+- spec/exe/matrix_from_metadata_v2_spec.rb
 - spec/data/doot.tar.gz
-- spec/data/inventory.yaml
 - spec/data/jim.yaml
+- spec/data/inventory.yaml