mirror of
https://github.com/philippdieter/puppet-ldapquery.git
synced 2025-10-13 04:54:47 +00:00
modulesync 2.12.0
This commit is contained in:
Tim Meusel
Ewoud Kohl van Wijngaarden
parent
39610804e1
commit
3c0152dece
14
.editorconfig
Normal file
14
.editorconfig
Normal file
@ -0,0 +1,14 @@
|
||||
# editorconfig.org
|
||||
|
||||
# MANAGED BY MODULESYNC
|
||||
|
||||
root = true
|
||||
|
||||
[*]
|
||||
charset = utf-8
|
||||
end_of_line = lf
|
||||
indent_size = 2
|
||||
tab_width = 2
|
||||
indent_style = space
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
281
.github/CONTRIBUTING.md
vendored
Normal file
281
.github/CONTRIBUTING.md
vendored
Normal file
@ -0,0 +1,281 @@
|
||||
# Contribution guidelines
|
||||
|
||||
## Table of contents
|
||||
|
||||
* [Contributing](#contributing)
|
||||
* [Writing proper commits - short version](#writing-proper-commits-short-version)
|
||||
* [Writing proper commits - long version](#writing-proper-commits-long-version)
|
||||
* [Dependencies](#dependencies)
|
||||
* [Note for OS X users](#note-for-os-x-users)
|
||||
* [The test matrix](#the-test-matrix)
|
||||
* [Syntax and style](#syntax-and-style)
|
||||
* [Running the unit tests](#running-the-unit-tests)
|
||||
* [Unit tests in docker](#unit-tests-in-docker)
|
||||
* [Integration tests](#integration-tests)
|
||||
|
||||
This module has grown over time based on a range of contributions from
|
||||
people using it. If you follow these contributing guidelines your patch
|
||||
will likely make it into a release a little more quickly.
|
||||
|
||||
## Contributing
|
||||
|
||||
Please note that this project is released with a Contributor Code of Conduct.
|
||||
By participating in this project you agree to abide by its terms.
|
||||
[Contributor Code of Conduct](https://voxpupuli.org/coc/).
|
||||
|
||||
* Fork the repo.
|
||||
* Create a separate branch for your change.
|
||||
* 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).
|
||||
* 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.
|
||||
* 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.
|
||||
* Squash your commits down into logical components. Make sure to rebase against our current master.
|
||||
* Push the branch to your fork and submit a pull request.
|
||||
|
||||
Please be prepared to repeat some of these steps as our contributors review your code.
|
||||
|
||||
## Writing proper commits - short version
|
||||
|
||||
* Make commits of logical units.
|
||||
* Check for unnecessary whitespace with "git diff --check" before committing.
|
||||
* Commit using Unix line endings (check the settings around "crlf" in git-config(1)).
|
||||
* Do not check in commented out code or unneeded files.
|
||||
* The first line of the commit message should be a short description (50 characters is the soft limit, excluding ticket number(s)), and should skip the full stop.
|
||||
* Associate the issue in the message. The first line should include the issue number in the form "(#XXXX) Rest of message".
|
||||
* The body should provide a meaningful commit message, which:
|
||||
*uses the imperative, present tense: `change`, not `changed` or `changes`.
|
||||
* includes motivation for the change, and contrasts its implementation with the previous behavior.
|
||||
* Make sure that you have tests for the bug you are fixing, or feature you are adding.
|
||||
* Make sure the test suites passes after your commit:
|
||||
* When introducing a new feature, make sure it is properly documented in the README.md
|
||||
|
||||
## Writing proper commits - long version
|
||||
|
||||
1. Make separate commits for logically separate changes.
|
||||
|
||||
Please break your commits down into logically consistent units
|
||||
which include new or changed tests relevant to the rest of the
|
||||
change. The goal of doing this is to make the diff easier to
|
||||
read for whoever is reviewing your code. In general, the easier
|
||||
your diff is to read, the more likely someone will be happy to
|
||||
review it and get it into the code base.
|
||||
|
||||
If you are going to refactor a piece of code, please do so as a
|
||||
separate commit from your feature or bug fix changes.
|
||||
|
||||
We also really appreciate changes that include tests to make
|
||||
sure the bug is not re-introduced, and that the feature is not
|
||||
accidentally broken.
|
||||
|
||||
Describe the technical detail of the change(s). If your
|
||||
description starts to get too long, that is a good sign that you
|
||||
probably need to split up your commit into more finely grained
|
||||
pieces.
|
||||
|
||||
Commits which plainly describe the things which help
|
||||
reviewers check the patch and future developers understand the
|
||||
code are much more likely to be merged in with a minimum of
|
||||
bike-shedding or requested changes. Ideally, the commit message
|
||||
would include information, and be in a form suitable for
|
||||
inclusion in the release notes for the version of Puppet that
|
||||
includes them.
|
||||
|
||||
Please also check that you are not introducing any trailing
|
||||
whitespace or other "whitespace errors". You can do this by
|
||||
running "git diff --check" on your changes before you commit.
|
||||
|
||||
2. Sending your patches
|
||||
|
||||
To submit your changes via a GitHub pull request, we _highly_
|
||||
recommend that you have them on a topic branch, instead of
|
||||
directly on `master`.
|
||||
It makes things much easier to keep track of, especially if
|
||||
you decide to work on another thing before your first change
|
||||
is merged in.
|
||||
|
||||
GitHub has some pretty good
|
||||
[general documentation](http://help.github.com/) on using
|
||||
their site. They also have documentation on
|
||||
[creating pull requests](http://help.github.com/send-pull-requests/).
|
||||
|
||||
In general, after pushing your topic branch up to your
|
||||
repository on GitHub, you can switch to the branch in the
|
||||
GitHub UI and click "Pull Request" towards the top of the page
|
||||
in order to open a pull request.
|
||||
|
||||
|
||||
3. Update the related GitHub issue.
|
||||
|
||||
If there is a GitHub issue associated with the change you
|
||||
submitted, then you should update the ticket to include the
|
||||
location of your branch, along with any other commentary you
|
||||
may wish to make.
|
||||
|
||||
## Dependencies
|
||||
|
||||
The testing and development tools have a bunch of dependencies,
|
||||
all managed by [bundler](http://bundler.io/) according to the
|
||||
[Puppet support matrix](http://docs.puppetlabs.com/guides/platforms.html#ruby-versions).
|
||||
|
||||
By default the tests use a baseline version of Puppet.
|
||||
|
||||
If you have Ruby 2.x or want a specific version of Puppet,
|
||||
you must set an environment variable such as:
|
||||
|
||||
```sh
|
||||
export PUPPET_VERSION="~> 5.5.6"
|
||||
```
|
||||
|
||||
You can install all needed gems for spec tests into the modules directory by
|
||||
running:
|
||||
|
||||
```sh
|
||||
bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
|
||||
```
|
||||
|
||||
If you also want to run acceptance tests:
|
||||
|
||||
```sh
|
||||
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
|
||||
```
|
||||
|
||||
Our all in one solution if you don't know if you need to install or update gems:
|
||||
|
||||
```sh
|
||||
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
|
||||
```
|
||||
|
||||
As an alternative to the `--jobs "$(nproc)` parameter, you can set an
|
||||
environment variable:
|
||||
|
||||
```sh
|
||||
BUNDLE_JOBS="$(nproc)"
|
||||
```
|
||||
|
||||
### Note for OS X users
|
||||
|
||||
`nproc` isn't a valid command under OS x. As an alternative, you can do:
|
||||
|
||||
```sh
|
||||
--jobs "$(sysctl -n hw.ncpu)"
|
||||
```
|
||||
|
||||
## The test matrix
|
||||
|
||||
### Syntax and style
|
||||
|
||||
The test suite will run [Puppet Lint](http://puppet-lint.com/) and
|
||||
[Puppet Syntax](https://github.com/gds-operations/puppet-syntax) to
|
||||
check various syntax and style things. You can run these locally with:
|
||||
|
||||
```sh
|
||||
bundle exec rake lint
|
||||
bundle exec rake validate
|
||||
```
|
||||
|
||||
It will also run some [Rubocop](http://batsov.com/rubocop/) tests
|
||||
against it. You can run those locally ahead of time with:
|
||||
|
||||
```sh
|
||||
bundle exec rake rubocop
|
||||
```
|
||||
|
||||
### Running the unit tests
|
||||
|
||||
The unit test suite covers most of the code, as mentioned above please
|
||||
add tests if you're adding new functionality. If you've not used
|
||||
[rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
|
||||
about how best to test your new feature.
|
||||
|
||||
To run the linter, the syntax checker and the unit tests:
|
||||
|
||||
```sh
|
||||
bundle exec rake test
|
||||
```
|
||||
|
||||
To run your all the unit tests
|
||||
|
||||
```sh
|
||||
bundle exec rake spec
|
||||
```
|
||||
|
||||
To run a specific spec test set the `SPEC` variable:
|
||||
|
||||
```sh
|
||||
bundle exec rake spec SPEC=spec/foo_spec.rb
|
||||
```
|
||||
|
||||
#### Unit tests in docker
|
||||
|
||||
Some people don't want to run the dependencies locally or don't want to install
|
||||
ruby. We ship a Dockerfile that enables you to run all unit tests and linting.
|
||||
You only need to run:
|
||||
|
||||
```sh
|
||||
docker build .
|
||||
```
|
||||
|
||||
Please ensure that a docker daemon is running and that your user has the
|
||||
permission to talk to it. You can specify a remote docker host by setting the
|
||||
`DOCKER_HOST` environment variable. it will copy the content of the module into
|
||||
the docker image. So it will not work if a Gemfile.lock exists.
|
||||
|
||||
### Integration tests
|
||||
|
||||
The unit tests just check the code runs, not that it does exactly what
|
||||
we want on a real machine. For that we're using
|
||||
[beaker](https://github.com/puppetlabs/beaker).
|
||||
|
||||
This fires up a new virtual machine (using vagrant) and runs a series of
|
||||
simple tests against it after applying the module. You can run this
|
||||
with:
|
||||
|
||||
```sh
|
||||
bundle exec rake acceptance
|
||||
```
|
||||
|
||||
This will run the tests on the module's default nodeset. You can override the
|
||||
nodeset used, e.g.,
|
||||
|
||||
```sh
|
||||
BEAKER_set=centos-7-x64 bundle exec rake acceptance
|
||||
```
|
||||
|
||||
There are default rake tasks for the various acceptance test modules, e.g.,
|
||||
|
||||
```sh
|
||||
bundle exec rake beaker:centos-7-x64
|
||||
bundle exec rake beaker:ssh:centos-7-x64
|
||||
```
|
||||
|
||||
If you don't want to have to recreate the virtual machine every time you can
|
||||
use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at
|
||||
least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the
|
||||
created virtual machines will be in `.vagrant/beaker_vagrant_files`.
|
||||
|
||||
Beaker also supports docker containers. We also use that in our automated CI
|
||||
pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
|
||||
|
||||
```sh
|
||||
PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
|
||||
```
|
||||
|
||||
You can replace the string `debian10` with any common operating system.
|
||||
The following strings are known to work:
|
||||
|
||||
* ubuntu1604
|
||||
* ubuntu1804
|
||||
* debian8
|
||||
* debian9
|
||||
* debian10
|
||||
* centos6
|
||||
* centos7
|
||||
* centos8
|
||||
|
||||
The easiest way to debug in a docker container is to open a shell:
|
||||
|
||||
```sh
|
||||
docker exec -it -u root ${container_id_or_name} bash
|
||||
```
|
||||
|
||||
The source of this file is in our [modulesync_config](https://github.com/voxpupuli/modulesync_config/blob/master/moduleroot/.github/CONTRIBUTING.md.erb)
|
||||
repository.
|
||||
26
.github/ISSUE_TEMPLATE.md
vendored
Normal file
26
.github/ISSUE_TEMPLATE.md
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
<!--
|
||||
Thank you for contributing to this project!
|
||||
|
||||
- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
|
||||
- Please check that here is no existing issue or PR that addresses your problem.
|
||||
- Please fill the following form to enable us to help you.
|
||||
- Our vulnerabilities reporting process is at https://voxpupuli.org/security/
|
||||
|
||||
-->
|
||||
|
||||
## Affected Puppet, Ruby, OS and module versions/distributions
|
||||
|
||||
- Puppet:
|
||||
- Ruby:
|
||||
- Distribution:
|
||||
- Module version:
|
||||
|
||||
## How to reproduce (e.g Puppet code you use)
|
||||
|
||||
## What are you seeing
|
||||
|
||||
## What behaviour did you expect instead
|
||||
|
||||
## Output log
|
||||
|
||||
## Any additional information you'd like to impart
|
||||
20
.github/PULL_REQUEST_TEMPLATE.md
vendored
Normal file
20
.github/PULL_REQUEST_TEMPLATE.md
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
<!--
|
||||
Thank you for contributing to this project!
|
||||
|
||||
- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
|
||||
- Please check that here is no existing issue or PR that addresses your problem.
|
||||
- Our vulnerabilities reporting process is at https://voxpupuli.org/security/
|
||||
|
||||
-->
|
||||
#### Pull Request (PR) description
|
||||
<!--
|
||||
Replace this comment with a description of your pull request.
|
||||
-->
|
||||
|
||||
#### This Pull Request (PR) fixes the following issues
|
||||
<!--
|
||||
Replace this comment with the list of issues or n/a.
|
||||
Use format:
|
||||
Fixes #123
|
||||
Fixes #124
|
||||
-->
|
||||
@ -1 +1 @@
|
||||
modulesync_config_version: '2.9.0'
|
||||
modulesync_config_version: '2.12.0'
|
||||
|
||||
64
.overcommit.yml
Normal file
64
.overcommit.yml
Normal file
@ -0,0 +1,64 @@
|
||||
# Managed by https://github.com/voxpupuli/modulesync_configs
|
||||
#
|
||||
# Hooks are only enabled if you take action.
|
||||
#
|
||||
# To enable the hooks run:
|
||||
#
|
||||
# ```
|
||||
# bundle exec overcommit --install
|
||||
# # ensure .overcommit.yml does not harm to you and then
|
||||
# bundle exec overcommit --sign
|
||||
# ```
|
||||
#
|
||||
# (it will manage the .git/hooks directory):
|
||||
#
|
||||
# Examples howto skip a test for a commit or push:
|
||||
#
|
||||
# ```
|
||||
# SKIP=RuboCop git commit
|
||||
# SKIP=PuppetLint git commit
|
||||
# SKIP=RakeTask git push
|
||||
# ```
|
||||
#
|
||||
# Don't invoke overcommit at all:
|
||||
#
|
||||
# ```
|
||||
# OVERCOMMIT_DISABLE=1 git commit
|
||||
# ```
|
||||
#
|
||||
# Read more about overcommit: https://github.com/brigade/overcommit
|
||||
#
|
||||
# To manage this config yourself in your module add
|
||||
#
|
||||
# ```
|
||||
# .overcommit.yml:
|
||||
# unmanaged: true
|
||||
# ```
|
||||
#
|
||||
# to your modules .sync.yml config
|
||||
---
|
||||
PreCommit:
|
||||
RuboCop:
|
||||
enabled: true
|
||||
description: 'Runs rubocop on modified files only'
|
||||
command: ['bundle', 'exec', 'rubocop']
|
||||
PuppetLint:
|
||||
enabled: true
|
||||
description: 'Runs puppet-lint on modified files only'
|
||||
command: ['bundle', 'exec', 'puppet-lint']
|
||||
YamlSyntax:
|
||||
enabled: true
|
||||
JsonSyntax:
|
||||
enabled: true
|
||||
TrailingWhitespace:
|
||||
enabled: true
|
||||
|
||||
PrePush:
|
||||
RakeTarget:
|
||||
enabled: true
|
||||
description: 'Run rake targets'
|
||||
targets:
|
||||
- 'validate'
|
||||
- 'test'
|
||||
- 'rubocop'
|
||||
command: [ 'bundle', 'exec', 'rake' ]
|
||||
12
.rubocop.yml
12
.rubocop.yml
@ -1,5 +1,6 @@
|
||||
require: rubocop-rspec
|
||||
AllCops:
|
||||
# Puppet Server 5 defaults to jruby 1.7 so TargetRubyVersion must stay at 1.9 until we drop support for puppet 5
|
||||
TargetRubyVersion: 1.9
|
||||
Include:
|
||||
- ./**/*.rb
|
||||
@ -13,10 +14,6 @@ AllCops:
|
||||
- Rakefile
|
||||
- Guardfile
|
||||
- Vagrantfile
|
||||
|
||||
Security/MarshalLoad:
|
||||
Enabled: false
|
||||
|
||||
Lint/ConditionPosition:
|
||||
Enabled: True
|
||||
|
||||
@ -427,6 +424,9 @@ Style/NumericLiterals:
|
||||
Style/OneLineConditional:
|
||||
Enabled: True
|
||||
|
||||
Style/OpMethod:
|
||||
Enabled: True
|
||||
|
||||
Style/ParenthesesAroundCondition:
|
||||
Enabled: True
|
||||
|
||||
@ -525,10 +525,6 @@ RSpec/NamedSubject:
|
||||
RSpec/RepeatedDescription:
|
||||
Enabled: False
|
||||
|
||||
# disabled for simpler testing on multiple platforms in case statement
|
||||
RSpec/RepeatedExample:
|
||||
Enabled: False
|
||||
|
||||
RSpec/NestedGroups:
|
||||
Enabled: False
|
||||
|
||||
|
||||
26
.travis.yml
26
.travis.yml
@ -3,8 +3,7 @@ dist: bionic
|
||||
language: ruby
|
||||
cache: bundler
|
||||
before_install:
|
||||
- gem update --system
|
||||
- gem update bundler
|
||||
- yes | gem update --system
|
||||
- bundle --version
|
||||
script:
|
||||
- 'bundle exec rake $CHECK'
|
||||
@ -13,19 +12,36 @@ matrix:
|
||||
include:
|
||||
- rvm: 2.4.4
|
||||
bundler_args: --without system_tests development release
|
||||
env: PUPPET_VERSION="~> 5.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
|
||||
env: PUPPET_VERSION="~> 5.0" CHECK=test
|
||||
- rvm: 2.5.3
|
||||
bundler_args: --without system_tests development release
|
||||
env: PUPPET_VERSION="~> 6.0" CHECK=test_with_coveralls
|
||||
- rvm: 2.5.3
|
||||
bundler_args: --without system_tests development release
|
||||
env: PUPPET_VERSION="~> 6.0" CHECK=rubocop
|
||||
- rvm: 2.5.3
|
||||
- rvm: 2.4.4
|
||||
bundler_args: --without system_tests development release
|
||||
env: PUPPET_VERSION="~> 6.0" CHECK=build DEPLOY_TO_FORGE=yes
|
||||
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
- /^v\d/
|
||||
notifications:
|
||||
email: false
|
||||
webhooks: https://voxpupu.li/incoming/travis
|
||||
irc:
|
||||
on_success: always
|
||||
on_failure: always
|
||||
channels:
|
||||
- "chat.freenode.org#voxpupuli-notifications"
|
||||
deploy:
|
||||
provider: puppetforge
|
||||
user: puppet
|
||||
password:
|
||||
secure: ""
|
||||
on:
|
||||
tags: true
|
||||
# all_branches is required to use tags
|
||||
all_branches: true
|
||||
# Only publish the build marked with "DEPLOY_TO_FORGE"
|
||||
condition: "$DEPLOY_TO_FORGE = yes"
|
||||
|
||||
21
Dockerfile
Normal file
21
Dockerfile
Normal file
@ -0,0 +1,21 @@
|
||||
FROM ruby:2.5.3
|
||||
|
||||
WORKDIR /opt/puppet
|
||||
|
||||
# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
|
||||
RUN mkdir -p /etc/sv
|
||||
|
||||
ARG PUPPET_VERSION="~> 6.0"
|
||||
ARG PARALLEL_TEST_PROCESSORS=4
|
||||
|
||||
# Cache gems
|
||||
COPY Gemfile .
|
||||
RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle}
|
||||
|
||||
COPY . .
|
||||
|
||||
RUN bundle install
|
||||
RUN bundle exec rake release_checks
|
||||
|
||||
# Container should not saved
|
||||
RUN exit 1
|
||||
45
Gemfile
45
Gemfile
@ -1,4 +1,4 @@
|
||||
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
||||
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
||||
|
||||
def location_for(place, fake_version = nil)
|
||||
if place =~ /^(git[:@][^#]*)#(.*)/
|
||||
@ -11,29 +11,9 @@ def location_for(place, fake_version = nil)
|
||||
end
|
||||
|
||||
group :test do
|
||||
gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false
|
||||
gem 'rspec-puppet-facts', '>= 1.9.5', :require => false
|
||||
gem 'rspec-puppet-utils', :require => false
|
||||
gem 'pdk', '>= 1.14.0', :require => false
|
||||
gem 'puppet-module', :require => false
|
||||
gem 'puppet-lint-leading_zero-check', :require => false
|
||||
gem 'puppet-lint-trailing_comma-check', :require => false
|
||||
gem 'puppet-lint-version_comparison-check', :require => false
|
||||
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
|
||||
gem 'puppet-lint-unquoted_string-check', :require => false
|
||||
gem 'puppet-lint-variable_contains_upcase', :require => false
|
||||
gem 'puppet-lint-absolute_classname-check', :require => false
|
||||
gem 'puppet-lint-topscope-variable-check', :require => false
|
||||
gem 'puppet-lint-legacy_facts-check', :require => false
|
||||
gem 'puppet-lint-anchor-check', :require => false
|
||||
gem 'metadata-json-lint', :require => false
|
||||
gem 'redcarpet', :require => false
|
||||
gem 'rubocop', '~> 0.49.1', :require => false
|
||||
gem 'rubocop-rspec', '~> 1.15.0', :require => false
|
||||
gem 'mocha', '~> 1.4.0', :require => false
|
||||
gem 'voxpupuli-test', '>= 1.0.0', :require => false
|
||||
gem 'coveralls', :require => false
|
||||
gem 'simplecov-console', :require => false
|
||||
gem 'parallel_tests', :require => false
|
||||
end
|
||||
|
||||
group :development do
|
||||
@ -44,26 +24,7 @@ group :development do
|
||||
end
|
||||
|
||||
group :system_tests do
|
||||
gem 'winrm', :require => false
|
||||
if beaker_version = ENV['BEAKER_VERSION']
|
||||
gem 'beaker', *location_for(beaker_version)
|
||||
else
|
||||
gem 'beaker', '>= 4.2.0', :require => false
|
||||
end
|
||||
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
|
||||
gem 'beaker-rspec', *location_for(beaker_rspec_version)
|
||||
else
|
||||
gem 'beaker-rspec', :require => false
|
||||
end
|
||||
gem 'serverspec', :require => false
|
||||
gem 'beaker-hostgenerator', '>= 1.1.22', :require => false
|
||||
gem 'beaker-docker', :require => false
|
||||
gem 'beaker-puppet', :require => false
|
||||
gem 'beaker-puppet_install_helper', :require => false
|
||||
gem 'beaker-module_install_helper', :require => false
|
||||
gem 'rbnacl', '>= 4', :require => false
|
||||
gem 'rbnacl-libsodium', :require => false
|
||||
gem 'bcrypt_pbkdf', :require => false
|
||||
gem 'voxpupuli-acceptance', :require => false
|
||||
end
|
||||
|
||||
group :release do
|
||||
|
||||
43
Rakefile
43
Rakefile
@ -1,4 +1,4 @@
|
||||
require 'puppetlabs_spec_helper/rake_tasks'
|
||||
require 'voxpupuli/test/rake'
|
||||
|
||||
# load optional tasks for releases
|
||||
# only available if gem group releases is installed
|
||||
@ -7,47 +7,6 @@ begin
|
||||
rescue LoadError
|
||||
end
|
||||
|
||||
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
|
||||
PuppetLint.configuration.absolute_classname_reverse = true
|
||||
|
||||
exclude_paths = %w(
|
||||
pkg/**/*
|
||||
vendor/**/*
|
||||
.vendor/**/*
|
||||
spec/**/*
|
||||
)
|
||||
PuppetLint.configuration.ignore_paths = exclude_paths
|
||||
PuppetSyntax.exclude_paths = exclude_paths
|
||||
|
||||
desc 'Auto-correct puppet-lint offenses'
|
||||
task 'lint:auto_correct' do
|
||||
Rake::Task[:lint_fix].invoke
|
||||
end
|
||||
|
||||
desc 'Run acceptance tests'
|
||||
RSpec::Core::RakeTask.new(:acceptance) do |t|
|
||||
t.pattern = 'spec/acceptance'
|
||||
end
|
||||
|
||||
desc 'Run tests'
|
||||
task test: [:release_checks]
|
||||
|
||||
namespace :check do
|
||||
desc 'Check for trailing whitespace'
|
||||
task :trailing_whitespace do
|
||||
Dir.glob('**/*.md', File::FNM_DOTMATCH).sort.each do |filename|
|
||||
next if filename =~ %r{^((modules|acceptance|\.?vendor|spec/fixtures|pkg)/|REFERENCE.md)}
|
||||
File.foreach(filename).each_with_index do |line, index|
|
||||
if line =~ %r{\s\n$}
|
||||
puts "#{filename} has trailing whitespace on line #{index + 1}"
|
||||
exit 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Rake::Task[:release_checks].enhance ['check:trailing_whitespace']
|
||||
|
||||
desc "Run main 'test' task and report merged results to coveralls"
|
||||
task test_with_coveralls: [:test] do
|
||||
if Dir.exist?(File.expand_path('../lib', __FILE__))
|
||||
|
||||
@ -1,19 +1,16 @@
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
|
||||
RSpec.configure do |c|
|
||||
c.mock_with :rspec
|
||||
end
|
||||
|
||||
require 'puppetlabs_spec_helper/module_spec_helper'
|
||||
require 'rspec-puppet-facts'
|
||||
require 'bundler'
|
||||
include RspecPuppetFacts
|
||||
# puppetlabs_spec_helper will set up coverage if the env variable is set.
|
||||
# We want to do this if lib exists and it hasn't been explicitly set.
|
||||
ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../../lib', __FILE__))
|
||||
|
||||
if ENV['DEBUG']
|
||||
Puppet::Util::Log.level = :debug
|
||||
Puppet::Util::Log.newdestination(:console)
|
||||
end
|
||||
require 'voxpupuli/test/spec_helper'
|
||||
|
||||
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
|
||||
facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
|
||||
@ -23,39 +20,3 @@ if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if Dir.exist?(File.expand_path('../../lib', __FILE__))
|
||||
require 'coveralls'
|
||||
require 'simplecov'
|
||||
require 'simplecov-console'
|
||||
SimpleCov.formatters = [
|
||||
SimpleCov::Formatter::HTMLFormatter,
|
||||
SimpleCov::Formatter::Console
|
||||
]
|
||||
SimpleCov.start do
|
||||
track_files 'lib/**/*.rb'
|
||||
add_filter '/spec'
|
||||
add_filter '/vendor'
|
||||
add_filter '/.vendor'
|
||||
add_filter Bundler.configured_bundle_path.path
|
||||
end
|
||||
end
|
||||
|
||||
RSpec.configure do |c|
|
||||
# getting the correct facter version is tricky. We use facterdb as a source to mock facts
|
||||
# see https://github.com/camptocamp/facterdb
|
||||
# people might provide a specific facter version. In that case we use it.
|
||||
# Otherwise we need to match the correct facter version to the used puppet version.
|
||||
# as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
|
||||
# https://puppet.com/docs/puppet/5.5/about_agent.html
|
||||
c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
|
||||
ENV['FACTERDB_FACTS_VERSION']
|
||||
else
|
||||
Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
|
||||
end
|
||||
|
||||
# Coverage generation
|
||||
c.after(:suite) do
|
||||
RSpec::Puppet::Coverage.report!
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user