Add gatk4/applybqsr (#331)

* Add applybqsr module

* Solve problem in functions.nf

* Add to pytest

software/gatk4/applybqsr/functions.nf

@@ -0,0 +1,60 @@
+/*
+ * -----------------------------------------------------
+ *  Utility functions used in nf-core DSL2 module files
+ * -----------------------------------------------------
+ */
+
+/*
+ * Extract name of software tool from process name using $task.process
+ */
+def getSoftwareName(task_process) {
+    return task_process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()
+}
+
+/*
+ * Function to initialise default values and to generate a Groovy Map of available options for nf-core modules
+ */
+def initOptions(Map args) {
+    def Map options = [:]
+    options.args          = args.args ?: ''
+    options.args2         = args.args2 ?: ''
+    options.args3         = args.args3 ?: ''
+    options.publish_by_id = args.publish_by_id ?: false
+    options.publish_dir   = args.publish_dir ?: ''
+    options.publish_files = args.publish_files
+    options.suffix        = args.suffix ?: ''
+    return options
+}
+
+/*
+ * Tidy up and join elements of a list to return a path string
+ */
+def getPathFromList(path_list) {
+    def paths = path_list.findAll { item -> !item?.trim().isEmpty() }  // Remove empty entries
+    paths = paths.collect { it.trim().replaceAll("^[/]+|[/]+\$", "") } // Trim whitespace and trailing slashes
+    return paths.join('/')
+}
+
+/*
+ * Function to save/publish module results
+ */
+def saveFiles(Map args) {
+    if (!args.filename.endsWith('.version.txt')) {
+        def ioptions = initOptions(args.options)
+        def path_list = [ ioptions.publish_dir ?: args.publish_dir ]
+        if (ioptions.publish_by_id) {
+            path_list.add(args.publish_id)
+        }
+        if (ioptions.publish_files instanceof Map) {
+            for (ext in ioptions.publish_files) {
+                if (args.filename.endsWith(ext.key)) {
+                    def ext_list = path_list.collect()
+                    ext_list.add(ext.value)
+                    return "${getPathFromList(ext_list)}/$args.filename"
+                }
+            }
+        } else if (ioptions.publish_files == null) {
+            return "${getPathFromList(path_list)}/$args.filename"
+        }
+    }
+}

software/gatk4/applybqsr/main.nf

@@ -0,0 +1,48 @@
+// Import generic module functions
+include { initOptions; saveFiles; getSoftwareName } from './functions'
+
+params.options = [:]
+options        = initOptions(params.options)
+
+process GATK4_APPLYBQSR {
+    tag "$meta.id"
+    label 'process_low'
+    publishDir "${params.outdir}",
+        mode: params.publish_dir_mode,
+        saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), publish_id:meta.id) }
+
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.0.0" : null)
+    if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
+        container "https://depot.galaxyproject.org/singularity/gatk4:4.2.0.0--0"
+    } else {
+        container "quay.io/biocontainers/gatk4:4.2.0.0--0"
+    }
+
+    input:
+    tuple val(meta), path(bam), path(bqsr_table)
+    path fasta
+    path fastaidx
+    path dict
+    path intervalsBed
+
+    output:
+    tuple val(meta), path("*.bam"), emit: bam
+    path "*.version.txt"          , emit: version
+
+    script:
+    def software = getSoftwareName(task.process)
+    def prefix   = options.suffix ? "${meta.id}${options.suffix}" : "${meta.id}"
+    def intervalsCommand = intervalsBed ? "-L ${intervalsBed}" : ""
+
+    """
+    gatk ApplyBQSR \\
+        -R $fasta \\
+        -I $bam \\
+        --bqsr-recal-file $bqsr_table \\
+        $intervalsCommand \\
+        -O ${prefix}.bam \\
+        $options.args
+
+    gatk --version | grep Picard | sed "s/Picard Version: //g" > ${software}.version.txt
+    """
+}

software/gatk4/applybqsr/meta.yml

