erb.rb: deprecate safe_level of ERB.new

Also, as it's in the middle of the list of 4 arguments, 3rd and 4th arguments
(trim_mode, eoutvar) are changed to keyword arguments.
Old ways to specify arguments are deprecated and warned now.

bin/erb: deprecate -S option.

We'll remove all of deprecated ones at Ruby 2.7+.

enc/make_encmake.rb: stopped using deprecated interface
ext/etc/mkconstants.rb: ditto
ext/socket/mkconstants.rb: ditto
sample/ripper/ruby2html.rb: ditto
spec/ruby/library/erb/defmethod/def_erb_method_spec.rb: ditto
spec/ruby/library/erb/new_spec.rb: ditto
test/erb/test_erb.rb: ditto
test/erb/test_erb_command.rb: ditto
tool/generic_erb.rb: ditto
tool/ruby_vm/helpers/dumper.rb: ditto
tool/transcode-tblgen.rb: ditto
lib/rdoc/erbio.rb: ditto
lib/rdoc/generator/darkfish.rb: ditto

[Feature #14256]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 15 insertions, 3 deletions

diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb
index c9986c7284..83c569b55b 100644
--- a/tool/generic_erb.rb
+++ b/tool/generic_erb.rb
@@ -34,7 +34,11 @@ unchanged = color.pass("unchanged")
 updated = color.fail("updated")
 
 result = templates.map do |template|
-  erb = ERB.new(File.read(template), nil, '%-')
+  if RUBY_VERSION >= '2.6'
+    erb = ERB.new(File.read(template), trim_mode: '%-')
+  else
+    erb = ERB.new(File.read(template), nil, '%-')
+  end
   erb.filename = template
   source ? erb.src : proc{erb.result(binding)}.call
 end
diff --git a/tool/ruby_vm/helpers/dumper.rb b/tool/ruby_vm/helpers/dumper.rb
index b622b898b9..ec7871dbea 100644
--- a/tool/ruby_vm/helpers/dumper.rb
+++ b/tool/ruby_vm/helpers/dumper.rb
@@ -32,7 +32,11 @@ class RubyVM::Dumper
   rescue Errno::ENOENT
     raise "don't know how to generate #{path}"
   else
-    erb = ERB.new src, nil, '%-'
+    if RUBY_VERSION >= '2.6'
+      erb = ERB.new(src, trim_mode: '%-')
+    else
+      erb = ERB.new(src, nil, '%-')
+    end
     erb.filename = path.realpath.to_path
     return erb
   end
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index f43627b781..6a896ad392 100644
--- a/tool/transcode-tblgen.rb
+++ b/tool/transcode-tblgen.rb
@@ -1078,7 +1078,11 @@ if __FILE__ == $0
   end
 
   libs1 = $".dup
-  erb = ERB.new(src, nil, '%')
+  if RUBY_VERSION >= '2.6'
+    erb = ERB.new(src, trim_mode: '%')
+  else
+    erb = ERB.new(src, nil, '%')
+  end
   erb.filename = arg
   erb_result = erb.result(binding)
   libs2 = $".dup