Skip to content

Commit f313891

Browse files
genebeangenebean
committed
Merge branch 'master' into release
A mergeback wasn't done after the release. Merging master into release will allow doing so now to true things up.
2 parents 88d3188 + 0c61840 commit f313891

File tree

109 files changed

+3156
-2081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+3156
-2081
lines changed

‎.fixtures.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
fixtures:
22
repositories:
3-
"stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib.git"
3+
'facts': 'git://github.com/puppetlabs/puppetlabs-facts.git'
4+
'provision': "git://github.com/puppetlabs/provision.git"
5+
'puppet_agent': 'git://github.com/puppetlabs/puppetlabs-puppet_agent.git'
6+
'stdlib': "https://github.com/puppetlabs/puppetlabs-stdlib.git"
47
forge_modules:
5-
mount_core: "puppetlabs/mount_core"
8+
'mount_core': "puppetlabs/mount_core"
69
symlinks:
7-
"lvm": "#{source_dir}"
10+
'lvm': "#{source_dir}"

‎.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*.rb eol=lf
2+
*.erb eol=lf
3+
*.pp eol=lf
4+
*.sh eol=lf
5+
*.epp eol=lf

‎.gitignore

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
1-
*.swp
2-
.*.swp
3-
Gemfile.lock
4-
.bundle/
5-
.fixtures/modules
6-
.fixtures/manifests
7-
spec/fixtures
1+
.git/
2+
.*.sw[op]
3+
.metadata
4+
.yardoc
5+
.yardwarns
6+
*.iml
7+
/.bundle/
8+
/.idea/
9+
/.vagrant/
10+
/coverage/
11+
/bin/
12+
/doc/
13+
/Gemfile.local
14+
/Gemfile.lock
15+
/junit/
16+
/log/
17+
/pkg/
18+
/spec/fixtures/manifests/
19+
/spec/fixtures/modules/
20+
/tmp/
21+
/vendor/
22+
/convert_report.txt
23+
/update_report.txt
24+
.DS_Store
25+
.project
26+
.envrc
27+
/inventory.yaml

‎.pdkignore

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
.git/
2+
.*.sw[op]
3+
.metadata
4+
.yardoc
5+
.yardwarns
6+
*.iml
7+
/.bundle/
8+
/.idea/
9+
/.vagrant/
10+
/coverage/
11+
/bin/
12+
/doc/
13+
/Gemfile.local
14+
/Gemfile.lock
15+
/junit/
16+
/log/
17+
/pkg/
18+
/spec/fixtures/manifests/
19+
/spec/fixtures/modules/
20+
/tmp/
21+
/vendor/
22+
/convert_report.txt
23+
/update_report.txt
24+
.DS_Store
25+
.project
26+
.envrc
27+
/inventory.yaml
28+
/appveyor.yml
29+
/.fixtures.yml
30+
/Gemfile
31+
/.gitattributes
32+
/.gitignore
33+
/.gitlab-ci.yml
34+
/.pdkignore
35+
/Rakefile
36+
/rakelib/
37+
/.rspec
38+
/.rubocop.yml
39+
/.travis.yml
40+
/.yardopts
41+
/spec/
42+
/.vscode/

‎.puppet-lint.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--relative

‎.rspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
--format documentation --color
1+
--color
2+
--format documentation

