Skip to content

Commit 8834181

Browse files
pvdbpvdb
committed
chore: use File::write instead of Kernel#open 
1 parent 4538838 commit 8834181

8 files changed

+85
-109
lines changed

‎test/helper.rb‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,17 @@ def rake_system_dir
9595

9696
FileUtils.mkdir_p @system_dir
9797

98-
open File.join(@system_dir, "sys1.rake"), "w" do |io|
99-
io << <<~SYS
100-
task "sys1" do
101-
puts "SYS1"
102-
end
103-
SYS
104-
end
98+
File.write File.join(@system_dir, "sys1.rake"), <<~SYS
99+
task "sys1" do
100+
puts "SYS1"
101+
end
102+
SYS
105103

106104
ENV["RAKE_SYSTEM"] = @system_dir
107105
end
108106

109107
def rakefile(contents)
110-
open "Rakefile", "w" do |io|
111-
io << contents
112-
end
108+
File.write "Rakefile", contents
113109
end
114110

115111
def jruby?

‎test/support/rakefile_definitions.rb‎

Lines changed: 55 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,16 @@ def rakefile_extra
186186

187187
FileUtils.mkdir_p "rakelib"
188188

189-
open File.join("rakelib", "extra.rake"), "w" do |io|
190-
io << <<~EXTRA_RAKE
191-
# Added for testing
192-
193-
namespace :extra do
194-
desc "An Extra Task"
195-
task :extra do
196-
puts "Read all about it"
197-
end
189+
File.write File.join("rakelib", "extra.rake"), <<~EXTRA_RAKE
190+
# Added for testing
191+
192+
namespace :extra do
193+
desc "An Extra Task"
194+
task :extra do
195+
puts "Read all about it"
198196
end
199-
EXTRA_RAKE
200-
end
197+
end
198+
EXTRA_RAKE
201199
end
202200

203201
def rakefile_file_creation
@@ -245,7 +243,7 @@ def rakefile_imports
245243
end
246244
247245
file "dynamic_deps" do |t|
248-
open(t.name, "w") do |f| f.puts "puts 'DYNAMIC'" end
246+
File.write t.name, "puts 'DYNAMIC'\n"
249247
end
250248
251249
import "dynamic_deps"
@@ -255,39 +253,31 @@ def rakefile_imports
255253
puts "FIRST"
256254
IMPORTS
257255

258-
open "deps.mf", "w" do |io|
259-
io << <<~DEPS
260-
default: other
261-
DEPS
262-
end
256+
File.write "deps.mf", <<~DEPS
257+
default: other
258+
DEPS
263259

264-
open "static_deps", "w" do |f|
265-
f.puts 'puts "STATIC"'
266-
end
260+
File.write "static_deps", "puts 'STATIC'\n"
267261
end
268262

269263
def rakefile_regenerate_imports
270264
rakefile <<~REGENERATE_IMPORTS
271265
task :default
272266
273267
task :regenerate do
274-
open("deps", "w") do |f|
275-
f << <<~CONTENT
276-
file "deps" => :regenerate
277-
puts "REGENERATED"
278-
CONTENT
279-
end
268+
File.write "deps", <<~CONTENT
269+
file "deps" => :regenerate
270+
puts "REGENERATED"
271+
CONTENT
280272
end
281273
282274
import "deps"
283275
REGENERATE_IMPORTS
284276

285-
open "deps", "w" do |f|
286-
f << <<~CONTENT
287-
file "deps" => :regenerate
288-
puts "INITIAL"
289-
CONTENT
290-
end
277+
File.write "deps", <<~CONTENT
278+
file "deps" => :regenerate
279+
puts "INITIAL"
280+
CONTENT
291281
end
292282

293283
def rakefile_multidesc
@@ -387,28 +377,22 @@ def rakefile_rakelib
387377
FileUtils.mkdir_p "rakelib"
388378

389379
Dir.chdir "rakelib" do
390-
open "test1.rb", "w" do |io|
391-
io << <<~TEST1
392-
task :default do
393-
puts "TEST1"
394-
end
395-
TEST1
396-
end
380+
File.write "test1.rb", <<~TEST1
381+
task :default do
382+
puts "TEST1"
383+
end
384+
TEST1
397385

398-
open "test2.rake", "w" do |io|
399-
io << <<~TEST1
400-
task :default do
401-
puts "TEST2"
402-
end
403-
TEST1
404-
end
386+
File.write "test2.rake", <<~TEST2
387+
task :default do
388+
puts "TEST2"
389+
end
390+
TEST2
405391
end
406392
end
407393

408394
def rakefile_rbext
409-
open "rakefile.rb", "w" do |io|
410-
io << 'task :default do puts "OK" end'
411-
end
395+
File.write "rakefile.rb", 'task :default do puts "OK" end'
412396
end
413397

414398
def rakefile_unittest
@@ -477,15 +461,15 @@ def rakefile_test_signal
477461
478462
task :default => :test
479463
TEST_SIGNAL
480-
open "a_test.rb", "w" do |io|
481-
io << 'puts "ATEST"' << "\n"
482-
io << "$stdout.flush" << "\n"
483-
io << 'Process.kill("TERM", $$)' << "\n"
484-
end
485-
open "b_test.rb", "w" do |io|
486-
io << 'puts "BTEST"' << "\n"
487-
io << "$stdout.flush" << "\n"
488-
end
464+
File.write "a_test.rb", <<~A_TEST
465+
puts "ATEST"
466+
$stdout.flush
467+
Process.kill("TERM", $$)
468+
A_TEST
469+
File.write "b_test.rb", <<~B_TEST
470+
puts "BTEST"
471+
$stdout.flush
472+
B_TEST
489473
end
490474

