Skip to content

Commit 9b54a08

Browse files
committed
Ruby version upgrade and bundle update
1 parent 333bb2f commit 9b54a08

File tree

104 files changed

+131
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+131
-120
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ AllCops:
66
NewCops: disable
77
SuggestExtensions: false
88
DisplayCopNames: true
9-
TargetRubyVersion: 3.3
9+
TargetRubyVersion: 3.4.4
1010
Exclude:
1111
- 'bin/*'
1212
- 'spec/acceptance/fixtures/**/*'

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.6
1+
3.4.4

Gemfile.lock

Lines changed: 72 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,140 +11,151 @@ PATH
1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
activesupport (7.1.3.3)
14+
activesupport (8.0.2)
1515
base64
16+
benchmark (>= 0.3)
1617
bigdecimal
17-
concurrent-ruby (~> 1.0, >= 1.0.2)
18+
concurrent-ruby (~> 1.0, >= 1.3.1)
1819
connection_pool (>= 2.2.5)
1920
drb
2021
i18n (>= 1.6, < 2)
22+
logger (>= 1.4.2)
2123
minitest (>= 5.1)
22-
mutex_m
23-
tzinfo (~> 2.0)
24+
securerandom (>= 0.3)
25+
tzinfo (~> 2.0, >= 2.0.5)
26+
uri (>= 0.13.1)
2427
addressable (2.8.7)
2528
public_suffix (>= 2.0.2, < 7.0)
26-
ast (2.4.2)
27-
base64 (0.2.0)
28-
bigdecimal (3.1.8)
29-
concurrent-ruby (1.3.4)
30-
connection_pool (2.4.1)
29+
ast (2.4.3)
30+
base64 (0.3.0)
31+
benchmark (0.4.1)
32+
bigdecimal (3.2.2)
33+
concurrent-ruby (1.3.5)
34+
connection_pool (2.5.3)
3135
contracts (0.17.2)
3236
crack (1.0.0)
3337
bigdecimal
3438
rexml
35-
diff-lcs (1.5.1)
36-
docile (1.4.0)
37-
drb (2.2.1)
38-
entitlements-app (1.1.0)
39+
diff-lcs (1.6.2)
40+
docile (1.4.1)
41+
drb (2.2.3)
42+
entitlements-app (1.2.0)
3943
concurrent-ruby (~> 1.3, >= 1.3.1)
4044
faraday (~> 2.0)
4145
logger (~> 1.6)
4246
net-ldap (~> 0.19)
4347
octokit (~> 4.18)
4448
optimist (~> 3.1)
4549
ostruct (~> 0.6.0)
46-
faraday (2.12.1)
50+
faraday (2.13.1)
4751
faraday-net_http (>= 2.0, < 3.5)
4852
json
4953
logger
50-
faraday-net_http (3.4.0)
54+
faraday-net_http (3.4.1)
5155
net-http (>= 0.5.0)
52-
faraday-retry (2.2.1)
56+
faraday-retry (2.3.2)
5357
faraday (~> 2.0)
54-
hashdiff (1.1.1)
55-
i18n (1.14.5)
58+
hashdiff (1.2.0)
59+
i18n (1.14.7)
5660
concurrent-ruby (~> 1.0)
57-
json (2.8.2)
58-
language_server-protocol (3.17.0.3)
59-
logger (1.6.2)
60-
minitest (5.23.1)
61-
mutex_m (0.2.0)
61+
json (2.12.2)
62+
language_server-protocol (3.17.0.5)
63+
lint_roller (1.1.0)
64+
logger (1.7.0)
65+
minitest (5.25.5)
6266
net-http (0.6.0)
6367
uri
6468
net-ldap (0.19.0)
6569
octokit (4.25.1)
6670
faraday (>= 1, < 3)
6771
sawyer (~> 0.9)
68-
optimist (3.1.0)
69-
ostruct (0.6.0)
70-
parallel (1.26.3)
71-
parser (3.3.5.0)
72+
optimist (3.2.1)
73+
ostruct (0.6.2)
74+
parallel (1.27.0)
75+
parser (3.3.8.0)
7276
ast (~> 2.4.1)
7377
racc
74-
prism (1.1.0)
75-
public_suffix (6.0.1)
78+
prism (1.4.0)
79+
public_suffix (6.0.2)
7680
racc (1.8.1)
77-
rack (3.0.14)
81+
rack (3.1.16)
7882
rainbow (3.1.1)
79-
rake (13.2.1)
80-
rbs (3.6.1)
83+
rake (13.3.0)
84+
rbs (3.9.4)
8185
logger
82-
regexp_parser (2.9.2)
86+
regexp_parser (2.10.0)
8387
retryable (3.0.5)
84-
rexml (3.3.9)
88+
rexml (3.4.1)
8589
rspec (3.13.0)
8690
rspec-core (~> 3.13.0)
8791
rspec-expectations (~> 3.13.0)
8892
rspec-mocks (~> 3.13.0)
89-
rspec-core (3.13.0)
93+
rspec-core (3.13.5)
9094
rspec-support (~> 3.13.0)
91-
rspec-expectations (3.13.1)
95+
rspec-expectations (3.13.5)
9296
diff-lcs (>= 1.2.0, < 2.0)
9397
rspec-support (~> 3.13.0)
94-
rspec-mocks (3.13.1)
98+
rspec-mocks (3.13.5)
9599
diff-lcs (>= 1.2.0, < 2.0)
96100
rspec-support (~> 3.13.0)
97-
rspec-support (3.13.1)
98-
rubocop (1.66.1)
101+
rspec-support (3.13.4)
102+
rubocop (1.77.0)
99103
json (~> 2.3)
100-
language_server-protocol (>= 3.17.0)
104+
language_server-protocol (~> 3.17.0.2)
105+
lint_roller (~> 1.1.0)
101106
parallel (~> 1.10)
102107
parser (>= 3.3.0.2)
103108
rainbow (>= 2.2.2, < 4.0)
104-
regexp_parser (>= 2.4, < 3.0)
105-
rubocop-ast (>= 1.32.2, < 2.0)
109+
regexp_parser (>= 2.9.3, < 3.0)
110+
rubocop-ast (>= 1.45.1, < 2.0)
106111
ruby-progressbar (~> 1.7)
107-
unicode-display_width (>= 2.4.0, < 3.0)
108-
rubocop-ast (1.32.3)
109-
parser (>= 3.3.1.0)
110-
rubocop-github (0.20.0)
111-
rubocop (>= 1.37)
112-
rubocop-performance (>= 1.15)
113-
rubocop-rails (>= 2.17)
114-
rubocop-performance (1.22.1)
115-
rubocop (>= 1.48.1, < 2.0)
116-
rubocop-ast (>= 1.31.1, < 2.0)
117-
rubocop-rails (2.25.0)
112+
unicode-display_width (>= 2.4.0, < 4.0)
113+
rubocop-ast (1.45.1)
114+
parser (>= 3.3.7.2)
115+
prism (~> 1.4)
116+
rubocop-github (0.26.0)
117+
rubocop (>= 1.76)
118+
rubocop-performance (>= 1.24)
119+
rubocop-rails (>= 2.23)
120+
rubocop-performance (1.25.0)
121+
lint_roller (~> 1.1)
122+
rubocop (>= 1.75.0, < 2.0)
123+
rubocop-ast (>= 1.38.0, < 2.0)
124+
rubocop-rails (2.32.0)
118125
activesupport (>= 4.2.0)
126+
lint_roller (~> 1.1)
119127
rack (>= 1.1)
120-
rubocop (>= 1.33.0, < 2.0)
121-
rubocop-ast (>= 1.31.1, < 2.0)
128+
rubocop (>= 1.75.0, < 2.0)
129+
rubocop-ast (>= 1.44.0, < 2.0)
122130
ruby-lsp (0.19.1)
123131
language_server-protocol (~> 3.17.0)
124132
prism (>= 1.1, < 2.0)
125133
rbs (>= 3, < 4)
126134
sorbet-runtime (>= 0.5.10782)
127135
ruby-progressbar (1.13.0)
128-
rugged (1.7.2)
136+
rugged (1.9.0)
129137
sawyer (0.9.2)
130138
addressable (>= 2.3.5)
131139
faraday (>= 0.17.3, < 3)
140+
securerandom (0.4.1)
132141
simplecov (0.22.0)
133142
docile (~> 1.1)
134143
simplecov-html (~> 0.11)
135144
simplecov_json_formatter (~> 0.1)
136145
simplecov-erb (1.0.1)
137146
simplecov (< 1.0)
138-
simplecov-html (0.12.3)
147+
simplecov-html (0.13.1)
139148
simplecov_json_formatter (0.1.4)
140-
sorbet-runtime (0.5.11597)
149+
sorbet-runtime (0.5.12203)
141150
tzinfo (2.0.6)
142151
concurrent-ruby (~> 1.0)
143-
unicode-display_width (2.6.0)
152+
unicode-display_width (3.1.4)
153+
unicode-emoji (~> 4.0, >= 4.0.4)
154+
unicode-emoji (4.0.4)
144155
uri (1.0.3)
145156
vcr (6.3.1)
146157
base64
147-
webmock (3.24.0)
158+
webmock (3.25.1)
148159
addressable (>= 2.8.0)
149160
crack (>= 0.3.2)
150161
hashdiff (>= 0.4.0, < 2.0.0)
@@ -169,4 +180,4 @@ DEPENDENCIES
169180
webmock (~> 3.23, >= 3.23.1)
170181

171182
BUNDLED WITH
172-
2.5.9
183+
2.6.9

lib/entitlements/backend/github_team/provider.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def create_github_team_group(entitlement_group)
162162
metadata = entitlement_group.metadata
163163
metadata["team_id"] = -999
164164
rescue Entitlements::Models::Group::NoMetadata
165-
metadata = {"team_id" => -999}
165+
metadata = { "team_id" => -999 }
166166
end
167167
Entitlements::Backend::GitHubTeam::Models::Team.new(
168168
team_id: -999,

lib/entitlements/service/github.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def graphql_http_post(query)
345345
return result
346346
else
347347
Entitlements.logger.warn "GraphQL failed on try #{try_number} of #{MAX_GRAPHQL_RETRIES}. Will retry."
348-
sleep WAIT_BETWEEN_GRAPHQL_RETRIES * (2 ** (try_number - 1))
348+
sleep WAIT_BETWEEN_GRAPHQL_RETRIES * (2**(try_number - 1))
349349
end
350350
end
351351
end

spec/acceptance/github-server/web.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def graphql_org_query(query)
124124
result.each do |user, role|
125125
end_cursor = Base64.strict_encode64(user)
126126
next if !cursor_flag && end_cursor != cursor
127-
edges << { "node" => { "login" => user }, "role" => role} if cursor_flag
127+
edges << { "node" => { "login" => user }, "role" => role } if cursor_flag
128128
cursor_flag = true
129129
break if edges.size >= first
130130
end

spec/acceptance/tests/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def ldap_obj
8383
host: uri.host,
8484
port: uri.port,
8585
encryption: (uri.scheme == "ldaps" ? :simple_tls : nil),
86-
auth: {method: :simple, username: ENV["LDAP_BINDDN"], password: ENV["LDAP_BINDPW"]}
86+
auth: { method: :simple, username: ENV["LDAP_BINDDN"], password: ENV["LDAP_BINDPW"] }
8787
)
8888

8989
ldap_object.bind

0 commit comments

Comments
 (0)