Skip to content

Commit 754f23f

Browse files
author
Helen
authored
Merge pull request #1048 from pmcmaw/pdk_convert
(MODULES-6454) - PDK Convert mysql
2 parents a5497b2 + 300f40c commit 754f23f

22 files changed

+338
-185
lines changed

.gitignore

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
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+
/log/
17+
/pkg/
18+
/spec/fixtures/manifests/
19+
/spec/fixtures/modules/
20+
/tmp/
21+
/vendor/
22+
/convert_report.txt
23+
.DS_Store

.rubocop.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
require:
3-
- rubocop-rspec
4-
- rubocop-i18n
3+
- rubocop-i18n
4+
- rubocop-rspec
55
AllCops:
6+
DisplayCopNames: true
67
TargetRubyVersion: '2.1'
78
Include:
89
- "./**/*.rb"
@@ -14,7 +15,6 @@ AllCops:
1415
- pkg/**/*
1516
- spec/fixtures/**/*
1617
- vendor/**/*
17-
inherit_from: .rubocop_todo.yml
1818
Metrics/LineLength:
1919
Description: People have wide screens, use them.
2020
Max: 200
@@ -65,12 +65,15 @@ Style/TrailingCommaInLiteral:
6565
Style/SymbolArray:
6666
Description: Using percent style obscures symbolic intent of array's contents.
6767
EnforcedStyle: brackets
68+
inherit_from: ".rubocop_todo.yml"
6869
Style/CollectionMethods:
6970
Enabled: true
7071
Style/MethodCalledOnDoEndBlock:
7172
Enabled: true
7273
Style/StringMethods:
7374
Enabled: true
75+
Layout/EndOfLine:
76+
Enabled: false
7477
Metrics/AbcSize:
7578
Enabled: false
7679
Metrics/BlockLength:
@@ -89,15 +92,17 @@ Metrics/PerceivedComplexity:
8992
Enabled: false
9093
RSpec/DescribeClass:
9194
Enabled: false
95+
RSpec/ExampleLength:
96+
Enabled: false
9297
RSpec/MessageExpectation:
9398
Enabled: false
99+
RSpec/MultipleExpectations:
100+
Enabled: false
101+
RSpec/NestedGroups:
102+
Enabled: false
94103
Style/AsciiComments:
95104
Enabled: false
96105
Style/IfUnlessModifier:
97106
Enabled: false
98107
Style/SymbolProc:
99108
Enabled: false
100-
GetText/DecorateString:
101-
Enabled: false
102-
GetText/DecorateFunctionMessage:
103-
Enabled: true

.rubocop_todo.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
GetText/DecorateString:
2+
Enabled: false

.sync.yml

Lines changed: 64 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,69 @@
11
---
22
appveyor.yml:
3-
delete: true
4-
spec/spec_helper.rb:
5-
allow_deprecations: true
3+
environment:
4+
PUPPET_GEM_VERSION: "~> 4.0"
5+
matrix:
6+
- RUBY_VERSION: 24-x64
7+
CHECK: "syntax lint"
8+
- RUBY_VERSION: 24-x64
9+
CHECK: metadata_lint
10+
- RUBY_VERSION: 24-x64
11+
CHECK: rubocop
12+
613
.travis.yml:
14+
bundle_args: --without system_tests
15+
docker_sets:
16+
- set: docker/centos-7
17+
options:
18+
- set: docker/ubuntu-14.04
19+
options:
20+
docker_defaults:
21+
bundler_args: ""
22+
secure: ""
23+
branches:
24+
- release
725
extras:
8-
- rvm: 2.1.9
9-
script: bundle exec rake rubocop
26+
- rvm: 2.1.9
27+
script: "\"bundle exec rake release_checks\""
28+
29+
Gemfile:
30+
required:
31+
':system_tests':
32+
- gem: 'puppet-module-posix-system-r#{minor_version}'
33+
platforms: ruby
34+
- gem: 'puppet-module-win-system-r#{minor_version}'
35+
platforms:
36+
- mswin
37+
- mingw
38+
- x64_mingw
39+
- gem: beaker
40+
version: '~> 3.13'
41+
from_env: BEAKER_VERSION
42+
- gem: beaker-abs
43+
from_env: BEAKER_ABS_VERSION
44+
version: '~> 0.1'
45+
- gem: beaker-pe
46+
- gem: beaker-hostgenerator
47+
from_env: BEAKER_HOSTGENERATOR_VERSION
48+
- gem: beaker-rspec
49+
from_env: BEAKER_RSPEC_VERSION
50+
':development':
51+
- gem: puppet-blacksmith
52+
version: '~> 3.4'
53+
- gem: puppet-lint-i18n
54+
55+
Rakefile:
56+
requires:
57+
- puppet_blacksmith/rake_tasks
58+
- puppet_pot_generator/rake_tasks
59+
60+
spec/spec_helper.rb:
61+
spec_overrides:
62+
- "require 'spec_helper_local'"
63+
1064
.rubocop.yml:
11-
unmanaged: true
12-
.rubocop_todo.yml:
13-
unmanaged: true
65+
default_configs:
66+
inherit_from: .rubocop_todo.yml
67+
require:
68+
- rubocop-i18n
69+
- rubocop-rspec

.travis.yml

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

0 commit comments

Comments
 (0)