@@ -0,0 +1,58 @@
+name: gatk4_applybqsr
+description: Apply base quality score recalibration (BQSR) to a bam file
+keywords:
+  - bqsr
+  - bam
+tools:
+  - gatk4:
+    description: |
+        Developed in the Data Sciences Platform at the Broad Institute, the toolkit offers a wide variety of tools
+        with a primary focus on variant discovery and genotyping. Its powerful processing engine
+        and high-performance computing features make it capable of taking on projects of any size.
+    homepage: https://gatk.broadinstitute.org/hc/en-us
+    documentation: https://gatk.broadinstitute.org/hc/en-us/categories/360002369672s
+    doi: 10.1158/1538-7445.AM2017-3590
+
+input:
+  - meta:
+      type: map
+      description: |
+        Groovy Map containing sample information
+        e.g. [ id:'test', single_end:false ]
+  - bam:
+      type: file
+      description: BAM file from alignment
+      pattern: "*.{bam}"
+  - bqsr_table:
+      type: file
+      description: Recalibration table from gatk4_baserecalibrator
+  - fasta:
+      type: file
+      description: The reference fasta file
+  - fastaidx:
+      type: file
+      description: Index of reference fasta file
+  - dict:
+      type: file
+      description: GATK sequence dictionary
+  - intervalsBed:
+      type: file
+      description: Bed file with the genomic regions included in the library (optional)
+
+output:
+  - meta:
+      type: map
+      description: |
+        Groovy Map containing sample information
+        e.g. [ id:'test', single_end:false ]
+  - version:
+      type: file
+      description: File containing software version
+      pattern: "*.{version.txt}"
+  - bam:
+      type: file
+      description: Recalibrated BAM file
+      pattern: "*.{bam}"
+
+authors:
+  - "@yocra3"

tests/config/pytest_software.yml

@@ -99,7 +99,7 @@ bismark_summary:
 blast_blastn:
   - software/blast/blastn/**
   - tests/software/blast/blastn/**
-  
+
 blast_makeblastdb:
   - software/blast/makeblastdb/**
   - tests/software/blast/makeblastdb/**
@@ -174,6 +174,10 @@ fastqc:
   - software/fastqc/**
   - tests/software/fastqc/**
 
+gatk4_applybqsr:
+  - software/gatk4/applybqsr/**
+  - tests/software/gatk4/applybqsr/**
+
 gatk4_bedtointervallist:
   - software/gatk4/bedtointervallist/**
   - tests/software/gatk4/bedtointervallist/**

tests/software/gatk4/applybqsr/main.nf

@@ -0,0 +1,32 @@
+#!/usr/bin/env nextflow
+
+nextflow.enable.dsl = 2
+
+include { GATK4_APPLYBQSR } from '../../../../software/gatk4/applybqsr/main.nf' addParams( options: [:] )
+
+workflow test_gatk4_applybqsr {
+
+  def input = []
+  input = [ [ id:'test' ], // meta map
+            file("${launchDir}/tests/data/genomics/sarscov2/bam/test_paired_end.sorted.bam", checkIfExists: true),
+            file("${launchDir}/tests/data/genomics/sarscov2/table/test.table", checkIfExists: true) ]
+  fasta = file("${launchDir}/tests/data/genomics/sarscov2/fasta/test_genome.fasta", checkIfExists: true)
+  fastaidx = file("${launchDir}/tests/data/genomics/sarscov2/fasta/test_genome.fasta.fai", checkIfExists: true)
+  dict = file("${launchDir}/tests/data/genomics/sarscov2/fasta/test_genome.dict", checkIfExists: true)
+
+    GATK4_APPLYBQSR ( input, fasta, fastaidx, dict, [] )
+}
+
+workflow test_gatk4_applybqsr_intervals {
+
+  def input = []
+  input = [ [ id:'test' ], // meta map
+            file("${launchDir}/tests/data/genomics/sarscov2/bam/test_paired_end.sorted.bam", checkIfExists: true),
+            file("${launchDir}/tests/data/genomics/sarscov2/table/test.table", checkIfExists: true)  ]
+  fasta = file("${launchDir}/tests/data/genomics/sarscov2/fasta/test_genome.fasta", checkIfExists: true)
+  fastaidx = file("${launchDir}/tests/data/genomics/sarscov2/fasta/test_genome.fasta.fai", checkIfExists: true)
+  dict = file("${launchDir}/tests/data/genomics/sarscov2/fasta/test_genome.dict", checkIfExists: true)
+  intervals = file("${launchDir}/tests/data/genomics/sarscov2/bed/test.bed", checkIfExists: true)
+
+  GATK4_APPLYBQSR ( input, fasta, fastaidx, dict, intervals)
+}

tests/software/gatk4/applybqsr/test.yml

@@ -0,0 +1,18 @@
+- name: gatk4 applybqsr test_gatk4_applybqsr
+  command: nextflow run tests/software/gatk4/applybqsr -entry test_gatk4_applybqsr -c tests/config/nextflow.config
+  tags:
+    - gatk4
+    - gatk4_applybqsr
+  files:
+    - path: output/gatk4/test.bam
+      md5sum: 943a43de5f575a0435fe13072cbc15c8
+
+- name: "\e[3~"
+  command: nextflow run tests/software/gatk4/applybqsr -entry test_gatk4_applybqsr_intervals -c tests/config/nextflow.config
+  tags:
+    - gatk4
+    - gatk4_applybqsr_intervals
+    - gatk4_applybqsr
+  files:
+    - path: output/gatk4/test.bam
+      md5sum: a92238a9a78da48bf437fd5b7d9790a3