beaker-puppet 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e452fe598084e8ffeeb7040c9ff4f7da9599e5d5109a346266092ca72842d1
-  data.tar.gz: 57f331cedabc4cae9c645d77997ea1ebf45f09432fb150c52e300bbfaae7afa4
+  metadata.gz: 53f89a92b8bca60e64107cc70882e959fbf05594edf34307374f392b8f31e622
+  data.tar.gz: a3cd7ac37aa8c519346bd8a2a874f6b42661983bf0f7edad91f53a77b3a646ab
 SHA512:
-  metadata.gz: dcadf1d4b92bf1fdd21ba5f9ef1de28a04b8fcca9286710a09b08b40d1a0c5264ff14d3d4756b90c0121d243726e66a3e01eef37b9ef327700226605ba3971ce
-  data.tar.gz: 8e010ce0c11ac41d7b71821520cffb1966a1603cb460438cb7b69cf3ea185053dbfa262bfb7573cb09fe592cf20cc1477b74d445f5609ccfae51993216600083
+  metadata.gz: a0a6be8dfcfcb86fb13b1b6833fa18b470769cdd50b6321c51f9aa5a75106eb3cab12f03f98b5f5eb7e4e861e8746041f83eeb2c1d1e8374910f19d96d40de23
+  data.tar.gz: cbaa76dcb7f841cc0d057b28ae761f820507b74d2dfa7f5f0226990a571ab032f5de12b1b5b59ca6e62e0df41dfb86db007ec81e1fa7b1b835a6f8ce07158b04

data/.github/workflows/release.yml

@@ -1,24 +1,32 @@
 name: Release
 
 on:
-  create:
-    ref_type: tag
+  push:
+    tags:
+      - '*'
 
 jobs:
   release:
     runs-on: ubuntu-latest
-    if: github.repository == 'voxpupuli/beaker-puppet'
-    env:
-      BUNDLE_WITHOUT: release
+    if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v2
-      - name: Install Ruby 2.7
+      - name: Install Ruby 3.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
+        env:
+          BUNDLE_WITHOUT: release
       - name: Build gem
         run: gem build *.gemspec
-      - name: Publish gem
+      - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:
           GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
+      - name: Setup GitHub packages access
+        run: |
+          mkdir -p ~/.gem
+          echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials
+          chmod 0600 ~/.gem/credentials
+      - name: Publish gem to GitHub packages
+        run: gem push --key github --host https://rubygems.pkg.github.com/voxpupuli *.gem

data/.github/workflows/test.yml

@@ -4,20 +4,25 @@ on:
   - pull_request
   - push
 
+env:
+  BUNDLE_WITHOUT: release
+
 jobs:
-  test:
+  rspec:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "2.4"
-          - "2.5"
-          - "2.6"
-          - "2.7"
+        include:
+          - ruby: "2.4"
+          - ruby: "2.5"
+          - ruby: "2.6"
+          - ruby: "2.7"
+          - ruby: "3.0"
+            coverage: "yes"
     env:
-      BUNDLE_WITHOUT: release
-    name: Ruby ${{ matrix.ruby }}
+      COVERAGE: ${{ matrix.coverage }}
+    name: RSpec - Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2
       - name: Install Ruby ${{ matrix.ruby }}
@@ -25,5 +30,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: Run tests
+      - name: spec tests
         run: bundle exec rake test:spec
+      - name: Verify gem builds
+        run: gem build *.gemspec

data/CHANGELOG.md