‎.rubocop.yml

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
---
2+
require:
3+
- rubocop-rspec
4+
- rubocop-i18n
5+
AllCops:
6+
DisplayCopNames: true
7+
TargetRubyVersion: '2.1'
8+
Include:
9+
- "./**/*.rb"
10+
Exclude:
11+
- bin/*
12+
- ".vendor/**/*"
13+
- "**/Gemfile"
14+
- "**/Rakefile"
15+
- pkg/**/*
16+
- spec/fixtures/**/*
17+
- vendor/**/*
18+
- "**/Puppetfile"
19+
- "**/Vagrantfile"
20+
- "**/Guardfile"
21+
inherit_from: ".rubocop_todo.yml"
22+
Metrics/LineLength:
23+
Description: People have wide screens, use them.
24+
Max: 200
25+
GetText:
26+
Enabled: false
27+
GetText/DecorateString:
28+
Description: We don't want to decorate test output.
29+
Exclude:
30+
- spec/**/*
31+
Enabled: false
32+
RSpec/BeforeAfterAll:
33+
Description: Beware of using after(:all) as it may cause state to leak between tests.
34+
A necessary evil in acceptance testing.
35+
Exclude:
36+
- spec/acceptance/**/*.rb
37+
RSpec/HookArgument:
38+
Description: Prefer explicit :each argument, matching existing module's style
39+
EnforcedStyle: each
40+
Style/BlockDelimiters:
41+
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
42+
be consistent then.
43+
EnforcedStyle: braces_for_chaining
44+
Style/ClassAndModuleChildren:
45+
Description: Compact style reduces the required amount of indentation.
46+
EnforcedStyle: compact
47+
Style/EmptyElse:
48+
Description: Enforce against empty else clauses, but allow `nil` for clarity.
49+
EnforcedStyle: empty
50+
Style/FormatString:
51+
Description: Following the main puppet project's style, prefer the % format format.
52+
EnforcedStyle: percent
53+
Style/FormatStringToken:
54+
Description: Following the main puppet project's style, prefer the simpler template
55+
tokens over annotated ones.
56+
EnforcedStyle: template
57+
Style/Lambda:
58+
Description: Prefer the keyword for easier discoverability.
59+
EnforcedStyle: literal
60+
Style/RegexpLiteral:
61+
Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
62+
EnforcedStyle: percent_r
63+
Style/TernaryParentheses:
64+
Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
65+
on complex expressions for better readability, but seriously consider breaking
66+
it up.
67+
EnforcedStyle: require_parentheses_when_complex
68+
Style/TrailingCommaInArguments:
69+
Description: Prefer always trailing comma on multiline argument lists. This makes
70+
diffs, and re-ordering nicer.
71+
EnforcedStyleForMultiline: comma
72+
Style/TrailingCommaInLiteral:
73+
Description: Prefer always trailing comma on multiline literals. This makes diffs,
74+
and re-ordering nicer.
75+
EnforcedStyleForMultiline: comma
76+
Style/SymbolArray:
77+
Description: Using percent style obscures symbolic intent of array's contents.
78+
EnforcedStyle: brackets
79+
RSpec/MessageSpies:
80+
EnforcedStyle: receive
81+
Style/Documentation:
82+
Exclude:
83+
- lib/puppet/parser/functions/**/*
84+
- spec/**/*
85+
Style/WordArray:
86+
EnforcedStyle: brackets
87+
Style/CollectionMethods:
88+
Enabled: true
89+
Style/MethodCalledOnDoEndBlock:
90+
Enabled: true
91+
Style/StringMethods:
92+
Enabled: true
93+
GetText/DecorateFunctionMessage:
94+
Enabled: false
95+
GetText/DecorateStringFormattingUsingInterpolation:
96+
Enabled: false
97+
GetText/DecorateStringFormattingUsingPercent:
98+
Enabled: false
99+
Layout/EndOfLine:
100+
Enabled: false
101+
Layout/IndentHeredoc:
102+
Enabled: false
103+
Metrics/AbcSize:
104+
Enabled: false
105+
Metrics/BlockLength:
106+
Enabled: false
107+
Metrics/ClassLength:
108+
Enabled: false
109+
Metrics/CyclomaticComplexity:
110+
Enabled: false
111+
Metrics/MethodLength:
112+
Enabled: false
113+
Metrics/ModuleLength:
114+
Enabled: false
115+
Metrics/ParameterLists:
116+
Enabled: false
117+
Metrics/PerceivedComplexity:
118+
Enabled: false
119+
RSpec/DescribeClass:
120+
Enabled: false
121+
RSpec/ExampleLength:
122+
Enabled: false
123+
RSpec/MessageExpectation:
124+
Enabled: false
125+
RSpec/MultipleExpectations:
126+
Enabled: false
127+
RSpec/NestedGroups:
128+
Enabled: false
129+
Style/AsciiComments:
130+
Enabled: false
131+
Style/IfUnlessModifier:
132+
Enabled: false
133+
Style/SymbolProc:
134+
Enabled: false

