jruby · Apr 25, 2015 · Apr 26, 2015 · Apr 26, 2015 · Apr 26, 2015 · Apr 26, 2015
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.0.0.0-SNAPSHOT
+9.0.0.0.pre2
diff --git a/bin/jirb_swing b/bin/jirb_swing
@@ -39,6 +39,16 @@ frame = JFrame.new(FRAME_TITLE).tap do |frame|
 
       tar = org.jruby.demo.readline.TextAreaReadline.new(text, HEADER)
       tar.hook_into_runtime_with_streams(JRuby.runtime)
+
+      # Ruby does not like redefining constants but we do not want the warnings
+      # readline reads constants and not the globals so we need to reassign
+      # the globals.
+      saved_verbose = $VERBOSE
+      $VERBOSE = nil
+      STDIN = $stdin
+      STDOUT = $stdout
+      STDERR = $stderr
+      $VERBOSE = saved_verbose
     end
   end)
 

diff --git a/core/pom.rb b/core/pom.rb
@@ -255,7 +255,7 @@
                                          'mainClass' => 'org.jruby.Main' } ] )
     execute_goals( 'shade',
                    :id => 'shade the asm classes',
-                   :phase => 'verify',
+                   :phase => 'package',
                    'artifactSet' => {
                      'includes' => [ 'com.github.jnr:jnr-ffi',
                                      'org.ow2.asm:*' ]

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.0.0.0-SNAPSHOT</version>
+    <version>9.0.0.0.pre2</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>
@@ -548,7 +548,7 @@
           </execution>
           <execution>
             <id>shade the asm classes</id>
-            <phase>verify</phase>
+            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>

diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -40,6 +40,8 @@
 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;
@@ -342,7 +344,7 @@ else if (home.startsWith("cp:")) {
         }
         if (home.startsWith("jar:") || ( home.startsWith("file:") && home.contains(".jar!/") ) ||
                 home.startsWith("classpath:") || home.startsWith("uri:")) {
-            error.println("Warning: JRuby home with uri like pathes may not have full functionality - use at your own risk");
+            error.println("Warning: JRuby home with uri like paths may not have full functionality - use at your own risk");
         }
         // do not normalize on plain jar like pathes coming from jruby-rack
         else if (!home.contains(".jar!/") && !home.startsWith("uri:")) {
@@ -391,6 +393,9 @@ public InputStream getScriptSource() {
                     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);
+                    stream = urlResource.inputStream();
                 } else {
                     File file = JRubyFile.create(getCurrentDirectory(), getScriptFileName());
                     if (isXFlag()) {
@@ -1405,7 +1410,7 @@ public String getProfilingService() {
     public void setProfilingService( String service )  {
         this.profilingService = service;
     }
-    
+
     private static ClassLoader setupLoader() {
         ClassLoader loader = RubyInstanceConfig.class.getClassLoader();
 

diff --git a/core/src/main/java/org/jruby/util/NullDeviceResource.java b/core/src/main/java/org/jruby/util/NullDeviceResource.java
@@ -151,13 +151,6 @@ private Channel createChannel(ModeFlags flags) throws ResourceException {
             throw new ResourceException.IOError(ioe);
         }
 
-        try {
-            if (flags.isTruncate()) fileChannel.truncate(0);
-        } catch (IOException ioe) {
-            // ignore; it's a pipe or fifo that can't be truncated (we only care about illegal seek).
-            if (!ioe.getMessage().equals("Illegal seek")) throw new ResourceException.IOError(ioe);
-        }
-
         return fileChannel;
     }
 }
diff --git a/core/src/main/java/org/jruby/util/URLResource.java b/core/src/main/java/org/jruby/util/URLResource.java
@@ -40,11 +40,11 @@ public class URLResource extends AbstractFileResource {
     URLResource(String uri, URL url, String[] files) {
         this(uri, url, null, null, files);
     }
-    
+
     URLResource(String uri, ClassLoader cl, String pathname, String[] files) {
         this(uri, null, cl, pathname, files);
     }
-    
+
     private URLResource(String uri, URL url, ClassLoader cl, String pathname, String[] files) {
         this.uri = uri;
         this.list = files;
@@ -53,7 +53,7 @@ private URLResource(String uri, URL url, ClassLoader cl, String pathname, String
         this.pathname = pathname;
         this.fileStat = new JarFileStat(this);
     }
-    
+
     @Override
     public String absolutePath()
     {
@@ -129,7 +129,7 @@ public FileStat stat() {
     public FileStat lstat() {
       return stat(); // URLs don't have symbolic links, so lstat == stat
     }
- 
+
     @Override
     public JRubyFile hackyGetJRubyFile() {
         return JRubyNonExistentFile.NOT_EXIST;
@@ -149,20 +149,23 @@ public Channel openChannel( ModeFlags flags, int perm ) throws ResourceException
         return Channels.newChannel(inputStream());
     }
 
+    public static FileResource create(ClassLoader cl, String pathname) {
+      try
+      {
+          pathname = new URI(pathname.replaceFirst("^/*", "/")).normalize().getPath().replaceAll("^/([.][.]/)*", "");
+      } catch (URISyntaxException e) {
+          pathname = pathname.replaceAll("^[.]?/*", "");
+      }
+      URL url = cl.getResource(pathname);
+      String[] files = listClassLoaderFiles(cl, pathname);
+      return new URLResource(URI_CLASSLOADER + pathname,
+                             cl,
+                             url == null ? null : pathname,
+                             files);
+    }
+
     public static FileResource createClassloaderURI(Ruby runtime, String pathname) {
-        ClassLoader cl = runtime.getJRubyClassLoader();
-        try
-        {
-            pathname = new URI(pathname.replaceFirst("^/*", "/")).normalize().getPath().replaceAll("^/([.][.]/)*", "");
-        } catch (URISyntaxException e) {
-            pathname = pathname.replaceAll("^[.]?/*", "");
-        }
-        URL url = cl.getResource(pathname);
-        String[] files = listClassLoaderFiles(cl, pathname);
-        return new URLResource(URI_CLASSLOADER + pathname,
-                               cl,
-                               url == null ? null : pathname,
-                               files);
+        return create(runtime.getJRubyClassLoader(), pathname);
     }
 
     public static FileResource create(Ruby runtime, String pathname)
@@ -176,7 +179,7 @@ public static FileResource create(Ruby runtime, String pathname)
         }
         return createRegularURI(pathname);
     }
-    
+
     private static FileResource createRegularURI(String pathname) {
         URL url;
         try
@@ -185,7 +188,7 @@ private static FileResource createRegularURI(String pathname) {
             // and make file:/a protocol to be file:///a so the second replace does not apply
             pathname = pathname.replaceFirst( "file:/([^/])", "file:///$1" );
             pathname = pathname.replaceFirst( ":/([^/])", "://$1" );
-            
+
             url = new URL(pathname);
             // we do not want to deal with those url here like this though they are valid url/uri
             if (url.getProtocol().startsWith("http")){
@@ -311,5 +314,5 @@ public static URL getResourceURL(Ruby runtime, String location)
             throw new RuntimeException("BUG in " + URLResource.class);
         }
     }
-    
+
 }
diff --git a/lib/pom.xml b/lib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.0.0.0-SNAPSHOT</version>
+    <version>9.0.0.0.pre2</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Lib Setup</name>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>9.0.0.0-SNAPSHOT</version>
+      <version>9.0.0.0.pre2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/lib/ruby/stdlib/rubygems.rb b/lib/ruby/stdlib/rubygems.rb
@@ -9,7 +9,7 @@
 require 'thread'
 
 module Gem
-  VERSION = '2.4.5'
+  VERSION = '2.4.6'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -598,7 +598,7 @@ def self.load_yaml
 
     unless test_syck
       begin
-        gem 'psych', '~> 1.2', '>= 1.2.1'
+        gem 'psych', '>= 1.2.1'
       rescue Gem::LoadError
         # It's OK if the user does not have the psych gem installed.  We will
         # attempt to require the stdlib version

diff --git a/lib/ruby/stdlib/rubygems/basic_specification.rb b/lib/ruby/stdlib/rubygems/basic_specification.rb
@@ -61,8 +61,7 @@ def contains_requirable_file? file
     @contains_requirable_file ||= {}
     @contains_requirable_file[file] ||=
     begin
-      if instance_variable_defined?(:@ignored) or
-         instance_variable_defined?('@ignored') then
+      if instance_variable_defined?(:@ignored) then
         return false
       elsif missing_extensions? then
         @ignored = true
@@ -145,7 +144,7 @@ def full_require_paths
         File.join full_gem_path, path
       end
 
-      full_paths.unshift extension_dir unless @extensions.nil? || @extensions.empty?
+      full_paths << extension_dir unless @extensions.nil? || @extensions.empty?
 
       full_paths
     end

diff --git a/lib/ruby/stdlib/rubygems/commands/help_command.rb b/lib/ruby/stdlib/rubygems/commands/help_command.rb
@@ -176,7 +176,7 @@ class Gem::Commands::HelpCommand < Gem::Command
 Ruby Version and Engine Dependency
 ==================================
 
-You can specifiy the version, engine and engine version of ruby to use with
+You can specify the version, engine and engine version of ruby to use with
 your gem dependencies file.  If you are not running the specified version
 RubyGems will raise an exception.
 
@@ -223,7 +223,7 @@ class Gem::Commands::HelpCommand < Gem::Command
 The #group method allows multiple groups.
 
 The #gemspec development dependencies are placed in the :development group by
-default.  This may be overriden with the :development_group option:
+default.  This may be overridden with the :development_group option:
 
   gemspec development_group: :other
 

diff --git a/lib/ruby/stdlib/rubygems/commands/open_command.rb b/lib/ruby/stdlib/rubygems/commands/open_command.rb
@@ -61,7 +61,9 @@ def open_gem name
   end
 
   def open_editor path
-    system(*@editor.split(/\s+/) + [path])
+    Dir.chdir(path) do
+      system(*@editor.split(/\s+/) + [path])
+    end
   end
 
   def spec_for name

diff --git a/lib/ruby/stdlib/rubygems/commands/yank_command.rb b/lib/ruby/stdlib/rubygems/commands/yank_command.rb
@@ -21,7 +21,7 @@ def description # :nodoc:
 data you will need to change them immediately and yank your gem.
 
 If you are yanking a gem due to intellectual property reasons contact
-http://help.rubygems.org for permanant removal.  Be sure to mention this
+http://help.rubygems.org for permanent removal.  Be sure to mention this
 as the reason for the removal request.
     EOF
   end

diff --git a/lib/ruby/stdlib/rubygems/compatibility.rb b/lib/ruby/stdlib/rubygems/compatibility.rb
@@ -20,8 +20,7 @@ module Gem
 
   $LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library
 
-  if $LOADED_FEATURES.any? do |path| path.end_with? '/rubygems.rb' end then
-    # TODO path does not exist here
+  if path = $LOADED_FEATURES.find {|n| n.end_with? '/rubygems.rb'} then
     raise LoadError, "another rubygems is already loaded from #{path}"
   end
 

diff --git a/lib/ruby/stdlib/rubygems/dependency_installer.rb b/lib/ruby/stdlib/rubygems/dependency_installer.rb
@@ -218,7 +218,17 @@ def find_gems_with_sources dep, best_only=false # :nodoc:
         tuples, errors = Gem::SpecFetcher.fetcher.search_for_dependency dep
 
         if best_only && !tuples.empty?
-          tuples.sort! { |a,b| b[0].version <=> a[0].version }
+          tuples.sort! do |a,b|
+            if b[0].version == a[0].version
+              if b[0].platform != Gem::Platform::RUBY
+                1
+              else
+                -1
+              end
+            else
+              b[0].version <=> a[0].version
+            end
+          end
           tuples = [tuples.first]
         end
 

diff --git a/lib/ruby/stdlib/rubygems/installer.rb b/lib/ruby/stdlib/rubygems/installer.rb
@@ -681,7 +681,7 @@ def app_script_text(bin_file_name)
   # return the stub script text used to launch the true Ruby script
 
   def windows_stub_script(bindir, bin_file_name)
-    ruby = Gem.ruby.chomp('"').tr(File::SEPARATOR, "\\")
+    ruby = Gem.ruby.gsub(/^\"|\"$/, "").tr(File::SEPARATOR, "\\")
     return <<-TEXT
 @ECHO OFF
 IF NOT "%~f0" == "~f0" GOTO :WinNT

diff --git a/lib/ruby/stdlib/rubygems/package.rb b/lib/ruby/stdlib/rubygems/package.rb
@@ -366,8 +366,9 @@ def extract_tar_gz io, destination_dir, pattern = "*" # :nodoc:
 
         FileUtils.mkdir_p mkdir, mkdir_options
 
-        open destination, 'wb', entry.header.mode do |out|
+        open destination, 'wb' do |out|
           out.write entry.read
+          FileUtils.chmod entry.header.mode, destination
         end if entry.file?
 
         verbose destination

diff --git a/lib/ruby/stdlib/rubygems/package/tar_writer.rb b/lib/ruby/stdlib/rubygems/package/tar_writer.rb
@@ -291,7 +291,7 @@ def mkdir(name, mode)
 
   def split_name(name) # :nodoc:
     if name.bytesize > 256
-      raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)") 
+      raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)")
     end
 
     if name.bytesize <= 100 then
@@ -311,11 +311,11 @@ def split_name(name) # :nodoc:
       name = newname
 
       if name.bytesize > 100
-        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)") 
+        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)")
       end
-    
+
       if prefix.bytesize > 155 then
-        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)") 
+        raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)")
       end
     end
 

diff --git a/lib/ruby/stdlib/rubygems/path_support.rb b/lib/ruby/stdlib/rubygems/path_support.rb
@@ -42,13 +42,6 @@ def initialize(env=ENV)
 
   private
 
-  ##
-  # Set the Gem home directory (as reported by Gem.dir).
-
-  def home=(home)
-    @home = home.to_s
-  end
-
   ##
   # Set the Gem search path (as reported by Gem.path).
 

diff --git a/lib/ruby/stdlib/rubygems/psych_additions.rb b/lib/ruby/stdlib/rubygems/psych_additions.rb
@@ -1,4 +1,4 @@
-# This exists just to satify bugs in marshal'd gemspecs that
+# This exists just to satisfy bugs in marshal'd gemspecs that
 # contain a reference to YAML::PrivateType. We prune these out
 # in Specification._load, but if we don't have the constant, Marshal
 # blows up.

diff --git a/lib/ruby/stdlib/rubygems/remote_fetcher.rb b/lib/ruby/stdlib/rubygems/remote_fetcher.rb
@@ -103,7 +103,7 @@ def api_endpoint(uri)
   # filename. Returns nil if the gem cannot be located.
   #--
   # Should probably be integrated with #download below, but that will be a
-  # larger, more emcompassing effort. -erikh
+  # larger, more encompassing effort. -erikh
 
   def download_to_cache dependency
     found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency