Skip to content

Commit 919c93f

Browse files
committed
Bump Ruby to 3.4
* Skipping 3.3 due to bundler bug: rubygems/rubygems#8217
1 parent 81e3e18 commit 919c93f

29 files changed

+120
-102
lines changed

.ruby-version

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

Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ gem 'loggregator_emitter', '~> 5.0'
1919
gem 'membrane', '~> 1.0'
2020
gem 'mime-types', '~> 3.6'
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'
@@ -59,6 +60,8 @@ gem 'fog-google', '~> 1.24.1'
5960
gem 'fog-local'
6061
gem 'fog-openstack'
6162

63+
gem 'google-protobuf', '~> 3.25'
64+
6265
gem 'cf-uaa-lib', '~> 4.0.8'
6366

6467
group :db do

Gemfile.lock

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -224,29 +224,27 @@ GEM
224224
google-apis-core (>= 0.11.0, < 2.a)
225225
google-cloud-env (1.6.0)
226226
faraday (>= 0.17.3, < 3.0)
227-
google-protobuf (3.25.5)
228-
google-protobuf (3.25.5-x86_64-darwin)
229-
google-protobuf (3.25.5-x86_64-linux)
227+
google-protobuf (3.25.6)
230228
googleapis-common-protos (1.6.0)
231229
google-protobuf (>= 3.18, < 5.a)
232230
googleapis-common-protos-types (~> 1.7)
233231
grpc (~> 1.41)
234-
googleapis-common-protos-types (1.15.0)
232+
googleapis-common-protos-types (1.19.0)
235233
google-protobuf (>= 3.18, < 5.a)
236234
googleauth (1.8.1)
237235
faraday (>= 0.17.3, < 3.a)
238236
jwt (>= 1.4, < 3.0)
239237
multi_json (~> 1.11)
240238
os (>= 0.9, < 2.0)
241239
signet (>= 0.16, < 2.a)
242-
grpc (1.64.0)
243-
google-protobuf (~> 3.25)
240+
grpc (1.71.0)
241+
google-protobuf (>= 3.25, < 5.0)
244242
googleapis-common-protos-types (~> 1.0)
245-
grpc (1.64.0-x86_64-darwin)
246-
google-protobuf (~> 3.25)
243+
grpc (1.71.0-x86_64-darwin)
244+
google-protobuf (>= 3.25, < 5.0)
247245
googleapis-common-protos-types (~> 1.0)
248-
grpc (1.64.0-x86_64-linux)
249-
google-protobuf (~> 3.25)
246+
grpc (1.71.0-x86_64-linux)
247+
google-protobuf (>= 3.25, < 5.0)
250248
googleapis-common-protos-types (~> 1.0)
251249
hashdiff (1.1.2)
252250
honeycomb-beeline (3.1.0)
@@ -554,6 +552,7 @@ GEM
554552
fluent-logger
555553
yajl-ruby (~> 1.0)
556554
stringio (3.1.2)
555+
syslog (0.1.1)
557556
talentbox-delayed_job_sequel (4.3.0)
558557
delayed_job (~> 4.1.0)
559558
sequel (>= 3.38, < 6.0)
@@ -617,6 +616,7 @@ DEPENDENCIES
617616
fog-google (~> 1.24.1)
618617
fog-local
619618
fog-openstack
619+
google-protobuf (~> 3.25)
620620
googleapis-common-protos (>= 1.3.12)
621621
hashdiff
622622
honeycomb-beeline
@@ -631,6 +631,7 @@ DEPENDENCIES
631631
mime-types (~> 3.6)
632632
mock_redis
633633
multipart-parser
634+
mutex_m
634635
mysql2 (~> 0.5.6)
635636
net-ssh
636637
netaddr (>= 2.0.4)
@@ -676,11 +677,12 @@ DEPENDENCIES
676677
sshkey
677678
statsd-ruby (~> 1.5.0)
678679
steno
680+
syslog
679681
talentbox-delayed_job_sequel (~> 4.3.0)
680682
thin
681683
timecop
682684
vmstat (~> 2.3)
683685
webmock (> 2.3.1)
684686