‎.rubocop_todo.yml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
# This configuration was generated by
2+
# `rubocop --auto-gen-config`
3+
# on 2019-11-01 16:00:27 +0000 using RuboCop version 0.49.1.
4+
# The point is for the user to remove these configuration records
5+
# one by one as the offenses are removed from the code base.
6+
# Note that changes in the inspected code, or installation of new
7+
# versions of RuboCop, may require this file to be generated again.
8+
9+
# Offense count: 1
10+
# Configuration parameters: AllowSafeAssignment.
11+
Lint/AssignmentInCondition:
12+
Exclude:
13+
- 'lib/puppet/type/filesystem.rb'
14+
15+
# Offense count: 43
16+
Lint/UselessAssignment:
17+
Exclude:
18+
- 'lib/puppet/provider/filesystem/aix.rb'
19+
- 'lib/puppet/provider/logical_volume/lvm.rb'
20+
- 'spec/spec_helper_acceptance_local.rb'
21+
- 'spec/unit/type/filesystem_spec.rb'
22+
- 'spec/unit/type/logical_volume_spec.rb'
23+
- 'spec/unit/type/physical_volume.rb'
24+
- 'tests/beaker/tests/aix/create_lv_with_param_max_range.rb'
25+
- 'tests/beaker/tests/aix/create_lv_with_param_min_range.rb'
26+
- 'tests/beaker/tests/aix/create_lv_with_param_type.rb'
27+
28+
# Offense count: 6
29+
Lint/Void:
30+
Exclude:
31+
- 'spec/unit/facter/lvm_support_spec.rb'
32+
33+
# Offense count: 252
34+
# Configuration parameters: AssignmentOnly.
35+
RSpec/InstanceVariable:
36+
Exclude:
37+
- 'spec/unit/puppet/provider/filesystem/lvm_spec.rb'
38+
- 'spec/unit/puppet/provider/logical_volume/lvm_spec.rb'
39+
- 'spec/unit/puppet/provider/physical_volume/lvm_spec.rb'
40+
- 'spec/unit/puppet/provider/volume_group/lvm_spec.rb'
41+
- 'spec/unit/puppet/type/filesystem_spec.rb'
42+
- 'spec/unit/puppet/type/logical_volume_spec.rb'
43+
- 'spec/unit/puppet/type/physical_volume_spec.rb'
44+
- 'spec/unit/puppet/type/volume_group_spec.rb'
45+
46+
# Offense count: 1
47+
RSpec/MultipleDescribes:
48+
Exclude:
49+
- 'spec/unit/facter/lvm_support_spec.rb'
50+
51+
# Offense count: 2
52+
RSpec/ScatteredSetup:
53+
Exclude:
54+
- 'spec/unit/puppet/provider/physical_volume/lvm_spec.rb'
55+
56+
# Offense count: 3
57+
Style/AccessorMethodName:
58+
Exclude:
59+
- 'lib/puppet/provider/logical_volume/lvm.rb'
60+
- 'lib/puppet/provider/physical_volume/lvm.rb'
61+
- 'lib/puppet/provider/volume_group/lvm.rb'
62+
63+
# Offense count: 1
64+
Style/ClassAndModuleCamelCase:
65+
Exclude:
66+
- 'lib/puppet_x/lvm/output.rb'
67+
68+
# Offense count: 2
69+
# Configuration parameters: EnforcedStyle, SupportedStyles.
70+
# SupportedStyles: nested, compact
71+
Style/ClassAndModuleChildren:
72+
Exclude:
73+
- 'lib/puppet_x/lvm/output.rb'
74+
75+
# Offense count: 1
76+
# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
77+
# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
78+
Style/FileName:
79+
Exclude:
80+
- 'tests/beaker/tests/create_filesystem_non-existing-format.rb'
81+
82+
# Offense count: 12
83+
# Configuration parameters: MinBodyLength.
84+
Style/GuardClause:
85+
Exclude:
86+
- 'lib/puppet/provider/filesystem/aix.rb'
87+
- 'lib/puppet/provider/filesystem/lvm.rb'
88+
- 'lib/puppet/provider/logical_volume/lvm.rb'
89+
- 'lib/puppet/provider/volume_group/aix.rb'
90+
- 'lib/puppet/provider/volume_group/lvm.rb'
91+
92+
# Offense count: 1
93+
Style/MultilineTernaryOperator:
94+
Exclude:
95+
- 'lib/puppet/provider/filesystem/lvm.rb'
96+
97+
# Offense count: 1
98+
# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
99+
# NamePrefix: is_, has_, have_
100+
# NamePrefixBlacklist: is_, has_, have_
101+
# NameWhitelist: is_a?
102+
Style/PredicateName:
103+
Exclude:
104+
- 'spec/**/*'
105+
- 'tests/beaker/lib/lvm_helper.rb'
106+
107+
# Offense count: 1
108+
# Cop supports --auto-correct.
109+
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
110+
# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
111+
Style/TernaryParentheses:
112+
Exclude:
113+
- 'lib/puppet/provider/filesystem/lvm.rb'

‎.sync.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
.gitlab-ci.yml:
3+
delete: true
4+
.rubocop.yml:
5+
include_todos: true
6+
.travis.yml:
7+
simplecov: true
8+
appveyor.yml:
9+
delete: true
10+
Gemfile:
11+
optional:
12+
':development':
13+
- gem: 'github_changelog_generator'
14+
version: '~> 1.15.0'
15+
Rakefile:
16+
changelog_version_tag_pattern: 'v%s'
17+
changelog_since_tag: '1.2.0'
18+
requires:
19+
- 'puppet-strings/tasks'
20+
spec/spec_helper.rb:
21+
mock_with: ':mocha'
22+
coverage_report: true

0 commit comments

Comments
 (0)