puppet_litmus 0.34.6 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6995f6c4a1cd2d14abbbf0d617ef28b18b029c3b3b3a342d7e1a98b0673394
-  data.tar.gz: 86fd172c61f5775906e666732cdcb949a28c62c6cb7e9e67c8c4638195dba488
+  metadata.gz: f9a130b9a5ccaf0b18f53a163b9e65dd207eef1fbe23db2921df3b4b534f44ab
+  data.tar.gz: b2f1d8367e536d2f83104b839438e26e7cfc4da9f06ba714730e7dbbb2de6f6c
 SHA512:
-  metadata.gz: 4ffef8459fcd7b032a6fc43a376ebc833be88f344f59364b4b622e7d0bddf8cf7a4d8681e6fa3012b6914ab6922a5b59d4d7e41b286e740dd543ff5e59b80887
-  data.tar.gz: 8789b4289c68186345dd097bda8539d8f5006184eb3b58f8cf544ca0fe80bb35d54ca6f43d7ddaa3fd53785b5d6e6dcf01e3fce4185e6a1fb27e3f4588f86773
+  metadata.gz: 9e5852a7557b51cf4ee81a50d169d58a7de90aebb6f4c0f53258274632b49f7e8d93175176b60b3435023326df6cabf27f68d10209d5bfdf100911f32a438869
+  data.tar.gz: 4c70b9fb01b6a32b374e287d2a8444896d31d9d38a0a8b7e18cc1cc10f5b531fcfad811a8269f707b9cc05f7085a5f94f94c28acf84a0a5858ebe5ef43db1e4f

data/exe/matrix_from_metadata

@@ -5,6 +5,25 @@
 
 require 'json'
 
+# Sets an output variable in GitHub Actions. If the GITHUB_OUTPUT environment
+# variable is not set, this will fail with an exit code of 1 and
+# send an ::error:: message to the GitHub Actions log.
+# @param name [String] The name of the output variable
+# @param value [String] The value of the output variable
+
+def set_output(name, value)
+  # Get the output path
+  output = ENV.fetch('GITHUB_OUTPUT')
+
+  # Write the output variable to GITHUB_OUTPUT
+  File.open(output, 'a') do |f|
+    f.puts "#{name}=#{value}"
+  end
+rescue KeyError
+  puts '::error::GITHUB_OUTPUT environment variable not set.'
+  exit 1
+end
+
 IMAGE_TABLE = {
   'RedHat-7' => 'rhel-7',
   'RedHat-8' => 'rhel-8',
@@ -92,6 +111,5 @@ end
 matrix[:platform] = matrix[:platform].uniq.sort
 matrix[:collection] = matrix[:collection].uniq.sort
 
-puts "::set-output name=matrix::#{JSON.generate(matrix)}"
-
+set_output('matrix', JSON.generate(matrix))
 puts "Created matrix with #{matrix[:platform].length * matrix[:collection].length} cells."

data/exe/matrix_from_metadata_v2

@@ -5,6 +5,25 @@
 
 require 'json'
 
+# Sets an output variable in GitHub Actions. If the GITHUB_OUTPUT environment
+# variable is not set, this will fail with an exit code of 1 and
+# send an ::error:: message to the GitHub Actions log.
+# @param name [String] The name of the output variable
+# @param value [String] The value of the output variable
+
+def set_output(name, value)
+  # Get the output path
+  output = ENV.fetch('GITHUB_OUTPUT')
+
+  # Write the output variable to GITHUB_OUTPUT
+  File.open(output, 'a') do |f|
+    f.puts "#{name}=#{value}"
+  end
+rescue KeyError
+  puts '::error::GITHUB_OUTPUT environment variable not set.'
+  exit 1
+end
+
 IMAGE_TABLE = {
   'RedHat-7' => 'rhel-7',
   'RedHat-8' => 'rhel-8',
@@ -48,6 +67,10 @@ COLLECTION_TABLE = [
     puppet_maj_version: 7,
     ruby_version: 2.7,
   },
+  {
+    puppet_maj_version: 8,
+    ruby_version: 3.2,
+  },
 ].freeze
 
 matrix = {
@@ -123,7 +146,11 @@ 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] << { puppet_version: "~> #{collection[:puppet_maj_version]}.0", ruby_version: collection[:ruby_version] }
+      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
     end
   end
 end
@@ -137,8 +164,8 @@ end
 matrix[:platforms] = matrix[:platforms].uniq.sort { |a, b| a[:label] <=> b[:label] }
 matrix[:collection] = matrix[:collection].uniq.sort
 
-puts "::set-output name=matrix::#{JSON.generate(matrix)}"
-puts "::set-output name=spec_matrix::#{JSON.generate(spec_matrix)}"
+set_output('matrix', JSON.generate(matrix))
+set_output('spec_matrix', JSON.generate(spec_matrix))
 
 acceptance_test_cell_count = matrix[:platforms].length * matrix[:collection].length
 spec_test_cell_count = spec_matrix[:include].length

data/lib/puppet_litmus/version.rb

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

data/spec/exe/fake_metadata.json

@@ -37,10 +37,10 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-g2381db6",
-  "pdk-version": "2.1.1"
+  "template-ref": "tags/2.7.4",
+  "pdk-version": "2.7.4"
 }

data/spec/exe/matrix_from_metadata_v2_spec.rb

@@ -4,38 +4,50 @@ require 'spec_helper'
 
 RSpec.describe 'matrix_from_metadata_v2' do
   context 'without arguments' do
+    let(:github_output) { Tempfile.new('github_output') }
+    let(:github_output_content) { github_output.read }
     let(:result) { run_matrix_from_metadata_v2 }
 
