Skip to content

Commit 15c1ba1

Browse files
authored
Merge pull request voxpupuli#44 from voxpupuli/modulesync
modulesync 0.16.3
2 parents 10b5883 + cad05cd commit 15c1ba1

File tree

7 files changed

+25
-20
lines changed

7 files changed

+25
-20
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ This module has grown over time based on a range of contributions from
22
people using it. If you follow these contributing guidelines your patch
33
will likely make it into a release a little quicker.
44

5-
65
## Contributing
76

8-
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/).
7+
Please note that this project is released with a Contributor Code of Conduct.
8+
By participating in this project you agree to abide by its terms.
9+
[Contributor Code of Conduct](https://voxpupuli.org/coc/).
910

1011
1. Fork the repo.
1112

@@ -76,7 +77,6 @@ To run the linter, the syntax checker and the unit tests:
7677

7778
bundle exec rake test
7879

79-
8080
## Integration tests
8181

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

.github/ISSUE_TEMPLATE.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<!--
22
Thank you for contributing to this project!
3+
34
- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
45
- Please check that here is no existing issue or PR that addresses your problem.
56
- Please fill the following form to enable us to help you.
7+
68
-->
79

8-
### Affected Puppet, Ruby, OS and module versions/distributions
10+
## Affected Puppet, Ruby, OS and module versions/distributions
911

1012
- Puppet:
1113
- Ruby:
1214
- Distribution:
1315
- Module version:
1416

15-
### How to reproduce (e.g Puppet code you use)
17+
## How to reproduce (e.g Puppet code you use)
1618

17-
### What are you seeing
19+
## What are you seeing
1820

19-
### What behaviour did you expect instead
21+
## What behaviour did you expect instead
2022

21-
### Output log
23+
## Output log
2224

23-
### Any additional information you'd like to impart
25+
## Any additional information you'd like to impart

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<!--
22
Thank you for contributing to this project!
3+
34
- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
45
- Please check that here is no existing issue or PR that addresses your problem.
6+
57
-->

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ coverage/
1111
log/
1212
.idea/
1313
*.iml
14-
.*.sw
14+
.*.sw?
1515
.yardoc/

.msync.yml

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

.travis.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,22 @@ matrix:
2323
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
2424
- rvm: 2.1.9
2525
env: PUPPET_VERSION="~> 4.0" CHECK=test
26-
- rvm: 2.2.5
26+
- rvm: 2.2.6
2727
env: PUPPET_VERSION="~> 4.0" CHECK=test
28-
- rvm: 2.3.1
28+
- rvm: 2.3.3
2929
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
30-
- rvm: 2.3.1
30+
- rvm: 2.3.3
3131
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
32-
- rvm: 2.3.1
32+
- rvm: 2.3.3
3333
env: PUPPET_VERSION="~> 4.0" CHECK=test
34-
- rvm: 2.4.0-preview1
34+
- rvm: 2.4.0-preview3
3535
env: PUPPET_VERSION="~> 4.0" CHECK=test
3636
allow_failures:
37-
- rvm: 2.4.0-preview1
37+
- rvm: 2.4.0-preview3
3838
notifications:
3939
email: false
4040
deploy:
4141
provider: puppetforge
42-
deploy:
43-
branch: ha-bug-puppet-forge
4442
user: puppet
4543
password:
4644
secure: "BupP3afJjFERXGk438ep3EZBqw1xeKN/PgYOje7pWljgrog16lXE7u4UrcUtzYnq31RH0CfSjmqNaUi6gEk0GEbJHDKHw2IwzUEd0oDgsafoHpoCiLgEe79IzUZ7tmuZ01mmrhzmgm34NhDkSspS2MPIU2ngxzAvXqlz4zsrm48="

spec/spec_helper.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'rspec-puppet-facts'
33
include RspecPuppetFacts
44

5-
unless RUBY_VERSION =~ %r{^1.9}
5+
if Dir.exist?(File.expand_path('../../lib', __FILE__)) && RUBY_VERSION !~ %r{^1.9}
66
require 'coveralls'
77
require 'simplecov'
88
require 'simplecov-console'
@@ -12,7 +12,10 @@
1212
Coveralls::SimpleCov::Formatter
1313
]
1414
SimpleCov.start do
15+
track_files 'lib/**/*.rb'
1516
add_filter '/spec'
17+
add_filter '/vendor'
18+
add_filter '/.vendor'
1619
end
1720
end
1821

0 commit comments

Comments
 (0)