jruby · Dec 10, 2014 · Dec 10, 2014
diff --git a/core/src/main/java/org/jruby/RubyFileTest.java b/core/src/main/java/org/jruby/RubyFileTest.java
@@ -97,16 +97,19 @@ public static IRubyObject directory_p(ThreadContext context, IRubyObject filenam
 
     @JRubyMethod(name = "executable?", required = 1, module = true)
     public static IRubyObject executable_p(IRubyObject recv, IRubyObject filename) {
-        FileStat stat = fileResource(filename).stat();
-
-        return recv.getRuntime().newBoolean(stat != null && stat.isExecutable());
+        return recv.getRuntime().newBoolean(fileResource(filename).canExecute());
     }
 
     @JRubyMethod(name = "executable_real?", required = 1, module = true)
     public static IRubyObject executable_real_p(IRubyObject recv, IRubyObject filename) {
-        FileStat stat = fileResource(filename).stat();
+        if (recv.getRuntime().getPosix().isNative()) {
+            FileStat stat = fileResource(filename).stat();
 
-        return recv.getRuntime().newBoolean(stat != null && stat.isExecutableReal());
+            return recv.getRuntime().newBoolean(stat != null && stat.isExecutableReal());
+        }
+        else {
+            return executable_p(recv, filename);
+        }
     }
 
     public static IRubyObject exist_p(IRubyObject recv, IRubyObject filename) {

diff --git a/core/src/main/java/org/jruby/util/AbstractFileResource.java b/core/src/main/java/org/jruby/util/AbstractFileResource.java
@@ -5,6 +5,11 @@
 
 abstract class AbstractFileResource implements FileResource {
 
+    @Override
+    public boolean canExecute() {
+        return false;
+    }
+
     @Override
     public InputStream inputStream() throws ResourceException {
         if (!exists()) {

diff --git a/core/src/main/java/org/jruby/util/EmptyFileResource.java b/core/src/main/java/org/jruby/util/EmptyFileResource.java
@@ -42,6 +42,11 @@ public boolean isFile() {
         return false;
     }
 
+    @Override
+    public boolean canExecute() {
+        return false;
+    }
+
     @Override
     public boolean canRead() {
         return false;

diff --git a/core/src/main/java/org/jruby/util/FileResource.java b/core/src/main/java/org/jruby/util/FileResource.java
@@ -17,6 +17,7 @@ public interface FileResource {
     boolean exists();
     boolean isDirectory();
     boolean isFile();
+    boolean canExecute();
 
     long lastModified();
     long length();

diff --git a/core/src/main/java/org/jruby/util/RegularFileResource.java b/core/src/main/java/org/jruby/util/RegularFileResource.java
@@ -67,6 +67,11 @@ public boolean exists() {
         return file.exists(); // || isSymLink();
     }
 
+    @Override
+    public boolean canExecute() {
+        return file.canExecute();
+    }
+
     @Override
     public boolean isFile() {
         return file.isFile();

diff --git a/test/test_file.rb b/test/test_file.rb
@@ -492,6 +492,22 @@ def test_readable_query # - readable?
     assert(result == 'falsetruetrue')
   end
 
+  [ :executable?, :executable_real? ].each do |method|
+    define_method :"test_#{method}_query" do # - executable?/executable_real?
+      if WINDOWS
+        exec_file = 'bin/jruby.bat'
+      else
+        exec_file = 'bin/jruby.sh'
+      end
+      assert(File.send(method, exec_file))
+      assert(!File.send(method, 'test/test_file.rb'))
+      assert(File.send(method, 'test'))
+      assert(!File.send(method, 'test_not'))
+      result = jruby("-e 'print File.#{method}(\"#{exec_file}\");print File.#{method}(\"test_not\");print File.#{method}(\"test\");print File.#{method}(\"test/test_file.rb\")'", 'jruby.native.enabled' => 'false' )
+      assert(result == 'truefalsetruefalse')
+    end
+  end
+
   def test_file_exist_query
     assert(File.exist?('test'))
     assert(! File.exist?('test_not'))