Merge the CLI class into the instrument.

Author: boris-spas

src/main/java/com/oracle/simpletool/CLI.java

@@ -25,7 +25,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.graalvm.options.OptionCategory;
 import org.graalvm.options.OptionDescriptors;
+import org.graalvm.options.OptionKey;
+import org.graalvm.options.OptionStability;
 import org.graalvm.options.OptionValues;
 
 /**
@@ -47,6 +50,12 @@
 @Registration(id = SimpleCodeCoverageInstrument.ID, name = "Simple Code Coverage", version = "0.1", services = SimpleCodeCoverageInstrument.class)
 public final class SimpleCodeCoverageInstrument extends TruffleInstrument {
 
+    @Option(name = "", help = "Enable Simple Coverage (default: false).", category = OptionCategory.USER, stability = OptionStability.STABLE)
+    static final OptionKey<Boolean> ENABLED = new OptionKey<>(false);
+
+    @Option(name = "PrintCoverage", help = "Print coverage to stdout on process exit (default: true).", category = OptionCategory.USER, stability = OptionStability.STABLE)
+    static final OptionKey<Boolean> PRINT_COVERAGE = new OptionKey<>(true);
+
     public static final String ID = "simple-code-coverage";
 
     /**
@@ -67,10 +76,11 @@ public Map<Source, Set<SourceSection>> getSourceToNotYetCoveredSections() {
      *
      * This method is used to properly initialize the instrument. A common
      * practice is to use the {@link Option} system to enable and configure the
-     * instrument, as is done in this method. Defining {@link Option}s Sis shown
-     * in the {@link CLI} class, and their usage can be seen in the
-     * {@link SimpleCodeCoverageInstrumentTest} when the context is being
-     * created.
+     * instrument, as is done in this method. Defining {@link Option}s as is
+     * shown in {@link #ENABLED} and {@link #PRINT_COVERAGE}, and their usage
+     * can be seen in the {@link SimpleCodeCoverageInstrumentTest} when the
+     * context is being created. Using them from the command line is shown in
+     * the runJsWithCoverage.sh script.
      *
      * @param env the environment for the instrument. Allows us to read the
      * {@link Option}s, input and output streams to be used for reading and
@@ -82,9 +92,9 @@ public Map<Source, Set<SourceSection>> getSourceToNotYetCoveredSections() {
     @Override
     protected void onCreate(final Env env) {
         final OptionValues options = env.getOptions();
-        if (CLI.ENABLED.getValue(options)) {
+        if (ENABLED.getValue(options)) {
             enable(env);
-            if (CLI.PRINT_COVERAGE.getValue(options)) {
+            if (PRINT_COVERAGE.getValue(options)) {
                 ensurePrintCoverage(env);
             }
             env.registerService(this);
@@ -202,15 +212,15 @@ public List<Integer> notYetCoveredLineNumbers(final Source source) {
      *
      * If the {@link TruffleInstrument} uses {@link Option}s, it is nesesery to
      * specify which {@link Option}s. The {@link OptionDescriptors} is
-     * automatically generated from the {@link CLI} class due to the
-     * {@link Option.Group} annotation. In our case, this is the
-     * {@code CLIOptionDescriptors} class.
+     * automatically generated from this class due to the {@link Option}
+     * annotation. In our case, this is the
+     * {@code SimpleCodeCoverageInstrumentOptionDescriptors} class.
      *
      * @return The class generated by the {@link Option.Group} annotation
      */
     @Override
     protected OptionDescriptors getOptionDescriptors() {
-        return new CLIOptionDescriptors();
+        return new SimpleCodeCoverageInstrumentOptionDescriptors();
     }
 
     /**