Make READ_RUBYOPT a launcher-only option

Author: eregon

src/launcher/java/org/truffleruby/launcher/CommandLineOptions.java

@@ -45,6 +45,8 @@ public class CommandLineOptions {
     boolean showVersion = false;
     boolean showCopyright = false;
     ShowHelp showHelp = ShowHelp.NONE;
+    /** Read the RUBYOPT and TRUFFLERUBYOPT environment variables */
+    boolean readRubyOptEnv = true;
     /** What should be done after context is created */
     ExecutionAction executionAction = ExecutionAction.NONE;
     /** What should be done when no action is set */

src/launcher/java/org/truffleruby/launcher/CommandLineParser.java

@@ -605,7 +605,7 @@ private CommandLineException notImplemented(String option) {
                 FEATURES.get("frozen-string-literal"));
 
         FEATURES.put("rubyopt",
-                (processor, enable) -> processor.config.setOption(OptionsCatalog.READ_RUBYOPT, enable));
+                (processor, enable) -> processor.config.readRubyOptEnv = enable);
     }
 
     private static Logger createLogger() {

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

@@ -68,7 +68,7 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
             final CommandLineParser argumentCommandLineParser = new CommandLineParser(args, config, true, false);
             argumentCommandLineParser.processArguments();
 
-            if ((boolean) config.getOption(OptionsCatalog.READ_RUBYOPT)) {
+            if (config.readRubyOptEnv) {
                 // Process RUBYOPT
                 final List<String> rubyoptArgs = getArgsFromEnvVariable("RUBYOPT");
                 new CommandLineParser(rubyoptArgs, config, false, true).processArguments();

src/main/java/org/truffleruby/options/Options.java

@@ -80,7 +80,6 @@ public class Options {
     public final boolean ARGV_GLOBALS;
     public final boolean IGNORE_LINES_BEFORE_RUBY_SHEBANG;
     public final boolean SYNTAX_CHECK;
-    public final boolean READ_RUBYOPT;
     public final String[] ARGV_GLOBAL_VALUES;
     public final String[] ARGV_GLOBAL_FLAGS;
     public final boolean BUILDING_CORE_CEXTS;
@@ -207,7 +206,6 @@ public Options(Env env, OptionValues options) {
         ARGV_GLOBALS = options.get(OptionsCatalog.ARGV_GLOBALS_KEY);
         IGNORE_LINES_BEFORE_RUBY_SHEBANG = options.get(OptionsCatalog.IGNORE_LINES_BEFORE_RUBY_SHEBANG_KEY);
         SYNTAX_CHECK = options.get(OptionsCatalog.SYNTAX_CHECK_KEY);
-        READ_RUBYOPT = options.get(OptionsCatalog.READ_RUBYOPT_KEY);
         ARGV_GLOBAL_VALUES = options.get(OptionsCatalog.ARGV_GLOBAL_VALUES_KEY);
         ARGV_GLOBAL_FLAGS = options.get(OptionsCatalog.ARGV_GLOBAL_FLAGS_KEY);
         BUILDING_CORE_CEXTS = options.get(OptionsCatalog.BUILDING_CORE_CEXTS_KEY);
@@ -393,8 +391,6 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return IGNORE_LINES_BEFORE_RUBY_SHEBANG;
             case "ruby.syntax_check":
                 return SYNTAX_CHECK;
-            case "ruby.read_rubyopt":
-                return READ_RUBYOPT;
             case "ruby.argv_global_values":
                 return ARGV_GLOBAL_VALUES;
             case "ruby.argv_global_flags":

src/options.yml

@@ -85,7 +85,6 @@ INTERNAL: # Options for debugging the TruffleRuby implementation
     SYNTAX_CHECK: [[syntax_check, -c], boolean, false, Do not execute just check syntax]
 
     # Used internally for the launcher to communicate with the RubyContext
-    READ_RUBYOPT: [read_rubyopt, boolean, true, Read RUBYOPT and TRUFFLERUBYOPT environment variables]
     ARGV_GLOBAL_VALUES: [argv_global_values, string-array, [], Parsed options from script argv with a value]
     ARGV_GLOBAL_FLAGS: [argv_global_flags, string-array, [], Parsed options from script argv acting as flags (no value)]
     BUILDING_CORE_CEXTS: [building.core.cexts, boolean, false, 'Used while building TruffleRuby to build core C extensions']

src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java

@@ -78,7 +78,6 @@ public class OptionsCatalog {
     public static final OptionKey<Boolean> ARGV_GLOBALS_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> IGNORE_LINES_BEFORE_RUBY_SHEBANG_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> SYNTAX_CHECK_KEY = new OptionKey<>(false);
-    public static final OptionKey<Boolean> READ_RUBYOPT_KEY = new OptionKey<>(true);
     public static final OptionKey<String[]> ARGV_GLOBAL_VALUES_KEY = new OptionKey<>(new String[]{}, StringArrayOptionType.INSTANCE);
     public static final OptionKey<String[]> ARGV_GLOBAL_FLAGS_KEY = new OptionKey<>(new String[]{}, StringArrayOptionType.INSTANCE);
     public static final OptionKey<Boolean> BUILDING_CORE_CEXTS_KEY = new OptionKey<>(false);
@@ -546,13 +545,6 @@ public class OptionsCatalog {
             .stability(OptionStability.EXPERIMENTAL)
             .build();
 
-    public static final OptionDescriptor READ_RUBYOPT = OptionDescriptor
-            .newBuilder(READ_RUBYOPT_KEY, "ruby.read_rubyopt")
-            .help("Read RUBYOPT and TRUFFLERUBYOPT environment variables")
-            .category(OptionCategory.INTERNAL)
-            .stability(OptionStability.EXPERIMENTAL)
-            .build();
-
     public static final OptionDescriptor ARGV_GLOBAL_VALUES = OptionDescriptor
             .newBuilder(ARGV_GLOBAL_VALUES_KEY, "ruby.argv_global_values")
             .help("Parsed options from script argv with a value")
@@ -1138,8 +1130,6 @@ public static OptionDescriptor fromName(String name) {
                 return IGNORE_LINES_BEFORE_RUBY_SHEBANG;
             case "ruby.syntax_check":
                 return SYNTAX_CHECK;
-            case "ruby.read_rubyopt":
-                return READ_RUBYOPT;
             case "ruby.argv_global_values":
                 return ARGV_GLOBAL_VALUES;
             case "ruby.argv_global_flags":
@@ -1377,7 +1367,6 @@ public static OptionDescriptor[] allDescriptors() {
             POLYGLOT_STDIO,
             PREINITIALIZATION,
             PRIMITIVE_CALLERS_ALWAYS_CLONE,
-            READ_RUBYOPT,
             REGEXP_INSTRUMENT_CREATION,
             REGEXP_INSTRUMENT_MATCH,
             REQUIRED_LIBRARIES,