Skip to content

Commit 907c384

Browse files
pmcmawpmcmaw
authored
Merge pull request #1772 from HelenCampbell/1.4.1convert
PDK Convert 1.4.1
2 parents 77d88c6 + 60e60d4 commit 907c384

33 files changed

+356
-239
lines changed

‎.gitignore

+18-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
# This file is generated by ModuleSync, do not edit.
2-
*.iml
31
.*.sw[op]
4-
.DS_Store
5-
.bundle/
6-
.idea/
72
.metadata
8-
.vagrant/
93
.yardoc
104
.yardwarns
11-
Gemfile.local
12-
Gemfile.lock
13-
bin/
14-
coverage/
15-
doc/
16-
junit/
17-
log/
18-
pkg/
19-
spec/fixtures/manifests/
20-
spec/fixtures/modules/
21-
tmp/
22-
vendor/
23-
5+
*.iml
6+
/.bundle/
7+
/.idea/
8+
/.vagrant/
9+
/coverage/
10+
/bin/
11+
/doc/
12+
/Gemfile.local
13+
/Gemfile.lock
14+
/junit/
15+
/log/
16+
/pkg/
17+
/spec/fixtures/manifests/
18+
/spec/fixtures/modules/
19+
/tmp/
20+
/vendor/
21+
/convert_report.txt
22+
.DS_Store

‎.rubocop.yml

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
require:
3-
- rubocop-rspec
2+
require: rubocop-rspec
43
AllCops:
4+
DisplayCopNames: true
55
TargetRubyVersion: '2.1'
66
Include:
77
- "./**/*.rb"
@@ -13,7 +13,6 @@ AllCops:
1313
- pkg/**/*
1414
- spec/fixtures/**/*
1515
- vendor/**/*
16-
inherit_from: .rubocop_todo.yml
1716
Metrics/LineLength:
1817
Description: People have wide screens, use them.
1918
Max: 200
@@ -64,12 +63,17 @@ Style/TrailingCommaInLiteral:
6463
Style/SymbolArray:
6564
Description: Using percent style obscures symbolic intent of array's contents.
6665
EnforcedStyle: brackets
66+
inherit_from: ".rubocop_todo.yml"
67+
RSpec/MessageSpies:
68+
EnforcedStyle: receive
6769
Style/CollectionMethods:
6870
Enabled: true
6971
Style/MethodCalledOnDoEndBlock:
7072
Enabled: true
7173
Style/StringMethods:
7274
Enabled: true
75+
Layout/EndOfLine:
76+
Enabled: false
7377
Metrics/AbcSize:
7478
Enabled: false
7579
Metrics/BlockLength:
@@ -88,14 +92,17 @@ Metrics/PerceivedComplexity:
8892
Enabled: false
8993
RSpec/DescribeClass:
9094
Enabled: false
95+
RSpec/ExampleLength:
96+
Enabled: false
9197
RSpec/MessageExpectation:
9298
Enabled: false
99+
RSpec/MultipleExpectations:
100+
Enabled: false
101+
RSpec/NestedGroups:
102+
Enabled: false
93103
Style/AsciiComments:
94104
Enabled: false
95105
Style/IfUnlessModifier:
96106
Enabled: false
97107
Style/SymbolProc:
98108
Enabled: false
99-
#TODO: Additional value added to resolve error's
100-
Style/GlobalVars:
101-
Enabled: false

‎.rubocop_todo.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Style/GlobalVars:
2+
Enabled: false
3+
RSpec/InstanceVariable:
4+
Enabled: false
5+
RSpec/RepeatedExample:
6+
Enabled: false
7+
RSpec/ExpectInHook:
8+
Enabled: false
9+
Style/CommentedKeyword:
10+
Enabled: false
11+
RSpec/NamedSubject:
12+
Enabled: false
13+
RSpec/VoidExpect:
14+
Enabled: false
15+
RSpec/AnyInstance:
16+
Enabled: false
17+
RSpec/FilePath:
18+
Enabled: false
19+
RSpec/EmptyExampleGroup:
20+
Enabled: false

‎.sync.yml

