Skip to content

Commit 20215f3

Browse files
trevor-vaughanop-ct
authored andcommitted
Package Update
Related: #783
1 parent 7498c44 commit 20215f3

File tree

5 files changed

+184
-14
lines changed

5 files changed

+184
-14
lines changed

.rubocop.yml

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
---
2+
require:
3+
- rubocop-rspec
4+
- rubocop-i18n
5+
AllCops:
6+
DisplayCopNames: true
7+
TargetRubyVersion: '2.6'
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+
Layout/EmptyLinesAroundAttributeAccessor:
22+
Enabled: true
23+
Layout/LineLength:
24+
Description: People have wide screens, use them.
25+
Max: 200
26+
Layout/SpaceAroundMethodCallOperator:
27+
Enabled: true
28+
Lint/RaiseException:
29+
Enabled: true
30+
Lint/StructNewOverride:
31+
Enabled: false
32+
I18n/GetText:
33+
Enabled: false
34+
I18n/GetText/DecorateString:
35+
Description: We don't want to decorate test output.
36+
Exclude:
37+
- spec/**/*
38+
Enabled: false
39+
Naming/AccessorMethodName:
40+
Exclude:
41+
- spec/**/*
42+
RSpec/BeforeAfterAll:
43+
Description: Beware of using after(:all) as it may cause state to leak between tests.
44+
A necessary evil in acceptance testing.
45+
Exclude:
46+
- spec/acceptance/**/*.rb
47+
RSpec/ExpectInHook:
48+
Exclude:
49+
- spec/unit/**/*.rb
50+
RSpec/HookArgument:
51+
Description: Prefer explicit :each argument, matching existing module's style
52+
EnforcedStyle: each
53+
RSpec/NamedSubject:
54+
Exclude:
55+
- spec/classes/**/*
56+
- spec/defines/**/*
57+
Style/BlockDelimiters:
58+
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
59+
be consistent then.
60+
EnforcedStyle: braces_for_chaining
61+
Style/ClassAndModuleChildren:
62+
Description: Compact style reduces the required amount of indentation.
63+
EnforcedStyle: compact
64+
Style/EmptyElse:
65+
Description: Enforce against empty else clauses, but allow `nil` for clarity.
66+
EnforcedStyle: empty
67+
Style/ExponentialNotation:
68+
Enabled: true
69+
Style/FormatString:
70+
Description: Following the main puppet project's style, prefer the % format format.
71+
EnforcedStyle: percent
72+
Style/FormatStringToken:
73+
Description: Following the main puppet project's style, prefer the simpler template
74+
tokens over annotated ones.
75+
EnforcedStyle: template
76+
Style/HashEachMethods:
77+
Enabled: true
78+
Style/HashSyntax:
79+
Enabled: false
80+
Style/HashTransformKeys:
81+
Enabled: false
82+
Style/HashTransformValues:
83+
Enabled: true
84+
Style/Lambda:
85+
Description: Prefer the keyword for easier discoverability.
86+
EnforcedStyle: literal
87+
Style/MixinUsage:
88+
Exclude:
89+
- spec/**/*
90+
Style/RedundantBegin:
91+
Enabled: false
92+
Style/RegexpLiteral:
93+
Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
94+
EnforcedStyle: percent_r
95+
Style/TernaryParentheses:
96+
Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
97+
on complex expressions for better readability, but seriously consider breaking
98+
it up.
99+
EnforcedStyle: require_parentheses_when_complex
100+
Style/TrailingCommaInArguments:
101+
Description: Prefer always trailing comma on multiline argument lists. This makes
102+
diffs, and re-ordering nicer.
103+
EnforcedStyleForMultiline: comma
104+
Style/TrailingCommaInArrayLiteral:
105+
Description: Prefer always trailing comma on multiline literals. This makes diffs,
106+
and re-ordering nicer.
107+
EnforcedStyleForMultiline: comma
108+
Style/SlicingWithRange:
109+
Enabled: true
110+
Style/SymbolArray:
111+
Description: Using percent style obscures symbolic intent of array's contents.
112+
EnforcedStyle: brackets
113+
RSpec/MessageSpies:
114+
EnforcedStyle: receive
115+
Style/Documentation:
116+
Exclude:
117+
- lib/puppet/parser/functions/**/*
118+
- spec/**/*
119+
Style/WordArray:
120+
EnforcedStyle: brackets
121+
Style/CollectionMethods:
122+
Enabled: true
123+
Style/MethodCalledOnDoEndBlock:
124+
Enabled: true
125+
Style/StringMethods:
126+
Enabled: true
127+
I18n/GetText/DecorateFunctionMessage:
128+
Enabled: false
129+
I18n/GetText/DecorateStringFormattingUsingInterpolation:
130+
Enabled: false
131+
I18n/GetText/DecorateStringFormattingUsingPercent:
132+
Enabled: false
133+
Layout/EndOfLine:
134+
Enabled: false
135+
Layout/HeredocIndentation:
136+
Enabled: false
137+
Metrics/AbcSize:
138+
Enabled: false
139+
Metrics/BlockLength:
140+
Enabled: false
141+
Metrics/ClassLength:
142+
Enabled: false
143+
Metrics/CyclomaticComplexity:
144+
Enabled: false
145+
Metrics/MethodLength:
146+
Enabled: false
147+
Metrics/ModuleLength:
148+
Enabled: false
149+
Metrics/ParameterLists:
150+
Enabled: false
151+
Metrics/PerceivedComplexity:
152+
Enabled: false
153+
RSpec/DescribeClass:
154+
Enabled: false
155+
RSpec/ExampleLength:
156+
Enabled: false
157+
RSpec/MessageExpectation:
158+
Enabled: false
159+
RSpec/MultipleExpectations:
160+
Enabled: false
161+
RSpec/MultipleMemoizedHelpers:
162+
Enabled: false
163+
RSpec/NestedGroups:
164+
Enabled: false
165+
Style/AsciiComments:
166+
Enabled: false
167+
Style/IfUnlessModifier:
168+
Enabled: false
169+
Style/SymbolProc:
170+
Enabled: false

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ group :test do
2020
gem 'puppet-lint-empty_string-check', :require => false
2121
gem 'puppet-lint-trailing_comma-check', :require => false
2222
gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
23-
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.13.2', '< 6']
23+
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.14.0', '< 6']
2424
gem( 'pdk', ENV['PDK_VERSION'] || '~> 2.0', :require => false) if major_puppet_version > 5
2525
gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2626
gem 'simp-build-helpers', ENV['SIMP_BUILD_HELPERS_VERSION'] || ['> 0.1', '< 2.0']

Gemfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ GEM
3333
beaker-docker (1.0.1)
3434
docker-api (~> 2.1)
3535
stringify-hash (~> 0.0.0)
36-
beaker-hostgenerator (1.12.0)
36+
beaker-hostgenerator (1.13.0)
3737
deep_merge (~> 1.0)
3838
beaker-pe (2.11.17)
3939
beaker (~> 4.0)
@@ -118,7 +118,7 @@ GEM
118118
highline (2.0.3)
119119
hitimes (2.0.0)
120120
hocon (1.3.1)
121-
http-cookie (1.0.4)
121+
http-cookie (1.0.5)
122122
domain_name (~> 0.5)
123123
httpclient (2.8.3)
124124
in-parallel (0.1.17)
@@ -294,7 +294,7 @@ GEM
294294
net-telnet (~> 0.1.1)
295295
nokogiri (~> 1.8)
296296
simp-build-helpers (0.1.1)
297-
simp-rake-helpers (5.13.2)
297+
simp-rake-helpers (5.14.0)
298298
bundler (>= 1.14, < 3.0)
299299
pager (~> 1.0)
300300
parallel (~> 1.0)
@@ -338,7 +338,7 @@ GEM
338338
tty-which (0.5.0)
339339
unf (0.1.4)
340340
unf_ext
341-
unf_ext (0.0.8.1)
341+
unf_ext (0.0.8.2)
342342
unicode-display_width (2.1.0)
343343
vmfloaty (1.7.0)
344344
commander (>= 4.4.3, < 4.7.0)
@@ -371,7 +371,7 @@ DEPENDENCIES
371371
rspec-puppet
372372
simp-beaker-helpers (>= 1.23.2, < 2)
373373
simp-build-helpers (> 0.1, < 2.0)
374-
simp-rake-helpers (>= 5.13.2, < 6)
374+
simp-rake-helpers (>= 5.14.0, < 6)
375375
simp-rspec-puppet-facts (~> 3.1)
376376
terminal-table
377377

Puppetfile.pinned

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ mod 'puppetlabs-apache',
9595

9696
mod 'puppetlabs-concat',
9797
:git => 'https://github.com/simp/puppetlabs-concat',
98-
:tag => 'v6.4.0'
98+
:tag => 'v7.0.1'
9999

100100
mod 'puppetlabs-hocon',
101101
:git => 'https://github.com/simp/pupmod-puppetlabs-hocon',
@@ -159,7 +159,7 @@ mod 'simp-at',
159159

160160
mod 'simp-auditd',
161161
:git => 'https://github.com/simp/pupmod-simp-auditd',
162-
:tag => '8.7.1'
162+
:tag => '8.7.3'
163163

