Skip to content

Commit c94b97c

Browse files
committed
Update from modulesync_config
1 parent 3fc602d commit c94b97c

File tree

6 files changed

+61
-87
lines changed

6 files changed

+61
-87
lines changed

.gitignore

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Managed by modulesync - DO NOT EDIT
22
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
33

4-
pkg/
5-
Gemfile.lock
6-
Gemfile.local
7-
vendor/
8-
.vendor/
9-
spec/fixtures/manifests/
10-
spec/fixtures/modules/
11-
.vagrant/
12-
.bundle/
13-
.ruby-version
14-
coverage/
15-
log/
16-
.idea/
17-
.dependencies/
18-
.librarian/
19-
Puppetfile.lock
4+
/pkg/
5+
/Gemfile.lock
6+
/Gemfile.local
7+
/vendor/
8+
/.vendor/
9+
/spec/fixtures/manifests/
10+
/spec/fixtures/modules/
11+
/.vagrant/
12+
/.bundle/
13+
/.ruby-version
14+
/coverage/
15+
/log/
16+
/.idea/
17+
/.dependencies/
18+
/.librarian/
19+
/Puppetfile.lock
2020
*.iml
2121
.*.sw?
22-
.yardoc/
23-
Guardfile
22+
/.yardoc/
23+
/Guardfile

.msync.yml

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

5-
modulesync_config_version: '5.3.0'
5+
modulesync_config_version: '5.5.0'

.pmtignore

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
# Managed by modulesync - DO NOT EDIT
22
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
33

4-
docs/
5-
pkg/
6-
Gemfile
7-
Gemfile.lock
8-
Gemfile.local
9-
vendor/
10-
.vendor/
11-
spec/
12-
Rakefile
13-
.vagrant/
14-
.bundle/
15-
.ruby-version
16-
coverage/
17-
log/
18-
.idea/
19-
.dependencies/
20-
.github/
21-
.librarian/
22-
Puppetfile.lock
4+
/docs/
5+
/pkg/
6+
/Gemfile
7+
/Gemfile.lock
8+
/Gemfile.local
9+
/vendor/
10+
/.vendor/
11+
/spec/
12+
/Rakefile
13+
/.vagrant/
14+
/.bundle/
15+
/.ruby-version
16+
/coverage/
17+
/log/
18+
/.idea/
19+
/.dependencies/
20+
/.github/
21+
/.librarian/
22+
/Puppetfile.lock
2323
*.iml
24-
.editorconfig
25-
.fixtures.yml
26-
.gitignore
27-
.msync.yml
28-
.overcommit.yml
29-
.pmtignore
30-
.rspec
31-
.rspec_parallel
32-
.rubocop.yml
33-
.sync.yml
24+
/.editorconfig
25+
/.fixtures.yml
26+
/.gitignore
27+
/.msync.yml
28+
/.overcommit.yml
29+
/.pmtignore
30+
/.rspec
31+
/.rspec_parallel
32+
/.rubocop.yml
33+
/.sync.yml
3434
.*.sw?
35-
.yardoc/
36-
.yardopts
37-
Dockerfile
35+
/.yardoc/
36+
/.yardopts
37+
/Dockerfile

Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ group :test do
77
gem 'voxpupuli-test', '~> 5.4', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
10-
gem 'puppet_metadata', '~> 1.0', :require => false
10+
gem 'puppet_metadata', '~> 2.0', :require => false
1111
end
1212

1313
group :development do
@@ -21,14 +21,14 @@ end
2121

2222
group :release do
2323
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
24-
gem 'voxpupuli-release', '>= 1.2.0', :require => false
25-
gem 'puppet-strings', '>= 2.2', :require => false
24+
gem 'voxpupuli-release', '~> 2.0', :require => false
25+
gem 'faraday-retry', '~> 2.1', :require => false if RUBY_VERSION >= '2.6'
2626
end
2727

2828
gem 'rake', :require => false
2929
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
3030

31-
puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
31+
puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
3232
gem 'puppet', puppetversion, :require => false, :groups => [:test]
3333

3434
# vim: syntax=ruby

Rakefile

+4-32
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ end
2424
begin
2525
require 'voxpupuli/release/rake_tasks'
2626
rescue LoadError
27+
# voxpupuli-release not present
28+
else
29+
GCGConfig.user = 'saz'
30+
GCGConfig.project = 'puppet-limits'
2731
end
2832

2933
desc "Run main 'test' task and report merged results to coveralls"
@@ -37,36 +41,4 @@ task test_with_coveralls: [:test] do
3741
end
3842
end
3943

40-
desc 'Generate REFERENCE.md'
41-
task :reference, [:debug, :backtrace] do |t, args|
42-
patterns = ''
43-
Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
44-
end
45-
46-
begin
47-
require 'github_changelog_generator/task'
48-
require 'puppet_blacksmith'
49-
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
50-
metadata = Blacksmith::Modulefile.new
51-
config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/
52-
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."
53-
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
54-
config.user = 'voxpupuli'
55-
config.project = metadata.metadata['name']
56-
end
57-
58-
# Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
59-
require 'rbconfig'
60-
if RbConfig::CONFIG['host_os'] =~ /linux/
61-
task :changelog do
62-
puts 'Fixing line endings...'
63-
changelog_file = File.join(__dir__, 'CHANGELOG.md')
64-
changelog_txt = File.read(changelog_file)
65-
new_contents = changelog_txt.gsub(%r{\r\n}, "\n")
66-
File.open(changelog_file, "w") {|file| file.puts new_contents }
67-
end
68-
end
69-
70-
rescue LoadError
71-
end
7244
# vim: syntax=ruby

spec/spec_helper.rb

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
require 'voxpupuli/test/spec_helper'
1111

12+
add_mocked_facts!
13+
1214
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
1315
facts = YAML.safe_load(File.read(File.join(__dir__, 'default_module_facts.yml')))
1416
facts&.each do |name, value|

0 commit comments

Comments
 (0)