voxpupuli-acceptance 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c4b7c689abbd0e3e7f9917b6c3d9e8170960d21ea09824943b39cbdfafe6b2c
-  data.tar.gz: 3fa4edc58eb170887640969a32cd973f8419b6aac449c8c9be2aaca3b4d6728e
+  metadata.gz: b94004396716a88abf812b4b9eb36e8ec6cf29ef9faaf7b3abcc5494c164aec5
+  data.tar.gz: fbb13171a4eade95e39fabc99609d6ee286269b713834d6f161928fd38525055
 SHA512:
-  metadata.gz: 6b4f8d4504bd29c9bc520cbfbebc8447aad495df74832b3404128c9fecfe383c4c9ae4883f8203a62737520ed4019092d9a6465f181dc9a17abed3fbd251db74
-  data.tar.gz: 2ab89e0a80b700057807e32f3ec4a54d5dc92776fc9c376d2fb2fceccea5f9d516be9ec15997f9a29350137175bf3e7047c3dc46153d71db1958f7393a9bb955
+  metadata.gz: fb81c5a2090cede4108248a8958b5d1d4d03b9eb5941914c98d0a7f109e708a07a0a584bd2a8e0abc92b36a820d54702d4543f3b776cb7b7cd91ba37bb5cd45e
+  data.tar.gz: 515e5307d2ad807862a07a5f7d0c97f4628c74cf524ea7fa2ffe1ed1309079cd4ddedfbfcff3052c36409bad5b8cf9496dc81471f4942e06c0d9ea4e363480a6

data/lib/voxpupuli/acceptance/examples.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples 'an idempotent resource' do |host|
   host ||= default
 
@@ -15,6 +17,7 @@ shared_examples 'the example' do |name, host|
     let(:manifest) do
       path = File.join(Dir.pwd, 'examples', name)
       raise Exception, "Example '#{path}' does not exist" unless File.exist?(path)
+
       File.read(path)
     end
   end

data/lib/voxpupuli/acceptance/facts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Voxpupuli
   module Acceptance
     class Facts
@@ -23,7 +25,8 @@ module Voxpupuli
 
           if beaker_facts.any?
             require 'json'
-            on(hosts, "mkdir -p #{File.dirname(FACT_FILE)} && cat <<VOXPUPULI_BEAKER_ENV_VARS > #{FACT_FILE}\n#{beaker_facts.to_json}\nVOXPUPULI_BEAKER_ENV_VARS")
+            on(hosts,
+               "mkdir -p #{File.dirname(FACT_FILE)} && cat <<VOXPUPULI_BEAKER_ENV_VARS > #{FACT_FILE}\n#{beaker_facts.to_json}\nVOXPUPULI_BEAKER_ENV_VARS")
           else
             on(hosts, "rm -f #{FACT_FILE}")
           end

data/lib/voxpupuli/acceptance/fixtures.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'puppet/modulebuilder'
 
@@ -52,7 +54,7 @@ module Voxpupuli
                 if logger
                   logger.warn(warning)
                 else
-                  STDERR.puts(warning)
+                  warn(warning)
                 end
               end
 
@@ -101,9 +103,9 @@ module Voxpupuli
         #
         # @param [Host, String, Symbol] host
         #   The beaker host to run on
-        def temp_dir_on(host, &block)
-          result = on host, "mktemp -d"
-          raise "Could not create directory" unless result.success?
+        def temp_dir_on(host)
+          result = on host, 'mktemp -d'
+          raise 'Could not create directory' unless result.success?
 
           dir = result.stdout.strip
 

data/lib/voxpupuli/acceptance/rake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   # Fixtures can be needed because of spec_prep
   # spec_prep task is provided by puppetlabs_spec_helper

