add --disable-console-log to test command

Author: cdupuis

CHANGELOG.md

@@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/atomist/rug-cli/compare/1.0.0-m.5...HEAD
+[Unreleased]: https://github.com/atomist/rug-cli/compare/1.0.0-m.6...HEAD
+
+## [1.0.0-m.6] - 2017-07-14
+
+Milestone 6 release
+
+[1.0.0-m.5]: https://github.com/atomist/rug-cli/compare/1.0.0-m.5...1.0.0-m.6
+
+### Added
+
+-	Added `--disable-console-log` for `test` command
 
 ## [1.0.0-m.5] - 2017-07-11
 

src/main/java/com/atomist/rug/cli/command/AbstractCompilingAndOperationLoadingCommand.java

@@ -66,7 +66,8 @@ private RugResolver createRugResolver(ArtifactDescriptor artifact, ArtifactSourc
                 String.format("Loading rugs of %s", ArtifactDescriptorUtils.coordinates(artifact)))
                         .run(indicator -> {
                             Dependency root = processArtifact(artifact, source);
-                            return new ArchiveRugResolver(root, ConsoleLogger.consoleLogger());
+                            return new ArchiveRugResolver(root, ConsoleLogger.consoleLogger(
+                                    !CommandLineOptions.hasOption("disable-console-log")));
                         });
     }
 

src/main/java/com/atomist/rug/cli/command/test/TestCommand.java

@@ -57,7 +57,8 @@ public class TestCommand extends AbstractAnnotationBasedCommand {
 
     @Command
     public void run(Rugs operations, ArtifactDescriptor artifact, ArtifactSource source,
-            Settings settings, @Argument(index = 1) String testToRun) {
+            Settings settings, @Argument(index = 1) String testToRun,
+            @com.atomist.rug.cli.command.annotation.Option("disable-console-log") boolean disableConsoleLog) {
         Optional<String> token = settings.getConfigValue(Settings.GIHUB_TOKEN_KEY, String.class);
 
         ArchiveTestResult result = new ProgressReportingOperationRunner<ArchiveTestResult>(
@@ -67,7 +68,8 @@ public void run(Rugs operations, ArtifactDescriptor artifact, ArtifactSource sou
                                     .singletonList(new LoggingGherkinExecutionListener(indicator));
                             GherkinRunner runner = new GherkinRunner(
                                     new JavaScriptContext(source, DefaultAtomistConfig$.MODULE$,
-                                            new SimpleBindings(), ConsoleLogger.consoleLogger()),
+                                            new SimpleBindings(),
+                                            ConsoleLogger.consoleLogger(!disableConsoleLog)),
                                     Option.apply(operations),
                                     JavaConverters.asScalaBufferConverter(listeners).asScala(),
                                     new GherkinRunnerConfig(Option.apply(token.orElse(null))));

src/main/java/com/atomist/rug/cli/command/test/TestCommandInfo.java

@@ -1,5 +1,8 @@
 package com.atomist.rug.cli.command.test;
 
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
 import com.atomist.rug.cli.command.AbstractLocalArtifactDescriptorProvider;
 import com.atomist.rug.resolver.ArtifactDescriptor;
 import com.atomist.rug.resolver.ArtifactDescriptor.Extension;
@@ -25,6 +28,14 @@ public String detail() {
     public int order() {
         return 50;
     }
+    
+    @Override
+    public Options options() {
+        Options options = super.options();
+        options.addOption(Option.builder().hasArg(false).desc("Disable console logging")
+                .longOpt("disable-console-log").optionalArg(true).build());
+        return options;
+    }
 
     @Override
     public String usage() {

src/main/java/com/atomist/rug/cli/output/ConsoleLogger.java

@@ -11,41 +11,50 @@
 import scala.runtime.BoxedUnit;
 
 public class ConsoleLogger {
-    
+
     private static Log log = new Log(ConsoleLogger.class);
 
     private String indent = Constants.LEFT_PADDING;
-    
-    private ConsoleLogger(String indent) {
+    private boolean enabled = true;
+
+    private ConsoleLogger(String indent, boolean enabled) {
         this.indent = indent;
+        this.enabled = enabled;
     }
-    
+
     public void log(String msg) {
-        log.info(indent + msg);
+        if (enabled) {
+            log.info(indent + msg);
+        }
     }
-    
+
     public void warn(String msg) {
-        log.info(indent + msg);
+        if (enabled) {
+            log.info(indent + msg);
+        }
     }
-    
+
     public void error(String msg) {
-        log.error(indent + msg);
+        if (enabled) {
+            log.error(indent + msg);
+        }
     }
-    
-    public static AbstractFunction1<ScriptEngine, BoxedUnit> consoleLogger(String indent) {
+
+    public static AbstractFunction1<ScriptEngine, BoxedUnit> consoleLogger(String indent,
+            boolean enabled) {
         return new AbstractFunction1<ScriptEngine, BoxedUnit>() {
 
             @Override
             public BoxedUnit apply(ScriptEngine engine) {
                 Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
-                bindings.put("console", new ConsoleLogger(indent));
+                bindings.put("console", new ConsoleLogger(indent, enabled));
                 engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE);
                 return null;
             }
         };
     }
-    
-    public static AbstractFunction1<ScriptEngine, BoxedUnit> consoleLogger() {
-        return consoleLogger("");
+
+    public static AbstractFunction1<ScriptEngine, BoxedUnit> consoleLogger(boolean enabled) {
+        return consoleLogger("", enabled);
     }
- }
+}