164164
mod 'simp-autofs',
165165
:git => 'https://github.com/simp/pupmod-simp-autofs',
@@ -175,7 +175,7 @@ mod 'simp-clamav',
175175

176176
mod 'simp-compliance_markup',
177177
:git => 'https://github.com/simp/pupmod-simp-compliance_markup',
178-
:tag => '3.2.0'
178+
:tag => '3.2.2'
179179

180180
mod 'simp-cron',
181181
:git => 'https://github.com/simp/pupmod-simp-cron',
@@ -474,7 +474,7 @@ mod 'simp-x2go',
474474

475475
mod 'simp-xinetd',
476476
:git => 'https://github.com/simp/pupmod-simp-xinetd',
477-
:tag => '4.3.0'
477+
:tag => '4.3.1'
478478

479479
mod 'treydock-kdump',
480480
:git => 'https://github.com/simp/pupmod-treydock-kdump',

src/assets/simp/build/simp.spec

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Requires: pupmod-puppet-chrony >= 2.4.0, pupmod-puppet-chrony < 3.0.0
3939
Requires: pupmod-puppet-firewalld => 4.4.0, pupmod-puppet-firewalld < 5.0.0
4040
Requires: pupmod-puppet-yum >= 4.3.0, pupmod-puppet-yum < 5.0.0
4141
Requires: pupmod-puppetlabs-apache >= 6.5.1, pupmod-puppetlabs-apache < 7.0.0
42-
Requires: pupmod-puppetlabs-concat >= 6.4.0, pupmod-puppetlabs-concat < 7.0.0
42+
Requires: pupmod-puppetlabs-concat >= 7.0.1, pupmod-puppetlabs-concat < 8.0.0
4343
Requires: pupmod-puppetlabs-hocon >= 1.1.0, pupmod-puppetlabs-hocon < 2.0.0
4444
Requires: pupmod-puppetlabs-inifile >= 4.1.0, pupmod-puppetlabs-inifile < 5.0.0
4545
Requires: pupmod-puppetlabs-motd >= 6.0.0, pupmod-puppetlabs-motd < 7.0.0
@@ -51,10 +51,10 @@ Requires: pupmod-saz-timezone >= 6.1.0, pupmod-saz-timezone < 7.0.0
5151
Requires: pupmod-simp-acpid >= 1.3.0, pupmod-simp-acpid < 2.0.0
5252
Requires: pupmod-simp-aide >= 6.5.0, pupmod-simp-aide < 7.0.0
5353
Requires: pupmod-simp-at >= 0.2.0, pupmod-simp-at < 1.0.0
54-
Requires: pupmod-simp-auditd >= 8.7.1, pupmod-simp-auditd < 9.0.0
54+
Requires: pupmod-simp-auditd >= 8.7.3, pupmod-simp-auditd < 9.0.0
5555
Requires: pupmod-simp-chkrootkit >= 0.4.0, pupmod-simp-chkrootkit < 1.0.0
5656
Requires: pupmod-simp-clamav >= 6.5.0, pupmod-simp-clamav < 7.0.0
57-
Requires: pupmod-simp-compliance_markup >= 3.2.0, pupmod-simp-compliance_markup < 4.0.0
57+
Requires: pupmod-simp-compliance_markup >= 3.2.2, pupmod-simp-compliance_markup < 4.0.0
5858
Requires: pupmod-simp-cron >= 0.3.0, pupmod-simp-cron < 1.0.0
5959
Requires: pupmod-simp-crypto_policy >= 0.2.0, pupmod-simp-crypto_policy < 1.0.0
6060
Requires: pupmod-simp-deferred_resources >= 0.4.0, pupmod-simp-deferred_resources < 1.0.0
@@ -101,7 +101,7 @@ Requires: pupmod-simp-tftpboot >= 6.4.1 pupmod-simp-tftpboot < 7.0.0
101101
Requires: pupmod-simp-tlog >= 0.3.2, pupmod-simp-tlog < 1.0.0
102102
Requires: pupmod-simp-useradd >= 0.5.0, pupmod-simp-useradd < 1.0.0
103103
Requires: pupmod-simp-vox_selinux >= 3.4.0, pupmod-simp-vox_selinux < 4.0.0
104-
Requires: pupmod-simp-xinetd >= 4.3.0, pupmod-simp-xinetd < 5.0.0
104+
Requires: pupmod-simp-xinetd >= 4.3.1, pupmod-simp-xinetd < 5.0.0
105105
Requires: pupmod-trlinkin-nsswitch >= 2.2.0, pupmod-trlinkin-nsswitch < 3.0.0
106106
%if 0%{?rhel} > 7
107107
Recommends: rubygem-simp-cli >= 7.0.0, rubygem-simp-cli < 8.0.0

0 commit comments

Comments
 (0)