make sure we contruct the path correctly when testing on isDirectory

this is only an issue with uri:classloader:/ and a classloader setup where the .jrubydir needs to be loaded to treat the path as directory fixes #3342 Sponsored by Lookout Inc.
jruby · Sep 22, 2015 · 5302de7 · 5302de7
1 parent df07868
commit 5302de7
Showing 4 changed files with 55 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/util/URLResource.java b/core/src/main/java/org/jruby/util/URLResource.java
@@ -265,7 +265,7 @@ private static String[] listClassLoaderFiles(ClassLoader classloader, String pat
         }
         try
         {
-            pathname = pathname + (pathname.equals("") ? ".jrubydir" : "/.jrubydir");
+            pathname = pathname + (pathname.equals("") || pathname.endsWith("/") ? ".jrubydir" : "/.jrubydir");
             Enumeration<URL> urls = classloader.getResources(pathname);
             if (!urls.hasMoreElements()) {
                 return null;

diff --git a/core/src/test/java/org/jruby/util/URLResourceTest.java b/core/src/test/java/org/jruby/util/URLResourceTest.java
@@ -20,6 +20,18 @@ public void testDirectory(){
                      Arrays.asList(new String[] {".", "dir_without_listing", "dir_with_listing"}));
     }
 
+    public void testDirectoryWithTrailingSlash(){
+        String uri = Thread.currentThread().getContextClassLoader().getResource( "somedir" ).toExternalForm();
+        FileResource resource = URLResource.create((Ruby) null, "uri:" + uri + "/");
+
+        assertNotNull(resource );
+        assertFalse(resource.isFile());
+        assertTrue(resource.isDirectory());
+        assertTrue(resource.exists());
+        assertEquals(Arrays.asList(resource.list()),
+                Arrays.asList(new String[] {".", "dir_without_listing", "dir_with_listing"}));
+    }
+
     public void testNoneDirectory(){
         String uri = Thread.currentThread().getContextClassLoader().getResource( "somedir/dir_without_listing" ).toExternalForm();
         FileResource resource = URLResource.create((Ruby) null, "uri:" + uri);
@@ -59,13 +71,27 @@ public void testDirectoryClassloader()
     {
         FileResource resource = URLResource.create((Ruby) null, "uri:classloader:/somedir");
 
+        assertNotNull(resource);
+        assertFalse(resource.isFile());
+        assertTrue(resource.isDirectory());
+        assertTrue(resource.exists());
+        assertEquals(Arrays.asList(resource.list()),
+                Arrays.asList(new String[]{".", "dir_without_listing",
+                        "dir_with_listing"}));
+    }
+
+    public void testDirectoryWithTrailingClassloader()
+    {
+        FileResource resource = URLResource.create((Ruby) null,
+                "uri:classloader:/somedir/");
+
         assertNotNull( resource );
         assertFalse( resource.isFile() );
         assertTrue( resource.isDirectory() );
         assertTrue( resource.exists() );
         assertEquals( Arrays.asList( resource.list() ),
-                      Arrays.asList( new String[] { ".", "dir_without_listing",
-                                                   "dir_with_listing" } ) );
+                Arrays.asList( new String[] { ".", "dir_without_listing",
+                        "dir_with_listing" } ) );
     }
 
     public void testNoneDirectoryClassloader()
@@ -102,4 +128,4 @@ public void testNonExistingFileClassloader()
         assertFalse( resource.isDirectory() );
         assertNull( resource.list() );
     }
-}
+}
diff --git a/maven/jruby-complete/src/it/integrity/pom.xml b/maven/jruby-complete/src/it/integrity/pom.xml
@@ -198,6 +198,28 @@
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>META-INF/jruby.home is not a file - GH-3342</id>
+            <phase>test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <workingDirectory>${basedir}</workingDirectory>
+              <executable>java</executable>
+              <arguments>
+                <argument>-classpath</argument>
+                <classpath/>
+                <argument>org.jruby.Main</argument>
+                <argument>-e</argument>
+                <argument>
+                  puts "jruby home is a file: " +
+                  File.file?("uri:classloader:/META-INF/jruby.home").to_s +
+                  File.file?("uri:classloader:/META-INF/jruby.home/").to_s
+                </argument>
+              </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -53,3 +53,6 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
+
+expected = "jruby home is a file: falsefalse";
+if ( !log.contains( expected ) ) throw new RuntimeException( "log file does not contain '" + expected + "'" );