Skip to content

Commit ade28c6

Browse files
committed
modulesync 4.1.0
1 parent 090a4ab commit ade28c6

17 files changed

+74
-31
lines changed

.editorconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# editorconfig.org
22

3-
# MANAGED BY MODULESYNC
3+
# Managed by modulesync - DO NOT EDIT
4+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
45

56
root = true
67

.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ By participating in this project you agree to abide by its terms.
2525

2626
* Fork the repo.
2727
* Create a separate branch for your change.
28-
* We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
28+
* We only take pull requests with passing tests, and documentation. GitHub Actions run the tests for us (check the .github/workflows/ directory). You can also execute them locally. This is explained [in a later section](#the-test-matrix).
2929
* Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
3030
* Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
3131
* Squash your commits down into logical components. Make sure to rebase against our current master.

.github/workflows/ci.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: CI
26

37
on: pull_request
@@ -12,16 +16,16 @@ jobs:
1216
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
1317
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
1418
env:
15-
BUNDLE_WITHOUT: development:release
19+
BUNDLE_WITHOUT: development:system_tests:release
1620
steps:
1721
- uses: actions/checkout@v2
1822
- name: Setup ruby
1923
uses: ruby/setup-ruby@v1
2024
with:
21-
ruby-version: '2.7'
25+
ruby-version: '3.0'
2226
bundler-cache: true
23-
- name: Run rake validate
24-
run: bundle exec rake validate
27+
- name: Run static validations
28+
run: bundle exec rake validate lint check
2529
- name: Run rake rubocop
2630
run: bundle exec rake rubocop
2731
- name: Setup Test Matrix
@@ -48,7 +52,7 @@ jobs:
4852
ruby-version: ${{ matrix.ruby }}
4953
bundler-cache: true
5054
- name: Run tests
51-
run: bundle exec rake
55+
run: bundle exec rake parallel_spec
5256

5357
acceptance:
5458
needs: setup_matrix
@@ -68,7 +72,7 @@ jobs:
6872
- name: Setup ruby
6973
uses: ruby/setup-ruby@v1
7074
with:
71-
ruby-version: '2.7'
75+
ruby-version: '3.0'
7276
bundler-cache: true
7377
- name: Run tests
7478
run: bundle exec rake beaker

.github/workflows/release.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: Release
26

37
on:
@@ -12,6 +16,7 @@ jobs:
1216
deploy:
1317
name: 'deploy to forge'
1418
runs-on: ubuntu-latest
19+
if: github.repository_owner == 'voxpupuli'
1520
steps:
1621
- name: Checkout repository
1722
uses: actions/checkout@v2

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
pkg/
25
Gemfile.lock
36
Gemfile.local

.msync.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
modulesync_config_version: '4.1.0'

.overcommit.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Managed by https://github.com/voxpupuli/modulesync_configs
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
23
#
34
# Hooks are only enabled if you take action.
45
#

.pmtignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
docs/
25
pkg/
36
Gemfile

.rspec

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
--format documentation
25
--color

.rspec_parallel

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
--format progress

.rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
inherit_gem:
36
voxpupuli-test: rubocop.yml

.yardopts

-2
This file was deleted.

Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# MANAGED BY MODULESYNC
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
FROM ruby:2.7
25

36
WORKDIR /opt/puppet

Gemfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
source ENV['GEM_SOURCE'] || "https://rubygems.org"
25

36
group :test do
4-
gem 'voxpupuli-test', '~> 2.1', :require => false
5-
gem 'coveralls', :require => false
6-
gem 'simplecov-console', :require => false
7-
gem 'fakefs', :require => false
8-
gem 'zabbixapi', :require => false
7+
gem 'voxpupuli-test', '~> 2.1', :require => false
8+
gem 'coveralls', :require => false
9+
gem 'simplecov-console', :require => false
10+
gem 'puppet_metadata', '~> 0.3.0', :require => false
11+
gem 'fakefs', :require => false
12+
gem 'zabbixapi', :require => false
913
end
1014

1115
group :development do
@@ -14,18 +18,15 @@ group :development do
1418
end
1519

1620
group :system_tests do
17-
gem 'puppet_metadata', '~> 0.3.0', :require => false
18-
gem 'voxpupuli-acceptance', :require => false
21+
gem 'voxpupuli-acceptance', '~> 1.0', :require => false
1922
end
2023

2124
group :release do
2225
gem 'github_changelog_generator', '>= 1.16.1', :require => false
23-
gem 'puppet-blacksmith', :require => false
24-
gem 'voxpupuli-release', :require => false
26+
gem 'voxpupuli-release', '>= 1.0.2', :require => false
2527
gem 'puppet-strings', '>= 2.2', :require => false
2628
end
2729

28-
gem 'puppetlabs_spec_helper', '~> 2.0', :require => false
2930
gem 'rake', :require => false
3031
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
3132

Rakefile

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
25
# otherwise attempt to load it directly.
36
begin
47
require 'voxpupuli/test/rake'
58
rescue LoadError
6-
require 'puppetlabs_spec_helper/rake_tasks'
9+
begin
10+
require 'puppetlabs_spec_helper/rake_tasks'
11+
rescue LoadError
12+
end
13+
end
14+
15+
# load optional tasks for acceptance
16+
# only available if gem group releases is installed
17+
begin
18+
require 'voxpupuli/acceptance/rake'
19+
rescue LoadError
720
end
821

922
# load optional tasks for releases
@@ -34,14 +47,12 @@ begin
3447
require 'github_changelog_generator/task'
3548
require 'puppet_blacksmith'
3649
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
37-
version = (Blacksmith::Modulefile.new).version
38-
config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
50+
metadata = Blacksmith::Modulefile.new
51+
config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/
3952
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
4053
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
4154
config.user = 'voxpupuli'
42-
metadata_json = File.join(File.dirname(__FILE__), 'metadata.json')
43-
metadata = JSON.load(File.read(metadata_json))
44-
config.project = metadata['name']
55+
config.project = metadata.metadata['name']
4556
end
4657

4758
# Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715

spec/spec_helper.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# This file is managed via modulesync
2-
# https://github.com/voxpupuli/modulesync
3-
# https://github.com/voxpupuli/modulesync_config
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
43

54
RSpec.configure do |c|
65
c.mock_with :mocha

spec/spec_helper_acceptance.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# This file is completely managed via modulesync
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
24
require 'voxpupuli/acceptance/spec_helper_acceptance'
35

46
configure_beaker

0 commit comments

Comments
 (0)