data/lib/voxpupuli/acceptance/serverspec_extensions/curl_command.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# written by https://github.com/ekohl
+# https://github.com/mizzy/serverspec/pull/611 was rejected so adding it here.
+
+require 'serverspec'
+
+module Voxpupuli
+  module Acceptance
+    module ServerspecExtensions
+      class CurlCommand < Serverspec::Type::Command
+        def response_code
+          m = /Response-Code: (?<code>\d+)/.match(stderr)
+          return 0 unless m
+
+          m[:code].to_i
+        end
+
+        def body
+          command_result.stdout
+        end
+
+        def body_as_json
+          MultiJson.load(body)
+        end
+
+        private
+
+        def curl_command
+          # curl supports %{stderr} to --write-out since 7.63.0
+          # so the following doesn't work on EL8, which has curl 7.61.1
+          command = "curl --silent --write-out '%{stderr}Response-Code: %{response_code}\\n' '#{@name}'" # rubocop:disable Style/FormatStringToken
+
+          @options.each do |option, value|
+            case option
+            when :cacert, :cert, :key
+              command += " --#{option} '#{value}'"
+            when :headers
+              value.each do |header, header_value|
+                command += if header_value
+                             " --header '#{header}: #{header_value}'"
+                           else
+                             " --header '#{header};'"
+                           end
+              end
+            else
+              raise "Unknown option #{option} (value: #{value})"
+            end
+          end
+
+          command
+        end
+
+        def command_result
+          @command_result ||= @runner.run_command(curl_command)
+        end
+      end
+    end
+  end
+end

data/lib/voxpupuli/acceptance/serverspec_extensions.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'serverspec'
+require_relative 'serverspec_extensions/curl_command'
+
+module Serverspec
+  module Helper
+    module Type
+      def curl_command(*args)
+        Voxpupuli::Acceptance::ServerspecExtensions::CurlCommand.new(*args)
+      end
+    end
+  end
+end

data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative 'examples'
+require_relative 'serverspec_extensions'
 
 def configure_beaker(modules: :metadata, &block)
   collection = ENV['BEAKER_PUPPET_COLLECTION'] || 'puppet'
@@ -18,7 +21,9 @@ def configure_beaker(modules: :metadata, &block)
       unless %w[none preinstalled].include?(collection)
         BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection)
       end
-      package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.puppet_package_name(host, prefer_aio: collection != 'none'))
+      package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME') do
+        BeakerPuppetHelpers::InstallUtils.collection2packagename(host, collection, prefer_aio: collection != 'none')
+      end
       host.install_package(package_name)
 
       # by default, puppet-agent creates /etc/profile.d/puppet-agent.sh which adds /opt/puppetlabs/bin to PATH
@@ -70,9 +75,7 @@ def configure_beaker(modules: :metadata, &block)
 end
 
 RSpec.configure do |c|
-  if ENV['GITHUB_ACTIONS'] == 'true'
-    c.formatter = 'RSpec::Github::Formatter'
-  end
+  c.formatter = 'RSpec::Github::Formatter' if ENV['GITHUB_ACTIONS'] == 'true'
 
   # Fact handling
   c.add_setting :suite_configure_facts_from_env, default: true
@@ -82,7 +85,7 @@ RSpec.configure do |c|
   c.add_setting :suite_hiera_data_dir, default: File.join('spec', 'acceptance', 'hieradata')
   c.add_setting :suite_hiera_hierachy, default: [
     {
-      name: "Per-node data",
+      name: 'Per-node data',
       path: 'fqdn/%{facts.networking.fqdn}.yaml',
     },
     {

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: voxpupuli-acceptance
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Vox Pupuli
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -86,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: beaker-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -242,10 +241,24 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
+- !ruby/object:Gem::Dependency
+  name: voxpupuli-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: A package that depends on all the gems Vox Pupuli modules need and methods
   to simplify acceptance spec helpers
 email:
-- pmc@voxpupuli.org
+- voxpupuli@groups.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -255,12 +268,13 @@ files:
 - lib/voxpupuli/acceptance/facts.rb
 - lib/voxpupuli/acceptance/fixtures.rb
 - lib/voxpupuli/acceptance/rake.rb
+- lib/voxpupuli/acceptance/serverspec_extensions.rb
+- lib/voxpupuli/acceptance/serverspec_extensions/curl_command.rb
 - lib/voxpupuli/acceptance/spec_helper_acceptance.rb
 homepage: https://github.com/voxpupuli/voxpupuli-acceptance
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -278,8 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for acceptance testing Vox Pupuli modules
 test_files: []