Skip to content

Commit 8532531

Browse files
authored
Merge pull request #121 from bastelfreak/ruby27
Drop Ruby 2.4/2.5/2.6
2 parents 7c64136 + ef02164 commit 8532531

4 files changed

Lines changed: 35 additions & 12 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install Ruby ${{ matrix.ruby }}
1919
uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: "3.0"
21+
ruby-version: "3.1"
2222
bundler-cache: true
2323
- name: Run Rubocop
2424
run: bundle exec rake rubocop
@@ -28,9 +28,6 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
ruby:
31-
- "2.4"
32-
- "2.5"
33-
- "2.6"
3431
- "2.7"
3532
- "3.0"
3633
- "3.1"

.rubocop.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ require:
99

1010
AllCops:
1111
NewCops: enable
12-
TargetRubyVersion: '2.4'
12+
TargetRubyVersion: '2.7'
13+
14+
Gemspec/DevelopmentDependencies:
15+
Enabled: false
16+
17+
Gemspec/RequireMFA:
18+
Enabled: false
1319

1420
Style/TrailingCommaInHashLiteral:
1521
Enabled: True

.rubocop_todo.yml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2023-03-17 12:20:43 UTC using RuboCop version 1.12.1.
3+
# on 2023-03-17 13:00:57 UTC using RuboCop version 1.48.1.
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
@@ -17,21 +17,30 @@ Naming/AccessorMethodName:
1717
- 'lib/beaker-rspec/helpers/serverspec.rb'
1818

1919
# Offense count: 1
20-
# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, Regex, IgnoreExecutableScripts, AllowedAcronyms.
20+
# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
21+
# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
2122
# 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
2223
Naming/FileName:
2324
Exclude:
2425
- 'lib/beaker-rspec.rb'
2526

2627
# Offense count: 1
2728
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
28-
# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
29+
# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
2930
Naming/MethodParameterName:
3031
Exclude:
3132
- 'lib/beaker-rspec/beaker_shim.rb'
3233

34+
# Offense count: 1
35+
# This cop supports safe autocorrection (--autocorrect).
36+
# Configuration parameters: EnforcedStyle.
37+
# SupportedStyles: be_a, be_kind_of
38+
RSpec/ClassCheck:
39+
Exclude:
40+
- 'spec/acceptance/example_spec.rb'
41+
3342
# Offense count: 3
34-
# Configuration parameters: Prefixes.
43+
# Configuration parameters: Prefixes, AllowedPatterns.
3544
# Prefixes: when, with, without
3645
RSpec/ContextWording:
3746
Exclude:
@@ -40,5 +49,17 @@ RSpec/ContextWording:
4049
# Offense count: 1
4150
# Configuration parameters: IgnoredMetadata.
4251
RSpec/DescribeClass:
52+
Exclude:
53+
- '**/spec/features/**/*'
54+
- '**/spec/requests/**/*'
55+
- '**/spec/routing/**/*'
56+
- '**/spec/system/**/*'
57+
- '**/spec/views/**/*'
58+
- 'spec/acceptance/example_spec.rb'
59+
60+
# Offense count: 5
61+
# Configuration parameters: AllowedPatterns.
62+
# AllowedPatterns: ^expect_, ^assert_
63+
RSpec/NoExpectationExample:
4364
Exclude:
4465
- 'spec/acceptance/example_spec.rb'

beaker-rspec.gemspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ Gem::Specification.new do |s|
1212
s.description = %q{RSpec bindings for beaker, see https://github.com/voxpupuli/beaker}
1313
s.license = 'Apache-2.0'
1414

15-
s.required_ruby_version = '>= 2.4.0', '<4.0.0'
15+
s.required_ruby_version = '>= 2.7.0', '<4.0.0'
1616

1717
s.files = `git ls-files`.split("\n")
18-
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
1918
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
2019
s.require_paths = ["lib"]
2120

@@ -25,7 +24,7 @@ Gem::Specification.new do |s|
2524
s.add_development_dependency 'rake', '~> 13.0'
2625

2726
# rubocop
28-
s.add_development_dependency 'rubocop', '~> 1.12.0'
27+
s.add_development_dependency 'rubocop', '~> 1.48.1'
2928
s.add_development_dependency 'rubocop-minitest'
3029
s.add_development_dependency 'rubocop-performance'
3130
s.add_development_dependency 'rubocop-rake'

0 commit comments

Comments
 (0)