Skip to content

Commit c013bf0

Browse files
committed
modulesync 0.21.0
1 parent 3f4573c commit c013bf0

File tree

6 files changed

+91
-17
lines changed

6 files changed

+91
-17
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,7 @@ If you don't want to have to recreate the virtual machine every time you
9898
can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
9999
at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
100100
for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.
101+
102+
The easiest way to debug in a docker container is to open a shell:
103+
104+
docker exec -it -u root ${container_id_or_name} bash

.msync.yml

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

.overcommit.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Managed by https://github.com/voxpupuli/modulesync_configs
2+
#
3+
# Hooks are only enabled if you take action.
4+
#
5+
# To enable the hooks run:
6+
#
7+
# ```
8+
# bundle exec overcommit --install
9+
# # ensure .overcommit.yml does not harm to you and then
10+
# bundle exec overcommit --sign
11+
# ```
12+
#
13+
# (it will manage the .git/hooks directory):
14+
#
15+
# Examples howto skip a test for a commit or push:
16+
#
17+
# ```
18+
# SKIP=RuboCop git commit
19+
# SKIP=PuppetLint git commit
20+
# SKIP=RakeTask git push
21+
# ```
22+
#
23+
# Don't invoke overcommit at all:
24+
#
25+
# ```
26+
# OVERCOMMIT_DISABLE=1 git commit
27+
# ```
28+
#
29+
# Read more about overcommit: https://github.com/brigade/overcommit
30+
#
31+
# To manage this config yourself in your module add
32+
#
33+
# ```
34+
# .overcommit.yml:
35+
# unmanaged: true
36+
# ```
37+
#
38+
# to your modules .sync.yml config
39+
---
40+
PreCommit:
41+
RuboCop:
42+
enabled: true
43+
description: 'Runs rubocop on modified files only'
44+
command: ['bundle', 'exec', 'rubocop']
45+
PuppetLint:
46+
enabled: true
47+
description: 'Runs puppet-lint on modified files only'
48+
command: ['bundle', 'exec', 'puppet-lint']
49+
YamlSyntax:
50+
enabled: true
51+
JsonSyntax:
52+
enabled: true
53+
TrailingWhitespace:
54+
enabled: true
55+
56+
PrePush:
57+
RakeTarget:
58+
enabled: true
59+
description: 'Run rake targets'
60+
targets:
61+
- 'test'
62+
- 'rubocop'
63+
command: [ 'bundle', 'exec', 'rake' ]

.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ AllCops:
99
- .vendor/**/*
1010
- pkg/**/*
1111
- spec/fixtures/**/*
12+
- Gemfile
13+
- Rakefile
1214
Lint/ConditionPosition:
1315
Enabled: True
1416

.travis.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ sudo: false
33
dist: trusty
44
language: ruby
55
cache: bundler
6-
bundler_args: --without system_tests development
76
before_install:
87
- bundle -v
98
- rm Gemfile.lock || true
@@ -17,27 +16,33 @@ matrix:
1716
fast_finish: true
1817
include:
1918
- rvm: 2.1.9
19+
bundler_args: --without system_tests development
2020
env: PUPPET_VERSION="~> 4.0" CHECK=test
21-
- rvm: 2.2.6
21+
- rvm: 2.2.7
22+
bundler_args: --without system_tests development
2223
env: PUPPET_VERSION="~> 4.0" CHECK=test
23-
- rvm: 2.3.3
24+
- rvm: 2.3.4
25+
bundler_args: --without system_tests development
2426
env: PUPPET_VERSION="~> 4.0" CHECK=test
25-
- rvm: 2.4.0
27+
- rvm: 2.4.1
28+
bundler_args: --without system_tests development
2629
env: PUPPET_VERSION="~> 4.0" CHECK=test
27-
- rvm: 2.4.0
30+
- rvm: 2.4.1
31+
bundler_args: --without system_tests development
2832
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
29-
- rvm: 2.4.0
33+
- rvm: 2.4.1
34+
bundler_args: --without system_tests development
3035
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
3136
- rvm: 2.4.0
37+
bundler_args: --without development
3238
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_set="docker/debian-8" bundle exec rake acceptance
3339
services: docker
3440
sudo: required
35-
bundler_args: --without development
3641
- rvm: 2.4.0
42+
bundler_args: --without development
3743
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_set="docker/centos-7" bundle exec rake acceptance
3844
services: docker
3945
sudo: required
40-
bundler_args: --without development
4146
branches:
4247
only:
4348
- master

Gemfile

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

1313
group :test do
14-
gem 'puppetlabs_spec_helper', '~> 2.0.1', :require => false
15-
gem 'parallel_tests', :require => false
14+
gem 'puppetlabs_spec_helper', '~> 2.1.1', :require => false
1615
gem 'rspec-puppet', '~> 2.5', :require => false
1716
gem 'rspec-puppet-facts', :require => false
1817
gem 'rspec-puppet-utils', :require => false
@@ -26,10 +25,10 @@ group :test do
2625
gem 'metadata-json-lint', :require => false
2726
gem 'puppet-blacksmith', :require => false
2827
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
29-
gem 'puppet-strings', '~> 1.0.0', :require => false
28+
gem 'puppet-strings', '~> 1.0', :require => false
3029
gem 'redcarpet', :require => false
31-
gem 'rubocop', '~> 0.47.0', :require => false if RUBY_VERSION >= '2.3.0'
32-
gem 'rubocop-rspec', '~> 1.10.0', :require => false if RUBY_VERSION >= '2.3.0'
30+
gem 'rubocop', '~> 0.48.0', :require => false if RUBY_VERSION >= '2.3.0'
31+
gem 'rubocop-rspec', '~> 1.15.0', :require => false if RUBY_VERSION >= '2.3.0'
3332
gem 'mocha', '>= 1.2.1', :require => false
3433
gem 'coveralls', :require => false
3534
gem 'simplecov-console', :require => false
@@ -39,9 +38,10 @@ group :test do
3938
end
4039

4140
group :development do
42-
gem 'travis', :require => false
43-
gem 'travis-lint', :require => false
44-
gem 'guard-rake', :require => false
41+
gem 'travis', :require => false
42+
gem 'travis-lint', :require => false
43+
gem 'guard-rake', :require => false
44+
gem 'overcommit', '~> 0.39.1', :require => false
4545
end
4646

4747
group :system_tests do

0 commit comments

Comments
 (0)