Revert changes to rdoc & rubygems regarding Tempfile.open(&block)

* They likely want to support older Ruby/tempfile versions
* Reverts part of e8c3872555fc85640505974e6b1c39d315572689

Author: eregon

test/rdoc/test_rdoc_parser.rb

@@ -106,7 +106,7 @@ def test_class_for_executable
   def test_class_for_forbidden
     omit 'chmod not supported' if Gem.win_platform?
 
-    Tempfile.open 'forbidden' do |io|
+    tf = Tempfile.open 'forbidden' do |io|
       begin
         File.chmod 0000, io.path
         forbidden = @store.add_file io.path
@@ -117,7 +117,9 @@ def test_class_for_forbidden
       ensure
         File.chmod 0400, io.path
       end
+      io
     end
+    tf.close!
   end
 
   def test_class_for_modeline

test/rdoc/test_rdoc_rd_block_parser.rb

@@ -154,7 +154,7 @@ def test_parse_include_subtree
         blank_line,
         blank_line)
 
-    Tempfile.open %w[parse_include .rd] do |io|
+    tf = Tempfile.open %w[parse_include .rd] do |io|
       io.puts "=begin\ninclude ((*worked*))\n=end"
       io.flush
 
@@ -163,7 +163,9 @@ def test_parse_include_subtree
       STR
 
       assert_equal expected, parse(str)
+      io
     end
+    tf.close!
   end
 
   def test_parse_heading

test/rdoc/test_rdoc_rdoc.rb

@@ -349,14 +349,16 @@ def test_parse_file_encoding
     @rdoc.options.encoding = Encoding::ISO_8859_1
     @rdoc.store = RDoc::Store.new
 
-    Tempfile.open 'test.txt' do |io|
+    tf = Tempfile.open 'test.txt' do |io|
       io.write 'hi'
       io.rewind
 
       top_level = @rdoc.parse_file io.path
 
       assert_equal Encoding::ISO_8859_1, top_level.absolute_name.encoding
+      io
     end
+    tf.close!
   end
 
   def test_parse_file_forbidden
@@ -365,7 +367,7 @@ def test_parse_file_forbidden
 
     @rdoc.store = RDoc::Store.new
 
-    Tempfile.open 'test.txt' do |io|
+    tf = Tempfile.open 'test.txt' do |io|
       io.write 'hi'
       io.rewind
 
@@ -384,7 +386,9 @@ def test_parse_file_forbidden
       ensure
         File.chmod 0400, io.path
       end
+      io
     end
+    tf.close!
   end
 
   def test_remove_unparseable
@@ -481,7 +485,7 @@ def test_setup_output_dir_exists_empty_created_rid
   end
 
   def test_setup_output_dir_exists_file
-    Tempfile.open 'test_rdoc_rdoc' do |tempfile|
+    tf = Tempfile.open 'test_rdoc_rdoc' do |tempfile|
       path = tempfile.path
 
       e = assert_raise RDoc::Error do
@@ -490,7 +494,9 @@ def test_setup_output_dir_exists_file
 
       assert_match(%r%#{Regexp.escape path} exists and is not a directory%,
                    e.message)
+      tempfile
     end
+    tf.close!
   end
 
   def test_setup_output_dir_exists_not_rdoc