[Truffle] Add Dir#{each,foreach,home}.

jruby · May 1, 2015 · 9de830f · chrisseaton · May 1, 2015 · 9de830f
1 parent 1457605
commit 9de830f
Showing 5 changed files with 52 additions and 10 deletions.
diff --git a/spec/truffle/tags/core/dir/each_tags.txt b/spec/truffle/tags/core/dir/each_tags.txt
@@ -1,4 +1,2 @@
-fails:Dir#each yields each directory entry in succession
 fails:Dir#each returns the directory which remains open
-fails:Dir#each returns an Enumerator if no block given
 fails:Dir#each raises an IOError when called on a closed Dir instance
diff --git a/spec/truffle/tags/core/dir/foreach_tags.txt b/spec/truffle/tags/core/dir/foreach_tags.txt
diff --git a/spec/truffle/tags/core/dir/home_tags.txt b/spec/truffle/tags/core/dir/home_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -21,6 +21,7 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.ConditionProfile;
+import jnr.posix.Passwd;
 import org.jcodings.Encoding;
 import org.jruby.runtime.Visibility;
 import org.jruby.truffle.nodes.RubyNode;
@@ -1800,6 +1801,27 @@ private RubyModule undefMethod(RubyModule module, String name) {
 
     }
 
+    @CoreMethod(names = "get_user_home", needsSelf = false, required = 1)
+    public abstract static class GetUserHomeNode extends CoreMethodArrayArgumentsNode {
+
+        public GetUserHomeNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        @Specialization
+        public RubyString userHome(RubyString uname) {
+            notDesignedForCompilation();
+            // TODO BJF 30-APR-2015 Review the more robust getHomeDirectoryPath implementation
+            final Passwd passwd = getContext().getPosix().getpwnam(uname.toString());
+            if (passwd == null) {
+                CompilerDirectives.transferToInterpreter();
+                throw new RaiseException(getContext().getCoreLibrary().argumentError("user " + uname.toString() + " does not exist", this));
+            }
+            return getContext().makeString(passwd.getHome());
+        }
+
+    }
+
     @NodeChildren({ @NodeChild(value = "module"), @NodeChild(value = "names") })
     public abstract static class SetVisibilityNode extends CoreMethodNode {
 

diff --git a/truffle/src/main/ruby/core/rubinius/common/dir.rb b/truffle/src/main/ruby/core/rubinius/common/dir.rb
@@ -121,6 +121,22 @@ def self.mkdir(path, mode = 0777)
     error
   end
 
+  def self.foreach(path)
+    return to_enum(:foreach, path) unless block_given?
+
+    open(path) do |dir|
+      while s = dir.read
+        yield s
+      end
+    end
+
+    nil
+  end
+
+  def self.join_path(p1, p2, dirsep)
+    "#{p1}#{dirsep ? '/' : ''}#{p2}"
+  end
+
   def self.chdir(path = ENV['HOME'])
     path = Rubinius::Type.coerce_to_path path
 
@@ -157,6 +173,16 @@ def self.getwd
     Rubinius::Type.external_string wd
   end
 
+  def each
+    return to_enum unless block_given?
+
+    while s = read
+      yield s
+    end
+
+    self
+  end
+
   class << self
     alias_method :pwd, :getwd
     alias_method :delete, :rmdir
@@ -171,4 +197,8 @@ class << self
     alias_method :exists?, :exist?
   end
 
+  def self.home(user=nil)
+    PrivateFile.expand_path("~#{user}")
+  end
+
 end