Merge pull request #1696 from jvhagey/gamma-update

adding upzip to gamma/gamma

modules/gamma/gamma/main.nf

@@ -1,6 +1,6 @@
 def VERSION = '2.1' // Version information not provided by tool on CLI
 
-process GAMMA {
+process GAMMA_GAMMA {
     tag "$meta.id"
     label 'process_low'
 
@@ -26,13 +26,24 @@ process GAMMA {
     script:
     def args = task.ext.args ?: ''
     def prefix = task.ext.prefix ?: "${meta.id}"
+
     """
-    GAMMA.py \\
+    if [[ ${fasta} == *.gz ]]
+    then
+        FNAME=\$(basename ${fasta} .gz)
+        gunzip -f ${fasta}
+        GAMMA.py \\
+        $args \\
+        "\${FNAME}" \\
+        $db \\
+        $prefix
+    else
+        GAMMA.py \\
         $args \\
         $fasta \\
         $db \\
         $prefix
-
+    fi
     cat <<-END_VERSIONS > versions.yml
     "${task.process}":
         gamma: $VERSION

modules/gamma/gamma/meta.yml

@@ -1,4 +1,4 @@
-name: "gamma"
+name: "gamma_gamma"
 description: Gene Allele Mutation Microbial Assessment
 keywords:
   - gamma
@@ -61,3 +61,4 @@ output:
 authors:
   - "@sateeshperi"
   - "@rastanton"
+  - "@jvhagey"

tests/config/pytest_modules.yml

@@ -711,9 +711,9 @@ freebayes:
   - modules/freebayes/**
   - tests/modules/freebayes/**
 
-gamma:
-  - modules/gamma/**
-  - tests/modules/gamma/**
+gamma/gamma:
+  - modules/gamma/gamma/**
+  - tests/modules/gamma/gamma/**
 
 gatk4/applybqsr:
   - modules/gatk4/applybqsr/**

tests/modules/gamma/gamma/main.nf

@@ -0,0 +1,29 @@
+#!/usr/bin/env nextflow
+
+nextflow.enable.dsl = 2
+
+include { GAMMA_GAMMA } from '../../../../modules/gamma/gamma/main.nf'
+
+workflow test_unzip {
+
+    input = [
+        [ id:'test', single_end:false ], // meta map
+        file(params.test_data['bacteroides_fragilis']['illumina']['test1_contigs_fa_gz'], checkIfExists: true),
+    ]
+
+    db = [ file("https://raw.githubusercontent.com/nf-core/test-datasets/modules/data/delete_me/srst2/ResGANNCBI_20210507_srst2.fasta", checkIfExists: true), ]
+
+    GAMMA_GAMMA ( input, db )
+}
+
+workflow test_gamma {
+
+    input = [
+        [ id:'test', single_end:false ], // meta map
+        file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
+    ]
+
+    db = [ file(params.test_data['sarscov2']['genome']['transcriptome_fasta'], checkIfExists: true) ]
+
+    GAMMA_GAMMA ( input, db )
+}

tests/modules/gamma/gamma/test.yml

@@ -0,0 +1,29 @@
+- name: gamma gamma test_unzip
+  command: nextflow run tests/modules/gamma/gamma -entry test_unzip -c tests/config/nextflow.config
+  tags:
+    - gamma/gamma
+    - gamma
+  files:
+    - path: output/gamma/test.fasta
+      md5sum: 5b3b831d863fffaa3410a9ee7bfa12ce
+    - path: output/gamma/test.gamma
+      md5sum: 46165a89e10b7315d3a9b0aa6c561626
+    - path: output/gamma/test.psl
+      md5sum: f489ce4602ddbcb692d5781ee3fbf449
+    - path: output/gamma/versions.yml
+      md5sum: 8baafec7b3b87f788f69e30d317c9722
+
+- name: gamma gamma test_gamma
+  command: nextflow run tests/modules/gamma/gamma -entry test_gamma -c tests/config/nextflow.config
+  tags:
+    - gamma/gamma
+    - gamma
+  files:
+    - path: output/gamma/test.fasta
+      md5sum: df37b48466181311e0a679f3c5878484
+    - path: output/gamma/test.gamma
+      md5sum: 3256708fa517a65ed01d99e0e3c762ae
+    - path: output/gamma/test.psl
+      md5sum: 162a2757ed3b167ae1e0cdb24213f940
+    - path: output/gamma/versions.yml
+      md5sum: b75c2871d8cac2f8ac67c0fbd22babd6

tests/modules/gamma/main.nf

@@ -1,17 +0,0 @@
-#!/usr/bin/env nextflow
-
-nextflow.enable.dsl = 2
-
-include { GAMMA } from '../../../modules/gamma/main.nf'
-
-workflow test_gamma {
-    
-    input = [
-        [ id:'test', single_end:false ], // meta map
-        file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
-    ]
-
-    db = [ file(params.test_data['sarscov2']['genome']['transcriptome_fasta'], checkIfExists: true) ]
-
-    GAMMA ( input, db )
-}

tests/modules/gamma/test.yml

@@ -1,13 +0,0 @@
-- name: gamma test_gamma
-  command: nextflow run tests/modules/gamma -entry test_gamma -c tests/config/nextflow.config
-  tags:
-    - gamma
-  files:
-    - path: output/gamma/test.fasta
-      md5sum: df37b48466181311e0a679f3c5878484
-    - path: output/gamma/test.gamma
-      md5sum: 3256708fa517a65ed01d99e0e3c762ae
-    - path: output/gamma/test.psl
-      md5sum: 162a2757ed3b167ae1e0cdb24213f940
-    - path: output/gamma/versions.yml
-      md5sum: 3fefb5b46c94993362243c5f9a472057