Skip to content

Commit d23f0e3

Browse files
authored
Merge pull request #52 from bastelfreak/foo
Require Ruby 3.2+ & puppet-lint 5.1+
2 parents ff5a3dc + 63327c7 commit d23f0e3

File tree

4 files changed

+28
-18
lines changed

4 files changed

+28
-18
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ inherit_gem:
99
Naming/FileName:
1010
Exclude:
1111
- "*.gemspec"
12+
13+
AllCops:
14+
TargetRubyVersion: 3.2

.rubocop_todo.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
# This configuration was generated by
2-
# `rubocop --auto-gen-config`
3-
# on 2023-04-21 12:08:55 UTC using RuboCop version 1.50.2.
2+
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3+
# using RuboCop version 1.79.2.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

99
# Offense count: 1
10-
Lint/UselessAssignment:
10+
# This cop supports safe autocorrection (--autocorrect).
11+
Lint/RedundantCopDisableDirective:
1112
Exclude:
12-
- 'lib/puppet-lint/plugins/check_strict_indent.rb'
13+
- 'spec/puppet-lint/plugins/check_strict_indent_spec.rb'
1314

14-
# Offense count: 4
15+
# Offense count: 8
1516
# Configuration parameters: ForbiddenDelimiters.
1617
# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
1718
Naming/HeredocDelimiterNaming:
1819
Exclude:
1920
- 'puppet-lint-strict_indent-check.gemspec'
2021
- 'spec/puppet-lint/plugins/check_strict_indent_spec.rb'
2122

22-
# Offense count: 5
23+
# Offense count: 6
2324
# Configuration parameters: MinSize.
2425
Performance/CollectionLiteralInLoop:
2526
Exclude:
2627
- 'lib/puppet-lint/plugins/check_strict_indent.rb'
2728

28-
# Offense count: 4
29+
# Offense count: 6
2930
# Configuration parameters: Prefixes, AllowedPatterns.
3031
# Prefixes: when, with, without
3132
RSpec/ContextWording:
@@ -43,7 +44,7 @@ RSpec/DescribeClass:
4344
- '**/spec/views/**/*'
4445
- 'spec/puppet-lint/plugins/check_strict_indent_spec.rb'
4546

46-
# Offense count: 10
47+
# Offense count: 17
4748
# This cop supports unsafe autocorrection (--autocorrect-all).
4849
# Configuration parameters: EnforcedStyle.
4950
# SupportedStyles: always, conditionals
@@ -53,20 +54,19 @@ Style/AndOr:
5354

5455
# Offense count: 1
5556
# This cop supports safe autocorrection (--autocorrect).
56-
# Configuration parameters: EnforcedStyle, AllowComments.
57+
# Configuration parameters: AutoCorrect, EnforcedStyle, AllowComments.
5758
# SupportedStyles: empty, nil, both
5859
Style/EmptyElse:
5960
Exclude:
6061
- 'lib/puppet-lint/plugins/check_strict_indent.rb'
6162

62-
# Offense count: 5
63+
# Offense count: 3
6364
# This cop supports unsafe autocorrection (--autocorrect-all).
6465
# Configuration parameters: EnforcedStyle.
6566
# SupportedStyles: always, always_true, never
6667
Style/FrozenStringLiteralComment:
6768
Exclude:
68-
- 'Gemfile'
69-
- 'Rakefile'
69+
- '**/*.arb'
7070
- 'lib/puppet-lint/plugins/check_strict_indent.rb'
7171
- 'puppet-lint-strict_indent-check.gemspec'
7272
- 'spec/puppet-lint/plugins/check_strict_indent_spec.rb'
@@ -77,7 +77,14 @@ Style/MultilineBlockChain:
7777
- 'lib/puppet-lint/plugins/check_strict_indent.rb'
7878
- 'spec/puppet-lint/plugins/check_strict_indent_spec.rb'
7979

80-
# Offense count: 2
80+
# Offense count: 1
81+
# This cop supports safe autocorrection (--autocorrect).
82+
# Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
83+
Style/MultipleComparison:
84+
Exclude:
85+
- 'lib/puppet-lint/plugins/check_strict_indent.rb'
86+
87+
# Offense count: 3
8188
# This cop supports unsafe autocorrection (--autocorrect-all).
8289
# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
8390
# SupportedStyles: predicate, comparison
@@ -102,7 +109,7 @@ Style/WhileUntilModifier:
102109

103110
# Offense count: 2
104111
# This cop supports safe autocorrection (--autocorrect).
105-
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
112+
# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
106113
# URISchemes: http, https
107114
Layout/LineLength:
108115
Max: 137

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ group :development do
1313
gem 'rake', '~> 13.0', '>= 13.0.6'
1414
gem 'rspec', '~> 3.12'
1515
gem 'rspec-collection_matchers', '~> 1.2'
16-
gem 'rspec-its', '~> 1.3'
17-
gem 'voxpupuli-rubocop', '~> 2.0'
16+
gem 'rspec-its', '>= 1.3', '< 3'
17+
gem 'voxpupuli-rubocop', '~> 4.2.0'
1818
end

puppet-lint-strict_indent-check.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
1717
Extends puppet-lint to ensure that your manifests follow a strict indentation pattern.
1818
EOF
1919

20-
spec.required_ruby_version = '>= 2.7.0'
20+
spec.required_ruby_version = '>= 3.2'
2121

22-
spec.add_dependency 'puppet-lint', '>= 3', '< 5'
22+
spec.add_dependency 'puppet-lint', '~> 5.1'
2323
end

0 commit comments

Comments
 (0)