[Truffle] Add more Dir.{open,entries}.

jruby · Apr 30, 2015 · 69b8e67 · 69b8e67
1 parent 1ddc236
commit 69b8e67
Showing 6 changed files with 55 additions and 14 deletions.
diff --git a/spec/truffle/tags/core/dir/entries_tags.txt b/spec/truffle/tags/core/dir/entries_tags.txt
@@ -1,7 +1,3 @@
-fails:Dir.entries returns an Array of filenames in an existing directory including dotfiles
-fails:Dir.entries calls #to_path on non-String arguments
-fails:Dir.entries accepts an options Hash
 fails:Dir.entries returns entries encoded with the filesystem encoding by default
 fails:Dir.entries returns entries encoded with the specified encoding
 fails:Dir.entries returns entries transcoded to the default internal encoding
-fails:Dir.entries raises a SystemCallError if called with a nonexistent diretory
diff --git a/spec/truffle/tags/core/dir/open_tags.txt b/spec/truffle/tags/core/dir/open_tags.txt
@@ -1,10 +1,2 @@
-fails:Dir.open returns a Dir instance representing the specified directory
-fails:Dir.open raises a SystemCallError if the directory does not exist
-fails:Dir.open may take a block which is yielded to with the Dir instance
-fails:Dir.open returns the value of the block if a block is given
 fails:Dir.open closes the Dir instance when the block exits if given a block
 fails:Dir.open closes the Dir instance when the block exits the block even due to an exception
-fails:Dir.open calls #to_path on non-String arguments
-fails:Dir.open accepts an options Hash
-fails:Dir.open calls #to_hash to convert the options object
-fails:Dir.open ignores the :encoding option if it is nil
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/DirPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/DirPrimitiveNodes.java
@@ -21,6 +21,7 @@
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyClass;
+import org.jruby.truffle.runtime.core.RubyEncoding;
 import org.jruby.truffle.runtime.core.RubyNilClass;
 import org.jruby.truffle.runtime.core.RubyString;
 
@@ -82,6 +83,13 @@ public RubyNilClass open(RubyBasicObject dir, RubyString path, RubyNilClass enco
             return nil();
         }
 
+        @CompilerDirectives.TruffleBoundary
+        @Specialization
+        public RubyNilClass open(RubyBasicObject dir, RubyString path, RubyEncoding encoding) {
+            // TODO BJF 30-APR-2015 HandleEncoding
+            return open(dir, path, nil());
+        }
+
     }
 
     @RubiniusPrimitive(name = "dir_read")

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
 import jnr.constants.platform.Fcntl;
+import org.jruby.RubyEncoding;
 import org.jruby.platform.Platform;
 import org.jruby.truffle.nodes.core.CoreClass;
 import org.jruby.truffle.nodes.core.CoreMethod;
@@ -23,6 +24,7 @@
 import org.jruby.util.unsafe.UnsafeHolder;
 import sun.misc.Unsafe;
 
+import java.io.File;
 import java.nio.charset.StandardCharsets;
 
 @CoreClass(name = "Rubinius::FFI::Platform::POSIX")
@@ -193,7 +195,21 @@ public UnlinkNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public int unlink(RubyString path) {
-            return posix().unlink(path.toString());
+            return posix().unlink(RubyEncoding.decodeUTF8(path.getByteList().getUnsafeBytes(), path.getByteList().getBegin(), path.getByteList().getRealSize()));
+        }
+
+    }
+
+    @CoreMethod(names = "umask", isModuleFunction = true, required = 1)
+    public abstract static class UmaskNode extends CoreMethodArrayArgumentsNode {
+
+        public UmaskNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        @Specialization
+        public int umask(int mask) {
+            return posix().umask(mask);
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StatPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StatPrimitiveNodes.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.source.SourceSection;
 import jnr.posix.FileStat;
+import org.jruby.RubyEncoding;
 import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
 import org.jruby.truffle.nodes.objectstorage.WriteHeadObjectFieldNode;
 import org.jruby.truffle.runtime.RubyContext;
@@ -36,7 +37,8 @@ public StatStatPrimitiveNode(RubyContext context, SourceSection sourceSection) {
         @Specialization
         public int stat(RubyBasicObject rubyStat, RubyString path) {
             final FileStat stat = posix().allocateStat();
-            final int code = posix().stat(path.toString(), stat);
+            final String pathString = RubyEncoding.decodeUTF8(path.getByteList().getUnsafeBytes(), path.getByteList().getBegin(), path.getByteList().getRealSize());
+            final int code = posix().stat(pathString, stat);
 
             if (code == 0) {
                 writeStatNode.execute(rubyStat, stat);

diff --git a/truffle/src/main/ruby/core/rubinius/common/dir.rb b/truffle/src/main/ruby/core/rubinius/common/dir.rb
@@ -34,6 +34,33 @@ class Dir
 
   FFI = Rubinius::FFI
 
+  def self.open(path, options=undefined)
+    dir = new path, options
+    if block_given?
+      begin
+        value = yield dir
+      ensure
+        dir.close
+      end
+
+      return value
+    else
+      return dir
+    end
+  end
+
+  def self.entries(path, options=undefined)
+    ret = []
+
+    open(path, options) do |dir|
+      while s = dir.read
+        ret << s
+      end
+    end
+
+    ret
+  end
+
   def self.[](*patterns)
     if patterns.size == 1
       pattern = Rubinius::Type.coerce_to_path(patterns[0])