Allow File.open and File.new with 4 arguments

lumeet · lumeet · commit e22d1dada69f · 2015-03-25T21:17:32.000+02:00
The methods now support filename, mode, permissions and options as
separate parameters.
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -321,7 +321,7 @@ public IRubyObject flock(ThreadContext context, IRubyObject operation) {
     }
 
     // rb_file_initialize
-    @JRubyMethod(name = "initialize", required = 1, optional = 2, visibility = PRIVATE)
+    @JRubyMethod(name = "initialize", required = 1, optional = 3, visibility = PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
         if (openFile != null) {
             throw context.runtime.newRuntimeError("reinitializing File");
diff --git a/test/mri/excludes/TestPathname.rb b/test/mri/excludes/TestPathname.rb
@@ -1,6 +1,5 @@
 exclude :test_find, "fails to EACCES an unreadable path, root cause of test_find.rb's test_unreadable_dir failure?"
 exclude :test_lchmod, "fails on Travis, maybe on Linux in general?"
-exclude :test_open, "4-args open()"
 exclude :test_realdirpath, "bad symlink resolution"
 exclude :test_realpath, "needs investigation"
 exclude :test_relative_path_from_casefold, "path encoding problems"

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ public IRubyObject flock(ThreadContext context, IRubyObject operation) {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`// rb_file_initialize`
`324`		`- @JRubyMethod(name = "initialize", required = 1, optional = 2, visibility = PRIVATE)`
	`324`	`+ @JRubyMethod(name = "initialize", required = 1, optional = 3, visibility = PRIVATE)`
`325`	`325`	`public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {`
`326`	`326`	`if (openFile != null) {`
`327`	`327`	`throw context.runtime.newRuntimeError("reinitializing File");`