voxpupuli-test 2.1.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83cb43a95eb449c4d42e755efc3fa398c367aaaa8175ba9bef77359289a9728e
-  data.tar.gz: c0b7251b7ed74102467599f028e962a155e6b013fe7b3ed0151cb00084f1ff35
+  metadata.gz: 361d2ad94e5056a8e275cb19c1e86ee840f43bb509824ba8e16cba329b19dd48
+  data.tar.gz: 303f4147709526d641ba0f7325a5567a2bd49c273b5c16c383360bcdfefe7dd2
 SHA512:
-  metadata.gz: f17c04833283a22c68fb3ff28a5f18745600831c8f291301b40620843ce1f9b4875e124ac31be9feef99ce7d8efd9e197510c3c7065011bde708757dba116e3e
-  data.tar.gz: 7e74116ae39a5fb92dc597b16d7e63087d831e7c010c8f8a7dec1603c8dcf049fd832bf04a41fff412956f0d11dc2d9521904996dddb04cbc60eafba046f0176
+  metadata.gz: ade2b704c7ed442bcac56036004dee1c1eefbe3e595a21889113d0bef71aa32f1800c21a34a2f3fdd7e6971520279f887ce4864c623a6264349e3a19069a826e
+  data.tar.gz: 3f4de0c79140863e4625cf98ef1fd7cc07d906c0a89e2deac355b81a3aadda4331474a47dd408694d59efd3c1c0f2982bd3aeb1cf4e605578bd07ec941c3ea71

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/spec_helper.rb

@@ -26,17 +26,6 @@ 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

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.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,14 +86,20 @@ dependencies:
     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,20 +114,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.5
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +338,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
@@ -392,7 +398,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