rbs 0.13.0 → 0.17.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ruby.yml +9 -5
- data/.gitignore +0 -1
- data/CHANGELOG.md +33 -1
- data/Gemfile +4 -0
- data/README.md +9 -3
- data/Rakefile +14 -1
- data/Steepfile +1 -1
- data/bin/annotate-with-rdoc +1 -1
- data/bin/setup +0 -2
- data/bin/test_runner.rb +15 -1
- data/{stdlib/builtin → core}/array.rbs +124 -120
- data/{stdlib/builtin → core}/basic_object.rbs +54 -54
- data/{stdlib/builtin → core}/binding.rbs +42 -42
- data/core/builtin.rbs +70 -0
- data/{stdlib/builtin → core}/class.rbs +33 -33
- data/{stdlib/builtin → core}/comparable.rbs +0 -0
- data/{stdlib/builtin → core}/complex.rbs +90 -90
- data/{stdlib/builtin → core}/constants.rbs +0 -0
- data/{stdlib/builtin → core}/data.rbs +0 -0
- data/{stdlib/builtin → core}/deprecated.rbs +0 -0
- data/{stdlib/builtin → core}/dir.rbs +1 -1
- data/{stdlib/builtin → core}/encoding.rbs +33 -33
- data/{stdlib/builtin → core}/enumerable.rbs +99 -92
- data/{stdlib/builtin → core}/enumerator.rbs +40 -40
- data/{stdlib/builtin → core}/errno.rbs +0 -0
- data/{stdlib/builtin → core}/errors.rbs +2 -2
- data/{stdlib/builtin → core}/exception.rbs +50 -50
- data/{stdlib/builtin → core}/false_class.rbs +6 -6
- data/{stdlib/builtin → core}/fiber.rbs +14 -14
- data/{stdlib/builtin → core}/fiber_error.rbs +1 -1
- data/{stdlib/builtin → core}/file.rbs +0 -0
- data/{stdlib/builtin → core}/file_test.rbs +0 -0
- data/{stdlib/builtin → core}/float.rbs +161 -161
- data/{stdlib/builtin → core}/gc.rbs +3 -3
- data/{stdlib/builtin → core}/hash.rbs +15 -15
- data/{stdlib/builtin → core}/integer.rbs +0 -0
- data/{stdlib/builtin → core}/io.rbs +89 -89
- data/{stdlib/builtin → core}/kernel.rbs +70 -154
- data/{stdlib/builtin → core}/marshal.rbs +0 -0
- data/{stdlib/builtin → core}/match_data.rbs +1 -1
- data/{stdlib/builtin → core}/math.rbs +0 -0
- data/{stdlib/builtin → core}/method.rbs +19 -19
- data/{stdlib/builtin → core}/module.rbs +13 -13
- data/{stdlib/builtin → core}/nil_class.rbs +20 -20
- data/{stdlib/builtin → core}/numeric.rbs +101 -101
- data/{stdlib/builtin → core}/object.rbs +173 -173
- data/{stdlib/builtin → core}/proc.rbs +91 -91
- data/{stdlib/builtin → core}/process.rbs +0 -0
- data/{stdlib/builtin → core}/random.rbs +1 -1
- data/{stdlib/builtin → core}/range.rbs +4 -6
- data/{stdlib/builtin → core}/rational.rbs +83 -83
- data/{stdlib/builtin → core}/rb_config.rbs +0 -0
- data/{stdlib/builtin → core}/regexp.rbs +0 -0
- data/{stdlib/builtin → core}/ruby_vm.rbs +0 -0
- data/{stdlib/builtin → core}/signal.rbs +7 -7
- data/{stdlib/builtin → core}/string.rbs +10 -10
- data/{stdlib/builtin → core}/string_io.rbs +8 -8
- data/{stdlib/builtin → core}/struct.rbs +2 -2
- data/{stdlib/builtin → core}/symbol.rbs +1 -1
- data/{stdlib/builtin → core}/thread.rbs +189 -189
- data/{stdlib/builtin → core}/thread_group.rbs +2 -2
- data/{stdlib/builtin → core}/time.rbs +0 -0
- data/{stdlib/builtin → core}/trace_point.rbs +0 -0
- data/{stdlib/builtin → core}/true_class.rbs +10 -10
- data/{stdlib/builtin → core}/unbound_method.rbs +0 -0
- data/{stdlib/builtin → core}/warning.rbs +1 -1
- data/docs/CONTRIBUTING.md +1 -0
- data/docs/repo.md +125 -0
- data/docs/syntax.md +50 -6
- data/goodcheck.yml +22 -5
- data/lib/rbs.rb +1 -0
- data/lib/rbs/ast/comment.rb +1 -1
- data/lib/rbs/cli.rb +105 -103
- data/lib/rbs/definition.rb +9 -4
- data/lib/rbs/definition_builder.rb +54 -22
- data/lib/rbs/environment.rb +1 -1
- data/lib/rbs/environment_loader.rb +79 -105
- data/lib/rbs/namespace.rb +1 -1
- data/lib/rbs/parser.rb +3153 -0
- data/lib/rbs/parser.y +25 -11
- data/lib/rbs/prototype/rb.rb +47 -9
- data/lib/rbs/prototype/runtime.rb +17 -7
- data/lib/rbs/repository.rb +121 -0
- data/lib/rbs/test/hook.rb +2 -0
- data/lib/rbs/test/setup.rb +5 -3
- data/lib/rbs/test/setup_helper.rb +4 -4
- data/lib/rbs/test/tester.rb +4 -1
- data/lib/rbs/test/type_check.rb +12 -6
- data/lib/rbs/type_name.rb +3 -2
- data/lib/rbs/variance_calculator.rb +1 -1
- data/lib/rbs/vendorer.rb +38 -16
- data/lib/rbs/version.rb +1 -1
- data/lib/rbs/writer.rb +1 -1
- data/sig/cli.rbs +58 -0
- data/sig/constant.rbs +2 -2
- data/sig/constant_table.rbs +11 -11
- data/sig/declarations.rbs +2 -2
- data/sig/definition.rbs +10 -5
- data/sig/definition_builder.rbs +4 -1
- data/sig/environment_loader.rbs +92 -46
- data/sig/members.rbs +2 -2
- data/sig/method_types.rbs +1 -1
- data/sig/namespace.rbs +4 -4
- data/sig/parser.rbs +25 -0
- data/sig/polyfill.rbs +42 -0
- data/sig/rbs.rbs +8 -0
- data/sig/repository.rbs +79 -0
- data/sig/substitution.rbs +3 -3
- data/sig/typename.rbs +1 -1
- data/sig/types.rbs +1 -1
- data/sig/vendorer.rbs +44 -0
- data/sig/writer.rbs +15 -15
- data/stdlib/abbrev/{abbrev.rbs → 0/abbrev.rbs} +0 -0
- data/stdlib/base64/{base64.rbs → 0/base64.rbs} +1 -1
- data/stdlib/benchmark/{benchmark.rbs → 0/benchmark.rbs} +2 -2
- data/stdlib/{bigdecimal/math → bigdecimal-math/0}/big_math.rbs +0 -0
- data/stdlib/bigdecimal/{big_decimal.rbs → 0/big_decimal.rbs} +0 -0
- data/stdlib/coverage/{coverage.rbs → 0/coverage.rbs} +2 -2
- data/stdlib/csv/{csv.rbs → 0/csv.rbs} +4 -4
- data/stdlib/date/{date.rbs → 0/date.rbs} +4 -4
- data/stdlib/date/{date_time.rbs → 0/date_time.rbs} +1 -1
- data/stdlib/dbm/0/dbm.rbs +277 -0
- data/stdlib/erb/{erb.rbs → 0/erb.rbs} +0 -0
- data/stdlib/fiber/{fiber.rbs → 0/fiber.rbs} +0 -0
- data/stdlib/find/{find.rbs → 0/find.rbs} +12 -12
- data/stdlib/forwardable/{forwardable.rbs → 0/forwardable.rbs} +0 -0
- data/stdlib/ipaddr/{ipaddr.rbs → 0/ipaddr.rbs} +0 -0
- data/stdlib/json/{json.rbs → 0/json.rbs} +0 -0
- data/stdlib/logger/{formatter.rbs → 0/formatter.rbs} +0 -0
- data/stdlib/logger/{log_device.rbs → 0/log_device.rbs} +1 -1
- data/stdlib/logger/{logger.rbs → 0/logger.rbs} +1 -1
- data/stdlib/logger/{period.rbs → 0/period.rbs} +0 -0
- data/stdlib/logger/{severity.rbs → 0/severity.rbs} +0 -0
- data/stdlib/mutex_m/{mutex_m.rbs → 0/mutex_m.rbs} +0 -0
- data/stdlib/pathname/{pathname.rbs → 0/pathname.rbs} +40 -40
- data/stdlib/prime/{integer-extension.rbs → 0/integer-extension.rbs} +0 -0
- data/stdlib/prime/{prime.rbs → 0/prime.rbs} +1 -1
- data/stdlib/pstore/0/pstore.rbs +287 -0
- data/stdlib/pty/{pty.rbs → 0/pty.rbs} +1 -1
- data/stdlib/securerandom/{securerandom.rbs → 0/securerandom.rbs} +0 -0
- data/stdlib/set/{set.rbs → 0/set.rbs} +10 -10
- data/stdlib/tmpdir/{tmpdir.rbs → 0/tmpdir.rbs} +12 -12
- data/stdlib/tsort/0/cyclic.rbs +4 -0
- data/stdlib/tsort/0/interfaces.rbs +19 -0
- data/stdlib/tsort/0/tsort.rbs +363 -0
- data/stdlib/uri/{file.rbs → 0/file.rbs} +0 -0
- data/stdlib/uri/{generic.rbs → 0/generic.rbs} +1 -1
- data/stdlib/uri/{http.rbs → 0/http.rbs} +0 -0
- data/stdlib/uri/{https.rbs → 0/https.rbs} +0 -0
- data/stdlib/uri/{ldap.rbs → 0/ldap.rbs} +0 -0
- data/stdlib/uri/{ldaps.rbs → 0/ldaps.rbs} +0 -0
- data/stdlib/zlib/{zlib.rbs → 0/zlib.rbs} +0 -0
- data/steep/Gemfile.lock +9 -9
- metadata +104 -93
- data/stdlib/builtin/builtin.rbs +0 -42
data/lib/rbs/parser.y
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
class RBS::Parser
|
2
|
-
token tUIDENT tLIDENT tNAMESPACE tINTERFACEIDENT
|
2
|
+
token tUIDENT tLIDENT tNAMESPACE tINTERFACEIDENT tGLOBALIDENT
|
3
|
+
tLKEYWORD tUKEYWORD tLKEYWORD_Q_E tUKEYWORD_Q_E
|
3
4
|
tIVAR tCLASSVAR
|
4
5
|
tANNOTATION
|
5
6
|
tSTRING tSYMBOL tINTEGER tWRITE_ATTR
|
@@ -474,6 +475,8 @@ rule
|
|
474
475
|
|
475
476
|
method_type:
|
476
477
|
start_merged_scope type_params params_opt block_opt kARROW simple_type {
|
478
|
+
reset_variable_scope
|
479
|
+
|
477
480
|
location = (val[1] || val[2] || val[3] || val[4]).location + val[5].location
|
478
481
|
type_params = val[1]&.value || []
|
479
482
|
|
@@ -846,7 +849,7 @@ rule
|
|
846
849
|
result = val[0]
|
847
850
|
}
|
848
851
|
|
849
|
-
keyword: tLKEYWORD | tUKEYWORD
|
852
|
+
keyword: tLKEYWORD | tUKEYWORD | tLKEYWORD_Q_E | tUKEYWORD_Q_E
|
850
853
|
|
851
854
|
function_type:
|
852
855
|
kLPAREN params kRPAREN kARROW simple_type {
|
@@ -874,7 +877,7 @@ rule
|
|
874
877
|
required_keywords: {},
|
875
878
|
optional_keywords: {},
|
876
879
|
rest_keywords: nil,
|
877
|
-
return_type: val[
|
880
|
+
return_type: val[1]
|
878
881
|
)
|
879
882
|
|
880
883
|
result = LocatedValue.new(value: type, location: location)
|
@@ -1165,14 +1168,21 @@ end
|
|
1165
1168
|
|
1166
1169
|
def new_token(type, value = input.matched)
|
1167
1170
|
charpos = charpos(input)
|
1168
|
-
|
1169
|
-
|
1171
|
+
matched = input.matched
|
1172
|
+
|
1173
|
+
if matched
|
1174
|
+
start_index = charpos - matched.size
|
1175
|
+
end_index = charpos
|
1170
1176
|
|
1171
|
-
|
1172
|
-
|
1173
|
-
|
1177
|
+
location = RBS::Location.new(buffer: buffer,
|
1178
|
+
start_pos: start_index,
|
1179
|
+
end_pos: end_index)
|
1174
1180
|
|
1175
|
-
|
1181
|
+
[type, LocatedValue.new(location: location, value: value)]
|
1182
|
+
else
|
1183
|
+
# scanner hasn't matched yet
|
1184
|
+
[false, nil]
|
1185
|
+
end
|
1176
1186
|
end
|
1177
1187
|
|
1178
1188
|
def charpos(scanner)
|
@@ -1291,10 +1301,10 @@ def next_token
|
|
1291
1301
|
return [:"type_#{type}", nil]
|
1292
1302
|
end
|
1293
1303
|
|
1294
|
-
return if @eof
|
1304
|
+
return new_token(false, '') if @eof
|
1295
1305
|
|
1296
1306
|
while true
|
1297
|
-
return if input.eos?
|
1307
|
+
return new_token(false, '') if input.eos?
|
1298
1308
|
|
1299
1309
|
case
|
1300
1310
|
when input.scan(/\s+/)
|
@@ -1344,8 +1354,12 @@ def next_token
|
|
1344
1354
|
new_token(:tNAMESPACE)
|
1345
1355
|
when input.scan(/[a-z_]\w*:/)
|
1346
1356
|
new_token(:tLKEYWORD, input.matched.chop.to_sym)
|
1357
|
+
when input.scan(/[a-z_]\w*[?!]:/)
|
1358
|
+
new_token(:tLKEYWORD_Q_E, input.matched.chop.to_sym)
|
1347
1359
|
when input.scan(/[A-Z]\w*:/)
|
1348
1360
|
new_token(:tUKEYWORD, input.matched.chop.to_sym)
|
1361
|
+
when input.scan(/[A-Z]\w*[?!]:/)
|
1362
|
+
new_token(:tUKEYWORD_Q_E, input.matched.chop.to_sym)
|
1349
1363
|
when input.scan(/\$[A-Za-z_]\w*/)
|
1350
1364
|
new_token(:tGLOBALIDENT)
|
1351
1365
|
when input.scan(/@[a-zA-Z_]\w*/)
|
data/lib/rbs/prototype/rb.rb
CHANGED
@@ -135,6 +135,18 @@ module RBS
|
|
135
135
|
|
136
136
|
decls.push member unless decls.include?(member)
|
137
137
|
|
138
|
+
when :ALIAS
|
139
|
+
new_name, old_name = node.children.map { |c| literal_to_symbol(c) }
|
140
|
+
member = AST::Members::Alias.new(
|
141
|
+
new_name: new_name,
|
142
|
+
old_name: old_name,
|
143
|
+
kind: singleton ? :singleton : :instance,
|
144
|
+
annotations: [],
|
145
|
+
location: nil,
|
146
|
+
comment: comments[node.first_lineno - 1],
|
147
|
+
)
|
148
|
+
decls.push member unless decls.include?(member)
|
149
|
+
|
138
150
|
when :FCALL
|
139
151
|
# Inside method definition cannot reach here.
|
140
152
|
args = node.children[1]&.children || []
|
@@ -166,9 +178,9 @@ module RBS
|
|
166
178
|
end
|
167
179
|
when :attr_reader
|
168
180
|
args.each do |arg|
|
169
|
-
if arg
|
181
|
+
if arg && (name = literal_to_symbol(arg))
|
170
182
|
decls << AST::Members::AttrReader.new(
|
171
|
-
name:
|
183
|
+
name: name,
|
172
184
|
ivar_name: nil,
|
173
185
|
type: Types::Bases::Any.new(location: nil),
|
174
186
|
location: nil,
|
@@ -179,9 +191,9 @@ module RBS
|
|
179
191
|
end
|
180
192
|
when :attr_accessor
|
181
193
|
args.each do |arg|
|
182
|
-
if arg
|
194
|
+
if arg && (name = literal_to_symbol(arg))
|
183
195
|
decls << AST::Members::AttrAccessor.new(
|
184
|
-
name:
|
196
|
+
name: name,
|
185
197
|
ivar_name: nil,
|
186
198
|
type: Types::Bases::Any.new(location: nil),
|
187
199
|
location: nil,
|
@@ -192,9 +204,9 @@ module RBS
|
|
192
204
|
end
|
193
205
|
when :attr_writer
|
194
206
|
args.each do |arg|
|
195
|
-
if arg
|
207
|
+
if arg && (name = literal_to_symbol(arg))
|
196
208
|
decls << AST::Members::AttrWriter.new(
|
197
|
-
name:
|
209
|
+
name: name,
|
198
210
|
ivar_name: nil,
|
199
211
|
type: Types::Bases::Any.new(location: nil),
|
200
212
|
location: nil,
|
@@ -203,6 +215,17 @@ module RBS
|
|
203
215
|
)
|
204
216
|
end
|
205
217
|
end
|
218
|
+
when :alias_method
|
219
|
+
if args[0] && args[1] && (new_name = literal_to_symbol(args[0])) && (old_name = literal_to_symbol(args[1]))
|
220
|
+
decls << AST::Members::Alias.new(
|
221
|
+
new_name: new_name,
|
222
|
+
old_name: old_name,
|
223
|
+
kind: singleton ? :singleton : :instance,
|
224
|
+
annotations: [],
|
225
|
+
location: nil,
|
226
|
+
comment: comments[node.first_lineno - 1],
|
227
|
+
)
|
228
|
+
end
|
206
229
|
end
|
207
230
|
|
208
231
|
each_child node do |child|
|
@@ -248,6 +271,15 @@ module RBS
|
|
248
271
|
end
|
249
272
|
end
|
250
273
|
|
274
|
+
def literal_to_symbol(node)
|
275
|
+
case node.type
|
276
|
+
when :LIT
|
277
|
+
node.children[0] if node.children[0].is_a?(Symbol)
|
278
|
+
when :STR
|
279
|
+
node.children[0].to_sym
|
280
|
+
end
|
281
|
+
end
|
282
|
+
|
251
283
|
def each_node(nodes)
|
252
284
|
nodes.each do |child|
|
253
285
|
if child.is_a?(RubyVM::AbstractSyntaxTree::Node)
|
@@ -379,7 +411,8 @@ module RBS
|
|
379
411
|
when :HASH
|
380
412
|
list = node.children[0]
|
381
413
|
if list
|
382
|
-
children = list.children
|
414
|
+
children = list.children
|
415
|
+
children.pop
|
383
416
|
else
|
384
417
|
children = []
|
385
418
|
end
|
@@ -387,8 +420,13 @@ module RBS
|
|
387
420
|
key_types = []
|
388
421
|
value_types = []
|
389
422
|
children.each_slice(2) do |k, v|
|
390
|
-
|
391
|
-
|
423
|
+
if k
|
424
|
+
key_types << literal_to_type(k)
|
425
|
+
value_types << literal_to_type(v)
|
426
|
+
else
|
427
|
+
key_types << untyped
|
428
|
+
value_types << untyped
|
429
|
+
end
|
392
430
|
end
|
393
431
|
|
394
432
|
if !key_types.empty? && key_types.all? { |t| t.is_a?(Types::Literal) }
|
@@ -17,11 +17,13 @@ module RBS
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def target?(const)
|
20
|
+
name = const_name(const)
|
21
|
+
|
20
22
|
patterns.any? do |pattern|
|
21
23
|
if pattern.end_with?("*")
|
22
|
-
(
|
24
|
+
(name || "").start_with?(pattern.chop)
|
23
25
|
else
|
24
|
-
|
26
|
+
name == pattern
|
25
27
|
end
|
26
28
|
end
|
27
29
|
end
|
@@ -37,7 +39,7 @@ module RBS
|
|
37
39
|
def decls
|
38
40
|
unless @decls
|
39
41
|
@decls = []
|
40
|
-
ObjectSpace.each_object(Module).select {|mod| target?(mod) }.sort_by(
|
42
|
+
ObjectSpace.each_object(Module).select {|mod| target?(mod) }.sort_by{|mod| const_name(mod) }.each do |mod|
|
41
43
|
case mod
|
42
44
|
when Class
|
43
45
|
generate_class mod
|
@@ -356,12 +358,14 @@ module RBS
|
|
356
358
|
end
|
357
359
|
|
358
360
|
def generate_module(mod)
|
359
|
-
|
361
|
+
name = const_name(mod)
|
362
|
+
|
363
|
+
unless name
|
360
364
|
RBS.logger.warn("Skipping anonymous module #{mod}")
|
361
365
|
return
|
362
366
|
end
|
363
367
|
|
364
|
-
type_name = to_type_name(
|
368
|
+
type_name = to_type_name(name)
|
365
369
|
|
366
370
|
decl = AST::Declarations::Module.new(
|
367
371
|
name: type_name,
|
@@ -374,12 +378,13 @@ module RBS
|
|
374
378
|
)
|
375
379
|
|
376
380
|
each_mixin(mod.included_modules, *mod.included_modules.flat_map(&:included_modules), namespace: type_name.namespace) do |included_module|
|
377
|
-
|
381
|
+
included_module_name = const_name(included_module)
|
382
|
+
unless included_module_name
|
378
383
|
RBS.logger.warn("Skipping anonymous module #{included_module} included in #{mod}")
|
379
384
|
next
|
380
385
|
end
|
381
386
|
|
382
|
-
module_name = to_type_name(
|
387
|
+
module_name = to_type_name(included_module_name)
|
383
388
|
if module_name.namespace == type_name.namespace
|
384
389
|
module_name = TypeName.new(name: module_name.name, namespace: Namespace.empty)
|
385
390
|
end
|
@@ -399,6 +404,11 @@ module RBS
|
|
399
404
|
|
400
405
|
generate_constants mod
|
401
406
|
end
|
407
|
+
|
408
|
+
def const_name(const)
|
409
|
+
@module_name_method ||= Module.instance_method(:name)
|
410
|
+
@module_name_method.bind(const).call
|
411
|
+
end
|
402
412
|
end
|
403
413
|
end
|
404
414
|
end
|
@@ -0,0 +1,121 @@
|
|
1
|
+
module RBS
|
2
|
+
class Repository
|
3
|
+
DEFAULT_STDLIB_ROOT = Pathname(_ = __dir__) + "../../stdlib"
|
4
|
+
|
5
|
+
class GemRBS
|
6
|
+
attr_reader :name
|
7
|
+
attr_reader :paths
|
8
|
+
|
9
|
+
def initialize(name:)
|
10
|
+
@name = name
|
11
|
+
@paths = []
|
12
|
+
@versions = nil
|
13
|
+
end
|
14
|
+
|
15
|
+
def versions
|
16
|
+
load! unless @versions
|
17
|
+
@versions or raise
|
18
|
+
end
|
19
|
+
|
20
|
+
def load!
|
21
|
+
@versions = {}
|
22
|
+
versions = @versions or raise
|
23
|
+
|
24
|
+
paths.each do |gem_path|
|
25
|
+
gem_path.each_child(false) do |child|
|
26
|
+
next unless Gem::Version.correct?(child.to_s)
|
27
|
+
|
28
|
+
if version = Gem::Version.create(child.to_s)
|
29
|
+
unless version.prerelease?
|
30
|
+
path = gem_path + child
|
31
|
+
|
32
|
+
if prev = versions[version]
|
33
|
+
RBS.logger.info { "Overwriting gem RBS in repository: gem=#{name}, prev_path=#{prev.path}, new_path=#{path}" }
|
34
|
+
end
|
35
|
+
|
36
|
+
versions[version] = VersionPath.new(gem: self, version: version, path: path)
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def version_names
|
44
|
+
versions.keys.sort_by(&:version)
|
45
|
+
end
|
46
|
+
|
47
|
+
def oldest_version
|
48
|
+
oldest = version_names.first or raise
|
49
|
+
versions[oldest] or raise
|
50
|
+
end
|
51
|
+
|
52
|
+
def latest_version
|
53
|
+
latest = version_names.last or raise
|
54
|
+
versions[latest] or raise
|
55
|
+
end
|
56
|
+
|
57
|
+
def find_best_version(version)
|
58
|
+
return latest_version unless version
|
59
|
+
|
60
|
+
if v = version_names.reverse.bsearch {|v| v <= version ? true : false }
|
61
|
+
versions[v]
|
62
|
+
else
|
63
|
+
oldest_version
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
def empty?
|
68
|
+
versions.empty?
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
VersionPath = _ = Struct.new(:gem, :version, :path, keyword_init: true)
|
73
|
+
|
74
|
+
attr_reader :dirs
|
75
|
+
attr_reader :gems
|
76
|
+
|
77
|
+
def initialize(no_stdlib: false)
|
78
|
+
@dirs = []
|
79
|
+
@gems = {}
|
80
|
+
|
81
|
+
unless no_stdlib
|
82
|
+
add(DEFAULT_STDLIB_ROOT)
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
def self.default
|
87
|
+
new().tap do |repo|
|
88
|
+
repo.add(DEFAULT_STDLIB_ROOT)
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
def add(dir)
|
93
|
+
dirs << dir
|
94
|
+
|
95
|
+
dir.each_child(false) do |child|
|
96
|
+
gem_name = child.to_s
|
97
|
+
gem_rbs = (gems[gem_name] ||= GemRBS.new(name: gem_name))
|
98
|
+
gem_rbs.paths << dir + child
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
102
|
+
def lookup(gem, version)
|
103
|
+
_, set = lookup_path(gem, version)
|
104
|
+
set&.path
|
105
|
+
end
|
106
|
+
|
107
|
+
def lookup_path(gem, version)
|
108
|
+
if gem_rbs = gems[gem]
|
109
|
+
unless gem_rbs.empty?
|
110
|
+
set = if v = Gem::Version.create(version)&.release
|
111
|
+
gem_rbs.find_best_version(v)
|
112
|
+
else
|
113
|
+
gem_rbs.latest_version
|
114
|
+
end
|
115
|
+
|
116
|
+
[gem_rbs, set]
|
117
|
+
end
|
118
|
+
end
|
119
|
+
end
|
120
|
+
end
|
121
|
+
end
|
data/lib/rbs/test/hook.rb
CHANGED
data/lib/rbs/test/setup.rb
CHANGED
@@ -2,6 +2,7 @@ require "rbs"
|
|
2
2
|
require "rbs/test"
|
3
3
|
require "optparse"
|
4
4
|
require "shellwords"
|
5
|
+
require "rbs/cli"
|
5
6
|
|
6
7
|
include RBS::Test::SetupHelper
|
7
8
|
|
@@ -32,12 +33,13 @@ if filter.empty?
|
|
32
33
|
exit 1
|
33
34
|
end
|
34
35
|
|
35
|
-
|
36
|
+
options = RBS::CLI::LibraryOptions.new()
|
37
|
+
|
36
38
|
OptionParser.new do |opts|
|
37
|
-
|
38
|
-
opts.on("-I [DIR]") do |dir| loader.add(path: Pathname(dir)) end
|
39
|
+
options.setup_library_options(opts)
|
39
40
|
end.parse!(opts)
|
40
41
|
|
42
|
+
loader = options.loader
|
41
43
|
env = RBS::Environment.from_loader(loader).resolve_type_names
|
42
44
|
|
43
45
|
def match(filter, name)
|
@@ -3,15 +3,15 @@ module RBS
|
|
3
3
|
module SetupHelper
|
4
4
|
class InvalidSampleSizeError < StandardError
|
5
5
|
attr_reader :string
|
6
|
-
|
6
|
+
|
7
7
|
def initialize(string)
|
8
8
|
@string = string
|
9
9
|
super("Sample size should be a positive integer: `#{string}`")
|
10
10
|
end
|
11
11
|
end
|
12
|
-
|
12
|
+
|
13
13
|
DEFAULT_SAMPLE_SIZE = 100
|
14
|
-
|
14
|
+
|
15
15
|
def get_sample_size(string)
|
16
16
|
case string
|
17
17
|
when ""
|
@@ -32,7 +32,7 @@ module RBS
|
|
32
32
|
when 'rspec'
|
33
33
|
['::RSpec::Mocks::Double']
|
34
34
|
when 'minitest'
|
35
|
-
['::Minitest::Mock']
|
35
|
+
['::Minitest::Mock']
|
36
36
|
else
|
37
37
|
RBS.logger.warn "Unknown test suite - defaults to nil"
|
38
38
|
nil
|