Skip to content

Commit 47e7aee

Browse files
bastelfreakbastelfreak
committed
modulesync 2.7.0
1 parent 4aa2f62 commit 47e7aee

File tree

7 files changed

+17
-61
lines changed

7 files changed

+17
-61
lines changed

‎.msync.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.5.1'
1+
modulesync_config_version: '2.7.0'

‎.sync.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@
88
- set: debian8-64
99
- set: debian9-64
1010
- set: centos7-64
11+
spec/spec_helper.rb:
12+
mock_with: ':mocha'

‎.travis.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ matrix:
3131
bundler_args: --without development release
3232
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
3333
services: docker
34-
- rvm: 2.5.3
35-
bundler_args: --without development release
36-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
37-
services: docker
3834
- rvm: 2.5.3
3935
bundler_args: --without development release
4036
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
@@ -43,10 +39,6 @@ matrix:
4339
bundler_args: --without development release
4440
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
4541
services: docker
46-
- rvm: 2.5.3
47-
bundler_args: --without development release
48-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
49-
services: docker
5042
- rvm: 2.5.3
5143
bundler_args: --without development release
5244
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
@@ -55,10 +47,6 @@ matrix:
5547
bundler_args: --without development release
5648
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
5749
services: docker
58-
- rvm: 2.5.3
59-
bundler_args: --without development release
60-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
61-
services: docker
6250
- rvm: 2.5.3
6351
bundler_args: --without development release
6452
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
@@ -67,10 +55,6 @@ matrix:
6755
bundler_args: --without development release
6856
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
6957
services: docker
70-
- rvm: 2.5.3
71-
bundler_args: --without development release
72-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
73-
services: docker
7458
- rvm: 2.5.3
7559
bundler_args: --without development release
7660
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
@@ -79,10 +63,6 @@ matrix:
7963
bundler_args: --without development release
8064
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
8165
services: docker
82-
- rvm: 2.5.3
83-
bundler_args: --without development release
84-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
85-
services: docker
8666
- rvm: 2.5.3
8767
bundler_args: --without development release
8868
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
@@ -91,10 +71,6 @@ matrix:
9171
bundler_args: --without development release
9272
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
9373
services: docker
94-
- rvm: 2.5.3
95-
bundler_args: --without development release
96-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
97-
services: docker
9874
branches:
9975
only:
10076
- master

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5.1
1+
FROM ruby:2.5.3
22

33
WORKDIR /opt/puppet
44

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
1111
end
1212

1313
group :test do
14-
gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
14+
gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false
1515
gem 'rspec-puppet-facts', '>= 1.8.0', :require => false
1616
gem 'rspec-puppet-utils', :require => false
1717
gem 'puppet-lint-leading_zero-check', :require => false
@@ -65,7 +65,7 @@ group :release do
6565
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator'
6666
gem 'puppet-blacksmith', :require => false
6767
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
68-
gem 'puppet-strings', '>= 1.0', :require => false
68+
gem 'puppet-strings', '>= 2.2', :require => false
6969
end
7070

7171

‎Rakefile‎

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,12 @@ require 'puppetlabs_spec_helper/rake_tasks'
33
# load optional tasks for releases
44
# only available if gem group releases is installed
55
begin
6-
require 'puppet_blacksmith/rake_tasks'
76
require 'voxpupuli/release/rake_tasks'
8-
require 'puppet-strings/tasks'
97
rescue LoadError
108
end
119

1210
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
13-
PuppetLint.configuration.fail_on_warnings = true
1411
PuppetLint.configuration.absolute_classname_reverse = true
15-
PuppetLint.configuration.send('relative')
16-
PuppetLint.configuration.send('disable_140chars')
17-
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
18-
PuppetLint.configuration.send('disable_documentation')
19-
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
2012

2113
exclude_paths = %w(
2214
pkg/**/*
@@ -29,19 +21,16 @@ PuppetSyntax.exclude_paths = exclude_paths
2921

3022
desc 'Auto-correct puppet-lint offenses'
3123
task 'lint:auto_correct' do
32-
PuppetLint.configuration.fix = true
33-
Rake::Task[:lint].invoke
24+
Rake::Task[:lint_fix].invoke
3425
end
3526

3627
desc 'Run acceptance tests'
3728
RSpec::Core::RakeTask.new(:acceptance) do |t|
3829
t.pattern = 'spec/acceptance'
3930
end
4031

41-
desc 'Run tests release_checks'
42-
task test: [
43-
:release_checks,
44-
]
32+
desc 'Run tests'
33+
task test: [:release_checks]
4534

4635
namespace :check do
4736
desc 'Check for trailing whitespace'
@@ -70,25 +59,10 @@ task test_with_coveralls: [:test] do
7059
end
7160
end
7261

73-
desc "Print supported beaker sets"
74-
task 'beaker_sets', [:directory] do |t, args|
75-
directory = args[:directory]
76-
77-
metadata = JSON.load(File.read('metadata.json'))
78-
79-
(metadata['operatingsystem_support'] || []).each do |os|
80-
(os['operatingsystemrelease'] || []).each do |release|
81-
if directory
82-
beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
83-
else
84-
beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
85-
end
86-
87-
filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
88-
89-
puts beaker_set if File.exists? filename
90-
end
91-
end
62+
desc 'Generate REFERENCE.md'
63+
task :reference, [:debug, :backtrace] do |t, args|
64+
patterns = ''
65+
Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
9266
end
9367

9468
begin

‎spec/spec_helper.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# This file is managed via modulesync
22
# https://github.com/voxpupuli/modulesync
33
# https://github.com/voxpupuli/modulesync_config
4+
RSpec.configure do |c|
5+
c.mock_with :mocha
6+
end
7+
48
require 'puppetlabs_spec_helper/module_spec_helper'
59
require 'rspec-puppet-facts'
610
include RspecPuppetFacts

0 commit comments

Comments
 (0)