+46-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,50 @@
11
---
2-
appveyor.yml:
3-
delete: true
4-
Rakefile:
5-
extra_disabled_lint_checks:
6-
- 'disable_only_variable_string'
7-
spec/spec_helper.rb:
8-
allow_deprecations: true
92
.travis.yml:
10-
env:
11-
global:
12-
- "PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers"
3+
bundle_args: --without system_tests
4+
docker_sets:
5+
- set: docker/centos-7
6+
options:
7+
- set: docker/ubuntu-14.04
8+
options:
9+
docker_defaults:
10+
bundler_args: ""
11+
secure: ""
12+
branches:
13+
- release
1314
extras:
14-
- rvm: 2.1.9
15-
script: bundle exec rake rubocop
15+
- env: CHECK=release_checks
16+
rvm: 2.1.9
17+
18+
Gemfile:
19+
required:
20+
':system_tests':
21+
- gem: 'puppet-module-posix-system-r#{minor_version}'
22+
platforms: ruby
23+
- gem: 'puppet-module-win-system-r#{minor_version}'
24+
platforms:
25+
- mswin
26+
- mingw
27+
- x64_mingw
28+
- gem: beaker
29+
version: '~> 3.13'
30+
from_env: BEAKER_VERSION
31+
- gem: beaker-abs
32+
from_env: BEAKER_ABS_VERSION
33+
version: '~> 0.1'
34+
- gem: beaker-pe
35+
- gem: beaker-hostgenerator
36+
from_env: BEAKER_HOSTGENERATOR_VERSION
37+
- gem: beaker-rspec
38+
from_env: BEAKER_RSPEC_VERSION
39+
':development':
40+
- gem: puppet-blacksmith
41+
version: '~> 3.4'
42+
43+
Rakefile:
44+
requires:
45+
- puppet_blacksmith/rake_tasks
46+
- puppet-lint/tasks/puppet-lint
1647

48+
.rubocop.yml:
49+
default_configs:
50+
inherit_from: .rubocop_todo.yml

‎.travis.yml

+61-24
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,71 @@
1-
#This file is generated by ModuleSync, do not edit.
21
---
2+
env:
3+
global:
4+
- PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
35
sudo: false
6+
dist: trusty
47
language: ruby
58
cache: bundler
6-
script: "bundle exec rake release_checks"
9+
before_install:
10+
- bundle -v
11+
- rm Gemfile.lock || true
12+
- gem update --system
13+
- gem update bundler
14+
- gem --version
15+
- bundle -v
16+
script:
17+
- 'bundle exec rake $CHECK'
18+
bundler_args: --without system_tests
19+
rvm:
20+
- 2.4.1
721
env:
8-
global:
9-
- PARALLEL_TEST_PROCESSORS=16 # reduce test parallelism to prevent overloading containers
22+
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
1023
matrix:
1124
fast_finish: true
1225
include:
13-
- rvm: 2.3.1
14-
dist: trusty
15-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
16-
script: bundle exec rake beaker
17-
services: docker
18-
sudo: required
19-
- rvm: 2.3.1
20-
dist: trusty
21-
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
22-
script: bundle exec rake beaker
23-
services: docker
24-
sudo: required
25-
- rvm: 2.4.1
26-
bundler_args: --without system_tests
27-
env: PUPPET_GEM_VERSION="~> 5.0"
28-
- rvm: 2.1.9
29-
bundler_args: --without system_tests
30-
env: PUPPET_GEM_VERSION="~> 4.0"
31-
- rvm: 2.1.9
32-
script: bundle exec rake rubocop
26+
-
27+
bundler_args:
28+
dist: trusty
29+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
30+
rvm: 2.4.1
31+
script: bundle exec rake beaker
32+
services: docker
33+
sudo: required
34+
-
35+
bundler_args:
36+
dist: trusty
37+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
38+
rvm: 2.4.1
39+
script: bundle exec rake beaker
40+
services: docker
41+
sudo: required
42+
-
43+
env: CHECK=rubocop
44+
-
45+
env: CHECK="syntax lint"
46+
-
47+
env: CHECK=metadata_lint
48+
-
49+
env: CHECK=spec
50+
-
51+
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
52+
rvm: 2.1.9
53+
-
54+
env: CHECK=release_checks
55+
rvm: 2.1.9
56+
branches:
57+
only:
58+
- master
59+
- /^v\d/
60+
- release
3361
notifications:
3462
email: false
63+
deploy:
64+
provider: puppetforge
65+
user: puppet
66+
password:
67+
secure: ""
68+
on:
69+
tags: true
70+
all_branches: true
71+
condition: "$DEPLOY_TO_FORGE = yes"

0 commit comments

Comments
 (0)