Skip to content

Commit 8b5c101

Browse files
authored
Merge pull request #933 from tdiary/fix/spec_error_on_ruby3
fix spec error on ruby3
2 parents b322436 + facc005 commit 8b5c101

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dockerfile": "Dockerfile",
77
"args": {
88
// Update 'VARIANT' to pick a Ruby version: 2, 2.7, 2.6, 2.5
9-
"VARIANT": "2",
9+
"VARIANT": "3",
1010
// Options
1111
"INSTALL_NODE": "false",
1212
"NODE_VERSION": "lts/*"

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ group :development do
2727
gem 'jasmine', '< 3'
2828
gem 'simplecov', require: false
2929
gem 'coveralls', '~> 0.8', require: false
30+
gem "rexml"
31+
gem "webrick"
3032
end
3133
end
3234

Gemfile.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ GEM
6666
rake (13.0.3)
6767
redcarpet (3.5.1)
6868
regexp_parser (2.0.3)
69+
rexml (3.2.4)
6970
rspec (3.10.0)
7071
rspec-core (~> 3.10.0)
7172
rspec-expectations (~> 3.10.0)
@@ -103,6 +104,7 @@ GEM
103104
thor (1.1.0)
104105
tins (1.26.0)
105106
sync
107+
webrick (1.7.0)
106108
xpath (3.2.0)
107109
nokogiri (~> 1.8)
108110

@@ -126,13 +128,15 @@ DEPENDENCIES
126128
racksh
127129
rake
128130
redcarpet
131+
rexml
129132
rspec
130133
ruby-debug-ide
131134
selenium-webdriver
132135
sequel
133136
simplecov
134137
sqlite3
135138
test-unit
139+
webrick
136140

137141
BUNDLED WITH
138142
2.1.4

lib/tdiary/io/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def transaction( date )
186186
else
187187
diaries.update( cache )
188188
end
189-
dirty = yield( diaries ) if iterator?
189+
dirty = yield( diaries ) if block_given?
190190
store( fh, diaries ) if ((dirty | force_save) & TDiaryBase::DIRTY_DIARY) != 0
191191
store_comment( cfile, diaries ) if ((dirty | force_save) & TDiaryBase::DIRTY_COMMENT) != 0
192192
store_referer( rfile, diaries ) if ((dirty | force_save) & TDiaryBase::DIRTY_REFERER) != 0

0 commit comments

Comments
 (0)