Skip to content

Commit 39695cf

Browse files
committed
update dependencies
* Update dependencies * Use Ruby 3.0 * Rubocop changes
1 parent 036c903 commit 39695cf

File tree

9 files changed

+25
-33
lines changed

9 files changed

+25
-33
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ on: [push, pull_request]
55
jobs:
66
build:
77
runs-on: ubuntu-latest
8-
strategy:
9-
matrix:
10-
ruby: ['2.6']
8+
119
services:
1210
db:
1311
image: postgres:12
@@ -19,15 +17,13 @@ jobs:
1917
--health-interval 10s
2018
--health-timeout 5s
2119
--health-retries 5
22-
name: Ruby ${{ matrix.ruby }} test
2320
env:
2421
DATABASE_URL: postgres://postgres:[email protected]
2522
steps:
2623
- uses: actions/checkout@v2
27-
2824
- uses: actions/setup-ruby@v1
2925
with:
30-
ruby-version: ${{ matrix.ruby }}
26+
ruby-version: 3.0
3127

3228
- name: Install bundler
3329
run: gem install bundler

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 2.6.0
1+
ruby 3.0.0

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
ruby '~> 2.6.0'
3+
ruby '~> 3.0'
44

55
gem 'bootsnap', '>= 1.4.2', require: false
66
gem 'iso-639'

Gemfile.lock

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ GEM
7979
factory_bot_rails (6.2.0)
8080
factory_bot (~> 6.2.0)
8181
railties (>= 5.0.0)
82-
fakefs (1.3.2)
82+
fakefs (1.4.0)
8383
ffi (1.15.4)
8484
globalid (0.5.2)
8585
activesupport (>= 5.0)
@@ -88,13 +88,12 @@ GEM
8888
rubocop-performance
8989
rubocop-rails (~> 2.2.0)
9090
thor
91-
i18n (1.8.10)
91+
i18n (1.8.11)
9292
concurrent-ruby (~> 1.0)
9393
iso-639 (0.3.5)
94-
listen (3.1.5)
94+
listen (3.0.8)
9595
rb-fsevent (~> 0.9, >= 0.9.4)
9696
rb-inotify (~> 0.9, >= 0.9.7)
97-
ruby_dep (~> 1.2)
9897
loofah (2.12.0)
9998
crass (~> 1.0.2)
10099
nokogiri (>= 1.5.9)
@@ -103,12 +102,10 @@ GEM
103102
marcel (1.0.2)
104103
method_source (1.0.0)
105104
mini_mime (1.1.2)
106-
mini_portile2 (2.6.1)
107105
minitest (5.14.4)
108106
msgpack (1.4.2)
109107
nio4r (2.5.8)
110-
nokogiri (1.12.5)
111-
mini_portile2 (~> 2.6.1)
108+
nokogiri (1.12.5-x86_64-darwin)
112109
racc (~> 1.4)
113110
parallel (1.21.0)
114111
parser (3.0.2.0)
@@ -120,9 +117,9 @@ GEM
120117
pry-byebug (3.9.0)
121118
byebug (~> 11.0)
122119
pry (~> 0.13.0)
123-
puma (5.5.1)
120+
puma (5.5.2)
124121
nio4r (~> 2.0)
125-
racc (1.5.2)
122+
racc (1.6.0)
126123
rack (2.2.3)
127124
rack-cors (1.1.1)
128125
rack (>= 2.0.0)
@@ -180,8 +177,8 @@ GEM
180177
rspec-expectations (~> 3.10)
181178
rspec-mocks (~> 3.10)
182179
rspec-support (~> 3.10)
183-
rspec-support (3.10.2)
184-
rubocop (1.22.1)
180+
rspec-support (3.10.3)
181+
rubocop (1.22.3)
185182
parallel (~> 1.10)
186183
parser (>= 3.0.0.0)
187184
rainbow (>= 2.2.2, < 4.0)
@@ -190,18 +187,17 @@ GEM
190187
rubocop-ast (>= 1.12.0, < 2.0)
191188
ruby-progressbar (~> 1.7)
192189
unicode-display_width (>= 1.4.0, < 3.0)
193-
rubocop-ast (1.12.0)
190+
rubocop-ast (1.13.0)
194191
parser (>= 3.0.1.1)
195-
rubocop-performance (1.11.5)
192+
rubocop-performance (1.12.0)
196193
rubocop (>= 1.7.0, < 2.0)
197194
rubocop-ast (>= 0.4.0)
198195
rubocop-rails (2.2.1)
199196
rack (>= 1.1)
200197
rubocop (>= 0.72.0)
201-
rubocop-rspec (2.5.0)
198+
rubocop-rspec (2.6.0)
202199
rubocop (~> 1.19)
203200
ruby-progressbar (1.11.0)
204-
ruby_dep (1.5.0)
205201
shoulda-matchers (5.0.0)
206202
activesupport (>= 5.2.0)
207203
spring (2.1.1)
@@ -224,10 +220,10 @@ GEM
224220
websocket-driver (0.7.5)
225221
websocket-extensions (>= 0.1.0)
226222
websocket-extensions (0.1.5)
227-
zeitwerk (2.4.2)
223+
zeitwerk (2.5.1)
228224

229225
PLATFORMS
230-
ruby
226+
x86_64-darwin-19
231227

232228
DEPENDENCIES
233229
bootsnap (>= 1.4.2)
@@ -253,7 +249,7 @@ DEPENDENCIES
253249
spring-watcher-listen (~> 2.0.0)
254250

255251
RUBY VERSION
256-
ruby 2.6.0p0
252+
ruby 3.0.0p0
257253

258254
BUNDLED WITH
259-
2.1.4
255+
2.2.30

app/presenters/fragment_presenter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def links
1616
up: fragment.parent,
1717
first: fragment.first_fragment,
1818
last: fragment.last_fragment,
19-
}.map { |name, fragment| link(name, fragment) }.compact
19+
}.filter_map { |name, fragment| link(name, fragment) }
2020
end
2121

2222
private

app/presenters/start_stop_fragment_presenter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def xml
2121
end
2222

2323
def links
24-
link_headers.map { |name, fragments| link(name, fragments) }.compact
24+
link_headers.filter_map { |name, fragments| link(name, fragments) }
2525
end
2626

2727
private

lib/parser/collection_parser.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ def parse!
2626
attr_reader :name, :collections, :logger
2727

2828
def find_group_cts_files
29-
Dir.glob(path(name, 'data', '*', '__cts__.xml')).sort
29+
Dir.glob(path(name, 'data', '*', '__cts__.xml'))
3030
end
3131

3232
def find_work_cts_files(group_cts_file)
3333
group_cts_directory = File.dirname(group_cts_file)
3434

35-
Dir.glob(File.join(group_cts_directory, '*', '__cts__.xml')).sort
35+
Dir.glob(File.join(group_cts_directory, '*', '__cts__.xml'))
3636
end
3737

3838
def parse_group_cts_file(file)

lib/parser/document_parser.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def build
3131
attr_reader :file, :parent, :work, :logger
3232

3333
def resources_from_tags(tags, directory)
34-
tags.map { |edition| resource_from_edition(edition, directory) }.compact
34+
tags.filter_map { |edition| resource_from_edition(edition, directory) }
3535
end
3636

3737
def resource_from_edition(edition, directory)

spec/rails_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# directory. Alternatively, in the individual `*_spec.rb` files, manually
2121
# require only the support files necessary.
2222
#
23-
Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
23+
Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
2424

2525
# Checks for pending migrations and applies them before tests are run.
2626
# If you are not using ActiveRecord, you can remove these lines.

0 commit comments

Comments
 (0)