Skip to content

Commit 9b27c76

Browse files
Merge pull request #99 from FRRouting/master
Release 2.3.9
2 parents b79c3e7 + 38fe0b2 commit 9b27c76

40 files changed

+948
-273
lines changed

.github/workflows/ruby.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: ruby/setup-ruby@v1
2828
with:
29-
ruby-version: 3.0.0
29+
ruby-version: 3.3.1
3030

3131
- name: rubocop
3232
uses: reviewdog/[email protected]
@@ -59,11 +59,11 @@ jobs:
5959
with:
6060
fetch-depth: 0
6161

62-
- name: Set up Ruby 3.0.2
62+
- name: Set up Ruby 3.3.1
6363
id: ruby
6464
uses: ruby/setup-ruby@v1
6565
with:
66-
ruby-version: 3.0.2
66+
ruby-version: 3.3.1
6767
bundler-cache: true
6868

6969
- name: Install required package

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ AllCops:
1010
Exclude:
1111
- 'githubapi/**/*'
1212
- 'db/schema.rb'
13+
- 'bin/console'
1314
Metrics/MethodLength:
1415
Max: 20
1516

.simplecov

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
SimpleCov.start do
1212
enable_coverage :branch
1313
primary_coverage :branch
14-
add_filter %r{^/spec/}
14+
add_filter %r{^/(spec|config)/}
1515
add_filter 'database_loader.rb'
16+
add_filter 'workers/slack_username2_id.rb'
1617
add_group 'Models', 'lib/models'
1718
add_group 'GitHub Functions', 'lib/github'
1819
add_group 'Bamboo CI Functions', 'lib/bamboo_ci'

Gemfile

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,31 @@
1010

1111
source 'https://rubygems.org'
1212

13-
ruby '3.0.2'
13+
ruby '3.3.1'
1414

1515
# Token
16-
gem 'jwt', '2.2.2'
16+
gem 'jwt'
1717

18-
gem 'octokit', '<= 4.17.0'
18+
gem 'octokit', '~> 9.1'
1919

2020
# Web Framework
21-
gem 'sinatra', '2.0.8.1'
21+
gem 'sinatra'
2222

23-
gem 'rack', '2.1.4'
23+
gem 'rack', '3.1.7'
24+
25+
gem 'rackup'
2426

2527
# ActiveRecord
26-
gem 'otr-activerecord', '2.0.3'
28+
gem 'otr-activerecord', '~> 2.3'
2729

2830
# PostgreSQL adapter
29-
gem 'pg', '1.2.3'
31+
gem 'pg', '~> 1.5', '>= 1.5.3'
3032

3133
gem 'netrc'
3234

33-
gem 'puma', '5.5.2'
35+
gem 'puma'
3436

35-
gem 'rake', '13.0.6'
37+
gem 'rake'
3638

3739
# Delayed Job
3840
gem 'delayed_job_active_record'
@@ -49,3 +51,9 @@ group :test do
4951
gem 'simplecov', require: false
5052
gem 'webmock', require: 'webmock/rspec'
5153
end
54+
55+
gem 'multipart-post', '~> 2.4'
56+
57+
gem 'faraday-retry', '~> 2.2'
58+
59+
gem 'faraday-multipart', '~> 1.0'

Gemfile.lock

