Remove jruby.compat.version which is no longer needed for supported JRubies

This has been set to 2.0 for all supported JRubies for a long time.

(cherry picked from commit 54b3c20)

Author: chadlwilson

README.md

@@ -206,8 +206,6 @@ as context init parameters in web.xml or as VM-wide system properties.
   sub-path of the main servlet context root.
 - `gem.path`: Relative path to the bundled gem repository. Defaults to
   */WEB-INF/gems*.
-- `jruby.compat.version`: Set to "1.8" or "1.9" to make JRuby run a specific
-  version of Ruby (same as the --1.8 / --1.9 command line flags).
 - `jruby.min.runtimes`: For non-threadsafe Rails applications using a runtime
   pool, specify an integer minimum number of runtimes to hold in the pool.
 - `jruby.max.runtimes`: For non-threadsafe Rails applications, an integer

src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java

@@ -309,10 +309,6 @@ protected RubyInstanceConfig initRuntimeConfig(final RubyInstanceConfig config)
         // Process arguments, namely any that might be in RUBYOPT
         config.processArguments(rackConfig.getRuntimeArguments());
 
-        if ( rackConfig.getCompatVersion() != null ) {
-            config.setCompatVersion(rackConfig.getCompatVersion());
-        }
-
         try { // try to set jruby home to jar file path
             final URL resource = Ruby.class.getResource("/META-INF/jruby.home");
             if ( resource != null && "jar".equals( resource.getProtocol() ) ) {

src/main/java/org/jruby/rack/DefaultRackConfig.java

@@ -17,13 +17,9 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.jruby.CompatVersion;
 import org.jruby.rack.logging.OutputStreamLogger;
 import org.jruby.rack.logging.StandardOutLogger;
 import org.jruby.util.SafePropertyAccessor;
-import static org.jruby.rack.RackLogger.Level.*;
 
 /**
  * A base implementation of that retrieves settings from system properties.
@@ -77,28 +73,6 @@ public void setQuiet(boolean quiet) {
         this.quiet = quiet;
     }
 
-    @Override
-    public CompatVersion getCompatVersion() {
-        final String version = getProperty("jruby.compat.version");
-        if ( version != null ) {
-            // we handle 1.8, RUBY1_9, --2.0 1_9 2.1.0.dev etc :
-            final Pattern pattern = Pattern.compile("([123])[._]([8901234567])");
-            final Matcher matcher = pattern.matcher(version);
-            if ( matcher.find() ) {
-                final String name = "RUBY" +
-                    matcher.group(1) + '_' + matcher.group(2);
-                try {
-                    return Enum.valueOf(CompatVersion.class, name);
-                }
-                catch (IllegalArgumentException e) {
-                    getLogger().log(WARN,
-                        "could not resolve compat version from '"+ version +"' will use default", e);
-                }
-            }
-        }
-        return null;
-    }
-
     @Override
     public String getRackup() {
         return getProperty("rackup");

src/main/java/org/jruby/rack/RackConfig.java

@@ -7,8 +7,6 @@
 
 package org.jruby.rack;
 
-import org.jruby.CompatVersion;
-
 import java.io.PrintStream;
 import java.util.Map;
 
@@ -32,12 +30,6 @@ public interface RackConfig {
      * @return <code>STDERR</code>
      */
     PrintStream getErr();
-    
-    /** 
-     * Return the Ruby version that JRuby should run.
-     * @return <code>RUBY_VERSION</code> (e.g. 1.8, 1.9)
-     */
-    CompatVersion getCompatVersion();
 
     /** 
      * Return the rackup Ruby script to be used to launch the application.

src/main/java/org/jruby/rack/embed/Config.java

@@ -27,7 +27,6 @@
 import java.io.PrintStream;
 import java.util.Map;
 
-import org.jruby.CompatVersion;
 import org.jruby.Ruby;
 import org.jruby.rack.DefaultRackConfig;
 import org.jruby.rack.RackConfig;
@@ -44,7 +43,6 @@ public class Config implements RackConfig {
 
     private RackLogger logger;
     private Map<String, String> rubyENV;
-    private CompatVersion compatVersion;
 
     public Config() {
         delegate = new DefaultRackConfig() {
@@ -61,31 +59,11 @@ public String getProperty(String key, String defaultValue) {
         };
     }
 
-    /*
-    Config(final RackConfig config) {
-        delegate = new DefaultRackConfig() {
-
-            @Override
-            public String getProperty(String key, String defaultValue) {
-                String value = config.getProperty(key, null);
-                if ( value != null ) return value;
-
-                value = Config.this.resolveProperty(key);
-                return value != null ? value : super.getProperty(key, defaultValue);
-            }
-
-            @Override
-            public RackLogger defaultLogger() { return null; }
-
-        };
-    } */
-
     @SuppressWarnings("unchecked")
     public void doInitialize(final Ruby runtime) {
         setOut( runtime.getOut() );
         setErr( runtime.getErr() );
         rubyENV = runtime.getENV();
-        compatVersion = runtime.getInstanceConfig().getCompatVersion();
     }
 
 
@@ -119,10 +97,6 @@ public final Number getNumberProperty(String key, Number defaultValue) {
         return delegate.getNumberProperty(key, defaultValue);
     }
 
-    public CompatVersion getCompatVersion() {
-        return compatVersion;
-    }
-
     public RackLogger getLogger() {
         if (logger == null) {
             logger = delegate.getLogger();

src/spec/ruby/jruby/rack/error_app_spec.rb

@@ -161,7 +161,7 @@ def in_tmpdir_with_files(files = {})
     end
     yield path
   ensure
-    FileUtils.rm_rf(path) if path && File.exists?(path)
+    FileUtils.rm_rf(path) if path && File.exist?(path)
   end
 
 end

src/spec/ruby/jruby/rack/integration_spec.rb

@@ -15,15 +15,11 @@
 
   before(:all) { require 'fileutils' }
 
-  #after(:all) { JRuby::Rack.context = nil }
-
   describe 'rack (lambda)' do
 
     before do
       @servlet_context = org.jruby.rack.mock.RackLoggingMockServletContext.new "file://#{STUB_DIR}/rack"
       @servlet_context.logger = raise_logger
-      # make sure we always boot runtimes in the same mode as specs :
-      set_compat_version @servlet_context
     end
 
     it "initializes" do
@@ -136,7 +132,6 @@ def base_path; "file://#{STUB_DIR}/rails30" end
       before :all do
         initialize_rails nil, base_path
       end
-      after(:all)  { restore_rails }
 
       it "loaded rack ~> 1.2" do
         @runtime = @rack_factory.getApplication.getRuntime
@@ -435,27 +430,12 @@ def initialize_rails(env = nil, servlet_context = @servlet_context)
     @servlet_context ||= servlet_context
   end
 
-  def restore_rails
-    #ENV['RACK_ENV'] = ENV_COPY['RACK_ENV'] if ENV.key?('RACK_ENV')
-    #ENV['RAILS_ENV'] = ENV_COPY['RAILS_ENV'] if ENV.key?('RAILS_ENV')
-  end
-
   def new_servlet_context(base_path = nil)
     servlet_context = org.jruby.rack.mock.RackLoggingMockServletContext.new base_path
     servlet_context.logger = raise_logger
-    prepare_servlet_context servlet_context
     servlet_context
   end
 
-  def prepare_servlet_context(servlet_context)
-    set_compat_version servlet_context
-  end
-
-  def set_compat_version(servlet_context = @servlet_context); require 'jruby'
-    compat_version = JRuby.runtime.getInstanceConfig.getCompatVersion # RUBY1_9
-    servlet_context.addInitParameter("jruby.compat.version", compat_version.to_s)
-  end
-
   private
 
   GEMFILES_DIR = File.expand_path('../../../gemfiles', STUB_DIR)

src/spec/ruby/rack/application_spec.rb

@@ -390,13 +390,6 @@ def newRuntime() # use the current runtime instead of creating new
         should_eval_as_eql_to "require 'yaml'", true # -ryaml not processed
       end
 
-      it "handles jruby.compat.version == '1.9' and starts in 1.9 mode" do
-        set_config 'jruby.compat.version', '1.9'
-        #@rack_config.stub(:getCompatVersion).and_return org.jruby.CompatVersion::RUBY1_9
-        @runtime = app_factory.new_runtime
-        @runtime.is1_9.should be_truthy
-      end
-
       it "handles jruby.runtime.arguments == '-X+O -Ke' and start with object space enabled and KCode EUC" do
         set_config 'jruby.runtime.arguments', '-X+O -Ke'
         #@rack_config.stub(:getRuntimeArguments).and_return ['-X+O', '-Ke'].to_java(:String)

src/spec/ruby/rack/config_spec.rb

@@ -184,56 +184,6 @@ def expect_empty_env(env)
 
   end
 
-  it "sets compat version from init parameter" do
-    @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-      and_return "RUBY1_9"
-    expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY1_9
-  end
-
-  it "sets compat version from init parameter (dot syntax)" do
-    @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-      and_return "1.8"
-    expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY1_8
-  end
-
-  it "leaves compat version nil if not specified" do
-    @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-      and_return nil
-    expect( config.getCompatVersion ).to be nil
-  end
-
-  it "leaves compat version nil if invalid value specified" do
-    @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-      and_return "4.2"
-    expect( config.getCompatVersion ).to be nil
-  end
-
-    it "sets compat version from init parameter (head-syntax)" do
-      @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-        and_return "1.9.3-SNAPSHOT"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY1_9
-    end
-
-  if JRUBY_VERSION >= '1.7.0'
-    it "sets compat version 2.0 from init parameter" do
-      @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-        and_return "RUBY2_0"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY2_0
-    end
-
-    it "sets compat version 2.0 from init parameter (dot syntax)" do
-      @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-        and_return "2_0"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY2_0
-    end
-
-    it "sets compat version 2.0 from init parameter (head-syntax)" do
-      @servlet_context.should_receive(:getInitParameter).with("jruby.compat.version").
-        and_return "2.0.0.dev"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY2_0
-    end
-  end
-
   describe "custom-properties" do
 
     it "parser an int property" do

src/spec/ruby/rack/embed/config_spec.rb

@@ -83,12 +83,6 @@
       end
     end
 
-    it "sets compat version from runtime" do
-      require 'jruby'
-      compat_version = JRuby.runtime.instance_config.compat_version
-      expect( @config.compat_version ).to eql compat_version
-    end
-
     it "sets out/err streams from runtime" do
       out = java.io.ByteArrayOutputStream.new
       err = java.io.ByteArrayOutputStream.new