Skip to content

Commit 2bfdd1a

Browse files
authored
Merge pull request #2232 from tk0miya/deps/pstore
deps: Add pstore, ostruct to Gemfile
2 parents 991bacb + 549847f commit 2bfdd1a

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ gem "rbs-amber", path: "test/assets/test-gem"
4444
# Bundled gems
4545
gem "net-smtp"
4646
gem 'csv'
47+
gem 'ostruct'
48+
gem 'pstore'
4749

4850
group :minitest do
4951
gem "minitest"

Gemfile.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ GEM
6666
net-smtp (0.5.0)
6767
net-protocol
6868
nkf (0.2.0)
69+
ostruct (0.6.1)
6970
parallel (1.26.3)
7071
parser (3.3.6.0)
7172
ast (~> 2.4.1)
7273
racc
7374
power_assert (2.0.5)
75+
pstore (0.1.4)
7476
psych (4.0.6)
7577
stringio
7678
public_suffix (6.0.1)
@@ -174,6 +176,8 @@ DEPENDENCIES
174176
mutex_m
175177
net-smtp
176178
nkf
179+
ostruct
180+
pstore
177181
raap
178182
rake
179183
rake-compiler

test/rbs/cli_test.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ def test_collection_install
11741174
path: #{dir.join('gem_rbs_collection')}
11751175
YAML
11761176

1177-
bundle_install('ast', 'abbrev', 'bigdecimal')
1177+
bundle_install('ast', 'abbrev', 'bigdecimal', 'logger')
11781178
_stdout, _stderr = run_rbs_collection("install", bundler: true)
11791179

11801180
rbs_collection_lock = dir.join('rbs_collection.lock.yaml')
@@ -1240,7 +1240,7 @@ def test_collection_update
12401240
path: #{dir.join('gem_rbs_collection')}
12411241
YAML
12421242

1243-
bundle_install('ast', 'abbrev', 'bigdecimal')
1243+
bundle_install('ast', 'abbrev', 'bigdecimal', 'logger')
12441244
run_rbs_collection("update", bundler: true)
12451245

12461246
assert dir.join('rbs_collection.lock.yaml').exist?
@@ -1280,7 +1280,7 @@ def test_collection_install_gemspec
12801280
RUBY
12811281
(dir/"sig").mkdir
12821282

1283-
bundle_install(:gemspec, "abbrev", "bigdecimal")
1283+
bundle_install(:gemspec, "abbrev", "bigdecimal", "logger")
12841284
stdout, _ = run_rbs_collection("install", bundler: true)
12851285

12861286
assert_match(/Installing ast:(\d(\.\d)*)/, stdout)
@@ -1310,7 +1310,7 @@ def test_collection_install__mutex_m__config__bundled
13101310
- name: mutex_m
13111311
YAML
13121312

1313-
bundle_install(["mutex_m", ">= 0.3.0"])
1313+
bundle_install("logger", ["mutex_m", ">= 0.3.0"])
13141314
_stdout, stderr = run_rbs_collection("install", bundler: true)
13151315

13161316
refute_match(/`mutex_m` as a stdlib in rbs-gem is deprecated./, stderr)
@@ -1343,7 +1343,7 @@ def test_collection_install__mutex_m__config__no_bundled
13431343
- name: mutex_m
13441344
YAML
13451345

1346-
bundle_install(["mutex_m", "0.2.0"])
1346+
bundle_install("logger", ["mutex_m", "0.2.0"])
13471347
_stdout, stderr = run_rbs_collection("install", bundler: true)
13481348

13491349
assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.'
@@ -1379,7 +1379,7 @@ def test_collection_install__mutex_m__config__stdlib_source
13791379
type: stdlib
13801380
YAML
13811381

1382-
bundle_install
1382+
bundle_install("logger")
13831383
_stdout, stderr = run_rbs_collection("install", bundler: true)
13841384

13851385
assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.'
@@ -1410,7 +1410,7 @@ def test_collection_install__mutex_m__bundled
14101410
path: #{dir.join('gem_rbs_collection')}
14111411
YAML
14121412

1413-
bundle_install(["mutex_m", ">= 0.3.0"])
1413+
bundle_install("logger", ["mutex_m", ">= 0.3.0"])
14141414
_stdout, stderr = run_rbs_collection("install", bundler: true)
14151415

14161416
refute_match(/`mutex_m` as a stdlib in rbs-gem is deprecated./, stderr)
@@ -1440,7 +1440,7 @@ def test_collection_install__mutex_m__no_bundled
14401440
path: #{dir.join('gem_rbs_collection')}
14411441
YAML
14421442

1443-
bundle_install(["mutex_m", "0.2.0"])
1443+
bundle_install("logger", ["mutex_m", "0.2.0"])
14441444
_stdout, stderr = run_rbs_collection("install", bundler: true)
14451445

14461446
assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.'
@@ -1475,7 +1475,7 @@ def test_collection_install__mutex_m__dependency_no_bundled
14751475
- name: mutex_m
14761476
YAML
14771477

1478-
bundle_install("true_string") # true_string is a soutaro's gem that doesn't have sig directory
1478+
bundle_install("logger", "true_string") # true_string is a soutaro's gem that doesn't have sig directory
14791479

14801480
_stdout, stderr = run_rbs_collection("install", bundler: true)
14811481

@@ -1519,7 +1519,7 @@ def test_collection_install__mutex_m__rbs_dependency_and__gem_dependency
15191519
- name: mutex_m
15201520
YAML
15211521

1522-
bundle_install(["hola", { path: "gem" }])
1522+
bundle_install("logger", ["hola", { path: "gem" }])
15231523

15241524
(dir + RBS::Collection::Config::PATH).write(<<~YAML)
15251525
sources:

0 commit comments

Comments
 (0)