Skip to content

Commit a6868f0

Browse files
authored
Drop minimum ruby version to work with Puppet 6 (simp#22)
* Roll back various gems to ruby 2.5-compatible versions * Fix up cops to match older rubocop * Add ruby 2.5 to test matrix Fixes simp#21
1 parent 9623f62 commit a6868f0

File tree

4 files changed

+6
-36
lines changed

4 files changed

+6
-36
lines changed

.github/workflows/pr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
ruby:
13+
- '2.5'
1314
- '2.6'
1415
- '2.7'
1516
- '3.0'
@@ -29,6 +30,7 @@ jobs:
2930
strategy:
3031
matrix:
3132
ruby:
33+
- '2.5'
3234
- '2.6'
3335
- '2.7'
3436
- '3.0'

.rubocop.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -520,14 +520,8 @@ Style/RedundantArgument:
520520
Enabled: false
521521
Style/SwapValues:
522522
Enabled: false
523-
Gemspec/DeprecatedAttributeAssignment:
524-
Enabled: false
525523
Gemspec/RequireMFA:
526524
Enabled: false
527-
Layout/LineContinuationLeadingSpace:
528-
Enabled: false
529-
Layout/LineContinuationSpacing:
530-
Enabled: false
531525
Layout/LineEndStringConcatenationIndentation:
532526
Enabled: false
533527
Layout/SpaceBeforeBrackets:
@@ -538,8 +532,6 @@ Lint/AmbiguousOperatorPrecedence:
538532
Enabled: true
539533
Lint/AmbiguousRange:
540534
Enabled: true
541-
Lint/ConstantOverwrittenInRescue:
542-
Enabled: true
543535
Lint/DeprecatedConstants:
544536
Enabled: true
545537
Lint/EmptyInPattern:
@@ -548,8 +540,6 @@ Lint/IncompatibleIoSelectWithFiberScheduler:
548540
Enabled: true
549541
Lint/LambdaWithoutLiteralBlock:
550542
Enabled: true
551-
Lint/NonAtomicFileOperation:
552-
Enabled: true
553543
Lint/NumberedParameterAssignment:
554544
Enabled: true
555545
Lint/OrAssignmentToConstant:
@@ -558,8 +548,6 @@ Lint/RedundantDirGlobSort:
558548
Enabled: true
559549
Lint/RefinementImportMethods:
560550
Enabled: true
561-
Lint/RequireRangeParentheses:
562-
Enabled: true
563551
Lint/RequireRelativeSelfPath:
564552
Enabled: true
565553
Lint/SymbolConversion:
@@ -574,12 +562,8 @@ Security/CompoundHash:
574562
Enabled: true
575563
Security/IoMethods:
576564
Enabled: true
577-
Style/EmptyHeredoc:
578-
Enabled: true
579565
Style/EndlessMethod:
580566
Enabled: true
581-
Style/EnvHome:
582-
Enabled: true
583567
Style/FetchEnvVar:
584568
Enabled: true
585569
Style/FileRead:
@@ -594,10 +578,6 @@ Style/IfWithBooleanLiteralBranches:
594578
Enabled: true
595579
Style/InPatternThen:
596580
Enabled: true
597-
Style/MagicCommentFormat:
598-
Enabled: true
599-
Style/MapCompactWithConditionalBlock:
600-
Enabled: true
601581
Style/MapToHash:
602582
Enabled: true
603583
Style/MultilineInPatternThen:
@@ -636,27 +616,15 @@ RSpec/BeEq:
636616
Enabled: true
637617
RSpec/BeNil:
638618
Enabled: true
639-
RSpec/ChangeByZero:
640-
Enabled: true
641-
RSpec/ClassCheck:
642-
Enabled: true
643619
RSpec/ExcessiveDocstringSpacing:
644620
Enabled: true
645621
RSpec/IdenticalEqualityAssertion:
646622
Enabled: true
647-
RSpec/NoExpectationExample:
648-
Enabled: true
649623
RSpec/SubjectDeclaration:
650624
Enabled: true
651625
RSpec/VerifiedDoubleReference:
652626
Enabled: true
653-
RSpec/Capybara/SpecificFinders:
654-
Enabled: false
655-
RSpec/Capybara/SpecificMatcher:
656-
Enabled: false
657627
RSpec/FactoryBot/SyntaxMethods:
658628
Enabled: false
659629
RSpec/Rails/AvoidSetupHook:
660630
Enabled: false
661-
RSpec/Rails/HaveHttpStatus:
662-
Enabled: false

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ gem 'rake', '~> 13.0'
77

88
group :tests do
99
gem 'rspec', '~> 3.11'
10-
gem 'rubocop', '~> 1.36'
11-
gem 'rubocop-performance', '~> 1.15'
12-
gem 'rubocop-rspec', '~> 2.13'
10+
gem 'rubocop', '~> 1.28'
11+
gem 'rubocop-performance', '~> 1.13'
12+
gem 'rubocop-rspec', '~> 2.10'
1313
gem 'rubocop-rake', '~> 0.6.0'
1414
end

scelint.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
99

1010
spec.summary = %q{Linter SIMP Compliance Engine data}
1111
spec.homepage = 'https://github.com/simp/rubygem-simp-scelint'
12-
spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
12+
spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
1313

1414
spec.metadata['homepage_uri'] = spec.homepage
1515
spec.metadata['source_code_uri'] = spec.homepage

0 commit comments

Comments
 (0)