jruby · Jan 5, 2018 · Jan 5, 2018 · Jan 5, 2018 · Jan 5, 2018
Showing with 24 additions and 6 deletions.

+2 −2 core/pom.rb

+2 −2 core/pom.xml

+11 −0 core/src/main/java/org/jruby/RubyDir.java

+9 −2 test/mri/ruby/test_dir.rb
diff --git a/core/pom.rb b/core/pom.rb
@@ -167,8 +167,8 @@
           'compilerArgs' => { 'arg' => '-J-Xmx1G' },
           'showWarnings' => 'true',
           'showDeprecation' => 'true',
-          'source' => [ '${base.java.version}', '1.7' ],
-          'target' => [ '${base.javac.version}', '1.7' ],
+          'source' => [ '${base.java.version}', '1.8' ],
+          'target' => [ '${base.javac.version}', '1.8' ],
           'useIncrementalCompilation' =>  'false' ) do
     execute_goals( 'compile',
                    :id => 'anno',

diff --git a/core/pom.xml b/core/pom.xml
@@ -536,9 +536,9 @@ DO NOT MODIFIY - GENERATED CODE
           <showWarnings>true</showWarnings>
           <showDeprecation>true</showDeprecation>
           <source>${base.java.version}</source>
-          <source>1.7</source>
+          <source>1.8</source>
           <target>${base.javac.version}</target>
-          <target>1.7</target>
+          <target>1.8</target>
           <useIncrementalCompilation>false</useIncrementalCompilation>
         </configuration>
       </plugin>

diff --git a/core/src/main/java/org/jruby/RubyDir.java b/core/src/main/java/org/jruby/RubyDir.java
@@ -354,6 +354,17 @@ public static IRubyObject chroot(IRubyObject recv, IRubyObject path) {
         throw recv.getRuntime().newNotImplementedError("chroot not implemented: chroot is non-portable and is not supported.");
     }
 
+    /**
+     * Returns an array containing all of the filenames except for "." and ".."
+     * in the given directory.
+     */
+    @JRubyMethod(name = "children", meta = true)
+    public static RubyArray children(ThreadContext context, IRubyObject recv, IRubyObject arg) {
+        RubyArray entries = entries19(context, recv, arg);
+        entries.removeIf(f -> f.equals(".") || f.equals(".."));
+        return entries;
+    }
+
     /**
      * Deletes the directory specified by <code>path</code>.  The directory must
      * be empty.

diff --git a/test/mri/ruby/test_dir.rb b/test/mri/ruby/test_dir.rb
@@ -184,19 +184,26 @@ def test_glob_recursive
     end
   end
 
-  def assert_entries(entries)
+  def assert_entries(entries, children_only = false)
     entries.sort!
-    assert_equal(%w(. ..) + ("a".."z").to_a, entries)
+    expected = ("a".."z").to_a
+    expected = %w(. ..) + expected unless children_only
+    assert_equal(expected, entries)
   end
 
   def test_entries
     assert_entries(Dir.open(@root) {|dir| dir.entries})
+    assert_entries(Dir.entries(@root).to_a)
   end
 
   def test_foreach
     assert_entries(Dir.foreach(@root).to_a)
   end
 
+  def test_children
+    assert_entries(Dir.children(@root), true)
+  end
+
   def test_dir_enc
     dir = Dir.open(@root, encoding: "UTF-8")
     begin