Skip to content

Commit f9c219e

Browse files
committed
Initial attempt at upgrading to Ruby 3.4
1 parent 8538b3b commit f9c219e

40 files changed

+573
-568
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.5
1+
3.4.2

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ gem 'membrane', '~> 1.0'
1919
gem 'mime-types', '~> 3.6'
2020
gem 'mock_redis'
2121
gem 'multipart-parser'
22+
gem 'mutex_m'
2223
gem 'netaddr', '>= 2.0.4'
2324
gem 'net-ssh'
2425
gem 'newrelic_rpm'
@@ -39,10 +40,10 @@ gem 'sinatra-contrib'
3940
gem 'sshkey'
4041
gem 'statsd-ruby', '~> 1.5.0'
4142
gem 'steno'
43+
gem 'syslog'
4244
gem 'talentbox-delayed_job_sequel', '~> 4.3.0'
4345
gem 'thin'
4446
gem 'vmstat', '~> 2.3'
45-
4647
# Rails Components
4748
gem 'actionpack', '~> 7.2.2'
4849
gem 'actionview', '~> 7.2.1'

Gemfile.lock

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ GEM
113113
base64 (0.2.0)
114114
beefcake (1.0.0)
115115
benchmark (0.3.0)
116-
bigdecimal (3.1.8)
116+
bigdecimal (3.1.9)
117117
bit-struct (0.17)
118118
builder (3.3.0)
119119
byebug (11.1.3)
@@ -330,6 +330,7 @@ GEM
330330
mustache (1.1.1)
331331
mustermann (3.0.0)
332332
ruby2_keywords (~> 0.0.1)
333+
mutex_m (0.2.0)
333334
mysql2 (0.5.6)
334335
net-ssh (7.3.0)
335336
netaddr (2.0.6)
@@ -495,7 +496,7 @@ GEM
495496
sexp_processor (~> 4.1)
496497
rubyzip (2.3.2)
497498
securerandom (0.3.1)
498-
sequel (5.85.0)
499+
sequel (5.89.0)
499500
bigdecimal
500501
sequel_pg (1.17.1)
501502
pg (>= 0.18.0, != 1.2.0)
@@ -547,6 +548,7 @@ GEM
547548
fluent-logger
548549
yajl-ruby (~> 1.0)
549550
stringio (3.1.1)
551+
syslog (0.1.1)
550552
talentbox-delayed_job_sequel (4.3.0)
551553
delayed_job (~> 4.1.0)
552554
sequel (>= 3.38, < 6.0)
@@ -621,6 +623,7 @@ DEPENDENCIES
621623
mime-types (~> 3.6)
622624
mock_redis
623625
multipart-parser
626+
mutex_m
624627
mysql2 (~> 0.5.6)
625628
net-ssh
626629
netaddr (>= 2.0.4)
@@ -666,6 +669,7 @@ DEPENDENCIES
666669
sshkey
667670
statsd-ruby (~> 1.5.0)
668671
steno
672+
syslog
669673
talentbox-delayed_job_sequel (~> 4.3.0)
670674
thin
671675
timecop

db/migrations/20220601183937_create_asg_lastest_updates.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Sequel.migration do
22
change do
33
create_table :asg_timestamps do
4-
primary_key name: :id
4+
primary_key '{:name=>:id}'
55
Timestamp :last_update
66
end
77
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Sequel.migration do
22
change do
33
alter_table :asg_timestamps do
4-
rename_column :'{:name=>:id}', :id
4+
rename_column '{:name=>:id}', :id
55
end
66
end
77
end

spec/request/admin_actions_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
let(:api_call) { ->(user_headers) { post '/v3/admin/actions/clear_buildpack_cache', {}, user_headers } }
1212

1313
let(:expected_codes_and_responses) do
14-
h = Hash.new(
15-
code: 403
16-
)
14+
h = Hash.new({
15+
code: 403
16+
})
1717
h['admin'] = {
1818
code: 202
1919
}

spec/request/app_features_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
end
4040

4141
let(:expected_codes_and_responses) do
42-
h = Hash.new(code: 404)
42+
h = Hash.new({ code: 404 })
4343
%w[admin admin_read_only global_auditor space_developer space_manager space_auditor org_manager
4444
space_supporter].each do |r|
4545
h[r] = { code: 200, response_object: features_response_object }
@@ -57,7 +57,7 @@
5757

5858
describe 'GET /v3/apps/:guid/features/:name' do
5959
let(:expected_codes_and_responses) do
60-
h = Hash.new(code: 404)
60+
h = Hash.new({ code: 404 })
6161
%w[admin admin_read_only global_auditor space_developer space_manager space_auditor org_manager
6262
space_supporter].each do |r|
6363
h[r] = { code: 200, response_object: feature_response_object }
@@ -114,9 +114,9 @@
114114
end
115115

116116
let(:expected_codes_and_responses) do
117-
h = Hash.new(code: 403, errors: CF_NOT_AUTHORIZED)
117+
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED })
118118
%w[no_role org_auditor org_billing_manager].each { |r| h[r] = { code: 404 } }
119-
%w[admin space_developer].each { |r| h[r] = { code: 200, response_object: feature_response_object } }
119+
%w[admin space_devµeloper].each { |r| h[r] = { code: 200, response_object: feature_response_object } }
120120
h
121121
end
122122

@@ -148,7 +148,7 @@
148148
end
149149

150150
let(:expected_codes_and_responses) do
151-
h = Hash.new(code: 403, errors: CF_NOT_AUTHORIZED)
151+
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED })
152152
%w[no_role org_auditor org_billing_manager].each { |r| h[r] = { code: 404 } }
153153
%w[admin space_developer space_supporter].each do |r|
154154
h[r] = { code: 200, response_object: feature_response_object }

spec/request/app_manifests_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
context 'permissions' do
5959
let(:api_call) { ->(user_headers) { get "/v3/apps/#{app_model.guid}/manifest", nil, user_headers } }
6060
let(:expected_codes_and_responses) do
61-
h = Hash.new(code: 403)
61+
h = Hash.new({ code: 403 })
6262
h['no_role'] = { code: 404 }
6363
h['org_auditor'] = { code: 404 }
6464
h['org_billing_manager'] = { code: 404 }

spec/request/app_usage_events_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
let(:usage_event_json) { build_usage_event_json(usage_event) }
1616

1717
let(:expected_codes_and_responses) do
18-
h = Hash.new(
19-
code: 404,
20-
response_object: []
21-
)
18+
h = Hash.new({
19+
code: 404,
20+
response_object: []
21+
})
2222
h['admin'] = {
2323
code: 200,
2424
response_object: usage_event_json
@@ -62,10 +62,10 @@
6262
let(:app_usage_event_2_json) { build_usage_event_json(app_usage_event_2) }
6363

6464
let(:expected_codes_and_responses) do
65-
h = Hash.new(
66-
code: 200,
67-
response_objects: []
68-
)
65+
h = Hash.new({
66+
code: 200,
67+
response_objects: []
68+
})
6969
h['admin'] = {
7070
code: 200,
7171
response_objects: [app_usage_event_json, app_usage_event_2_json]
@@ -151,7 +151,7 @@
151151
end
152152

153153
let(:expected_codes_and_responses) do
154-
h = Hash.new(code: 403)
154+
h = Hash.new({ code: 403 })
155155
h['admin'] = { code: 200 }
156156
h
157157
end

spec/request/apps_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
end
9393

9494
let(:expected_codes_and_responses) do
95-
h = Hash.new(code: 403, errors: CF_NOT_AUTHORIZED)
95+
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED })
9696
h['org_billing_manager'] = { code: 422 }
9797
h['org_auditor'] = { code: 422 }
9898
h['no_role'] = { code: 422 }
@@ -453,7 +453,7 @@
453453
end
454454

455455
let(:expected_codes_and_responses) do
456-
h = Hash.new(code: 200, response_objects: [app_model1_response_object, app_model2_response_object])
456+
h = Hash.new({ code: 200, response_objects: [app_model1_response_object, app_model2_response_object] })
457457

458458
h['org_auditor'] = {
459459
code: 200,
@@ -1359,7 +1359,7 @@
13591359
end
13601360

13611361
let(:expected_codes_and_responses) do
1362-
h = Hash.new(code: 200, response_object: app_model_response_object)
1362+
h = Hash.new({ code: 200, response_object: app_model_response_object })
13631363
h['org_auditor'] = { code: 404 }
13641364
h['org_billing_manager'] = { code: 404 }
13651365
h['no_role'] = { code: 404 }
@@ -1593,7 +1593,7 @@
15931593
end
15941594

15951595
let(:expected_codes_and_responses) do
1596-
h = Hash.new(code: 200, response_object: app_model_response_object)
1596+
h = Hash.new({ code: 200, response_object: app_model_response_object })
15971597
h['space_supporter'] = { code: 200, response_object: app_model_empty_system_env_response_object }
15981598
h['global_auditor'] = h['org_manager'] = h['space_manager'] = h['space_auditor'] = { code: 403 }
15991599
h['org_auditor'] = h['org_billing_manager'] = h['no_role'] = { code: 404 }
@@ -1725,7 +1725,7 @@
17251725
end
17261726

17271727
let(:expected_codes_and_responses) do
1728-
h = Hash.new(code: 403)
1728+
h = Hash.new({ code: 403 })
17291729
h['admin'] = h['admin_read_only'] = h['space_developer'] = { code: 200, response_object: expected_response }
17301730
h['space_supporter'] = { code: 200, response_object: expected_response_system_env_redacted }
17311731
h['org_auditor'] = h['org_billing_manager'] = h['no_role'] = { code: 404 }
@@ -1741,7 +1741,7 @@
17411741

17421742
it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
17431743
let(:expected_codes_and_responses) do
1744-
h = Hash.new(code: 403)
1744+
h = Hash.new({ code: 403 })
17451745
h['admin'] = h['admin_read_only'] = { code: 200, response_object: expected_response }
17461746
h['org_auditor'] = h['org_billing_manager'] = h['no_role'] = { code: 404 }
17471747
h
@@ -1810,7 +1810,7 @@
18101810
->(headers) { get "/v3/apps/#{app_model.guid}/builds", nil, headers }
18111811
end
18121812
let(:expected_codes_and_responses) do
1813-
h = Hash.new(code: 200, response_guids: [build.guid, second_build.guid])
1813+
h = Hash.new({ code: 200, response_guids: [build.guid, second_build.guid] })
18141814
h['org_auditor'] = { code: 404 }
18151815
h['org_billing_manager'] = { code: 404 }
18161816
h['no_role'] = { code: 404 }

0 commit comments

Comments
 (0)