beaker_puppet_helpers 2.1.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/release.yml +41 -0
- data/.github/workflows/release.yml +90 -15
- data/.github/workflows/test.yml +1 -1
- data/.rubocop_todo.yml +2 -2
- data/CHANGELOG.md +16 -0
- data/Gemfile +2 -2
- data/beaker_puppet_helpers.gemspec +1 -4
- data/lib/beaker_puppet_helpers/install_utils.rb +12 -5
- metadata +4 -31
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b7dd5d465e4187f1f158245ae58677b5111b37638c28167786e7eb2881b6cfd9
|
|
4
|
+
data.tar.gz: 7321b2de3401576cac8c5cd2c9792601c4461c43ef63b0e8835356be22ea05f6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cc57cc0e895adbb49bb7b9970c02093142e25f043eb40abadb6649ff13e41b45c9c4f8a797d6c946119566958da8be0c40d07974bb0d0ca86cef2c9c3fb32d9d
|
|
7
|
+
data.tar.gz: aa2617a52e5b9a187e09b4c895b01e198014b98ee57c2259e9adfbe1b6782a83006d56f838b4f5865fed2432057fe7498c80517658c82e31c8fb38c56d89db74
|
data/.github/release.yml
ADDED
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
---
|
|
2
|
+
# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
|
|
3
|
+
|
|
4
|
+
changelog:
|
|
5
|
+
exclude:
|
|
6
|
+
labels:
|
|
7
|
+
- duplicate
|
|
8
|
+
- invalid
|
|
9
|
+
- modulesync
|
|
10
|
+
- question
|
|
11
|
+
- skip-changelog
|
|
12
|
+
- wont-fix
|
|
13
|
+
- wontfix
|
|
14
|
+
- github_actions
|
|
15
|
+
|
|
16
|
+
categories:
|
|
17
|
+
- title: Breaking Changes 🛠
|
|
18
|
+
labels:
|
|
19
|
+
- backwards-incompatible
|
|
20
|
+
|
|
21
|
+
- title: New Features 🎉
|
|
22
|
+
labels:
|
|
23
|
+
- enhancement
|
|
24
|
+
|
|
25
|
+
- title: Bug Fixes 🐛
|
|
26
|
+
labels:
|
|
27
|
+
- bug
|
|
28
|
+
- bugfix
|
|
29
|
+
|
|
30
|
+
- title: Documentation Updates 📚
|
|
31
|
+
labels:
|
|
32
|
+
- documentation
|
|
33
|
+
- docs
|
|
34
|
+
|
|
35
|
+
- title: Dependency Updates ⬆️
|
|
36
|
+
labels:
|
|
37
|
+
- dependencies
|
|
38
|
+
|
|
39
|
+
- title: Other Changes
|
|
40
|
+
labels:
|
|
41
|
+
- "*"
|
|
@@ -1,31 +1,106 @@
|
|
|
1
|
-
|
|
1
|
+
---
|
|
2
|
+
name: Gem Release
|
|
2
3
|
|
|
3
4
|
on:
|
|
4
5
|
push:
|
|
5
6
|
tags:
|
|
6
7
|
- '*'
|
|
7
8
|
|
|
9
|
+
permissions: {}
|
|
10
|
+
|
|
8
11
|
jobs:
|
|
9
|
-
release:
|
|
10
|
-
|
|
12
|
+
build-release:
|
|
13
|
+
# Prevent releases from forked repositories
|
|
11
14
|
if: github.repository_owner == 'voxpupuli'
|
|
15
|
+
name: Build the gem
|
|
16
|
+
runs-on: ubuntu-24.04
|
|
12
17
|
steps:
|
|
13
18
|
- uses: actions/checkout@v4
|
|
14
|
-
- name: Install Ruby
|
|
19
|
+
- name: Install Ruby
|
|
15
20
|
uses: ruby/setup-ruby@v1
|
|
16
21
|
with:
|
|
17
|
-
ruby-version: '
|
|
18
|
-
bundler: 'none'
|
|
22
|
+
ruby-version: 'ruby'
|
|
19
23
|
- name: Build gem
|
|
20
|
-
|
|
24
|
+
shell: bash
|
|
25
|
+
run: gem build --verbose *.gemspec
|
|
26
|
+
- name: Upload gem to GitHub cache
|
|
27
|
+
uses: actions/upload-artifact@v4
|
|
28
|
+
with:
|
|
29
|
+
name: gem-artifact
|
|
30
|
+
path: '*.gem'
|
|
31
|
+
retention-days: 1
|
|
32
|
+
compression-level: 0
|
|
33
|
+
|
|
34
|
+
create-github-release:
|
|
35
|
+
needs: build-release
|
|
36
|
+
name: Create GitHub release
|
|
37
|
+
runs-on: ubuntu-24.04
|
|
38
|
+
permissions:
|
|
39
|
+
contents: write # clone repo and create release
|
|
40
|
+
steps:
|
|
41
|
+
- name: Download gem from GitHub cache
|
|
42
|
+
uses: actions/download-artifact@v4
|
|
43
|
+
with:
|
|
44
|
+
name: gem-artifact
|
|
45
|
+
- name: Create Release
|
|
46
|
+
shell: bash
|
|
47
|
+
env:
|
|
48
|
+
GH_TOKEN: ${{ github.token }}
|
|
49
|
+
run: gh release create --repo ${{ github.repository }} ${{ github.ref_name }} --generate-notes *.gem
|
|
50
|
+
|
|
51
|
+
release-to-github:
|
|
52
|
+
needs: build-release
|
|
53
|
+
name: Release to GitHub
|
|
54
|
+
runs-on: ubuntu-24.04
|
|
55
|
+
permissions:
|
|
56
|
+
packages: write # publish to rubygems.pkg.github.com
|
|
57
|
+
steps:
|
|
58
|
+
- name: Download gem from GitHub cache
|
|
59
|
+
uses: actions/download-artifact@v4
|
|
60
|
+
with:
|
|
61
|
+
name: gem-artifact
|
|
62
|
+
- name: Publish gem to GitHub packages
|
|
63
|
+
run: gem push --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem
|
|
64
|
+
env:
|
|
65
|
+
GEM_HOST_API_KEY: ${{ secrets.GITHUB_TOKEN }}
|
|
66
|
+
|
|
67
|
+
release-to-rubygems:
|
|
68
|
+
needs: build-release
|
|
69
|
+
name: Release gem to rubygems.org
|
|
70
|
+
runs-on: ubuntu-24.04
|
|
71
|
+
environment: release # recommended by rubygems.org
|
|
72
|
+
permissions:
|
|
73
|
+
id-token: write # rubygems.org authentication
|
|
74
|
+
steps:
|
|
75
|
+
- name: Download gem from GitHub cache
|
|
76
|
+
uses: actions/download-artifact@v4
|
|
77
|
+
with:
|
|
78
|
+
name: gem-artifact
|
|
79
|
+
- uses: rubygems/configure-rubygems-credentials@v1.0.0
|
|
21
80
|
- name: Publish gem to rubygems.org
|
|
81
|
+
shell: bash
|
|
22
82
|
run: gem push *.gem
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
83
|
+
|
|
84
|
+
release-verification:
|
|
85
|
+
name: Check that all releases are done
|
|
86
|
+
runs-on: ubuntu-24.04
|
|
87
|
+
permissions:
|
|
88
|
+
contents: read # minimal permissions that we have to grant
|
|
89
|
+
needs:
|
|
90
|
+
- create-github-release
|
|
91
|
+
- release-to-github
|
|
92
|
+
- release-to-rubygems
|
|
93
|
+
steps:
|
|
94
|
+
- name: Download gem from GitHub cache
|
|
95
|
+
uses: actions/download-artifact@v4
|
|
96
|
+
with:
|
|
97
|
+
name: gem-artifact
|
|
98
|
+
- name: Install Ruby
|
|
99
|
+
uses: ruby/setup-ruby@v1
|
|
100
|
+
with:
|
|
101
|
+
ruby-version: 'ruby'
|
|
102
|
+
- name: Wait for release to propagate
|
|
103
|
+
shell: bash
|
|
26
104
|
run: |
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
chmod 0600 ~/.gem/credentials
|
|
30
|
-
- name: Publish gem to GitHub packages
|
|
31
|
-
run: gem push --key github --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem
|
|
105
|
+
gem install rubygems-await
|
|
106
|
+
gem await *.gem
|
data/.github/workflows/test.yml
CHANGED
data/.rubocop_todo.yml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# This configuration was generated by
|
|
2
|
-
# `rubocop --auto-gen-config`
|
|
3
|
-
#
|
|
2
|
+
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
|
|
3
|
+
# using RuboCop version 1.75.8.
|
|
4
4
|
# The point is for the user to remove these configuration records
|
|
5
5
|
# one by one as the offenses are removed from the code base.
|
|
6
6
|
# Note that changes in the inspected code, or installation of new
|
data/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,22 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
|
|
5
|
+
## [2.3.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/2.3.0) (2025-06-15)
|
|
6
|
+
|
|
7
|
+
[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/2.2.0...2.3.0)
|
|
8
|
+
|
|
9
|
+
**Implemented enhancements:**
|
|
10
|
+
|
|
11
|
+
- Remove base64 & benchmark dependencies [\#68](https://github.com/voxpupuli/beaker_puppet_helpers/pull/68) ([bastelfreak](https://github.com/bastelfreak))
|
|
12
|
+
|
|
13
|
+
## [2.2.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/2.2.0) (2025-03-19)
|
|
14
|
+
|
|
15
|
+
[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/2.1.0...2.2.0)
|
|
16
|
+
|
|
17
|
+
**Implemented enhancements:**
|
|
18
|
+
|
|
19
|
+
- Support the none collection in implementation helpers [\#62](https://github.com/voxpupuli/beaker_puppet_helpers/pull/62) ([ekohl](https://github.com/ekohl))
|
|
20
|
+
|
|
5
21
|
## [2.1.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/2.1.0) (2025-03-19)
|
|
6
22
|
|
|
7
23
|
[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/2.0.0...2.1.0)
|
data/Gemfile
CHANGED
|
@@ -13,7 +13,7 @@ group :development do
|
|
|
13
13
|
end
|
|
14
14
|
|
|
15
15
|
group :rubocop do
|
|
16
|
-
gem 'voxpupuli-rubocop', '~> 3.
|
|
16
|
+
gem 'voxpupuli-rubocop', '~> 3.1.0'
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
group :test do
|
|
@@ -27,7 +27,7 @@ when 'vagrant', 'vagrant_libvirt'
|
|
|
27
27
|
gem 'beaker-vagrant'
|
|
28
28
|
end
|
|
29
29
|
|
|
30
|
-
group :release do
|
|
30
|
+
group :release, optional: true do
|
|
31
31
|
gem 'faraday-retry', require: false
|
|
32
32
|
gem 'github_changelog_generator', require: false
|
|
33
33
|
end
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Gem::Specification.new do |s|
|
|
4
4
|
s.name = 'beaker_puppet_helpers'
|
|
5
|
-
s.version = '2.
|
|
5
|
+
s.version = '2.3.0'
|
|
6
6
|
s.authors = ['Vox Pupuli']
|
|
7
7
|
s.email = ['voxpupuli@groups.io']
|
|
8
8
|
s.homepage = 'https://github.com/voxpupuli/beaker_puppet_helpers'
|
|
@@ -18,7 +18,4 @@ Gem::Specification.new do |s|
|
|
|
18
18
|
# Run time dependencies
|
|
19
19
|
s.add_dependency 'beaker', '>= 5.8.1', '< 7'
|
|
20
20
|
s.add_dependency 'puppet-modulebuilder', '>= 0.3', '< 3'
|
|
21
|
-
# we need to declare both dependencies explicitly on Ruby 3.4+
|
|
22
|
-
s.add_dependency 'base64', '~> 0.2.0'
|
|
23
|
-
s.add_dependency 'benchmark', '~> 0.4.0'
|
|
24
21
|
end
|
|
@@ -27,7 +27,11 @@ module BeakerPuppetHelpers
|
|
|
27
27
|
# The used collection (puppet7, openvox8...)
|
|
28
28
|
# @return [String] the implementation
|
|
29
29
|
def self.implementation_from_collection(collection)
|
|
30
|
-
collection
|
|
30
|
+
if collection == 'none'
|
|
31
|
+
'puppet'
|
|
32
|
+
else
|
|
33
|
+
collection.gsub(/\d+/, '')
|
|
34
|
+
end
|
|
31
35
|
end
|
|
32
36
|
|
|
33
37
|
# Install official Puppet release repository configuration on host(s).
|
|
@@ -111,11 +115,14 @@ module BeakerPuppetHelpers
|
|
|
111
115
|
# @param [Beaker::Host] host
|
|
112
116
|
# The host to act on
|
|
113
117
|
# @param collection
|
|
114
|
-
# The used collection (puppet7, openvox8...)
|
|
115
|
-
# @param [Boolean] prefer_aio
|
|
116
|
-
# Whether to prefer AIO packages or OS packages
|
|
118
|
+
# The used collection (none, puppet7, openvox8, ...)
|
|
119
|
+
# @param [Optional[Boolean]] prefer_aio
|
|
120
|
+
# Whether to prefer AIO packages or OS packages. If not specified, it's
|
|
121
|
+
# derived from the collection
|
|
117
122
|
# @return [String] the package name
|
|
118
|
-
def self.collection2packagename(host, collection, prefer_aio:
|
|
123
|
+
def self.collection2packagename(host, collection, prefer_aio: nil)
|
|
124
|
+
prefer_aio = collection != 'none' if prefer_aio.nil?
|
|
125
|
+
|
|
119
126
|
implementation = implementation_from_collection(collection)
|
|
120
127
|
package_name(host, prefer_aio: prefer_aio, implementation: implementation)
|
|
121
128
|
end
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beaker_puppet_helpers
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Vox Pupuli
|
|
8
8
|
bindir: bin
|
|
9
9
|
cert_chain: []
|
|
10
|
-
date:
|
|
10
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
|
11
11
|
dependencies:
|
|
12
12
|
- !ruby/object:Gem::Dependency
|
|
13
13
|
name: beaker
|
|
@@ -49,34 +49,6 @@ dependencies:
|
|
|
49
49
|
- - "<"
|
|
50
50
|
- !ruby/object:Gem::Version
|
|
51
51
|
version: '3'
|
|
52
|
-
- !ruby/object:Gem::Dependency
|
|
53
|
-
name: base64
|
|
54
|
-
requirement: !ruby/object:Gem::Requirement
|
|
55
|
-
requirements:
|
|
56
|
-
- - "~>"
|
|
57
|
-
- !ruby/object:Gem::Version
|
|
58
|
-
version: 0.2.0
|
|
59
|
-
type: :runtime
|
|
60
|
-
prerelease: false
|
|
61
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
62
|
-
requirements:
|
|
63
|
-
- - "~>"
|
|
64
|
-
- !ruby/object:Gem::Version
|
|
65
|
-
version: 0.2.0
|
|
66
|
-
- !ruby/object:Gem::Dependency
|
|
67
|
-
name: benchmark
|
|
68
|
-
requirement: !ruby/object:Gem::Requirement
|
|
69
|
-
requirements:
|
|
70
|
-
- - "~>"
|
|
71
|
-
- !ruby/object:Gem::Version
|
|
72
|
-
version: 0.4.0
|
|
73
|
-
type: :runtime
|
|
74
|
-
prerelease: false
|
|
75
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
76
|
-
requirements:
|
|
77
|
-
- - "~>"
|
|
78
|
-
- !ruby/object:Gem::Version
|
|
79
|
-
version: 0.4.0
|
|
80
52
|
description: For use for the Beaker acceptance testing tool
|
|
81
53
|
email:
|
|
82
54
|
- voxpupuli@groups.io
|
|
@@ -85,6 +57,7 @@ extensions: []
|
|
|
85
57
|
extra_rdoc_files: []
|
|
86
58
|
files:
|
|
87
59
|
- ".github/dependabot.yml"
|
|
60
|
+
- ".github/release.yml"
|
|
88
61
|
- ".github/workflows/release.yml"
|
|
89
62
|
- ".github/workflows/test.yml"
|
|
90
63
|
- ".gitignore"
|
|
@@ -129,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
129
102
|
- !ruby/object:Gem::Version
|
|
130
103
|
version: '0'
|
|
131
104
|
requirements: []
|
|
132
|
-
rubygems_version: 3.6.
|
|
105
|
+
rubygems_version: 3.6.7
|
|
133
106
|
specification_version: 4
|
|
134
107
|
summary: Beaker's Puppet DSL Extension Helpers
|
|
135
108
|
test_files: []
|