Skip to content

Commit 4668ab5

Browse files
authored
feat: upgrade to rack 3 (#241)
* feat: upgrade to rack 3 requires sinatra updating to 4.x / padrino-core 0.16(pre)
1 parent c0065fb commit 4668ab5

File tree

3 files changed

+65
-51
lines changed

3 files changed

+65
-51
lines changed

Diff for: Gemfile.lock

+39-32
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ GIT
1515
GEM
1616
remote: https://rubygems.org/
1717
specs:
18-
anyway_config (2.7.0)
18+
anyway_config (2.7.1)
1919
ruby-next-core (~> 1.0)
2020
as-notifications (1.0.2)
2121
awesome_print (1.9.2)
@@ -43,7 +43,7 @@ GEM
4343
concurrent-ruby (~> 1.0)
4444
dry-core (~> 1.1)
4545
zeitwerk (~> 2.6)
46-
dry-schema (1.14.0)
46+
dry-schema (1.14.1)
4747
concurrent-ruby (~> 1.0)
4848
dry-configurable (~> 1.0, >= 1.0.1)
4949
dry-core (~> 1.1)
@@ -82,7 +82,7 @@ GEM
8282
ruby2_keywords (~> 0.0.1)
8383
mysql2 (0.5.6)
8484
nio4r (2.7.4)
85-
nokogiri (1.18.2)
85+
nokogiri (1.18.3)
8686
mini_portile2 (~> 2.8.2)
8787
racc (~> 1.4)
8888
pact-support (1.21.2)
@@ -92,16 +92,16 @@ GEM
9292
jsonpath (~> 1.0)
9393
rainbow (~> 3.1.1)
9494
string_pattern (~> 2.0)
95-
pact_broker (2.113.0)
95+
pact_broker (2.113.2)
9696
anyway_config (~> 2.1)
9797
dry-validation (~> 1.8)
9898
haml (~> 5.0)
9999
json (~> 2.3)
100100
moments (~> 0.2)
101101
pact-support (~> 1.21, >= 1.21.2)
102102
psych (~> 5.0)
103-
rack (~> 2.2, >= 2.2.3)
104-
rack-protection (~> 3.0)
103+
rack (~> 3.1, >= 3.1.11)
104+
rack-protection (~> 4.1)
105105
redcarpet (~> 3.5, >= 3.5.1)
106106
reform (~> 2.6)
107107
request_store (~> 1.5)
@@ -113,30 +113,36 @@ GEM
113113
sucker_punch (~> 3.0)
114114
table_print (~> 1.5)
115115
webmachine (>= 2.0.0.beta, < 3.0)
116-
webrick (~> 1.8)
117116
wisper (~> 2.0)
118-
padrino-core (0.15.3)
119-
padrino-support (= 0.15.3)
120-
sinatra (>= 2.2.4)
117+
padrino-core (0.16.0.pre3)
118+
padrino-support (= 0.16.0.pre3)
119+
rackup (~> 2.1)
120+
sinatra (~> 4)
121121
thor (~> 1.0)
122-
padrino-support (0.15.3)
122+
padrino-support (0.16.0.pre3)
123123
parslet (2.0.0)
124124
pg (1.5.9)
125125
psych (5.2.3)
126126
date
127127
stringio
128-
puma (5.6.9)
128+
puma (6.6.0)
129129
nio4r (~> 2.0)
130130
racc (1.8.1)
131-
rack (2.2.11)
132-
rack-protection (3.2.0)
131+
rack (3.1.11)
132+
rack-protection (4.1.1)
133133
base64 (>= 0.1.0)
134-
rack (~> 2.2, >= 2.2.4)
134+
logger (>= 1.6.0)
135+
rack (>= 3.0.0, < 4)
136+
rack-session (2.1.0)
137+
base64 (>= 0.1.0)
138+
rack (>= 3.0.0)
135139
rack-test (2.2.0)
136140
rack (>= 1.3)
141+
rackup (2.2.1)
142+
rack (>= 3)
137143
rainbow (3.1.1)
138144
rake (13.2.1)
139-
redcarpet (3.6.0)
145+
redcarpet (3.6.1)
140146
reform (2.6.2)
141147
disposable (>= 0.5.0, < 1.0.0)
142148
representable (>= 3.1.1, < 4)
@@ -159,9 +165,9 @@ GEM
159165
rspec-expectations (3.13.3)
160166
diff-lcs (>= 1.2.0, < 2.0)
161167
rspec-support (~> 3.13.0)
162-
rspec-its (1.3.1)
163-
rspec-core (>= 3.0.0)
164-
rspec-expectations (>= 3.0.0)
168+
rspec-its (2.0.0)
169+
rspec-core (>= 3.13.0)
170+
rspec-expectations (>= 3.13.0)
165171
rspec-mocks (3.13.2)
166172
diff-lcs (>= 1.2.0, < 2.0)
167173
rspec-support (~> 3.13.0)
@@ -174,18 +180,20 @@ GEM
174180
semantic_logger (4.16.1)
175181
concurrent-ruby (~> 1.0)
176182
semver2 (3.4.2)
177-
sequel (5.89.0)
183+
sequel (5.90.0)
178184
bigdecimal
179-
sinatra (3.2.0)
185+
sinatra (4.1.1)
186+
logger (>= 1.6.0)
180187
mustermann (~> 3.0)
181-
rack (~> 2.2, >= 2.2.4)
182-
rack-protection (= 3.2.0)
188+
rack (>= 3.0.0, < 4)
189+
rack-protection (= 4.1.1)
190+
rack-session (>= 2.0.0, < 3)
183191
tilt (~> 2.0)
184-
sqlite3 (1.7.3)
192+
sqlite3 (2.6.0)
185193
mini_portile2 (~> 2.8.0)
186194
string_pattern (2.3.0)
187195
regexp_parser (~> 2.5, >= 2.5.0)
188-
stringio (3.1.2)
196+
stringio (3.1.5)
189197
sucker_punch (3.2.0)
190198
concurrent-ruby (~> 1.0)
191199
table_print (1.5.7)
@@ -199,9 +207,8 @@ GEM
199207
base64
200208
i18n (>= 0.4.0)
201209
multi_json
202-
webrick (1.9.1)
203210
wisper (2.0.1)
204-
zeitwerk (2.7.1)
211+
zeitwerk (2.7.2)
205212

206213
PLATFORMS
207214
ruby
@@ -212,15 +219,15 @@ DEPENDENCIES
212219
conventional-changelog!
213220
mysql2 (~> 0.3)
214221
pact_broker
215-
padrino-core (~> 0.14, >= 0.14.3)
222+
padrino-core (>= 0.16.0.pre3)
216223
pg (~> 1.5)
217-
puma (~> 5.6)
224+
puma (~> 6.0)
218225
rack-test (~> 2.0, >= 2.0.2)
219226
rake (~> 13.0)
220227
rspec (~> 3.7)
221-
rspec-its (~> 1.2)
222-
sinatra (~> 3.0)
223-
sqlite3 (~> 1.6)
228+
rspec-its (~> 2.0)
229+
sinatra (~> 4.0)
230+
sqlite3 (~> 2.0)
224231

225232
BUNDLED WITH
226233
2.4.22

Diff for: pact_broker/Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ gem "puma", "~> 6.0"
66
gem "mysql2", "~>0.3"
77
gem "sqlite3", "~>2.0", force_ruby_platform: true
88
gem "rake", "~> 13.0"
9-
gem "padrino-core", ">= 0.14.3", "~> 0.14"
10-
gem "sinatra", "~> 3.0"
9+
gem "padrino-core", ">= 0.16.0.pre3"
10+
gem "sinatra", "~> 4.0"

Diff for: pact_broker/Gemfile.lock

+24-17
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,16 @@ GEM
7878
jsonpath (~> 1.0)
7979
rainbow (~> 3.1.1)
8080
string_pattern (~> 2.0)
81-
pact_broker (2.113.0)
81+
pact_broker (2.113.2)
8282
anyway_config (~> 2.1)
8383
dry-validation (~> 1.8)
8484
haml (~> 5.0)
8585
json (~> 2.3)
8686
moments (~> 0.2)
8787
pact-support (~> 1.21, >= 1.21.2)
8888
psych (~> 5.0)
89-
rack (~> 2.2, >= 2.2.3)
90-
rack-protection (~> 3.0)
89+
rack (~> 3.1, >= 3.1.11)
90+
rack-protection (~> 4.1)
9191
redcarpet (~> 3.5, >= 3.5.1)
9292
reform (~> 2.6)
9393
request_store (~> 1.5)
@@ -99,13 +99,13 @@ GEM
9999
sucker_punch (~> 3.0)
100100
table_print (~> 1.5)
101101
webmachine (>= 2.0.0.beta, < 3.0)
102-
webrick (~> 1.8)
103102
wisper (~> 2.0)
104-
padrino-core (0.15.3)
105-
padrino-support (= 0.15.3)
106-
sinatra (>= 2.2.4)
103+
padrino-core (0.16.0.pre3)
104+
padrino-support (= 0.16.0.pre3)
105+
rackup (~> 2.1)
106+
sinatra (~> 4)
107107
thor (~> 1.0)
108-
padrino-support (0.15.3)
108+
padrino-support (0.16.0.pre3)
109109
parslet (2.0.0)
110110
pg (1.5.9)
111111
psych (5.2.3)
@@ -114,10 +114,16 @@ GEM
114114
puma (6.6.0)
115115
nio4r (~> 2.0)
116116
racc (1.8.1)
117-
rack (2.2.12)
118-
rack-protection (3.2.0)
117+
rack (3.1.11)
118+
rack-protection (4.1.1)
119119
base64 (>= 0.1.0)
120-
rack (~> 2.2, >= 2.2.4)
120+
logger (>= 1.6.0)
121+
rack (>= 3.0.0, < 4)
122+
rack-session (2.1.0)
123+
base64 (>= 0.1.0)
124+
rack (>= 3.0.0)
125+
rackup (2.2.1)
126+
rack (>= 3)
121127
rainbow (3.1.1)
122128
rake (13.2.1)
123129
redcarpet (3.6.1)
@@ -144,10 +150,12 @@ GEM
144150
semver2 (3.4.2)
145151
sequel (5.90.0)
146152
bigdecimal
147-
sinatra (3.2.0)
153+
sinatra (4.1.1)
154+
logger (>= 1.6.0)
148155
mustermann (~> 3.0)
149-
rack (~> 2.2, >= 2.2.4)
150-
rack-protection (= 3.2.0)
156+
rack (>= 3.0.0, < 4)
157+
rack-protection (= 4.1.1)
158+
rack-session (>= 2.0.0, < 3)
151159
tilt (~> 2.0)
152160
sqlite3 (2.6.0)
153161
mini_portile2 (~> 2.8.0)
@@ -167,7 +175,6 @@ GEM
167175
base64
168176
i18n (>= 0.4.0)
169177
multi_json
170-
webrick (1.9.1)
171178
wisper (2.0.1)
172179
zeitwerk (2.7.2)
173180

@@ -177,11 +184,11 @@ PLATFORMS
177184
DEPENDENCIES
178185
mysql2 (~> 0.3)
179186
pact_broker
180-
padrino-core (~> 0.14, >= 0.14.3)
187+
padrino-core (>= 0.16.0.pre3)
181188
pg (~> 1.5)
182189
puma (~> 6.0)
183190
rake (~> 13.0)
184-
sinatra (~> 3.0)
191+
sinatra (~> 4.0)
185192
sqlite3 (~> 2.0)
186193

187194
BUNDLED WITH

0 commit comments

Comments
 (0)