491475
def rakefile_failing_test_task
@@ -497,21 +481,21 @@ def rakefile_failing_test_task
497481
t.test_files = ['a_test.rb']
498482
end
499483
TEST_TASK
500-
open "a_test.rb", "w" do |io|
501-
io << "require 'minitest/autorun'\n"
502-
io << "class ExitTaskTest < Minitest::Test\n"
503-
io << " def test_exit\n"
504-
io << " assert false, 'this should fail'\n"
505-
io << " end\n"
506-
io << "end\n"
507-
end
484+
File.write "a_test.rb", <<~A_TEST
485+
require 'minitest/autorun'
486+
class ExitTaskTest < Minitest::Test
487+
def test_exit
488+
assert false, 'this should fail'
489+
end
490+
end
491+
A_TEST
508492
end
509493

510494
def rakefile_stand_alone_filelist
511-
open "stand_alone_filelist.rb", "w" do |io|
512-
io << "require 'rake/file_list'\n"
513-
io << "FL = Rake::FileList['*.rb']\n"
514-
io << "puts FL\n"
515-
end
495+
File.write "stand_alone_filelist.rb", <<~STAND_ALONE
496+
require 'rake/file_list'
497+
FL = Rake::FileList['*.rb']
498+
puts FL
499+
STAND_ALONE
516500
end
517501
end

‎test/test_rake_application_options.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ def test_rakelib
184184
def test_require
185185
$LOAD_PATH.unshift @tempdir
186186

187-
open "reqfile.rb", "w" do |io| io << "TESTING_REQUIRE << 1" end
188-
open "reqfile2.rb", "w" do |io| io << "TESTING_REQUIRE << 2" end
189-
open "reqfile3.rake", "w" do |io| io << "TESTING_REQUIRE << 3" end
187+
File.write "reqfile.rb", "TESTING_REQUIRE << 1"
188+
File.write "reqfile2.rb", "TESTING_REQUIRE << 2"
189+
File.write "reqfile3.rake", "TESTING_REQUIRE << 3"
190190

191191
flags(["--require", "reqfile"], "-rreqfile2", "-rreqfile3")
192192

‎test/test_rake_definitions.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def test_implicit_file_dependencies
7878
def create_existing_file
7979
Dir.mkdir File.dirname(EXISTINGFILE) unless
8080
File.exist?(File.dirname(EXISTINGFILE))
81-
open(EXISTINGFILE, "w") do |f| f.puts "HI" end unless
81+
File.write(EXISTINGFILE, "HI") unless
8282
File.exist?(EXISTINGFILE)
8383
end
8484

‎test/test_rake_file_list.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ def setup
2323
FileUtils.touch "abc.x"
2424
FileUtils.touch "existing"
2525

26-
open "xyzzy.txt", "w" do |io|
27-
io.puts "x"
28-
io.puts "XYZZY"
29-
end
26+
File.write "xyzzy.txt", <<~EOTEXT
27+
x
28+
XYZZY
29+
EOTEXT
3030

3131
end
3232

‎test/test_rake_file_task.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_file_need
2727
assert ftask.needed?, "file should be needed"
2828
assert_equal Rake::LATE, ftask.timestamp
2929

30-
open(ftask.name, "w") { |f| f.puts "HI" }
30+
File.write(ftask.name, "HI\n")
3131

3232
assert_nil ftask.prerequisites.map { |n| Task[n].timestamp }.max
3333
assert ! ftask.needed?, "file should not be needed"

‎test/test_rake_file_utils.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def test_rm_nowrite
5656
end
5757

5858
def test_ln
59-
open("a", "w") { |f| f.puts "TEST_LN" }
59+
File.write("a", "TEST_LN\n")
6060

6161
Rake::FileUtilsExt.safe_ln("a", "b", verbose: false)
6262

@@ -410,9 +410,7 @@ def test_split_all
410410
end
411411

412412
def command(name, text)
413-
open name, "w", 0750 do |io|
414-
io << text
415-
end
413+
File.write(name, text)
416414
end
417415

418416
def check_no_expansion

‎test/test_rake_makefile_loader.rb‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,22 @@ class TestRakeMakefileLoader < Rake::TestCase # :nodoc:
88
def test_parse
99
Dir.chdir @tempdir
1010

11-
open "sample.mf", "w" do |io|
12-
io << <<~'SAMPLE_MF'
13-
# Comments
14-
a: a1 a2 a3 a4
15-
b: b1 b2 b3 \
16-
b4 b5 b6\
17-
# Mid: Comment
18-
b7
11+
File.write "sample.mf", <<~'SAMPLE_MF'
12+
# Comments
13+
a: a1 a2 a3 a4
14+
b: b1 b2 b3 \
15+
b4 b5 b6\
16+
# Mid: Comment
17+
b7
1918
20-
a : a5 a6 a7
21-
c: c1
22-
d: d1 d2 \
19+
a : a5 a6 a7
20+
c: c1
21+
d: d1 d2 \
2322
24-
e f : e1 f1
23+
e f : e1 f1
2524
26-
g\ 0: g1 g\ 2 g\ 3 g4
27-
SAMPLE_MF
28-
end
25+
g\ 0: g1 g\ 2 g\ 3 g4
26+
SAMPLE_MF
2927

3028
Task.clear
3129
loader = Rake::MakefileLoader.new

0 commit comments

Comments
 (0)