puppetlabs_spec_helper 7.0.2 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aff49125194753239b27f4dff9121d08a66bd9886dbe1abf41f377e6af82a264
-  data.tar.gz: f2f8f5d3ef921b6bd0471c019483540f93e6b4593e46836084d52f4d5d11a482
+  metadata.gz: b43b9b0bc503cc22827d130ea6b8b38c8f47ddc411fa01d475358bf1b3d84662
+  data.tar.gz: fae07b2e2c37f912afdec1e701a44ff97765558b33e25525ba1a5aaa8d69b343
 SHA512:
-  metadata.gz: 66ab221f58ed2e14613e6939d531021a60fb7bed2ac8dd7a149239700558ccc8aecadd5734439bdf860d224fda8be347c6e48cfa903e7140f8978e3c7797d8b4
-  data.tar.gz: 6e80a70f589f871725113e794d42a1b1edbc2f2dc734ab7fa030a9d76fb267b9c99154945250a828783963298bef06f26d8ff36128bc4d6c5b527292ec337e61
+  metadata.gz: 1405267c761ea07175994796430a21dbedec7d85ef4f8fdfe68c0d5f6b8653d03a32d094e35b519905532a6f82148823ca1c627af2aaff5bd099f69ac87bd067
+  data.tar.gz: e6a2cd716e27ba64e551e831be688db045edf9999f655ad9fbce793fb563f769523a62bff104bab6cfb38c635b35a6255b8484d0cc3c9a36aca4c532897093b8

data/.rubocop.yml

@@ -17,3 +17,6 @@ AllCops:
 # Disabled
 Style/ClassAndModuleChildren:
   Enabled: false
+
+Layout/LineLength:
+  Max: 200

data/README.md

@@ -410,7 +410,7 @@ You can enable it, set the following environment variable:s
 
 ``SIMPLECOV=yes``
 
-Remember to add the simplecov-console and codecov gems to your `Gemfile`. If you run `spec:simplecov` on Travis-CI or any of the other supported CI services, reports gets automatically uploaded to https://codecov.io/ .
+Remember to add the simplecov-console gem to your `Gemfile`. If you run `spec:simplecov` on Travis-CI or any of the other supported CI services, reports get generated which can then be uploaded to [codecov.io](https://codecov.io) with the recommended [codecov uploader](https://docs.codecov.com/docs/codecov-uploader).
 
 Some Notes for Windows Users
 ============================

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -20,35 +20,42 @@ env_module_path = ENV.fetch('MODULEPATH', nil)
 module_path = File.join(fixture_path, 'modules')
 
 module_path = [module_path, env_module_path].join(File::PATH_SEPARATOR) if env_module_path
+
 if ENV['SIMPLECOV'] == 'yes'
   begin
     require 'simplecov'
     require 'simplecov-console'
+  rescue LoadError
+    raise 'Add the simplecov and simplecov-console gems to Gemfile to enable this task'
+  end
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::Console
+  ]
+
+  begin
     require 'codecov'
+    SimpleCov.formatters << SimpleCov::Formatter::Codecov
+  rescue LoadError
+    # continue without codecov, we could warn here but we want to avoid its use if possible
+  end
+
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+    add_filter '/spec'
 
-    SimpleCov.formatters = [
-      SimpleCov::Formatter::HTMLFormatter,
-      SimpleCov::Formatter::Console,
-      SimpleCov::Formatter::Codecov
-    ]
-    SimpleCov.start do
-      track_files 'lib/**/*.rb'
-      add_filter '/spec'
-
-      # do not track vendored files
-      add_filter '/vendor'
-      add_filter '/.vendor'
-
-      # do not track gitignored files
-      # this adds about 4 seconds to the coverage check
-      # this could definitely be optimized
-      add_filter do |f|
-        # system returns true if exit status is 0, which with git-check-ignore means file is ignored
-        system("git check-ignore --quiet #{f.filename}")
-      end
+    # do not track vendored files
+    add_filter '/vendor'
+    add_filter '/.vendor'
+
+    # do not track gitignored files
+    # this adds about 4 seconds to the coverage check
+    # this could definitely be optimized
+    add_filter do |f|
+      # system returns true if exit status is 0, which with git-check-ignore means file is ignored
+      system("git check-ignore --quiet #{f.filename}")
     end
-  rescue LoadError
-    raise 'Add the simplecov, simplecov-console, codecov gems to Gemfile to enable this task'
   end
 end
 

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -176,7 +176,7 @@ puppet_lint_disable_checks = %w[
 ]
 
 puppet_lint_disable_checks.each do |check|
-  PuppetLint.configuration.send("disable_#{check}")
+  PuppetLint.configuration.send(:"disable_#{check}")
 end
 PuppetLint::RakeTask.new(:lint)
 

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -107,7 +107,7 @@ module PuppetlabsSpecHelper
 
         fixtures = fixtures['fixtures']
 
-        fixtures['symlinks'] = auto_symlink if fixtures['symlinks'].nil?
+        fixtures['symlinks'] = fixtures['symlinks'].nil? ? auto_symlink : auto_symlink.merge!(fixtures['symlinks'])
 
         result = {}
         if fixtures.include?(category) && !fixtures[category].nil?
@@ -151,7 +151,7 @@ module PuppetlabsSpecHelper
         return hash unless hash['scm'] == 'git'
 
         # Forward slashes in the ref aren't allowed. And is probably a branch name.
-        raise ArgumentError, "The ref for #{hash['target']} is invalid (Contains a forward slash). If this is a branch name, please use the 'branch' setting instead." if hash['ref'].include?('/')
+        raise ArgumentError, "The ref for #{hash['target']} is invalid (Contains a forward slash). If this is a branch name, please use the 'branch' setting instead." if hash['ref']&.include?('/')
 
         hash
       end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetlabsSpecHelper
-  VERSION = '7.0.2'
+  VERSION = '7.0.4'
 end

data/spec/spec_helper.rb

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 if ENV['COVERAGE'] == 'yes'
-  require 'simplecov'
-  require 'simplecov-console'
-  require 'codecov'
+  begin
+    require 'simplecov'
+    require 'simplecov-console'
+  rescue LoadError
+    raise 'Add the simplecov and simplecov-console gems to Gemfile to enable this task'
+  end
 
   SimpleCov.formatters = [
     SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::Codecov
+    SimpleCov::Formatter::Console
   ]
+
   SimpleCov.start do
     track_files 'lib/**/*.rb'
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.4
 platform: ruby
 authors:
 - Puppet, Inc.
 - Community Contributors
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-12 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-github
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ homepage: http://github.com/puppetlabs/puppetlabs_spec_helper
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - puppet, >= 7.0.0
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.
 test_files: []