Skip to content

Commit 13bc18f

Browse files
committed
modulesync 2.3.0
1 parent 9aea141 commit 13bc18f

23 files changed

+45
-252
lines changed

.editorconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# editorconfig.org
2+
3+
# MANAGED BY MODULESYNC
4+
5+
root = true
6+
7+
[*]
8+
charset = utf-8
9+
end_of_line = lf
10+
indent_size = 2
11+
tab_width = 2
12+
indent_style = space
13+
insert_final_newline = true
14+
trim_trailing_whitespace = true

.github/CONTRIBUTING.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,21 @@ To run a specific spec test set the `SPEC` variable:
109109
bundle exec rake spec SPEC=spec/foo_spec.rb
110110
```
111111

112+
### Unit tests in docker
113+
114+
Some people don't want to run the dependencies locally or don't want to install
115+
ruby. We ship a Dockerfile that enables you to run all unit tests and linting.
116+
You only need to run:
117+
118+
```sh
119+
docker build .
120+
```
121+
122+
Please ensure that a docker daemon is running and that your user has the
123+
permission to talk to it. You can specify a remote docker host by setting the
124+
`DOCKER_HOST` environment variable. it will copy the content of the module into
125+
the docker image. So it will not work if a Gemfile.lock exists.
126+
112127
## Integration tests
113128

114129
The unit tests just check the code runs, not that it does exactly what

.msync.yml

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

.pmtignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ Puppetfile.lock
1818
*.iml
1919
.*.sw?
2020
.yardoc/
21+
Dockerfile

Gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ end
1212

1313
group :test do
1414
gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
15-
gem 'rspec-puppet-facts', :require => false
15+
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
1818
gem 'puppet-lint-trailing_comma-check', :require => false
@@ -28,7 +28,8 @@ group :test do
2828
gem 'coveralls', :require => false
2929
gem 'simplecov-console', :require => false
3030
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
31-
gem 'parallel_tests', :require => false
31+
gem 'parallel_tests', '2.24.0', :require => false if RUBY_VERSION < '2.2.0'
32+
gem 'parallel_tests', :require => false if RUBY_VERSION >= '2.2.0'
3233
end
3334

3435
group :development do
@@ -43,15 +44,15 @@ group :system_tests do
4344
if beaker_version = ENV['BEAKER_VERSION']
4445
gem 'beaker', *location_for(beaker_version)
4546
else
46-
gem 'beaker', '>= 3.9.0', :require => false
47+
gem 'beaker', '>= 4.2.0', :require => false
4748
end
4849
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
4950
gem 'beaker-rspec', *location_for(beaker_rspec_version)
5051
else
5152
gem 'beaker-rspec', :require => false
5253
end
5354
gem 'serverspec', :require => false
54-
gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
55+
gem 'beaker-hostgenerator', '>= 1.1.22', :require => false
5556
gem 'beaker-docker', :require => false
5657
gem 'beaker-puppet', :require => false
5758
gem 'beaker-puppet_install_helper', :require => false

spec/acceptance/nodesets/centos-511-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/centos-6-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/centos-66-x64-pe.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

spec/acceptance/nodesets/centos-66-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/centos-7-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/centos-72-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/debian-78-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/debian-82-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/fedora-24-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/fedora-25-x64.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

spec/acceptance/nodesets/fedora-26-x64.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

spec/acceptance/nodesets/fedora-27-x64.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/acceptance/nodesets/ubuntu-server-1604-x64.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

spec/classes/coverage_spec.rb

Lines changed: 0 additions & 4 deletions
This file was deleted.

spec/default_facts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# Hint if using with rspec-puppet-facts ("on_supported_os.each"):
99
# if a same named fact exists in facterdb it will be overridden.
1010
---
11-
concat_basedir: "/tmp"
1211
ipaddress: "172.16.254.254"
1312
is_pe: false
1413
macaddress: "AA:AA:AA:AA:AA:AA"

spec/spec_helper.rb

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
require 'puppetlabs_spec_helper/module_spec_helper'
2-
require 'rspec-puppet-facts'
3-
include RspecPuppetFacts
4-
51
# This file is managed via modulesync
62
# https://github.com/voxpupuli/modulesync
73
# https://github.com/voxpupuli/modulesync_config
4+
require 'puppetlabs_spec_helper/module_spec_helper'
5+
require 'rspec-puppet-facts'
6+
include RspecPuppetFacts
87

98
if Dir.exist?(File.expand_path('../../lib', __FILE__))
109
require 'coveralls'
@@ -23,13 +22,13 @@
2322
end
2423

2524
RSpec.configure do |c|
26-
default_facts = {
27-
puppetversion: Puppet.version,
28-
facterversion: Facter.version
29-
}
25+
default_facts = {}
3026
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
3127
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
3228
c.default_facts = default_facts
33-
end
3429

35-
# vim: syntax=ruby
30+
# Coverage generation
31+
c.after(:suite) do
32+
RSpec::Puppet::Coverage.report!
33+
end
34+
end

0 commit comments

Comments
 (0)