Merge pull request jruby#8654 from danini-the-panini/ds-fix-dir-glob-windows

fix glob dir on windows

Author: enebo

core/src/main/java/org/jruby/util/Dir.java

@@ -973,11 +973,22 @@ private static int glob_helper(Ruby runtime, String cwd, byte[] scheme,
                         }
                         if ( fnmatch(magic, 0, magic.length, fileBytes, 0, fileBytes.length, flags) == 0 ) {
                             buf.length(0);
-                            if (scheme != null && SLASH_INDEX == -1) buf.append(scheme);
                             buf.append(base);
                             buf.append( isRoot(base) ? EMPTY : SLASH );
                             buf.append( getBytesInUTF8(file) );
-                            if ( SLASH_INDEX == -1 ) {
+                            boolean dirMatch = false;
+                            if (SLASH_INDEX == end - 1) {
+                                resource = JRubyFile.createResource(runtime, cwd, new String(buf.unsafeBytes(), buf.begin(), buf.length(), enc.getCharset()));
+                                dirMatch = resource.isDirectory();
+                            }
+                            if ( dirMatch || SLASH_INDEX == -1 ) {
+                                if (scheme != null) {
+                                    byte[] bufBytes = buf.bytes();
+                                    buf.length(0);
+                                    buf.append(scheme);
+                                    buf.append(bufBytes);
+                                }
+                                if (dirMatch) buf.append(SLASH);
                                 status = func.call(buf.getUnsafeBytes(), 0, buf.getRealSize(), enc, arg);
                                 if ( status != 0 ) break;
                                 continue;
@@ -993,7 +1004,7 @@ private static int glob_helper(Ruby runtime, String cwd, byte[] scheme,
                     for ( DirGlobber globber : links ) {
                         final ByteList link = globber.link;
                         if ( status == 0 ) {
-                            resource = JRubyFile.createResource(runtime, cwd, RubyString.byteListToString(link));
+                            resource = JRubyFile.createResource(runtime, cwd, new String(link.unsafeBytes(), link.begin(), link.length(), enc.getCharset()));
                             if ( resource.isDirectory() ) {
                                 final int len = link.getRealSize();
                                 buf.length(0);

test/jruby/test_dir.rb

@@ -213,6 +213,18 @@ def test_glob_with_blocks
     FileUtils.rm_r("testDir_3") rescue nil
   end
 
+  def test_glob_dir
+    Dir.mkdir('testDir_4')
+    Dir.mkdir('testDir_4/a')
+    Dir.mkdir('testDir_4/b')
+    FileUtils.touch('testDir_4/file.txt')
+    assert_equal(Dir.glob('testDir_4/*/'), ['testDir_4/a/', 'testDir_4/b/'])
+    Dir.chdir("testDir_4") do
+      assert_equal(Dir.glob('*/'), ['a/', 'b/'])
+    end
+    FileUtils.rm_r("testDir_4") rescue nil
+  end
+
   def test_dir_dot_does_not_throw_exception
     # just makes sure this doesn't throw a Java exception
     Dir['.']