@@ -2,9 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v1.21.0](https://github.com/voxpupuli/beaker-puppet/tree/v1.21.0) (2020-12-21)
+## [v1.22.0](https://github.com/voxpupuli/beaker-puppet/tree/v1.22.0) (2021-08-17)
 
-[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.20.0...v1.21.0)
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.21.0...v1.22.0)
+
+**Implemented enhancements:**
+
+- Create better puppet apply tmpfiles [\#161](https://github.com/voxpupuli/beaker-puppet/pull/161) ([trevor-vaughan](https://github.com/trevor-vaughan))
+- Drop stringify-hash dependency [\#158](https://github.com/voxpupuli/beaker-puppet/pull/158) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- Remove mentions of Beaker 3 [\#165](https://github.com/voxpupuli/beaker-puppet/pull/165) ([ekohl](https://github.com/ekohl))
+- Use the built-in Resolv::IPv4::Regex [\#164](https://github.com/voxpupuli/beaker-puppet/pull/164) ([ekohl](https://github.com/ekohl))
+- Implement codecov; update README.md [\#162](https://github.com/voxpupuli/beaker-puppet/pull/162) ([bastelfreak](https://github.com/bastelfreak))
+- Add both GPG keys when installing repos on SLES [\#157](https://github.com/voxpupuli/beaker-puppet/pull/157) ([GabrielNagy](https://github.com/GabrielNagy))
+
+## [1.21.0](https://github.com/voxpupuli/beaker-puppet/tree/1.21.0) (2020-12-21)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.20.0...1.21.0)
 
 **Fixed bugs:**
 

data/Gemfile

@@ -2,10 +2,6 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gemspec
 
-group :release do
-  gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes'
-end
-
 def location_for(place, fake_version = nil)
   if place =~ /^(git:[^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
@@ -18,11 +14,15 @@ end
 
 
 group :test do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || ['>= 4.16.0', '< 5.0.0'])
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || ['>= 4.30.0', '< 5.0.0'])
   gem "beaker-abs", *location_for(ENV['ABS_VERSION'] || '~> 0.4.0')
 end
 
+group :release do
+  gem 'github_changelog_generator', require: false
+end
 
-if File.exists? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
+group :coverage, optional: ENV['COVERAGE']!='yes' do
+  gem 'simplecov-console', :require => false
+  gem 'codecov', :require => false
 end

data/README.md

@@ -1,5 +1,13 @@
 # beaker-puppet: The Puppet-Specific Beaker Library
 
+[![License](https://img.shields.io/github/license/voxpupuli/beaker-puppet.svg)](https://github.com/voxpupuli/beaker-puppet/blob/master/LICENSE)
+[![Test](https://github.com/voxpupuli/beaker-puppet/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/beaker-puppet/actions/workflows/test.yml)
+[![codecov](https://codecov.io/gh/voxpupuli/beaker-puppet/branch/master/graph/badge.svg?token=Mypkl78hvK)](https://codecov.io/gh/voxpupuli/beaker-puppet)
+[![Release](https://github.com/voxpupuli/beaker-puppet/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/beaker-puppet/actions/workflows/release.yml)
+[![RubyGem Version](https://img.shields.io/gem/v/beaker-puppet.svg)](https://rubygems.org/gems/beaker-puppet)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/beaker-puppet.svg)](https://rubygems.org/gems/beaker-puppet)
+[![Donated by Puppet Inc](https://img.shields.io/badge/donated%20by-Puppet%20Inc-fb7047.svg)](#transfer-notice)
+
 The purpose of this library is to hold all puppet-specific info & DSL methods.
 This includes all helper & installer methods.
 
@@ -9,43 +17,23 @@ of beaker, please do, we would love any help that you'd like to provide.
 
 # How Do I Use This?
 
-## With Beaker 3.x
-
-This library is included as a dependency of Beaker 3.x versions and is automatically included, so there's nothing to do.
-
-## With Beaker 4.x
+You will need to include beaker-puppet alongside Beaker in your Gemfile or project.gemspec. E.g.
 
-As of Version 1.0 of `beaker-puppet`, the minimum supported version of beaker is Version 4.0. If you use `ENV['BEAKER_VERSION']`, you will have to ensure that this is compatible, and that if you are using a local Git repository it is up to date.
-
-As of beaker 4.0, all hypervisor and DSL extension libraries have been removed and are no longer dependencies. In order to use a specific hypervisor or DSL extension library in your project, you will need to include them alongside Beaker in your Gemfile or project.gemspec. E.g.
-
-~~~ruby
+```ruby
 # Gemfile
 gem 'beaker', '~>4.0'
 gem 'beaker-puppet', '~>1.0'
 # project.gemspec
 s.add_runtime_dependency 'beaker', '~>4.0'
 s.add_runtime_dependency 'beaker-puppet', '~>1.0'
-~~~
-
-For DSL Extension Libraries, you must also ensure that you `require` the library in your test files. You can do this manually in individual test files or in a test helper (if you have one). You can [use `Bundler.require()`](https://bundler.io/v1.16/guides/groups.html) to require the library automatically.
-
-### Right Now? (beaker 3.x)
-
-At this point, beaker-puppet is included in beaker, so you don't have to _do_
-anything to get the methods in this library.
-
-You can use these methods in a test by referencing them by name without
-qualifications, as they're included in the beaker DSL by default.
-
-### In beaker's Next Major Version? (beaker 4.x)
+```
 
-In beaker's next major version, the requirement for beaker-puppet will be pulled
-from that repo. When that happens, then the usage pattern will change. In order
-to use this then, you'll need to include beaker-puppet as a dependency right
-next to beaker itself.
+For DSL Extension Libraries, you must also ensure that you `require` the
+library in your test files. You can do this manually in individual test files
+or in a test helper (if you have one). You can [use
+`Bundler.require()`](https://bundler.io/v1.16/guides/groups.html) to require
+the library automatically. To explicitly require it:
 
-Once you've done that & installed the gems, in your test, you'll have to
 ```ruby
 require 'beaker-puppet'
 ```
@@ -74,31 +62,24 @@ file, or you can provide a beaker-hostgenerator value to the `TEST_TARGET`
 environment variable. You can also specify the tests that get executed with the
 `TESTS` environment variable.
 
-# Contributing
-
-Please refer to puppetlabs/beaker's [contributing](https://github.com/puppetlabs/beaker/blob/master/CONTRIBUTING.md) guide.
-
-# Releasing
+## Transfer Notice
 
-* Install the required gems to generate the changelog:
+This plugin was originally authored by [Puppet Inc](http://puppet.com).
+The maintainer preferred that Puppet Community take ownership of the module for future improvement and maintenance.
+Existing pull requests and issues were transferred over, please fork and continue to contribute here.
 
-```
-bundle install --path .vendor/ --jobs=$(nproc) --with release
-```
+Previously: https://github.com/puppetlabs/beaker
 
-* Update the gem version in `lib/beaker-puppet/version.rb`
+## License
 
-* Export a GitHub access token:
+This gem is licensed under the Apache-2 license.
 
-```
-export CHANGELOG_GITHUB_TOKEN=...
-```
-
-* Generate the changelog
-
-```
-bundle exec rake changelog
-```
+## Release information
 
-* Create a PR with the changes
-* After the merge, create a git tag and push it, GitHub Actions will do the release
+To make a new release, please do:
+* update the version in `lib/beaker-puppet/version.rb`
+* Install gems with `bundle install --with release --path .vendor`
+* generate the changelog with `bundle exec rake changelog`
+* Check if the new version matches the closed issues/PRs in the changelog
+* Create a PR with it
+* After it got merged, push a tag. GitHub actions will do the actual release to rubygems and GitHub Packages

data/beaker-puppet.gemspec

@@ -5,9 +5,9 @@ require 'beaker-puppet/version'
 Gem::Specification.new do |s|
   s.name        = "beaker-puppet"
   s.version     = BeakerPuppet::VERSION
-  s.authors     = ["Puppet"]
-  s.email       = ["delivery@puppet.com"]
-  s.homepage    = "https://github.com/puppetlabs/beaker-puppet"
+  s.authors     = ["Vox Pupuli"]
+  s.email       = ["voxpupuli@groups.io"]
+  s.homepage    = "https://github.com/voxpupuli/beaker-puppet"
   s.summary     = %q{Beaker's Puppet DSL Extension Helpers!}
   s.description = %q{For use for the Beaker acceptance testing tool}
   s.license     = 'Apache2'
@@ -22,8 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '>= 0.6', '< 2.0'
   s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'pry', '~> 0.10'
 
   # Acceptance Testing Dependencies
   s.add_development_dependency 'beaker-vmpooler'
@@ -34,7 +32,6 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '~> 4.1'
-  s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'in-parallel', '~> 0.1'
   s.add_runtime_dependency 'oga'
 

data/lib/beaker-puppet.rb

@@ -1,6 +1,5 @@
 require 'beaker'
 
-require 'stringify-hash'
 require 'in_parallel'
 require 'beaker-puppet/version'
 require 'beaker-puppet/wrappers'

data/lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -12,7 +12,7 @@ module Beaker
 
         # Return the regular expression pattern for an IPv4 address
         def ipv4_regex
-          return /(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/
+          Resolv::IPv4::Regex
         end
 
         # Return the IP address that given hostname returns when resolved on
@@ -519,7 +519,7 @@ module Beaker
               puppet_apply_opts['ENV'] = opts[:environment]
             end
 
-            file_path = host.tmpfile('apply_manifest.pp')
+            file_path = host.tmpfile(%(apply_manifest_#{Time.now.strftime("%H%M%S%L")}.pp))
             create_remote_file(host, file_path, manifest + "\n")
 
             if host[:default_apply_opts].respond_to? :merge

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -1036,8 +1036,11 @@ module Beaker
               # package. We'll have to remember to update this block when
               # we update the signing keys
               if variant == 'sles' && version >= '11'
-                on host, "wget -O /tmp/puppet-gpg-key http://yum.puppetlabs.com/RPM-GPG-KEY-puppet"
-                on host, "rpm --import /tmp/puppet-gpg-key"
+                %w[puppet puppet-20250406].each do |gpg_key|
+                  on host, "wget -O /tmp/#{gpg_key} https://yum.puppet.com/RPM-GPG-KEY-#{gpg_key}"
+                  on host, "rpm --import /tmp/#{gpg_key}"
+                  on host, "rm -f /tmp/#{gpg_key}"
+                end
               end
 
               if variant == 'cisco_nexus'

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.21.0'
+  VERSION = '1.22.0'
 end

data/spec/beaker-puppet/helpers/puppet_helpers_spec.rb

@@ -1229,10 +1229,6 @@ describe ClassMixedWithDSLHelpers do
   end
 
   describe '#bounce_service' do
-    # let( :options ) {
-    #   opts = StringifyHash.new
-    #   opts
-    # }
     let( :options ) { Beaker::Options::Presets.new.presets }
     let( :result ) { double.as_null_object }
     before :each do
@@ -1285,12 +1281,13 @@ describe ClassMixedWithDSLHelpers do
   end
 
   describe '#sleep_until_puppetdb_started' do
-    let( :options ) {
-      opts = StringifyHash.new # defaults from presets.rb
-      opts[:puppetdb_port_nonssl] = 8080
-      opts[:puppetdb_port_ssl] = 8081
-      opts
-    }
+    let( :options ) do # defaults from presets.rb
+      {
+        :puppetdb_port_nonssl => 8080,
+        :puppetdb_port_ssl => 8081
+      }
+    end
+
     before :each do
       allow( subject ).to receive( :options ) { options }
       allow( hosts[0] ).to receive( :node_name ).and_return( '' )
@@ -1347,11 +1344,10 @@ describe ClassMixedWithDSLHelpers do
   end
 
   describe '#sleep_until_puppetserver_started' do
-    let( :options ) {
-      opts = StringifyHash.new
-      opts[:puppetserver_port] = 8140
-      opts
-    }
+    let( :options ) do
+      { :puppetserver_port => 8140 }
+    end
+
     before :each do
       allow( subject ).to receive( :options ) { options }
       allow( hosts[0] ).to receive( :node_name )
@@ -1371,11 +1367,10 @@ describe ClassMixedWithDSLHelpers do
   end
 
   describe '#sleep_until_nc_started' do
-    let( :options ) { # defaults from presets.rb
-      opts = StringifyHash.new
-      opts[:nodeclassifier_port] = 4433
-      opts
-    }
+    let( :options ) do # defaults from presets.rb
+      { :nodeclassifier_port => 4433 }
+    end
+
     before :each do
       allow( subject ).to receive( :options ) { options }
       allow( hosts[0] ).to receive( :node_name )

data/spec/beaker-puppet/install_utils/foss_utils_spec.rb

@@ -1632,19 +1632,4 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
   end
-
-  describe '#get_latest_puppet_agent_build_from_url' do
-    let(:urls) {['https://downloads.puppet.com/mac/10.9/PC1/x86_64',
-            'https://downloads.puppet.com/mac/10.10/PC1/x86_64',
-            'https://downloads.puppet.com/mac/10.11/PC1/x86_64',
-            'https://downloads.puppet.com/mac/10.12/PC1/x86_64',
-            'https://downloads.puppet.com/windows']}
-
-    it "gets the right version" do
-      urls.each do |url|
-        expect(subject.get_latest_puppet_agent_build_from_url(url)).to match(/\d*.\d*.\d*/)
-      end
-    end
-  end
-
 end

data/spec/spec_helper.rb

@@ -1,4 +1,27 @@
-require 'simplecov'
+begin
+  require 'simplecov'
+  require 'simplecov-console'
+  require 'codecov'
+rescue LoadError
+else
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+
+    add_filter '/spec'
+
+    enable_coverage :branch
+
+    # do not track vendored files
+    add_filter '/vendor'
+    add_filter '/.vendor'
+  end
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::Console,
+    SimpleCov::Formatter::Codecov,
+  ]
+end
+
 # require 'pp' statement needed before fakefs, otherwise they can collide. Ref:
 #   https://github.com/fakefs/fakefs#fakefs-----typeerror-superclass-mismatch-for-class-file
 require 'pp'
@@ -20,4 +43,4 @@ RSpec.configure do |config|
   config.include FakeFS::SpecHelpers
   config.include TestFileHelpers
   config.include HostHelpers
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
-- Puppet
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -72,34 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: beaker-vmpooler
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +128,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: stringify-hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: in-parallel
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +158,7 @@ dependencies:
         version: '0'
 description: For use for the Beaker acceptance testing tool
 email:
-- delivery@puppet.com
+- voxpupuli@groups.io
 executables:
 - beaker-puppet
 extensions: []
@@ -291,7 +249,7 @@ files:
 - spec/helpers.rb
 - spec/spec_helper.rb
 - tasks/ci.rake
-homepage: https://github.com/puppetlabs/beaker-puppet
+homepage: https://github.com/voxpupuli/beaker-puppet
 licenses:
 - Apache2
 metadata: {}
@@ -310,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Beaker's Puppet DSL Extension Helpers!