Skip to content

Commit

Permalink
Package Update
Browse files Browse the repository at this point in the history
Related: #783
  • Loading branch information
trevor-vaughan authored and op-ct committed May 27, 2022
1 parent 7498c44 commit 20215f3
Show file tree
Hide file tree
Showing 5 changed files with 184 additions and 14 deletions.
170 changes: 170 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
---
require:
- rubocop-rspec
- rubocop-i18n
AllCops:
DisplayCopNames: true
TargetRubyVersion: '2.6'
Include:
- "**/*.rb"
Exclude:
- bin/*
- ".vendor/**/*"
- "**/Gemfile"
- "**/Rakefile"
- pkg/**/*
- spec/fixtures/**/*
- vendor/**/*
- "**/Puppetfile"
- "**/Vagrantfile"
- "**/Guardfile"
Layout/EmptyLinesAroundAttributeAccessor:
Enabled: true
Layout/LineLength:
Description: People have wide screens, use them.
Max: 200
Layout/SpaceAroundMethodCallOperator:
Enabled: true
Lint/RaiseException:
Enabled: true
Lint/StructNewOverride:
Enabled: false
I18n/GetText:
Enabled: false
I18n/GetText/DecorateString:
Description: We don't want to decorate test output.
Exclude:
- spec/**/*
Enabled: false
Naming/AccessorMethodName:
Exclude:
- spec/**/*
RSpec/BeforeAfterAll:
Description: Beware of using after(:all) as it may cause state to leak between tests.
A necessary evil in acceptance testing.
Exclude:
- spec/acceptance/**/*.rb
RSpec/ExpectInHook:
Exclude:
- spec/unit/**/*.rb
RSpec/HookArgument:
Description: Prefer explicit :each argument, matching existing module's style
EnforcedStyle: each
RSpec/NamedSubject:
Exclude:
- spec/classes/**/*
- spec/defines/**/*
Style/BlockDelimiters:
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
be consistent then.
EnforcedStyle: braces_for_chaining
Style/ClassAndModuleChildren:
Description: Compact style reduces the required amount of indentation.
EnforcedStyle: compact
Style/EmptyElse:
Description: Enforce against empty else clauses, but allow `nil` for clarity.
EnforcedStyle: empty
Style/ExponentialNotation:
Enabled: true
Style/FormatString:
Description: Following the main puppet project's style, prefer the % format format.
EnforcedStyle: percent
Style/FormatStringToken:
Description: Following the main puppet project's style, prefer the simpler template
tokens over annotated ones.
EnforcedStyle: template
Style/HashEachMethods:
Enabled: true
Style/HashSyntax:
Enabled: false
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Enabled: true
Style/Lambda:
Description: Prefer the keyword for easier discoverability.
EnforcedStyle: literal
Style/MixinUsage:
Exclude:
- spec/**/*
Style/RedundantBegin:
Enabled: false
Style/RegexpLiteral:
Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
EnforcedStyle: percent_r
Style/TernaryParentheses:
Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
on complex expressions for better readability, but seriously consider breaking
it up.
EnforcedStyle: require_parentheses_when_complex
Style/TrailingCommaInArguments:
Description: Prefer always trailing comma on multiline argument lists. This makes
diffs, and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/TrailingCommaInArrayLiteral:
Description: Prefer always trailing comma on multiline literals. This makes diffs,
and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/SlicingWithRange:
Enabled: true
Style/SymbolArray:
Description: Using percent style obscures symbolic intent of array's contents.
EnforcedStyle: brackets
RSpec/MessageSpies:
EnforcedStyle: receive
Style/Documentation:
Exclude:
- lib/puppet/parser/functions/**/*
- spec/**/*
Style/WordArray:
EnforcedStyle: brackets
Style/CollectionMethods:
Enabled: true
Style/MethodCalledOnDoEndBlock:
Enabled: true
Style/StringMethods:
Enabled: true
I18n/GetText/DecorateFunctionMessage:
Enabled: false
I18n/GetText/DecorateStringFormattingUsingInterpolation:
Enabled: false
I18n/GetText/DecorateStringFormattingUsingPercent:
Enabled: false
Layout/EndOfLine:
Enabled: false
Layout/HeredocIndentation:
Enabled: false
Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
Enabled: false
Metrics/ClassLength:
Enabled: false
Metrics/CyclomaticComplexity:
Enabled: false
Metrics/MethodLength:
Enabled: false
Metrics/ModuleLength:
Enabled: false
Metrics/ParameterLists:
Enabled: false
Metrics/PerceivedComplexity:
Enabled: false
RSpec/DescribeClass:
Enabled: false
RSpec/ExampleLength:
Enabled: false
RSpec/MessageExpectation:
Enabled: false
RSpec/MultipleExpectations:
Enabled: false
RSpec/MultipleMemoizedHelpers:
Enabled: false
RSpec/NestedGroups:
Enabled: false
Style/AsciiComments:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
Style/SymbolProc:
Enabled: false
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ group :test do
gem 'puppet-lint-empty_string-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false
gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.13.2', '< 6']
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.14.0', '< 6']
gem( 'pdk', ENV['PDK_VERSION'] || '~> 2.0', :require => false) if major_puppet_version > 5
gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem 'simp-build-helpers', ENV['SIMP_BUILD_HELPERS_VERSION'] || ['> 0.1', '< 2.0']
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GEM
beaker-docker (1.0.1)
docker-api (~> 2.1)
stringify-hash (~> 0.0.0)
beaker-hostgenerator (1.12.0)
beaker-hostgenerator (1.13.0)
deep_merge (~> 1.0)
beaker-pe (2.11.17)
beaker (~> 4.0)
Expand Down Expand Up @@ -118,7 +118,7 @@ GEM
highline (2.0.3)
hitimes (2.0.0)
hocon (1.3.1)
http-cookie (1.0.4)
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
in-parallel (0.1.17)
Expand Down Expand Up @@ -294,7 +294,7 @@ GEM
net-telnet (~> 0.1.1)
nokogiri (~> 1.8)
simp-build-helpers (0.1.1)
simp-rake-helpers (5.13.2)
simp-rake-helpers (5.14.0)
bundler (>= 1.14, < 3.0)
pager (~> 1.0)
parallel (~> 1.0)
Expand Down Expand Up @@ -338,7 +338,7 @@ GEM
tty-which (0.5.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.1)
unf_ext (0.0.8.2)
unicode-display_width (2.1.0)
vmfloaty (1.7.0)
commander (>= 4.4.3, < 4.7.0)
Expand Down Expand Up @@ -371,7 +371,7 @@ DEPENDENCIES
rspec-puppet
simp-beaker-helpers (>= 1.23.2, < 2)
simp-build-helpers (> 0.1, < 2.0)
simp-rake-helpers (>= 5.13.2, < 6)
simp-rake-helpers (>= 5.14.0, < 6)
simp-rspec-puppet-facts (~> 3.1)
terminal-table

