Merge ab9f546 into e5e3f97

rubyzip · Jan 26, 2021 · eeaf6a9 · eeaf6a9
2 parents e5e3f97 + ab9f546
commit eeaf6a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/lib/zip/ioextras/abstract_output_stream.rb b/lib/zip/ioextras/abstract_output_stream.rb
@@ -11,7 +11,7 @@ def write(data)
       end
 
       def print(*params)
-        self << params.join($OUTPUT_FIELD_SEPARATOR) << $OUTPUT_RECORD_SEPARATOR.to_s
+        self << params.join << $OUTPUT_RECORD_SEPARATOR.to_s
       end
 
       def printf(a_format_string, *params)

diff --git a/test/ioextras/abstract_output_stream_test.rb b/test/ioextras/abstract_output_stream_test.rb
@@ -20,13 +20,11 @@ def <<(data)
   def setup
     @output_stream = TestOutputStream.new
 
-    @save_comma_sep = $OUTPUT_FIELD_SEPARATOR
     @save_output_sep = $OUTPUT_RECORD_SEPARATOR
   end
 
   def teardown
-    $, = @save_comma_sep
-    $\ = @save_output_sep
+    $OUTPUT_RECORD_SEPARATOR = @save_output_sep
   end
 
   def test_write
@@ -40,7 +38,7 @@ def test_write
   end
 
   def test_print
-    $\ = nil # record separator set to nil
+    $OUTPUT_RECORD_SEPARATOR = nil # record separator set to nil
     @output_stream.print('hello')
     assert_equal('hello', @output_stream.buffer)
 
@@ -50,19 +48,18 @@ def test_print
     @output_stream.print(' You ok ', 'out ', 'there?')
     assert_equal('hello world. You ok out there?', @output_stream.buffer)
 
-    $\ = "\n"
+    $OUTPUT_RECORD_SEPARATOR = "\n"
     @output_stream.print
     assert_equal("hello world. You ok out there?\n", @output_stream.buffer)
 
     @output_stream.print('I sure hope so!')
     assert_equal("hello world. You ok out there?\nI sure hope so!\n", @output_stream.buffer)
 
-    $, = 'X'
     @output_stream.buffer = ''
     @output_stream.print('monkey', 'duck', 'zebra')
-    assert_equal("monkeyXduckXzebra\n", @output_stream.buffer)
+    assert_equal("monkeyduckzebra\n", @output_stream.buffer)
 
-    $\ = nil
+    $OUTPUT_RECORD_SEPARATOR = nil
     @output_stream.buffer = ''
     @output_stream.print(20)
     assert_equal('20', @output_stream.buffer)