puppetlabs_spec_helper 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef65ff61efb2a4ba220a726fd2ac309dc077a37ba9a2a2951430cebdd449b3c3
-  data.tar.gz: e079aa402cc3c638d7fb0f9dae179afb884a894ba20334ce781289523177446c
+  metadata.gz: f934201ede34e89f4c04e3cfa7b952e6e31b883163c06138833f3d1ec631d33d
+  data.tar.gz: 69202a2e69af3b92d9fe44298916005791d52f227d0151826dee267d8f3a10dc
 SHA512:
-  metadata.gz: 616b63b83dafabafeb3d6ece228f76d94f21ac01266093100fd8fa2c75b14a99c8e2fa5ba3bff1a6e0203a4321486fa2e3133aeb7edc35541d139e31ce1495b3
-  data.tar.gz: cb0399bf3984b9bab34d202819493c1829cabf6050f9f2d19ada65a41aaa268e7901e62382c77dfbaf948bff8bd944d42c80d25941a366115fdf79e67e9c5f93
+  metadata.gz: 962d07bc1fd4b324754d124e4c30619e238e342a18032ae210aa26531c61be9d4ecd7572e88e564ae4533d01c58a1abf9d907f0c89f8d3f59f2b136140913969
+  data.tar.gz: 452342796faa97b4d2b4cb4a16c06476358233de3e4ea7cf6d2f52f1c066807b6387bc4488072c4d424640db6706cf4f9047a4daf8740dd6c9c32016a865d721

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - "> 0.49, < 1"
+  - dependency-name: rubocop
+    versions:
+    - ">= 1.a, < 2"

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v4.0.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v4.0.0) (2021-07-26)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v3.0.0...v4.0.0)
+
+**Implemented enhancements:**
+
+- Use Rubocop's Github Actions formatter if possible [\#340](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/340) ([ekohl](https://github.com/ekohl))
+- Remove beaker integration [\#338](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/338) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- Upgrade to GitHub-native Dependabot [\#336](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/336) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- \(IAC-1452\) - removal of Inappropriate Terminology [\#335](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/335) ([david22swan](https://github.com/david22swan))
+- Add gemspec required\_ruby\_version [\#334](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/334) ([alexjfisher](https://github.com/alexjfisher))
+
 ## [v3.0.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v3.0.0) (2021-02-10)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.16.0...v3.0.0)
@@ -13,6 +28,10 @@ All significant changes to this repo will be summarized in this file.
 - Remove i18n/gettext task [\#331](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/331) ([DavidS](https://github.com/DavidS))
 - Restructure PuppetLint rake tasks so they can be configurable [\#330](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/330) ([nmaludy](https://github.com/nmaludy))
 
+**Merged pull requests:**
+
+- Release prep for v3.0.0 [\#333](https://github.com/puppetlabs/puppetlabs_spec_helper/pull/333) ([DavidS](https://github.com/DavidS))
+
 ## [v2.16.0](https://github.com/puppetlabs/puppetlabs_spec_helper/tree/v2.16.0) (2021-01-18)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.15.0...v2.16.0)
@@ -645,7 +664,7 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...main
 [2.8.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.2...v2.7.0
 [2.6.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.1...v2.6.2

data/HISTORY.md

@@ -450,7 +450,7 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.8.0...main
 [2.8.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.2...v2.7.0
 [2.6.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.6.1...v2.6.2

data/README.md

@@ -102,10 +102,10 @@ This project is intended to serve two purposes:
 To Use this Project
 ===================
 
-The most common usage scenario is that you will check out the 'master'
+The most common usage scenario is that you will check out the 'main'
 branch of this project from github, and install it as a rubygem.
 There should be few or no cases where you would want to have any other
-branch of this project besides master/HEAD.
+branch of this project besides main/HEAD.
 
 Running on non-current ruby versions
 ------------------------------------

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -6,7 +6,6 @@ require 'rspec/core/rake_task'
 require 'tmpdir'
 require 'pathname'
 require 'puppetlabs_spec_helper/version'
-require 'puppetlabs_spec_helper/tasks/beaker'
 require 'puppetlabs_spec_helper/tasks/fixtures'
 require 'puppetlabs_spec_helper/tasks/check_symlinks'
 require 'English'
@@ -259,7 +258,7 @@ task :compute_dev_version do
 
   # If we're in a CI environment include our build number
   # If the branch is a release branch we append an 'r' into the new_version,
-  # this is due to the release branch buildID conflicting with master branch when trying to push to the staging forge.
+  # this is due to the release branch buildID conflicting with main branch when trying to push to the staging forge.
   # More info can be found at https://tickets.puppetlabs.com/browse/FM-6170
   new_version = if build = (ENV['BUILD_NUMBER'] || ENV['TRAVIS_BUILD_NUMBER'])
                   if branch.eql? 'release'
@@ -337,6 +336,14 @@ begin
   RuboCop::RakeTask.new(:rubocop) do |task|
     # These make the rubocop experience maybe slightly less terrible
     task.options = ['-D', '-S', '-E']
+
+    # Use Rubocop's Github Actions formatter if possible
+    if ENV['GITHUB_ACTIONS'] == 'true'
+      rubocop_spec = Gem::Specification.find_by_name('rubocop')
+      if Gem::Version.new(rubocop_spec.version) >= Gem::Version.new('1.2')
+        task.formatters << 'github'
+      end
+    end
   end
 rescue LoadError
   desc 'rubocop is not available in this installation'

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -41,7 +41,7 @@ module PuppetlabsSpecHelper::Tasks::FixtureHelpers
   # @return [Hash] - returns a hash of all the fixture repositories
   # @example
   # {"puppetlabs-stdlib"=>{"target"=>"https://gitlab.com/puppetlabs/puppet-stdlib.git",
-  # "ref"=>nil, "branch"=>"master", "scm"=>nil,
+  # "ref"=>nil, "branch"=>"main", "scm"=>nil,
   # }}
   def repositories
     @repositories ||= fixtures('repositories') || {}

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module PuppetlabsSpecHelper
-  VERSION = '3.0.0'
+  VERSION = '4.0.0'
 
   # compat for pre-1.2.0 users; deprecated
   module Version

data/puppetlabs_spec_helper.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.4')
+
   spec.add_runtime_dependency 'mocha', '~> 1.0'
   spec.add_runtime_dependency 'pathspec', '>= 0.2.1', '< 1.1.0'
   spec.add_runtime_dependency 'puppet-lint', '~> 2.0'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Puppet, Inc.
 - Community Contributors
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -211,6 +211,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".noexec.yaml"
 - ".rspec"
@@ -233,7 +234,6 @@ files:
 - lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb
 - lib/puppetlabs_spec_helper/puppetlabs_spec_helper.rb
 - lib/puppetlabs_spec_helper/rake_tasks.rb
-- lib/puppetlabs_spec_helper/tasks/beaker.rb
 - lib/puppetlabs_spec_helper/tasks/check_symlinks.rb
 - lib/puppetlabs_spec_helper/tasks/fixtures.rb
 - lib/puppetlabs_spec_helper/version.rb
@@ -244,7 +244,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
@@ -252,15 +252,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.
 test_files: []

data/lib/puppetlabs_spec_helper/tasks/beaker.rb

@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-
-require 'rspec/core/rake_task'
-
-module PuppetlabsSpecHelper; end
-module PuppetlabsSpecHelper::Tasks; end
-module PuppetlabsSpecHelper::Tasks::BeakerHelpers
-  # This is a helper for the self-symlink entry of fixtures.yml
-  def source_dir
-    Dir.pwd
-  end
-
-  # cache the repositories and return a hash object
-  def repositories
-    @repositories ||= fixtures('repositories')
-    @repositories
-  end
-
-  # get the array of Beaker set names
-  # @return [Array<String>]
-  def beaker_node_sets
-    return @beaker_nodes if @beaker_nodes
-
-    @beaker_nodes = Dir['spec/acceptance/nodesets/*.yml'].sort.map do |node_set|
-      node_set.slice!('.yml')
-      File.basename(node_set)
-    end
-  end
-
-  # Use "vagrant ssh" to login to the given node in the node set
-  # @param set [String] The name of the node set (yml file)
-  # @param node [String] The name of the node in the set. For multi-node sets.
-  def vagrant_ssh(set, node = nil)
-    vagrant_yml_dir = File.join '.vagrant', 'beaker_vagrant_files', "#{set}.yml"
-    vagrant_file = File.join vagrant_yml_dir, 'Vagrantfile'
-    unless File.file? vagrant_file
-      puts "There is no Vagrantfile at: '#{vagrant_file}'. Perhaps, the node is not created or is destroyed."
-      exit 1
-    end
-    Dir.chdir(vagrant_yml_dir) do
-      command = 'vagrant ssh'
-      command += " #{node}" if node
-      # Vagrant is not distributed as a normal gem
-      # and we should protect it from the current Ruby environment
-      env = {
-        'RUBYLIB' => nil,
-        'GEM_PATH' => nil,
-        'BUNDLE_BIN_PATH' => nil,
-      }
-      system env, command
-    end
-  end
-end
-include PuppetlabsSpecHelper::Tasks::BeakerHelpers # legacy support code # rubocop:disable Style/MixinUsage
-
-desc 'Run beaker acceptance tests'
-RSpec::Core::RakeTask.new(:beaker) do |t|
-  SetupBeaker.setup_beaker(t)
-end
-
-class SetupBeaker
-  def self.setup_beaker(task)
-    task.rspec_opts = []
-    task.pattern = 'spec/acceptance'
-    # TEST_TIERS env variable is a comma separated list of tiers to run. e.g. low, medium, high
-    if ENV['TEST_TIERS']
-      test_tiers = ENV['TEST_TIERS'].split(',')
-      test_tiers_allowed = ENV.fetch('TEST_TIERS_ALLOWED', 'low,medium,high').split(',')
-      raise 'TEST_TIERS env variable must have at least 1 tier specified. Either low, medium or high or one of the tiers listed in TEST_TIERS_ALLOWED (comma separated).' if test_tiers.count == 0
-
-      test_tiers.each do |tier|
-        tier_to_add = tier.strip.downcase
-        raise "#{tier_to_add} not a valid test tier." unless test_tiers_allowed.include?(tier_to_add)
-
-        tiers = "--tag tier_#{tier_to_add}"
-        task.rspec_opts.push(tiers)
-      end
-    else
-      puts 'TEST_TIERS env variable not defined. Defaulting to run all tests.'
-    end
-    task
-  end
-end
-
-desc 'List available beaker nodesets'
-task 'beaker:sets' do
-  beaker_node_sets.each do |set|
-    puts set
-  end
-end
-
-# alias for compatibility
-task 'beaker_nodes' => 'beaker:sets'
-
-desc 'Try to use vagrant to login to the Beaker node'
-task 'beaker:ssh', [:set, :node] do |_task, args|
-  set = args[:set] || ENV['BEAKER_set'] || ENV['RS_SET'] || 'default'
-  node = args[:node]
-  vagrant_ssh set, node
-end
-
-beaker_node_sets.each do |set|
-  desc "Run the Beaker acceptance tests for the node set '#{set}'"
-  task "beaker:#{set}" do
-    ENV['BEAKER_set'] = set
-    Rake::Task['beaker'].reenable
-    Rake::Task['beaker'].invoke
-  end
-
-  desc "Use vagrant to login to a node from the set '#{set}'"
-  task "beaker:ssh:#{set}", [:node] do |_task, args|
-    node = args[:node]
-    vagrant_ssh set, node
-  end
-end