Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d79adf43e95a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f015f56023b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 13, 2015

  1. [ruby-2.3 Feature #11253] Add support for :flags option for IO#option

    @cheald
    cheald committed Dec 13, 2015
    Copy the full SHA
    c57834f View commit details

  2. Replace context.runtime with a local runtime reference.

    @cheald
    cheald committed Dec 13, 2015
    Copy the full SHA
    8f2d6b4 View commit details

  3. Merge pull request #3534 from cheald/add_flags_option 

    [ruby-2.3 Feature #11253] Add support for :flags option for IO#open
    @kares
    kares committed Dec 13, 2015
    Copy the full SHA
    5f015f5 View commit details
Showing with 37 additions and 10 deletions.
  1. +15 −10 core/src/main/java/org/jruby/util/io/EncodingUtils.java
  2. +22 −0 test/mri/ruby/test_io.rb
25 changes: 15 additions & 10 deletions core/src/main/java/org/jruby/util/io/EncodingUtils.java
View file
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@ public static void extractModeEncoding(ThreadContext context,
fmode_p[0] = OpenFile.READABLE;
oflags_p[0] = ModeFlags.RDONLY;
} else {
intmode = TypeConverter.checkIntegerType(context.runtime, vmode(vmodeAndVperm_p), "to_int");
intmode = TypeConverter.checkIntegerType(runtime, vmode(vmodeAndVperm_p), "to_int");

if (!intmode.isNil()) {
vmode(vmodeAndVperm_p, intmode);
@@ -198,7 +198,7 @@ public static void extractModeEncoding(ThreadContext context,
hasEnc = true;
parseModeEncoding(context, ioEncodable, p.substring(colonSplit + 1), fmode_p);
} else {
Encoding e = (fmode_p[0] & OpenFile.BINMODE) != 0 ? ascii8bitEncoding(context.runtime) : null;
Encoding e = (fmode_p[0] & OpenFile.BINMODE) != 0 ? ascii8bitEncoding(runtime) : null;
ioExtIntToEncs(context, ioEncodable, e, null, fmode_p[0]);
}
}
@@ -216,40 +216,45 @@ public static void extractModeEncoding(ThreadContext context,
ecflags = SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(ioEncodable.getEnc2(), ecflags);
ecopts_p[0] = context.nil;
} else {
extractBinmode(context.runtime, options, fmode_p);
extractBinmode(runtime, options, fmode_p);
// Differs from MRI but we open with ModeFlags
if ((fmode_p[0] & OpenFile.BINMODE) != 0) {
oflags_p[0] |= ModeFlags.BINARY;

if (!hasEnc) {
ioExtIntToEncs(context, ioEncodable, ascii8bitEncoding(context.runtime), null, fmode_p[0]);
ioExtIntToEncs(context, ioEncodable, ascii8bitEncoding(runtime), null, fmode_p[0]);
}
} else if (DEFAULT_TEXTMODE != 0 && (vmode(vmodeAndVperm_p) == null || vmode(vmodeAndVperm_p).isNil())) {
fmode_p[0] |= DEFAULT_TEXTMODE;
}

if (!hasVmode) {
IRubyObject v = hashARef(context.runtime, options, "mode");
IRubyObject v = hashARef(runtime, options, "mode");

if (!v.isNil()) {
if (vmode(vmodeAndVperm_p) != null && !vmode(vmodeAndVperm_p).isNil()) {
throw context.runtime.newArgumentError("mode specified twice");
throw runtime.newArgumentError("mode specified twice");
}
hasVmode = true;
vmode(vmodeAndVperm_p, v);

continue vmode_handle;
}
}
IRubyObject v = hashARef(context.runtime, options, "perm");
IRubyObject v = hashARef(runtime, options, "perm");
if (!v.isNil()) {
if (vperm(vmodeAndVperm_p) != null) {
if (!vperm(vmodeAndVperm_p).isNil()) throw context.runtime.newArgumentError("perm specified twice");
if (!vperm(vmodeAndVperm_p).isNil()) throw runtime.newArgumentError("perm specified twice");

vperm(vmodeAndVperm_p, v);
}
}


IRubyObject extraFlags = hashARef(runtime, options, "flags");
if (!extraFlags.isNil()) {
oflags_p[0] |= extraFlags.convertToInteger().getIntValue();
}

ecflags = (fmode_p[0] & OpenFile.READABLE) != 0 ?
MODE_BTMODE(fmode_p[0], ECONV_DEFAULT_NEWLINE_DECORATOR, 0, EConvFlags.UNIVERSAL_NEWLINE_DECORATOR) : 0;
if (TEXTMODE_NEWLINE_DECORATOR_ON_WRITE != -1) {
@@ -258,7 +263,7 @@ public static void extractModeEncoding(ThreadContext context,
}

if (ioExtractEncodingOption(context, ioEncodable, options, fmode_p)) {
if (hasEnc) throw context.runtime.newArgumentError("encoding specified twice");
if (hasEnc) throw runtime.newArgumentError("encoding specified twice");
}

ecflags = SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(ioEncodable.getEnc2(), ecflags);
22 changes: 22 additions & 0 deletions test/mri/ruby/test_io.rb
View file
Original file line number Diff line number Diff line change
@@ -3158,4 +3158,26 @@ def test_close_uninitialized
io = IO.allocate
assert_raise(IOError) { io.close }
end

def test_open_flag
make_tempfile do |t|
assert_raise(Errno::EEXIST){ open(t, File::WRONLY|File::CREAT, flags: File::EXCL){} }
assert_raise(Errno::EEXIST){ open(t, 'w', flags: File::EXCL){} }
assert_raise(Errno::EEXIST){ open(t, mode: 'w', flags: File::EXCL){} }
end
end

def test_open_flag_binar
make_tempfile do |t|
open(t, File::RDONLY, flags: File::BINARY) do |f|
assert_equal true, f.binmode
end
open(t, 'r', flags: File::BINARY) do |f|
assert_equal true, f.binmode
end
open(t, mode: 'r', flags: File::BINARY) do |f|
assert_equal true, f.binmode
end
end
end if File::BINARY != 0
end