+    before(:each) do
+      ENV['GITHUB_OUTPUT'] = github_output.path
+    end
+
     it 'run successfully' do
       expect(result.status_code).to eq 0
     end
 
     it 'generates the matrix' do
       expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
-      expect(result.stdout).to include(
+      expect(github_output_content).to include(
         [
-          '::set-output name=matrix::{',
+          'matrix={',
           '"platforms":[',
           '{"label":"CentOS-6","provider":"provision::docker","image":"litmusimage/centos:6"},',
           '{"label":"RedHat-8","provider":"provision::provision_service","image":"rhel-8"},',
           '{"label":"Ubuntu-18.04","provider":"provision::docker","image":"litmusimage/ubuntu:18.04"}',
           '],',
           '"collection":[',
-          '"puppet6-nightly","puppet7-nightly"',
+          '"puppet7-nightly","puppet8-nightly"',
           ']',
           '}',
         ].join,
       )
-      expect(result.stdout).to include(
-        '::set-output name=spec_matrix::{"include":[{"puppet_version":"~> 6.0","ruby_version":2.5},{"puppet_version":"~> 7.0","ruby_version":2.7}]}',
+      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}]}',
       )
       expect(result.stdout).to include("Created matrix with 8 cells:\n  - Acceptance Test Cells: 6\n  - Spec Test Cells: 2")
     end
   end
 
   context 'with --exclude-platforms ["ubuntu-18.04"]' do
+    let(:github_output) { Tempfile.new('github_output') }
+    let(:github_output_content) { github_output.read }
     let(:result) { run_matrix_from_metadata_v2({ '--exclude-platforms' => ['ubuntu-18.04'] }) }
 
+    before(:each) do
+      ENV['GITHUB_OUTPUT'] = github_output.path
+    end
+
     it 'run successfully' do
       expect(result.status_code).to eq 0
     end
@@ -43,29 +55,35 @@ RSpec.describe 'matrix_from_metadata_v2' do
     it 'generates the matrix without excluded platforms' do
       expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
       expect(result.stdout).to include('::warning::Ubuntu-18.04 was excluded from testing')
-      expect(result.stdout).to include(
+      expect(github_output_content).to include(
         [
-          '::set-output name=matrix::{',
+          'matrix={',
           '"platforms":[',
           '{"label":"CentOS-6","provider":"provision::docker","image":"litmusimage/centos:6"},',
           '{"label":"RedHat-8","provider":"provision::provision_service","image":"rhel-8"}',
           '],',
           '"collection":[',
-          '"puppet6-nightly","puppet7-nightly"',
+          '"puppet7-nightly","puppet8-nightly"',
           ']',
           '}',
         ].join,
       )
-      expect(result.stdout).to include(
-        '::set-output name=spec_matrix::{"include":[{"puppet_version":"~> 6.0","ruby_version":2.5},{"puppet_version":"~> 7.0","ruby_version":2.7}]}',
+      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}]}',
       )
       expect(result.stdout).to include("Created matrix with 6 cells:\n  - Acceptance Test Cells: 4\n  - Spec Test Cells: 2")
     end
   end
 
   context 'with --exclude-platforms \'["ubuntu-18.04","redhat-8"]\'' do
+    let(:github_output) { Tempfile.new('github_output') }
+    let(:github_output_content) { github_output.read }
     let(:result) { run_matrix_from_metadata_v2({ '--exclude-platforms' => ['ubuntu-18.04', 'redhat-8'] }) }
 
+    before(:each) do
+      ENV['GITHUB_OUTPUT'] = github_output.path
+    end
+
     it 'run successfully' do
       expect(result.status_code).to eq 0
     end
@@ -74,20 +92,20 @@ RSpec.describe 'matrix_from_metadata_v2' do
       expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
       expect(result.stdout).to include('::warning::Ubuntu-18.04 was excluded from testing')
       expect(result.stdout).to include('::warning::RedHat-8 was excluded from testing')
-      expect(result.stdout).to include(
+      expect(github_output_content).to include(
         [
-          '::set-output name=matrix::{',
+          'matrix={',
           '"platforms":[',
           '{"label":"CentOS-6","provider":"provision::docker","image":"litmusimage/centos:6"}',
           '],',
           '"collection":[',
-          '"puppet6-nightly","puppet7-nightly"',
+          '"puppet7-nightly","puppet8-nightly"',
           ']',
           '}',
         ].join,
       )
-      expect(result.stdout).to include(
-        '::set-output name=spec_matrix::{"include":[{"puppet_version":"~> 6.0","ruby_version":2.5},{"puppet_version":"~> 7.0","ruby_version":2.7}]}',
+      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}]}',
       )
       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.34.6
+  version: 0.36.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -154,20 +154,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: r10k
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.15.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.15.1
 description: "    Providing a simple command line tool for puppet content creators,
   to enable simple and complex test deployments.\n"
 email:
@@ -229,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/spec_helper.rb
-- spec/support/inventory.rb
-- spec/support/inventorytesting.yaml
 - spec/exe/matrix_from_metadata_v2_spec.rb
 - spec/exe/fake_metadata.json
-- spec/data/jim.yaml
-- spec/data/doot.tar.gz
-- spec/data/inventory.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/util_spec.rb
+- spec/lib/puppet_litmus/puppet_litmus_version_spec.rb
+- spec/spec_helper.rb
+- spec/support/inventorytesting.yaml
+- spec/support/inventory.rb
+- spec/data/doot.tar.gz
+- spec/data/inventory.yaml
+- spec/data/jim.yaml