From fe52b95a24c753eb9f63485060779e20fd0b3268 Mon Sep 17 00:00:00 2001
From: Dominik <dominik.brilhaus@hhu.de>
Date: Fri, 24 Mar 2023 12:59:34 +0100
Subject: [PATCH] docker-free kallisto collect

---
 runs/kallisto_collect/run.cwl                 | 63 +++++++++++--------
 runs/kallisto_collect/run.yml                 |  5 +-
 workflows/kallisto_collect/kallisto_collect.R | 11 ----
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/runs/kallisto_collect/run.cwl b/runs/kallisto_collect/run.cwl
index 2736cc4..eaee053 100644
--- a/runs/kallisto_collect/run.cwl
+++ b/runs/kallisto_collect/run.cwl
@@ -1,30 +1,41 @@
 #!/usr/bin/env cwl-runner
+
 cwlVersion: v1.2
-class: Workflow
+class: CommandLineTool
+
 inputs:
-  in_kallisto_results:
-    type: Directory
-  in_metadata_file:
-    type: File
-  in_metadata_sample:
-    type: string
-  in_metadata_factor:
-    type: string
-  out_folder:
-    type: string
+- id: r_script
+  type: File
+  inputBinding:
+    position: 0
+- id: in_kallisto_results
+  type: Directory
+  inputBinding:
+    position: 1
+- id: in_metadata_file
+  type: File
+  inputBinding:
+    position: 2
+- id: in_metadata_sample
+  type: string
+  inputBinding:
+    position: 3
+- id: in_metadata_factor
+  type: string
+  inputBinding:
+    position: 4
+- id: out_folder
+  type: string
+  inputBinding:
+    position: 5
+
 outputs:
-  out_dir:
-    type:
-      type: array
-      items: Directory
-    outputSource: kallisto_collect/outdir
-steps:
-  kallisto_collect:
-    run: ../../workflows/kallisto_collect/workflow.cwl
-    in:
-      in_kallisto_results: in_kallisto_results
-      in_metadata_file: in_metadata_file
-      in_metadata_sample: in_metadata_sample
-      in_metadata_factor: in_metadata_factor
-      out_folder: out_folder
-    out: [outdir]
+- id: outdir
+  type:
+    type: array
+    items: Directory
+  outputBinding:
+    glob: $(runtime.outdir)/$(inputs.out_folder)
+
+baseCommand:
+- Rscript
diff --git a/runs/kallisto_collect/run.yml b/runs/kallisto_collect/run.yml
index 78c3462..2a4197c 100644
--- a/runs/kallisto_collect/run.yml
+++ b/runs/kallisto_collect/run.yml
@@ -1,10 +1,13 @@
 cores: 1
+r_script:
+  class: File
+  path: ../../workflows/kallisto_collect/kallisto_collect.R
 in_kallisto_results: 
   class: Directory
   path: ../kallisto_sleuth/out
 in_metadata_file: 
   class: File
-  path: ../merged_isa_metadata/merged_isa.tsv
+  path: ../merged_isa_metadata/out/merged_isa.tsv
 in_metadata_sample: "Sample.Name.2"
 in_metadata_factor: "Factor..Photosynthesis.mode."
 out_folder: out
diff --git a/workflows/kallisto_collect/kallisto_collect.R b/workflows/kallisto_collect/kallisto_collect.R
index 6c221c2..6a24e7e 100644
--- a/workflows/kallisto_collect/kallisto_collect.R
+++ b/workflows/kallisto_collect/kallisto_collect.R
@@ -1,16 +1,5 @@
 #!/usr/bin/env Rscript
 
-################################################
-#### CWL-independent tests
-################################################
-
-# arc_root <- "~/gitlab_dataplant/samplearc_rnaseq_adrian/"
-# in_kallisto_results <- "runs/kallisto_quant/kallisto_results"
-# in_metadata_file <- "runs/merged_isa_metadata/merged_isa.tsv"
-# in_metadata_sample <- "Sample.Name.2"
-# in_metadata_factor <- "Factor..Photosynthesis.mode."
-# out_folder <- "runs/kallisto_collect"
-
 ################################################
 #### Load required library
 ################################################
-- 
GitLab