merge revision(s) 762fca9b12b9cfb0159404c95ee4275100169c17:

	Prefer `File` class methods to write a string

	---
	 tool/make-snapshot | 23 ++++++++++-------------
	 1 file changed, 10 insertions(+), 13 deletions(-)

1 files changed, 10 insertions, 13 deletions

diff --git a/tool/make-snapshot b/tool/make-snapshot
index 5c66d5b76f..eb6858e906 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -341,7 +341,7 @@ def package(vcs, rev, destdir, tmp = nil)
     v = v[0]
   end
 
-  open("#{v}/revision.h", "wb") {|f|
+  File.open("#{v}/revision.h", "wb") {|f|
     short = vcs.short_revision(revision)
     f.puts "#define RUBY_REVISION #{short.inspect}"
     unless short == revision
@@ -387,6 +387,7 @@ def package(vcs, rev, destdir, tmp = nil)
     return
   end
   def (clean = []).add(n) push(n); n end
+  def clean.create(file, content = "") File.binwrite(add(file), content) end
   Dir.chdir(v) do
     unless File.exist?("ChangeLog")
       vcs.export_changelog(url, nil, revision, "ChangeLog")
@@ -434,14 +435,12 @@ def package(vcs, rev, destdir, tmp = nil)
       rescue Errno::ENOENT
         # use fallback file
       end
-      File.open(clean.add("config.status"), "w") {|f|
-        f.print status
-      }
+      clean.create("config.status", status)
       FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
-      File.open("#{hdrdir}/config.h", "w") {}
+      File.binwrite("#{hdrdir}/config.h", "")
       FileUtils.mkpath(defaults = "#{extout}/rubygems/defaults")
-      File.open("#{defaults}/operating_system.rb", "w") {}
-      File.open("#{defaults}/ruby.rb", "w") {}
+      File.binwrite("#{defaults}/operating_system.rb", "")
+      File.binwrite("#{defaults}/ruby.rb", "")
       miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross"
       baseruby = ENV["BASERUBY"]
       mk = (IO.read("template/Makefile.in") rescue IO.read("Makefile.in")).
@@ -477,11 +476,9 @@ update-gems:
 $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time:
 touch-unicode-files:
       APPEND
-      open(clean.add("Makefile"), "w") do |f|
-        f.puts mk
-      end
-      File.open(clean.add("revision.tmp"), "w") {}
-      File.open(clean.add(".revision.time"), "w") {}
+      clean.create("Makefile", mk)
+      clean.create("revision.tmp")
+      clean.create(".revision.time")
       ENV["CACHE_SAVE"] = "no"
       make = MAKE.new(args)
       return unless make.run("update-download")
@@ -615,7 +612,7 @@ revisions.collect {|rev| package(vcs, rev, destdir, tmp)}.flatten.each do |name|
     success = false
     next
   end
-  str = open(name, "rb") {|f| f.read}
+  str = File.binread(name)
   pathname = Pathname(name)
   basename = pathname.basename.to_s
   extname = pathname.extname.sub(/\A\./, '')