voxpupuli-test 2.1.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f51041bfbc4a413f50f904b36e0e68e92143dcf36e9a983937dd65d0f709869
-  data.tar.gz: aa0f3fc47a960a5ec0934b9241fdf376ddc6e884bf6a3da8fc6315f27d1c1ec6
+  metadata.gz: 97d2c88e7e4c23e93a3ac2652eba0f05b6bd72b0f7d2f6fac2093f5b4baa1c44
+  data.tar.gz: d81e623cfb7628cf53955b617469548e695ae7d0480852ed47607f5d887465a4
 SHA512:
-  metadata.gz: d786d510b6a96cf663d374f310860eb230d0ad4d71f6b6a890164a08cc964d0f2ce5499fa021b52fa162ff8c63aeeb162da26e9fe5ea4df005e349f37cce5682
-  data.tar.gz: 670524ea7f695442cba226beb453224dec3fca7826adf8b211e906bfa76716d4db2a1174bfc99eb00d62430f5ce77df1d1f4c94d137145d34d700222741acd86
+  metadata.gz: 1068e62ab25491f8454d01b716015cd113ecd1aba558c04b0fa3fe2eb04805e88c89761c87ddb8e08c42badad112e686b5eb24cf6023abf63e6cb0028b4d20ae
+  data.tar.gz: ef76c1e71041e4ac40342a43072337f78713ed84a5dc38db127aee5a0b7f2044d3cb2d1373a45c68583f66702ff75ef36067ce48b5ddd208156642c97e30296d

data/lib/voxpupuli/test/facts.rb

@@ -1,3 +1,6 @@
+require 'rspec-puppet-facts'
+include RspecPuppetFacts
+
 # Override facts
 #
 # This doesn't use deep_merge because that's highly unpredictable. It can merge
@@ -32,3 +35,63 @@ def apply_overrides!(facts, overrides, enforce_strings)
     end
   end
 end
+
+# Add mocked facts based on the metadata present in the module
+#
+# This means that for some module there are hardcoded mocks, such as stdlib.
+# When stdlib is present in metadata.json, facts like service_provider are
+# mocked and return the correct value according to the OS facts.
+def add_mocked_facts!
+  add_facts_for_metadata(RspecPuppetFacts.metadata)
+end
+
+def add_facts_for_metadata(metadata)
+  return unless metadata && metadata['dependencies']
+
+  metadata['dependencies'].each do |dependency|
+    case normalize_module_name(dependency['name'])
+    when 'camptocamp/systemd'
+      add_custom_fact :systemd, ->(os, facts) { facts[:service_provider] == 'systemd' }
+    when 'puppetlabs/stdlib'
+      add_stdlib_facts
+    end
+  end
+end
+
+def normalize_module_name(name)
+  return unless name
+  name.sub('-', '/')
+end
+
+def add_stdlib_facts
+  add_custom_fact :puppet_environmentpath, '/etc/puppetlabs/code/environments'
+  add_custom_fact :puppet_vardir, '/opt/puppetlabs/puppet/cache'
+  add_custom_fact :root_home, '/root'
+
+  # Rough conversion of grepping in the puppet source:
+  # grep defaultfor lib/puppet/provider/service/*.rb
+  add_custom_fact :service_provider, ->(os, facts) do
+    case facts[:osfamily].downcase
+    when 'archlinux'
+      'systemd'
+    when 'darwin'
+      'launchd'
+    when 'debian'
+      'systemd'
+    when 'freebsd'
+      'freebsd'
+    when 'gentoo'
+      'openrc'
+    when 'openbsd'
+      'openbsd'
+    when 'redhat'
+      facts[:operatingsystemrelease].to_i >= 7 ? 'systemd' : 'redhat'
+    when 'suse'
+      facts[:operatingsystemmajrelease].to_i >= 12 ? 'systemd' : 'redhat'
+    when 'windows'
+      'windows'
+    else
+      'init'
+    end
+  end
+end

data/lib/voxpupuli/test/rake.rb

@@ -1,4 +1,5 @@
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'metadata_json_deps'
 
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
 
@@ -21,4 +22,11 @@ namespace :check do
     end
   end
 end
-Rake::Task[:release_checks].enhance ['check:trailing_whitespace']
+Rake::Task[:check].enhance ['check:trailing_whitespace']
+
+
+desc 'Run metadata-json-deps'
+task :metadata_deps do
+  files = FileList['metadata.json']
+  MetadataJsonDeps::run(files)
+end

data/lib/voxpupuli/test/spec_helper.rb

@@ -1,20 +1,3 @@
-# getting the correct facter version is tricky. We use facterdb as a source to mock facts
-# see https://github.com/camptocamp/facterdb
-# people might provide a specific facter version. In that case we use it.
-# Otherwise we need to match the correct facter version to the used puppet version.
-# as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
-# https://puppet.com/docs/puppet/5.5/about_agent.html
-#
-# The environment variable `PUPPET_VERSION` is available in our travis environment, but we cannot rely on it
-# if somebody runs the tests locally. For that case we should fallback the the puppet gem version.
-def suggest_facter_version
-  return ENV['FACTERDB_FACTS_VERSION'] if ENV['FACTERDB_FACTS_VERSION']
-
-  require 'bundler'
-  puppet_version = ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : Gem.loaded_specs['puppet'].version.to_s
-  Gem::Dependency.new('', puppet_version).match?('', '5') ? '3.11.0' : '3.14.0'
-end
-
 RSpec.configure do |config|
   # puppetlabs_spec_helper defaults to mocha but emits a deprecation warning
   # Vox Pupuli prefers rspec to avoid the deprecation warning unless explicitly
@@ -26,22 +9,8 @@ end
 
 require 'voxpupuli/test/facts'
 require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-include RspecPuppetFacts
-
-# Generating facts is slow - this memoizes the facts between multiple classes.
-# Marshalling is used to get unique instances which helps when tests overrides
-# facts.
-FACTS_CACHE = {}
-def on_supported_os(opts = {})
-  result = FACTS_CACHE[opts.to_s] ||= super(opts)
-  Marshal.load(Marshal.dump(result))
-end
 
 RSpec.configure do |config|
-  config.default_facter_version = suggest_facter_version
-
-  # Coverage generation
   config.after(:suite) do
     RSpec::Puppet::Coverage.report!
   end

data/rubocop.yml

@@ -161,6 +161,9 @@ Style/BracesAroundHashParameters:
 Style/CaseEquality:
   Enabled: True
 
+Style/TrailingCommaInArguments:
+  Enabled: False
+
 Layout/CaseIndentation:
   Enabled: True
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voxpupuli-test
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: rspec-puppet-facts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-puppet-utils
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.5
+- !ruby/object:Gem::Dependency
+  name: metadata_json_deps
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.16.0
+- !ruby/object:Gem::Dependency
+  name: puppet-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: puppet-lint-absolute_classname-check
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +366,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet-lint-optional_default-check
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -378,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Helpers for testing Vox Pupuli modules