Make monochrome_logs argument of function

Rather than reading it from global params.monochrome_logs, monochrome_logs is an argument supplied to the function. This means a pipeline developer can configure it more precisely.

Author: adamrtalbot

plugins/nf-validation/src/main/nextflow/validation/SchemaValidator.groovy

@@ -220,9 +220,6 @@ class SchemaValidator extends PluginExtensionPoint {
         if( !params.containsKey("validationLenientMode") ) {
             params.validationLenientMode = false
         }
-        if( !params.containsKey("monochrome_logs") ) {
-            params.monochrome_logs = false
-        }
         if( !params.containsKey("help") ) {
             params.help = false
         }
@@ -247,7 +244,6 @@ class SchemaValidator extends PluginExtensionPoint {
         def List expectedParams = [
             "validationFailUnrecognisedParams",
             "validationLenientMode",
-            "monochrome_logs",
             "help",
             "validationShowHiddenParams",
             "validationSchemaIgnoreParams",
@@ -263,7 +259,7 @@ class SchemaValidator extends PluginExtensionPoint {
     * whether the given parameters adhere to the specifications
     */
     @Function
-    void validateParameters(String schema_filename='nextflow_schema.json') {
+    void validateParameters(String schema_filename='nextflow_schema.json', Boolean monochrome_logs=false) {
 
         def Map params = initialiseExpectedParams(session.params)
         def String baseDir = session.baseDir
@@ -346,7 +342,6 @@ class SchemaValidator extends PluginExtensionPoint {
         }
 
         // Colors
-        def Boolean monochrome_logs = params.monochrome_logs
         def colors = logColours(monochrome_logs)
 
         // Validate
@@ -648,10 +643,9 @@ class SchemaValidator extends PluginExtensionPoint {
     // Beautify parameters for --help
     //
     @Function
-    String paramsHelp(String command, String schema_filename='nextflow_schema.json') {
+    String paramsHelp(String command, String schema_filename='nextflow_schema.json', Boolean monochrome_logs=false) {
         def Map params = initialiseExpectedParams(session.params)
         def String baseDir = session.baseDir
-        def Boolean monochrome_logs = params.monochrome_logs
         def colors = logColours(monochrome_logs)
         Integer num_hidden = 0
         String output  = ''
@@ -816,12 +810,11 @@ class SchemaValidator extends PluginExtensionPoint {
     // Beautify parameters for summary and return as string
     //
     @Function
-    public String paramsSummaryLog(WorkflowMetadata workflow, String schema_filename='nextflow_schema.json') {
+    public String paramsSummaryLog(WorkflowMetadata workflow, String schema_filename='nextflow_schema.json', Boolean monochrome_logs=false) {
 
         def String baseDir = session.baseDir
         def Map params = session.params
 
-        def Boolean monochrome_logs = params.monochrome_logs
         def colors = logColours(monochrome_logs)
         String output  = ''
         def LinkedHashMap params_map = paramsSummaryMap(workflow, schema_filename)

plugins/nf-validation/src/test/nextflow/validation/PluginExtensionMethodsTest.groovy

@@ -80,7 +80,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec{
             params.monochrome_logs = true
             include { validateParameters } from 'plugin/nf-validation'
             
-            validateParameters('src/testResources/nextflow_schema.json')
+            validateParameters('src/testResources/nextflow_schema.json', params.monochrome_logs)
         """
 
         when:
@@ -226,7 +226,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec{
             params.validationFailUnrecognisedParams = true
             include { validateParameters } from 'plugin/nf-validation'
             
-            validateParameters('$schema')
+            validateParameters('$schema', params.monochrome_logs)
         """
 
         when:
@@ -251,7 +251,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec{
             params.outdir = 10
             include { validateParameters } from 'plugin/nf-validation'
             
-            validateParameters('$schema')
+            validateParameters('$schema', params.monochrome_logs)
         """
 
         when:
@@ -303,7 +303,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec{
             params.max_time = '10.day'
             include { validateParameters } from 'plugin/nf-validation'
             
-            validateParameters('$schema')
+            validateParameters('$schema', params.monochrome_logs)
         """
 
         when:
@@ -378,7 +378,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec{
             params.max_cpus = 1.2
             include { validateParameters } from 'plugin/nf-validation'
             
-            validateParameters('$schema')
+            validateParameters('$schema', params.monochrome_logs)
         """
 
         when:
@@ -404,7 +404,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec{
             params.max_memory = '10'
             include { validateParameters } from 'plugin/nf-validation'
             
-            validateParameters('$schema')
+            validateParameters('$schema', params.monochrome_logs)
         """
 
         when:
@@ -640,7 +640,7 @@ class PluginExtensionMethodsTest extends Dsl2Spec{
             params.input = 'src/testResources/samplesheet_no_required.csv'
             include { validateParameters } from 'plugin/nf-validation'
             
-            validateParameters('$schema')
+            validateParameters('$schema', params.monochrome_logs)
         """
 
         when: