jruby · Jun 5, 2015 · Jun 5, 2015 · Jun 5, 2015
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -35,13 +35,13 @@
 import org.jruby.runtime.backtrace.TraceType;
 import org.jruby.runtime.load.LoadService;
 import org.jruby.runtime.profile.builtin.ProfileOutput;
+import org.jruby.util.FileResource;
 import org.jruby.util.InputStreamMarkCursor;
 import org.jruby.util.JRubyFile;
 import org.jruby.util.KCode;
 import org.jruby.util.NormalizedFile;
 import org.jruby.util.SafePropertyAccessor;
 import org.jruby.util.URLResource;
-import org.jruby.util.FileResource;
 import org.jruby.util.cli.ArgumentProcessor;
 import org.jruby.util.cli.Options;
 import org.jruby.util.cli.OutputStrings;
@@ -389,44 +389,32 @@ public InputStream getScriptSource() {
                 return getInput();
             } else {
                 final String script = getScriptFileName();
-                final InputStream stream;
-                if (script.startsWith("file:") && script.indexOf(".jar!/") != -1) {
-                    stream = new URL("jar:" + script).openStream();
-                } else if (script.startsWith("classpath:")) {
-                    stream = getScriptSourceFromJar(script);
-                } else if (script.startsWith("uri:classloader:")) {
-                    FileResource urlResource = URLResource.create(loader, script, true);
-                    stream = urlResource.inputStream();
-                } else {
-                    File file = JRubyFile.create(getCurrentDirectory(), getScriptFileName());
-                    if (isXFlag()) {
-                        // search for a shebang line and
-                        // return the script between shebang and __END__ or CTRL-Z (0x1A)
-                        return findScript(file);
+                FileResource resource =JRubyFile.createResource(null, getCurrentDirectory(), getScriptFileName());
+                if (resource != null && resource.exists()) {
+                    if (resource.isFile() || resource.isSymLink()) {
+                        if (isXFlag()) {
+                            // search for a shebang line and
+                            // return the script between shebang and __END__ or CTRL-Z (0x1A)
+                            return findScript(resource.inputStream());
+                        }
+                        return new BufferedInputStream(resource.inputStream(), 8192);
+                    }
+                    else {
+                        throw new FileNotFoundException(script + " (Not a file)");
                     }
-                    stream = new FileInputStream(file);
                 }
-
-                return new BufferedInputStream(stream, 8192);
+                else {
+                    throw new FileNotFoundException(script + " (No such file or directory)");
+                }
             }
         } catch (IOException e) {
-            // We haven't found any file directly on the file system,
-            // now check for files inside the JARs.
-            InputStream is = getJarScriptSource(scriptFileName);
-            if (is != null) {
-                return new BufferedInputStream(is, 8129);
-            }
             throw new MainExitException(1, "Error opening script file: " + e.getMessage());
         }
     }
 
