IO::binwrite handles Hash opts as last argument

rubinius · Apr 21, 2012 · ae986bf · ae986bf
1 parent 2bfb8c1
commit ae986bf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/kernel/common/io19.rb b/kernel/common/io19.rb
@@ -24,9 +24,24 @@ def self.binread(file, length=nil, offset=0)
     end
   end
 
-  def self.binwrite(file, string, offset=nil)
-    mode = File::CREAT | File::RDWR | File::BINARY
-    mode |= File::TRUNC unless offset
+  def self.binwrite(file, string, *args)
+    if args.size > 2
+      raise ArgumentError, "wrong number of arguments (#{args.size + 2} for 2..3)"
+    end
+
+    offset, opts = args
+    opts ||= {}
+    if offset.is_a?(Hash)
+      offset, opts = nil, offset
+    end
+
+    if opts[:mode]
+      mode = opts[:mode]
+    else
+      mode = File::CREAT | File::RDWR | File::BINARY
+      mode |= File::TRUNC unless offset
+    end
+
     File.open(file, mode, :encoding => "ASCII-8BIT") do |f|
       f.seek(offset || 0)
       f.write(string)

diff --git a/spec/tags/19/ruby/core/io/binwrite_tags.txt b/spec/tags/19/ruby/core/io/binwrite_tags.txt