Lines changed: 117 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,122 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activemodel (7.0.7.2)
5-
activesupport (= 7.0.7.2)
6-
activerecord (7.0.7.2)
7-
activemodel (= 7.0.7.2)
8-
activesupport (= 7.0.7.2)
9-
activesupport (7.0.7.2)
10-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activemodel (7.2.1)
5+
activesupport (= 7.2.1)
6+
activerecord (7.2.1)
7+
activemodel (= 7.2.1)
8+
activesupport (= 7.2.1)
9+
timeout (>= 0.4.0)
10+
activesupport (7.2.1)
11+
base64
12+
bigdecimal
13+
concurrent-ruby (~> 1.0, >= 1.3.1)
14+
connection_pool (>= 2.2.5)
15+
drb
1116
i18n (>= 1.6, < 2)
17+
logger (>= 1.4.2)
1218
minitest (>= 5.1)
13-
tzinfo (~> 2.0)
14-
addressable (2.8.5)
15-
public_suffix (>= 2.0.2, < 6.0)
19+
securerandom (>= 0.3)
20+
tzinfo (~> 2.0, >= 2.0.5)
21+
addressable (2.8.7)
22+
public_suffix (>= 2.0.2, < 7.0)
1623
ast (2.4.2)
1724
base64 (0.1.1)
18-
concurrent-ruby (1.2.2)
19-
crack (0.4.5)
25+
bigdecimal (3.1.8)
26+
concurrent-ruby (1.3.4)
27+
connection_pool (2.4.1)
28+
crack (1.0.0)
29+
bigdecimal
2030
rexml
2131
database_cleaner (2.0.2)
2232
database_cleaner-active_record (>= 2, < 3)
23-
database_cleaner-active_record (2.1.0)
33+
database_cleaner-active_record (2.2.0)
2434
activerecord (>= 5.a)
2535
database_cleaner-core (~> 2.0.0)
2636
database_cleaner-core (2.0.1)
27-
delayed_job (4.1.11)
37+
delayed_job (4.1.12)
2838
activesupport (>= 3.0, < 8.0)
29-
delayed_job_active_record (4.1.8)
39+
delayed_job_active_record (4.1.10)
3040
activerecord (>= 3.0, < 8.0)
3141
delayed_job (>= 3.0, < 5)
32-
diff-lcs (1.5.0)
33-
docile (1.4.0)
34-
factory_bot (6.2.1)
42+
diff-lcs (1.5.1)
43+
docile (1.4.1)
44+
drb (2.2.1)
45+
factory_bot (6.4.6)
3546
activesupport (>= 5.0.0)
36-
faker (3.2.1)
47+
faker (3.4.2)
3748
i18n (>= 1.8.11, < 2)
38-
faraday (1.10.3)
39-
faraday-em_http (~> 1.0)
40-
faraday-em_synchrony (~> 1.0)
41-
faraday-excon (~> 1.1)
42-
faraday-httpclient (~> 1.0)
43-
faraday-multipart (~> 1.0)
44-
faraday-net_http (~> 1.0)
45-
faraday-net_http_persistent (~> 1.0)
46-
faraday-patron (~> 1.0)
47-
faraday-rack (~> 1.0)
48-
faraday-retry (~> 1.0)
49-
ruby2_keywords (>= 0.0.4)
50-
faraday-em_http (1.0.0)
51-
faraday-em_synchrony (1.0.0)
52-
faraday-excon (1.1.0)
53-
faraday-httpclient (1.0.1)
49+
faraday (2.11.0)
50+
faraday-net_http (>= 2.0, < 3.4)
51+
logger
5452
faraday-multipart (1.0.4)
5553
multipart-post (~> 2)
56-
faraday-net_http (1.0.1)
57-
faraday-net_http_persistent (1.2.0)
58-
faraday-patron (1.0.0)
59-
faraday-rack (1.0.0)
60-
faraday-retry (1.0.3)
61-
hashdiff (1.0.1)
54+
faraday-net_http (3.3.0)
55+
net-http
56+
faraday-retry (2.2.1)
57+
faraday (~> 2.0)
58+
hashdiff (1.1.1)
6259
hashie (5.0.0)
6360
hashie-forbidden_attributes (0.1.1)
6461
hashie (>= 3.0)
65-
i18n (1.14.1)
62+
i18n (1.14.5)
6663
concurrent-ruby (~> 1.0)
67-
json (2.6.3)
68-
jwt (2.2.2)
64+
json (2.7.2)
65+
jwt (2.8.2)
66+
base64
6967
language_server-protocol (3.17.0.3)
70-
minitest (5.19.0)
71-
multipart-post (2.3.0)
72-
mustermann (1.1.2)
68+
logger (1.6.1)
69+
minitest (5.25.1)
70+
multipart-post (2.4.1)
71+
mustermann (3.0.3)
7372
ruby2_keywords (~> 0.0.1)
73+
net-http (0.4.1)
74+
uri
7475
netrc (0.11.0)
75-
nio4r (2.5.9)
76-
octokit (4.16.0)
77-
faraday (>= 0.9)
78-
sawyer (~> 0.8.0, >= 0.5.3)
79-
otr-activerecord (2.0.3)
80-
activerecord (>= 4.0, < 7.1)
76+
nio4r (2.7.3)
77+
octokit (9.1.0)
78+
faraday (>= 1, < 3)
79+
sawyer (~> 0.9)
80+
otr-activerecord (2.4.0)
81+
activerecord (>= 6.0, < 7.3)
8182
hashie-forbidden_attributes (~> 0.1)
82-
parallel (1.23.0)
83-
parser (3.2.2.3)
83+
parallel (1.26.3)
84+
parser (3.3.5.0)
8485
ast (~> 2.4.1)
8586
racc
86-
pg (1.2.3)
87-
public_suffix (5.0.3)
88-
puma (5.5.2)
87+
pg (1.5.7)
88+
public_suffix (6.0.1)
89+
puma (6.4.2)
8990
nio4r (~> 2.0)
90-
racc (1.7.1)
91-
rack (2.1.4)
92-
rack-protection (2.0.8.1)
93-
rack
91+
racc (1.8.1)
92+
rack (3.1.7)
93+
rack-protection (4.0.0)
94+
base64 (>= 0.1.0)
95+
rack (>= 3.0.0, < 4)
96+
rack-session (2.0.0)
97+
rack (>= 3.0.0)
9498
rack-test (2.1.0)
9599
rack (>= 1.3)
100+
rackup (2.1.0)
101+
rack (>= 3)
102+
webrick (~> 1.8)
96103
rainbow (3.1.1)
97-
rake (13.0.6)
98-
regexp_parser (2.8.1)
99-
rexml (3.2.6)
100-
rspec (3.12.0)
101-
rspec-core (~> 3.12.0)
102-
rspec-expectations (~> 3.12.0)
103-
rspec-mocks (~> 3.12.0)
104-
rspec-core (3.12.2)
105-
rspec-support (~> 3.12.0)
106-
rspec-expectations (3.12.3)
104+
rake (13.2.1)
105+
regexp_parser (2.9.2)
106+
rexml (3.3.7)
107+
rspec (3.13.0)
108+
rspec-core (~> 3.13.0)
109+
rspec-expectations (~> 3.13.0)
110+
rspec-mocks (~> 3.13.0)
111+
rspec-core (3.13.1)
112+
rspec-support (~> 3.13.0)
113+
rspec-expectations (3.13.2)
107114
diff-lcs (>= 1.2.0, < 2.0)
108-
rspec-support (~> 3.12.0)
109-
rspec-mocks (3.12.6)
115+
rspec-support (~> 3.13.0)
116+
rspec-mocks (3.13.1)
110117
diff-lcs (>= 1.2.0, < 2.0)
111-
rspec-support (~> 3.12.0)
112-
rspec-support (3.12.1)
118+
rspec-support (~> 3.13.0)
119+
rspec-support (3.13.1)
113120
rubocop (1.56.1)
114121
base64 (~> 0.1.1)
115122
json (~> 2.3)
@@ -122,62 +129,72 @@ GEM
122129
rubocop-ast (>= 1.28.1, < 2.0)
123130
ruby-progressbar (~> 1.7)
124131
unicode-display_width (>= 2.4.0, < 3.0)
125-
rubocop-ast (1.29.0)
126-
parser (>= 3.2.1.0)
127-
rubocop-performance (1.19.0)
128-
rubocop (>= 1.7.0, < 2.0)
129-
rubocop-ast (>= 0.4.0)
132+
rubocop-ast (1.32.3)
133+
parser (>= 3.3.1.0)
134+
rubocop-performance (1.21.1)
135+
rubocop (>= 1.48.1, < 2.0)
136+
rubocop-ast (>= 1.31.1, < 2.0)
130137
ruby-progressbar (1.13.0)
131138
ruby2_keywords (0.0.5)
132-
sawyer (0.8.2)
139+
sawyer (0.9.2)
133140
addressable (>= 2.3.5)
134-
faraday (> 0.8, < 2.0)
141+
faraday (>= 0.17.3, < 3)
142+
securerandom (0.3.1)
135143
simplecov (0.22.0)
136144
docile (~> 1.1)
137145
simplecov-html (~> 0.11)
138146
simplecov_json_formatter (~> 0.1)
139147
simplecov-html (0.12.3)
140148
simplecov_json_formatter (0.1.4)
141-
sinatra (2.0.8.1)
142-
mustermann (~> 1.0)
143-
rack (~> 2.0)
144-
rack-protection (= 2.0.8.1)
149+
sinatra (4.0.0)
150+
mustermann (~> 3.0)
151+
rack (>= 3.0.0, < 4)
152+
rack-protection (= 4.0.0)
153+
rack-session (>= 2.0.0, < 3)
145154
tilt (~> 2.0)
146-
tilt (2.2.0)
155+
tilt (2.4.0)
156+
timeout (0.4.1)
147157
tzinfo (2.0.6)
148158
concurrent-ruby (~> 1.0)
149-
unicode-display_width (2.4.2)
150-
webmock (3.19.0)
159+
unicode-display_width (2.5.0)
160+
uri (0.13.1)
161+
webmock (3.23.1)
151162
addressable (>= 2.8.0)
152163
crack (>= 0.3.2)
153164
hashdiff (>= 0.4.0, < 2.0.0)
165+
webrick (1.8.1)
154166