-    private InputStream getScriptSourceFromJar(String script) {
-        return Ruby.getClassLoader().getResourceAsStream(script.substring("classpath:".length()));
-    }
-
-    private static InputStream findScript(File file) throws IOException {
+    private static InputStream findScript(InputStream is) throws IOException {
         StringBuilder buf = new StringBuilder();
-        BufferedReader br = new BufferedReader(new FileReader(file));
+        BufferedReader br = new BufferedReader(new InputStreamReader(is));
         String currentLine = br.readLine();
         while (currentLine != null && !isRubyShebangLine(currentLine)) {
             currentLine = br.readLine();
@@ -445,27 +433,6 @@ private static InputStream findScript(File file) throws IOException {
         return new BufferedInputStream(new ByteArrayInputStream(buf.toString().getBytes()), 8192);
     }
 
-    private static InputStream getJarScriptSource(String scriptFileName) {
-        boolean looksLikeJarURL = scriptFileName.startsWith("file:") && scriptFileName.indexOf("!/") != -1;
-        if (!looksLikeJarURL) {
-            return null;
-        }
-
-        String before = scriptFileName.substring("file:".length(), scriptFileName.indexOf("!/"));
-        String after =  scriptFileName.substring(scriptFileName.indexOf("!/") + 2);
-
-        try {
-            JarFile jFile = new JarFile(before);
-            JarEntry entry = jFile.getJarEntry(after);
-
-            if (entry != null && !entry.isDirectory()) {
-                return jFile.getInputStream(entry);
-            }
-        } catch (IOException ignored) {
-        }
-        return null;
-    }
-
     public String displayedFileName() {
         if (hasInlineScript) {
             if (scriptFileName != null) {

diff --git a/core/src/main/java/org/jruby/util/JRubyFile.java b/core/src/main/java/org/jruby/util/JRubyFile.java
@@ -110,7 +110,7 @@ private static FileResource createResource(Ruby runtime, String cwd, String path
         }
 
         // If any other special resource types fail, count it as a filesystem backed resource.
-        return new RegularFileResource(runtime.getPosix(), f);
+        return new RegularFileResource(runtime == null ? null : runtime.getPosix(), f);
     }
 
     public static String normalizeSeps(String path) {

diff --git a/core/src/main/java/org/jruby/util/URLResource.java b/core/src/main/java/org/jruby/util/URLResource.java
@@ -179,13 +179,6 @@ public static FileResource createClassloaderURI(Ruby runtime, String pathname, b
         return create(cl, pathname, isFile);
     }
 
-//    public static FileResource createClassloaderURI(Ruby runtime, String pathname) {
-//        // retrieve the classloader from the runtime if available otherwise mimic how the runtime got its classloader and
-//        // take this
-//        ClassLoader cl = runtime != null ? runtime.getJRubyClassLoader() : URLResource.class.getClassLoader();
-//        return create(cl, pathname);
-//    }
-
     public static FileResource create(Ruby runtime, String pathname, boolean isFile)
     {
         if (!pathname.startsWith(URI)) {

diff --git a/core/src/test/java/org/jruby/util/URLResourceTest.java b/core/src/test/java/org/jruby/util/URLResourceTest.java
@@ -25,7 +25,6 @@ public void testNoneDirectory(){
         FileResource resource = URLResource.create((Ruby) null, "uri:" + uri, false);
 
         assertNotNull(resource );
-        // you can open streams on file-system directories
         assertTrue(resource.isFile());
         assertTrue(resource.exists());
         assertFalse(resource.isDirectory());
@@ -37,7 +36,6 @@ public void testFile(){
         FileResource resource = URLResource.create((Ruby) null, "uri:" + uri, false);
 
         assertNotNull(resource );
-        // you can open streams on file-system directories
         assertTrue(resource.isFile());
         assertTrue(resource.exists());
         assertFalse(resource.isDirectory());
@@ -75,7 +73,6 @@ public void testNoneDirectoryClassloader()
                 "uri:classloader:/somedir/dir_without_listing", false);
 
         assertNotNull( resource );
-        // you can open streams on file-system directories
         assertTrue( resource.isFile() );
         assertTrue( resource.exists() );
         assertFalse( resource.isDirectory() );
@@ -88,7 +85,6 @@ public void testFileClassloader()
                 "uri:classloader:/somedir/.jrubydir", false );
 
         assertNotNull( resource );
-        // you can open streams on file-system directories
         assertTrue( resource.isFile() );
         assertTrue( resource.exists() );
         assertFalse( resource.isDirectory() );
@@ -106,4 +102,4 @@ public void testNonExistingFileClassloader()
         assertFalse( resource.isDirectory() );
         assertNull( resource.list() );
     }
-}
+}
diff --git a/maven/jruby-complete/src/it/extended/Mavenfile b/maven/jruby-complete/src/it/extended/Mavenfile
@@ -2,7 +2,6 @@
 
 properties( 'polyglot.dump.pom' => 'pom.xml',
             'jruby.version' => '@project.version@',
-            'jruby.version' => '1.7.21-SNAPSHOT',
             'jruby.plugins.version' => '1.0.8',
             'jruby.home' => '${basedir}/../../../../..' )
 

diff --git a/maven/jruby-complete/src/it/extended/pom.xml b/maven/jruby-complete/src/it/extended/pom.xml
@@ -8,7 +8,7 @@
   <name>extended</name>
   <properties>
     <jruby.home>${basedir}/../../../../..</jruby.home>
-    <jruby.version>1.7.21-SNAPSHOT</jruby.version>
+    <jruby.version>@project.version@</jruby.version>
     <jruby.plugins.version>1.0.8</jruby.plugins.version>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
   </properties>