Use - instead of _ for all user options

* To be consistent with the MRI option style.

Author: eregon

spec/truffle/launcher_spec.rb

@@ -210,15 +210,15 @@ def should_print_full_java_command(options, env: {})
     end
 
     it 'parses ,' do
-      out = ruby_exe("puts $LOAD_PATH", options: "--load_paths=a,b")
+      out = ruby_exe("puts $LOAD_PATH", options: "--load-paths=a,b")
       $?.success?.should == true
       out.lines[0].should == "#{Dir.pwd}/a\n"
       out.lines[1].should == "#{Dir.pwd}/b\n"
     end
 
     it 'parses , respecting escaping' do
       # \\\\ translates to one \
-      out = ruby_exe("puts $LOAD_PATH", options: "--load_paths=a\\\\,b,,\\\\c")
+      out = ruby_exe("puts $LOAD_PATH", options: "--load-paths=a\\\\,b,,\\\\c")
       $?.success?.should == true
       out.lines[0].should == "#{Dir.pwd}/a,b\n"
       out.lines[1].should == "#{Dir.pwd}\n"
@@ -254,7 +254,7 @@ def should_print_full_java_command(options, env: {})
     $?.success?.should == true
     out.should =~ /language options/i
     out.should include("Ruby:")
-    out.should include("--ruby.load_paths=")
+    out.should include("--ruby.load-paths=")
   end
 
   guard -> { TruffleRuby.sulong? } do

spec/truffle/options/parsing_spec.rb

@@ -35,9 +35,9 @@
     end
 
     it "arrays of strings" do
-      ruby_exe("p Truffle::Boot.get_option('load_paths')", options: "--load_paths=ruby_spec_test_value").should == "[\"ruby_spec_test_value\"]\n"
-      ruby_exe("p Truffle::Boot.get_option('load_paths')", options: "--load_paths=a,b,c").should == "[\"a\", \"b\", \"c\"]\n"
-      ruby_exe("p Truffle::Boot.get_option('load_paths')", options: "--load_paths=a\\\\,b,c").should == "[\"a,b\", \"c\"]\n"
+      ruby_exe("p Truffle::Boot.get_option('load-paths')", options: "--load-paths=ruby_spec_test_value").should == "[\"ruby_spec_test_value\"]\n"
+      ruby_exe("p Truffle::Boot.get_option('load-paths')", options: "--load-paths=a,b,c").should == "[\"a\", \"b\", \"c\"]\n"
+      ruby_exe("p Truffle::Boot.get_option('load-paths')", options: "--load-paths=a\\\\,b,c").should == "[\"a,b\", \"c\"]\n"
     end
 
   end

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

@@ -291,17 +291,17 @@ public class Options {
 
     public Object fromDescription(OptionDescription<?> description) {
         switch (description.getName()) {
-            case "ruby.load_paths":
+            case "ruby.load-paths":
                 return LOAD_PATHS;
-            case "ruby.required_libraries":
+            case "ruby.required-libraries":
                 return REQUIRED_LIBRARIES;
-            case "ruby.working_directory":
+            case "ruby.working-directory":
                 return WORKING_DIRECTORY;
             case "ruby.debug":
                 return DEBUG;
             case "ruby.verbose":
                 return VERBOSITY;
-            case "ruby.source_encoding":
+            case "ruby.source-encoding":
                 return SOURCE_ENCODING;
             case "ruby.internal-encoding":
                 return INTERNAL_ENCODING;

src/main/ruby/post-boot/post-boot.rb

@@ -9,7 +9,7 @@
 # GNU Lesser General Public License version 2.1.
 
 Truffle::Boot.delay do
-  wd = Truffle::Boot.get_option('working_directory')
+  wd = Truffle::Boot.get_option('working-directory')
   Dir.chdir(wd) unless wd.empty?
 end
 

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

@@ -20,19 +20,19 @@ public class OptionsCatalog {
 
     public static final StringArrayOptionDescription LOAD_PATHS = new StringArrayOptionDescription(
             OptionCategory.USER,
-            "ruby.load_paths",
+            "ruby.load-paths",
             "Load paths (configured by the -I Ruby option)",
             new String[]{"-I"},
             new String[]{});
     public static final StringArrayOptionDescription REQUIRED_LIBRARIES = new StringArrayOptionDescription(
             OptionCategory.USER,
-            "ruby.required_libraries",
+            "ruby.required-libraries",
             "Required libraries (configured by the -r Ruby option)",
             new String[]{"-r"},
             new String[]{});
     public static final StringOptionDescription WORKING_DIRECTORY = new StringOptionDescription(
             OptionCategory.USER,
-            "ruby.working_directory",
+            "ruby.working-directory",
             "Interpreter will switch to this directory (configured by the -C Ruby option)",
             new String[]{"-C"},
             "");
@@ -50,7 +50,7 @@ public class OptionsCatalog {
             Verbosity.FALSE);
     public static final StringOptionDescription SOURCE_ENCODING = new StringOptionDescription(
             OptionCategory.USER,
-            "ruby.source_encoding",
+            "ruby.source-encoding",
             "Source encoding (configured by the -K Ruby option)",
             new String[]{"-K"},
             "");
@@ -801,17 +801,17 @@ public class OptionsCatalog {
 
     public static OptionDescription<?> fromName(String name) {
         switch (name) {
-            case "ruby.load_paths":
+            case "ruby.load-paths":
                 return LOAD_PATHS;
-            case "ruby.required_libraries":
+            case "ruby.required-libraries":
                 return REQUIRED_LIBRARIES;
-            case "ruby.working_directory":
+            case "ruby.working-directory":
                 return WORKING_DIRECTORY;
             case "ruby.debug":
                 return DEBUG;
             case "ruby.verbose":
                 return VERBOSITY;
-            case "ruby.source_encoding":
+            case "ruby.source-encoding":
                 return SOURCE_ENCODING;
             case "ruby.internal-encoding":
                 return INTERNAL_ENCODING;

tool/options.yml

@@ -1,12 +1,12 @@
 USER:
   # Options corresponding to MRI options, which are also useful outside the TruffleRuby launcher
-  LOAD_PATHS: [[load_paths, -I], string-array, [], Load paths]
-  REQUIRED_LIBRARIES: [[required_libraries, -r], string-array, [], Required libraries]
-  WORKING_DIRECTORY: [[working_directory, -C], string, '', Interpreter will switch to this directory]
+  LOAD_PATHS: [[load-paths, -I], string-array, [], Load paths]
+  REQUIRED_LIBRARIES: [[required-libraries, -r], string-array, [], Required libraries]
+  WORKING_DIRECTORY: [[working-directory, -C], string, '', Interpreter will switch to this directory]
   DEBUG: [[debug, -d], boolean, false, Debug]
   VERBOSITY: [[verbose, -v, -w, -W], enum/verbosity, false, Verbosity]
 
-  SOURCE_ENCODING: [[source_encoding, -K], string, '', Source encoding]
+  SOURCE_ENCODING: [[source-encoding, -K], string, '', Source encoding]
   INTERNAL_ENCODING: [[internal-encoding, -E, -U], string, '', Internal encoding]
   EXTERNAL_ENCODING: [[external-encoding, -E], string, '', External encoding]
 

tool/simplecov_core.rb

@@ -1,5 +1,5 @@
 # Run with --coverage.global=true if you want coverage of the core library
-# $ export TRUFFLERUBYOPT="--coverage.global=true --required_libraries=./tool/simplecov_core.rb"
+# $ export TRUFFLERUBYOPT="--coverage.global=true --required-libraries=./tool/simplecov_core.rb"
 # Then run a hello world, specs, etc
 
 at_exit do