Skip to content

Commit e79131c

Browse files
committed
ruby 3.4
1 parent 8abc124 commit e79131c

File tree

6 files changed

+52
-25
lines changed

6 files changed

+52
-25
lines changed

.github/workflows/actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
image: mysql
1313
strategy:
1414
matrix:
15-
ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3' ]
15+
ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3', '3.4' ]
1616
task: [ 'spec' ]
1717
include:
1818
- ruby: 2.7 # keep in sync with lowest version

.rubocop.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require:
1+
plugins:
22
- rubocop-rake
33
- rubocop-rspec
44

@@ -74,6 +74,10 @@ RSpec/VerifiedDoubles:
7474
RSpec/ExampleLength:
7575
Enabled: false
7676

77+
# does not understand .should
78+
RSpec/NoExpectationExample:
79+
Enabled: false
80+
7781
Style/CombinableLoops:
7882
Enabled: false
7983

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ gem 'rspec-legacy_formatters'
1212
gem 'rubocop'
1313
gem 'rubocop-rake'
1414
gem 'rubocop-rspec'
15+
gem 'benchmark'
16+
gem 'logger'
17+
gem 'mutex_m'
18+
gem 'base64'
19+
gem 'bigdecimal'
1520

1621
gem 'mysql2', group: :mysql
1722
gem 'sqlite3', '~> 1.4'

Gemfile.lock

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,34 @@ GEM
1717
minitest (>= 5.1)
1818
tzinfo (~> 2.0)
1919
zeitwerk (~> 2.3)
20-
ast (2.4.2)
20+
ast (2.4.3)
21+
base64 (0.2.0)
22+
benchmark (0.4.0)
23+
bigdecimal (3.1.9)
24+
bigdecimal (3.1.9-java)
2125
bump (0.10.0)
2226
concurrent-ruby (1.1.9)
2327
diff-lcs (1.5.0)
2428
i18n (1.10.0)
2529
concurrent-ruby (~> 1.0)
26-
json (2.7.1)
27-
json (2.7.1-java)
28-
language_server-protocol (3.17.0.3)
30+
json (2.10.2)
31+
json (2.10.2-java)
32+
language_server-protocol (3.17.0.4)
33+
lint_roller (1.1.0)
34+
logger (1.7.0)
2935
mini_portile2 (2.8.7)
3036
minitest (5.15.0)
37+
mutex_m (0.3.0)
3138
mysql2 (0.5.6)
32-
parser (3.3.0.5)
39+
parser (3.3.8.0)
3340
ast (~> 2.4.1)
3441
racc
35-
racc (1.7.3)
36-
racc (1.7.3-java)
42+
prism (1.4.0)
43+
racc (1.8.1)
44+
racc (1.8.1-java)
3745
rainbow (3.1.1)
3846
rake (13.0.6)
39-
regexp_parser (2.9.0)
40-
rexml (3.2.6)
47+
regexp_parser (2.10.0)
4148
rspec (3.11.0)
4249
rspec-core (~> 3.11.0)
4350
rspec-expectations (~> 3.11.0)
@@ -55,29 +62,34 @@ GEM
5562
rspec-rerun (1.1.0)
5663
rspec (~> 3.0)
5764
rspec-support (3.11.0)
58-
rubocop (1.62.1)
65+
rubocop (1.75.2)
5966
json (~> 2.3)
60-
language_server-protocol (>= 3.17.0)
67+
language_server-protocol (~> 3.17.0.2)
68+
lint_roller (~> 1.1.0)
6169
parallel (~> 1.10)
6270
parser (>= 3.3.0.2)
6371
rainbow (>= 2.2.2, < 4.0)
64-
regexp_parser (>= 1.8, < 3.0)
65-
rexml (>= 3.2.5, < 4.0)
66-
rubocop-ast (>= 1.31.1, < 2.0)
72+
regexp_parser (>= 2.9.3, < 3.0)
73+
rubocop-ast (>= 1.44.0, < 2.0)
6774
ruby-progressbar (~> 1.7)
68-
unicode-display_width (>= 2.4.0, < 3.0)
69-
rubocop-ast (1.31.2)
70-
parser (>= 3.3.0.4)
71-
rubocop-rake (0.6.0)
72-
rubocop (~> 1.0)
73-
rubocop-rspec (2.9.0)
74-
rubocop (~> 1.19)
75+
unicode-display_width (>= 2.4.0, < 4.0)
76+
rubocop-ast (1.44.1)
77+
parser (>= 3.3.7.2)
78+
prism (~> 1.4)
79+
rubocop-rake (0.7.1)
80+
lint_roller (~> 1.1)
81+
rubocop (>= 1.72.1)
82+
rubocop-rspec (3.5.0)
83+
lint_roller (~> 1.1)
84+
rubocop (~> 1.72, >= 1.72.1)
7585
ruby-progressbar (1.13.0)
7686
sqlite3 (1.7.3)
7787
mini_portile2 (~> 2.8.0)
7888
tzinfo (2.0.4)
7989
concurrent-ruby (~> 1.0)
80-
unicode-display_width (2.5.0)
90+
unicode-display_width (3.1.4)
91+
unicode-emoji (~> 4.0, >= 4.0.4)
92+
unicode-emoji (4.0.4)
8193
zeitwerk (2.5.4)
8294

8395
PLATFORMS
@@ -86,7 +98,12 @@ PLATFORMS
8698

8799
DEPENDENCIES
88100
activerecord (~> 6.0)
101+
base64
102+
benchmark
103+
bigdecimal
89104
bump
105+
logger
106+
mutex_m
90107
mysql2
91108
parallel!
92109
rake

lib/parallel.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def map(source, options = {}, &block)
255255

256256
if options[:in_processes] && options[:in_threads]
257257
raise ArgumentError, "Please specify only one of `in_processes` or `in_threads`."
258-
elsif RUBY_PLATFORM =~ (/java/) && !(options[:in_processes])
258+
elsif RUBY_PLATFORM =~ (/java/) && !options[:in_processes]
259259
method = :in_threads
260260
size = options[method] || processor_count
261261
elsif options[:in_threads]

spec/cases/each_with_ar_sqlite.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# frozen_string_literal: true
22
require './spec/cases/helper'
3+
require "logger"
34
require "active_record"
45
require "sqlite3"
56
require "tempfile"

0 commit comments

Comments
 (0)