Expand Down
8 changes: 4 additions & 4 deletions Puppetfile.pinned
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ mod 'puppetlabs-apache',

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

mod 'puppetlabs-hocon',
:git => 'https://github.com/simp/pupmod-puppetlabs-hocon',
Expand Down Expand Up @@ -159,7 +159,7 @@ mod 'simp-at',

mod 'simp-auditd',
:git => 'https://github.com/simp/pupmod-simp-auditd',
:tag => '8.7.1'
:tag => '8.7.3'

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

mod 'simp-compliance_markup',
:git => 'https://github.com/simp/pupmod-simp-compliance_markup',
:tag => '3.2.0'
:tag => '3.2.2'

mod 'simp-cron',
:git => 'https://github.com/simp/pupmod-simp-cron',
Expand Down Expand Up @@ -474,7 +474,7 @@ mod 'simp-x2go',

mod 'simp-xinetd',
:git => 'https://github.com/simp/pupmod-simp-xinetd',
:tag => '4.3.0'
:tag => '4.3.1'

mod 'treydock-kdump',
:git => 'https://github.com/simp/pupmod-treydock-kdump',
Expand Down
8 changes: 4 additions & 4 deletions src/assets/simp/build/simp.spec
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Requires: pupmod-puppet-chrony >= 2.4.0, pupmod-puppet-chrony < 3.0.0
Requires: pupmod-puppet-firewalld => 4.4.0, pupmod-puppet-firewalld < 5.0.0
Requires: pupmod-puppet-yum >= 4.3.0, pupmod-puppet-yum < 5.0.0
Requires: pupmod-puppetlabs-apache >= 6.5.1, pupmod-puppetlabs-apache < 7.0.0
Requires: pupmod-puppetlabs-concat >= 6.4.0, pupmod-puppetlabs-concat < 7.0.0
Requires: pupmod-puppetlabs-concat >= 7.0.1, pupmod-puppetlabs-concat < 8.0.0
Requires: pupmod-puppetlabs-hocon >= 1.1.0, pupmod-puppetlabs-hocon < 2.0.0
Requires: pupmod-puppetlabs-inifile >= 4.1.0, pupmod-puppetlabs-inifile < 5.0.0
Requires: pupmod-puppetlabs-motd >= 6.0.0, pupmod-puppetlabs-motd < 7.0.0
Expand All @@ -51,10 +51,10 @@ Requires: pupmod-saz-timezone >= 6.1.0, pupmod-saz-timezone < 7.0.0
Requires: pupmod-simp-acpid >= 1.3.0, pupmod-simp-acpid < 2.0.0
Requires: pupmod-simp-aide >= 6.5.0, pupmod-simp-aide < 7.0.0
Requires: pupmod-simp-at >= 0.2.0, pupmod-simp-at < 1.0.0
Requires: pupmod-simp-auditd >= 8.7.1, pupmod-simp-auditd < 9.0.0
Requires: pupmod-simp-auditd >= 8.7.3, pupmod-simp-auditd < 9.0.0
Requires: pupmod-simp-chkrootkit >= 0.4.0, pupmod-simp-chkrootkit < 1.0.0
Requires: pupmod-simp-clamav >= 6.5.0, pupmod-simp-clamav < 7.0.0
Requires: pupmod-simp-compliance_markup >= 3.2.0, pupmod-simp-compliance_markup < 4.0.0
Requires: pupmod-simp-compliance_markup >= 3.2.2, pupmod-simp-compliance_markup < 4.0.0
Requires: pupmod-simp-cron >= 0.3.0, pupmod-simp-cron < 1.0.0
Requires: pupmod-simp-crypto_policy >= 0.2.0, pupmod-simp-crypto_policy < 1.0.0
Requires: pupmod-simp-deferred_resources >= 0.4.0, pupmod-simp-deferred_resources < 1.0.0
Expand Down Expand Up @@ -101,7 +101,7 @@ Requires: pupmod-simp-tftpboot >= 6.4.1 pupmod-simp-tftpboot < 7.0.0
Requires: pupmod-simp-tlog >= 0.3.2, pupmod-simp-tlog < 1.0.0
Requires: pupmod-simp-useradd >= 0.5.0, pupmod-simp-useradd < 1.0.0
Requires: pupmod-simp-vox_selinux >= 3.4.0, pupmod-simp-vox_selinux < 4.0.0
Requires: pupmod-simp-xinetd >= 4.3.0, pupmod-simp-xinetd < 5.0.0
Requires: pupmod-simp-xinetd >= 4.3.1, pupmod-simp-xinetd < 5.0.0
Requires: pupmod-trlinkin-nsswitch >= 2.2.0, pupmod-trlinkin-nsswitch < 3.0.0
%if 0%{?rhel} > 7
Recommends: rubygem-simp-cli >= 7.0.0, rubygem-simp-cli < 8.0.0
Expand Down

0 comments on commit 20215f3

Please sign in to comment.