155167
PLATFORMS
168+
ruby
156169
x86_64-linux
157170

158171
DEPENDENCIES
159172
database_cleaner
160173
delayed_job_active_record
161174
factory_bot
162175
faker
163-
jwt (= 2.2.2)
176+
faraday-multipart (~> 1.0)
177+
faraday-retry (~> 2.2)
178+
jwt
179+
multipart-post (~> 2.4)
164180
netrc
165-
octokit (<= 4.17.0)
166-
otr-activerecord (= 2.0.3)
167-
pg (= 1.2.3)
168-
puma (= 5.5.2)
169-
rack (= 2.1.4)
181+
octokit (~> 9.1)
182+
otr-activerecord (~> 2.3)
183+
pg (~> 1.5, >= 1.5.3)
184+
puma
185+
rack (= 3.1.7)
170186
rack-test
171-
rake (= 13.0.6)
187+
rackup
188+
rake
172189
rspec
173190
rubocop (= 1.56.1)
174191
rubocop-performance
175192
simplecov
176-
sinatra (= 2.0.8.1)
193+
sinatra
177194
webmock
178195

179196
RUBY VERSION
180-
ruby 3.0.2p107
197+
ruby 3.3.1p55
181198

182199
BUNDLED WITH
183-
2.4.7
200+
2.5.9

0 commit comments

Comments
 (0)