Skip to content

Commit

Permalink
Remove Ruby 2.4 support (#1412)
Browse files Browse the repository at this point in the history
* Remove Ruby 2.4 support

* Fix: Style/RedundantBegin: Redundant begin block detected
  • Loading branch information
vsppedro committed Feb 11, 2021
1 parent cd71a95 commit ec93ea9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
- 2.7.2
- 2.6.6
- 2.5.8
- 2.4.10
appraisal:
- rails_6_0
- rails_5_2
Expand All @@ -43,7 +42,6 @@ jobs:
exclude:
- { ruby: 2.7.2, appraisal: rails_4_2 }
- { ruby: 2.6.6, appraisal: rails_4_2 }
- { ruby: 2.4.10, appraisal: rails_6_0 }
env:
DATABASE_ADAPTER: ${{ matrix.adapter }}
BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require:
- rubocop-rails
AllCops:
NewCops: disable
TargetRubyVersion: 2.4
TargetRubyVersion: 2.5
Exclude:
- 'gemfiles/*'
Bundler/OrderedGems:
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,14 @@ machine, understanding the codebase, and creating a good pull request.

## Compatibility

Shoulda Matchers is [tested][travis] and supported against Ruby 2.4+, Rails
Shoulda Matchers is [tested][travis] and supported against Ruby 2.5+, Rails
4.2+, RSpec 3.x, and Minitest 5.x.

For Ruby < 2.4 and Rails < 4.1 compatibility, please use [v3.1.3][v3.1.3].
For Ruby < 3.0 and Rails < 6.1 compatibility, please use [v4.5.1][v4.5.1].

[v3.1.3]: https://github.com/thoughtbot/shoulda-matchers/tree/v3.1.3
[v4.5.1]: https://github.com/thoughtbot/shoulda-matchers/tree/v4.5.1

## Versioning

Expand Down
2 changes: 1 addition & 1 deletion shoulda-matchers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ Gem::Specification.new do |s|
'shoulda-matchers.gemspec']
s.require_paths = ['lib']

s.required_ruby_version = '>= 2.4.0'
s.required_ruby_version = '>= 2.5.0'
s.add_dependency('activesupport', '>= 4.2.0')
end
14 changes: 6 additions & 8 deletions spec/support/tests/command_runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,12 @@ def run
pid = spawn(env, *command, options)
t = Thread.new do
loop do
begin
@command_output += reader.read_nonblock(4096)
rescue IO::WaitReadable
IO.select([reader])
retry
rescue EOFError
break
end
@command_output += reader.read_nonblock(4096)
rescue IO::WaitReadable
IO.select([reader])
retry
rescue EOFError
break
end
end
Process.waitpid(pid)
Expand Down

0 comments on commit ec93ea9

Please sign in to comment.