685687
BUNDLED WITH
686-
2.4.10
688+
2.6.6

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 :id, name: :id
55
Timestamp :last_update
66
end
77
end
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Sequel.migration do
2-
change do
3-
alter_table :asg_timestamps do
4-
rename_column :'{:name=>:id}', :id
5-
end
2+
up do
3+
# no op
4+
end
5+
6+
down do
7+
# no op
68
end
79
end

docs/v3/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source 'http://rubygems.org'
22

3+
gem 'bigdecimal'
34
gem 'json', '>= 2.3.0'
45
gem 'middleman', '~> 4.5'
56
gem 'middleman-autoprefixer', '~> 3.0', '>= 3.0.0'
@@ -8,6 +9,7 @@ gem 'middleman-livereload', '>= 3.4.7'
89
gem 'middleman-sprockets', '~> 4.1', '>= 4.1.1'
910
gem 'middleman-syntax', '3.4.0'
1011
gem 'mini_racer'
12+
gem 'mutex_m'
1113
gem 'nokogiri', '~> 1.18.3'
1214
gem 'rake', '>= 12.3.3'
1315
gem 'redcarpet', '~> 3.6.1'

docs/v3/Gemfile.lock

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GEM
1010
public_suffix (>= 2.0.2, < 6.0)
1111
autoprefixer-rails (10.4.7.0)
1212
execjs (~> 2)
13-
backports (3.25.0)
13+
bigdecimal (3.1.9)
1414
coffee-script (2.4.1)
1515
coffee-script-source
1616
execjs
@@ -21,9 +21,9 @@ GEM
2121
em-websocket (0.5.3)
2222
eventmachine (>= 0.12.9)
2323
http_parser.rb (~> 0)
24-
erubis (2.7.0)
24+
erubi (1.13.1)
2525
eventmachine (1.2.7)
26-
execjs (2.9.1)
26+
execjs (2.10.0)
2727
fast_blank (1.0.1)
2828
fastimage (2.3.1)
2929
ffi (1.16.3)
@@ -48,41 +48,41 @@ GEM
4848
rb-fsevent (~> 0.10, >= 0.10.3)
4949
rb-inotify (~> 0.9, >= 0.9.10)
5050
memoist (0.16.2)
51-
middleman (4.5.1)
52-
coffee-script (~> 2.2)
53-
haml (>= 4.0.5)
54-
kramdown (>= 2.3.0)
55-
middleman-cli (= 4.5.1)
56-
middleman-core (= 4.5.1)
51+
middleman (4.6.0)
52+
middleman-cli (= 4.6.0)
53+
middleman-core (= 4.6.0)
5754
middleman-autoprefixer (3.0.0)
5855
autoprefixer-rails (~> 10.0)
5956
middleman-core (>= 4.0.0)
60-
middleman-cli (4.5.1)
57+
middleman-cli (4.6.0)
6158
thor (>= 0.17.0, < 1.3.0)
62-
middleman-core (4.5.1)
63-
activesupport (>= 6.1, < 7.1)
59+
middleman-core (4.6.0)
60+
activesupport (>= 6.1)
6461
addressable (~> 2.4)
65-
backports (~> 3.6)
6662
bundler (~> 2.0)
67-
contracts (~> 0.13, < 0.17)
63+
coffee-script (~> 2.2)
64+
contracts
6865
dotenv
69-
erubis
66+
erubi
7067
execjs (~> 2.0)
7168
fast_blank
7269
fastimage (~> 2.0)
70+
haml (>= 4.0.5)
7371
hamster (~> 3.0)
74-
hashie (~> 3.4)
75-
i18n (~> 1.6.0)
72+
hashie (>= 3.4, < 6.0)
73+
i18n (>= 1.6, < 1.15)
74+
kramdown (~> 2.4)
7675
listen (~> 3.0)
7776
memoist (~> 0.14)
7877
padrino-helpers (~> 0.15.0)
7978
parallel
80-
rack (>= 1.4.5, < 3)
79+
rack (>= 3)
80+
rackup
8181
sassc (~> 2.0)
8282
servolux
83-
tilt (~> 2.0.9)
83+
tilt (~> 2.2)
8484
toml
85-
uglifier (~> 3.0)
85+
uglifier (>= 3, < 5)
8686
webrick
8787
middleman-gh-pages (0.4.1)
8888
rake (> 0.9.3)
@@ -100,6 +100,7 @@ GEM
100100
mini_racer (0.16.0)
101101
libv8-node (~> 18.19.0.0)
102102
minitest (5.23.1)
103+
mutex_m (0.3.0)
103104
nokogiri (1.18.3)
104105
mini_portile2 (~> 2.8.2)
105106
racc (~> 1.4)
@@ -118,9 +119,11 @@ GEM
118119
parslet (2.0.0)
119120
public_suffix (5.0.5)
120121
racc (1.8.1)
121-
rack (2.2.13)
122+
rack (3.1.12)
122123
rack-livereload (0.3.17)
123124
rack
125+
rackup (2.2.1)
126+
rack (>= 3)
124127
rake (13.2.1)
125128
rb-fsevent (0.11.2)
126129
rb-inotify (0.11.1)
@@ -136,17 +139,17 @@ GEM
136139
sassc (2.4.0)
137140
ffi (~> 1.9)
138141
servolux (0.13.0)
139-
sprockets (3.7.2)
142+
sprockets (4.2.1)
140143
concurrent-ruby (~> 1.0)
141-
rack (> 1, < 3)
144+
rack (>= 2.2.4, < 4)
142145
temple (0.10.3)
143146
thor (1.2.2)
144-
tilt (2.0.11)
147+
tilt (2.6.0)
145148
toml (0.3.0)
146149
parslet (>= 1.8.0, < 3.0.0)
147150
tzinfo (2.0.6)
148151
concurrent-ruby (~> 1.0)
149-
uglifier (3.2.0)
152+
uglifier (4.2.1)
150153
execjs (>= 0.3.0, < 3)
151154
webrick (1.8.2)
152155

