sushi_fabric 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2624e396ce9d663acbeb4dd22bfbd4463cba7c14699d6e171907517c2636bee7
-  data.tar.gz: 8117911fa8b21fdc81bb1672b9c40f25ae383d22c7d496a964be55ac0703b272
+  metadata.gz: 18274b38a1b2b7a5c044435c9fb66406f865690b2807b01413d3fe349d1cdb90
+  data.tar.gz: 82d53f12e77604cc72b334103c0330e08b458ea4220579cd1f6284a4ee918bea
 SHA512:
-  metadata.gz: 1be2262ff2a7180e0d110fd06d1d7c2ab8a38252e514dca4cae35c9a29b15010751ab1ce36509005a1628c107cdd90de9fa032290674600d734a066e7173d0c9
-  data.tar.gz: f57ab1b10f1f382b68a7e517b499e46160d64046b9363e36f2d8f9c13b0b981e44e031c4674aa579252e45de9635672da36f3d9cb98e5b582bb801525aa031c6
+  metadata.gz: 9199dd3d05f40b71e86c1277dde1970200ff8c89e95547853e22acd66ad0ccdc8c7a6bf27fc1d2f6520796c26bc7adb569d1dc23cadff45ba20fc3db54c977ad
+  data.tar.gz: 534f1f1ea9e36c750255affed0925db10389fd9f27aacb13660e4638dc127c64f63f1b70b4fa15012c28514e46570c1488cc73efc0a9d4bdce9acd726f07a230

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20230404-145037'
+# Version = '20230623-165238'
 
 require 'csv'
 require 'fileutils'
@@ -349,7 +349,7 @@ class SushiApp
   end
   def check_application_parameters
     if @required_params and (@required_params - @params.keys).empty?
-      @output_params = @params.clone
+      @output_params = {"sushi_app" => self.class.name}.merge(@params.clone)
     end
   end
   def set_user_parameters
@@ -588,9 +588,8 @@ rm -rf #{@scratch_dir} || exit 1
   def save_parameters_as_tsv
     file_path = File.join(@scratch_result_dir, @parameter_file)
     CSV.open(file_path, 'w', :col_sep=>"\t") do |out|
-      out << ["sushi_app", self.class.name]
       @output_params.each do |key, value|
-        if @output_params[key, 'file_upload']
+        if @output_params[key, 'file_upload'] and !value.to_s.empty?
           uploaded_file_path = File.join(@result_dir, "uploaded", File.basename(value))
           out << [key, uploaded_file_path]
           @params[key] = uploaded_file_path
@@ -651,7 +650,7 @@ rm -rf #{@scratch_dir} || exit 1
   end
   def copy_uploaded_files
     if not @uploaded_files.empty?
-      @uploaded_files.each do |file|
+      @uploaded_files.compact.select{|file| !file.empty?}.each do |file|
         FileUtils.cp(file, @uploaded_files_dir)
         command = "cp #{file} #{@uploaded_files_dir}"
         puts command

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler