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: faea8f0552d7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 213d935e7143
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 14, 2015

  1. Copy the full SHA
    84fe15e View commit details
  2. Copy the full SHA
    414e5fe View commit details
  3. Copy the full SHA
    213d935 View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyFile.java
Original file line number Diff line number Diff line change
@@ -1143,7 +1143,7 @@ public static IRubyObject unlink(ThreadContext context, IRubyObject recv, IRubyO
Ruby runtime = context.runtime;
POSIX posix = runtime.getPosix();

if (!posix.isNative()) return delete(context, recv, args);
if (!posix.isNative() || Platform.IS_WINDOWS) return delete(context, recv, args);

for (int i = 0; i < args.length; i++) {
RubyString filename = get_path(context, args[i]);
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyKernel.java
Original file line number Diff line number Diff line change
@@ -1441,7 +1441,7 @@ public static IRubyObject test(ThreadContext context, IRubyObject recv, IRubyObj
public static IRubyObject backquote(ThreadContext context, IRubyObject recv, IRubyObject str) {
Ruby runtime = context.runtime;

if (runtime.getPosix().isNative()) {
if (runtime.getPosix().isNative() && !Platform.IS_WINDOWS) {
IRubyObject port;
IRubyObject result;
OpenFile fptr;
3 changes: 2 additions & 1 deletion core/src/main/java/org/jruby/ext/tempfile/Tempfile.java
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;
import org.jruby.exceptions.RaiseException;
import org.jruby.platform.Platform;
import org.jruby.runtime.Arity;
import org.jruby.runtime.Block;
import org.jruby.runtime.BlockCallback;
@@ -201,7 +202,7 @@ public IRubyObject unlink(ThreadContext context) {
Ruby runtime = context.runtime;
POSIX posix = runtime.getPosix();

if (posix.isNative()) {
if (posix.isNative() && !Platform.IS_WINDOWS) {
try {
RubyFile.unlink(context, this);
} catch (RaiseException re) {
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/io/console.rb
Original file line number Diff line number Diff line change
@@ -204,7 +204,7 @@ def self.console(sym = nil)
end

if !result || RbConfig::CONFIG['host_os'] =~ /(mswin)|(win32)|(ming)/
warn "io/console not supported; tty will not be manipulated"
warn "io/console not supported; tty will not be manipulated" if $VERBOSE

# Windows version is always stubbed for now
class IO