@@ -157,6 +160,7 @@ PLATFORMS
157160
x86_64-linux
158161

159162
DEPENDENCIES
163+
bigdecimal
160164
json (>= 2.3.0)
161165
middleman (~> 4.5)
162166
middleman-autoprefixer (~> 3.0, >= 3.0.0)
@@ -165,10 +169,11 @@ DEPENDENCIES
165169
middleman-sprockets (~> 4.1, >= 4.1.1)
166170
middleman-syntax (= 3.4.0)
167171
mini_racer
172+
mutex_m
168173
nokogiri (~> 1.18.3)
169174
rake (>= 12.3.3)
170175
redcarpet (~> 3.6.1)
171176
sass
172177

173178
BUNDLED WITH
174-
2.4.10
179+
2.6.6

spec/request/admin_actions_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
h = Hash.new(
1515
{ code: 403 }.freeze
1616
)
17+
1718
h['admin'] = {
1819
code: 202
1920
}

spec/request/app_features_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
let(:expected_codes_and_responses) do
6262
h = Hash.new({ code: 404 }.freeze)
63+
6364
%w[admin admin_read_only global_auditor space_developer space_manager space_auditor org_manager
6465
space_supporter].each do |r|
6566
h[r] = { code: 200, response_object: features_response_object }
@@ -78,6 +79,7 @@
7879
describe 'GET /v3/apps/:guid/features/:name' do
7980
let(:expected_codes_and_responses) do
8081
h = Hash.new({ code: 404 }.freeze)
82+
8183
%w[admin admin_read_only global_auditor space_developer space_manager space_auditor org_manager
8284
space_supporter].each do |r|
8385
h[r] = { code: 200, response_object: feature_response_object }
@@ -161,6 +163,7 @@
161163

162164
let(:expected_codes_and_responses) do
163165
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
166+
164167
%w[no_role org_auditor org_billing_manager].each { |r| h[r] = { code: 404 } }
165168
%w[admin space_developer].each { |r| h[r] = { code: 200, response_object: feature_response_object } }
166169
h

spec/support/shared_examples/v3_service_binding_delete.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class BadError < StandardError; end
7272
VCAP::Services::ServiceBrokers::V2::Errors::ConcurrencyError.new(
7373
'foo',
7474
:delete,
75-
double(code: '500', reason: '', body: '')
75+
double({ code: '500', reason: '', body: '' })
7676
)
7777
)
7878
dbl

0 commit comments

Comments
 (0)