sushi_fabric 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fcb6060694f934b06aaa331d68ce7494a4db25f310cfdf771249d19af201176
-  data.tar.gz: 0f97798abd3e030a36878d009cae200c285da65544d108446cd56ffb45fb1997
+  metadata.gz: a1018e406de9a52abc0c904f94990e5370ae7791cb7460081b6d5f9d38b1292c
+  data.tar.gz: e70a1fa7f02f6947ec6752bcd65c55aae2151badc6797d16fa1024a5f13b248d
 SHA512:
-  metadata.gz: f2644586e02507a2af9d6130a5e15b13ef3f8571a1ea3caac2d0b5f8bc71e6758bd5e8fb52c74e76015492b40704fca56835c26c24fe20bc25807dbea0238665
-  data.tar.gz: 4e5569562947413786252375c7819628a31b16be8f14ca032cd1969f1d2db7e0dabeea8fa2c8ec0b4ea71fd23fe4136296d5f1162cc175413ef5ef29fb2d5c96
+  metadata.gz: 2425522c912c4d289053d97027d8c53553f1fa0503c610db77b67db7ad4786865c642ea6d5f3d380c41f38df0b0371dd6bb6603927af98f54369e7b9062ac5cb
+  data.tar.gz: c165c1dd223dbbb9eb508576935d92e6254611cfabb19654085224a418d2980b9012fa2d8241ac0d6828e6c189718764f9db92e81b76c9c7c95aef5bf086e10d

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20220217-160253'
+# Version = '20230404-132741'
 
 require 'csv'
 require 'fileutils'
@@ -813,6 +813,7 @@ rm -rf #{@scratch_dir} || exit 1
   end
   def save_parameters_in_sushi_db
     if @next_dataset_id and next_dataset = DataSet.find_by_id(@next_dataset_id)
+      @output_params['sushi_app'] = self.class
       next_dataset.job_parameters = @output_params
       next_dataset.save
     end
@@ -851,7 +852,12 @@ rm -rf #{@scratch_dir} || exit 1
                           else
                             "#{@name.gsub(/\s/,'').gsub(/_/,'')}_#{dataset.id}"
                           end
-      data_set_arr = {'DataSetName'=>next_dataset_name, 'ProjectNumber'=>@project.gsub(/p/,''), 'ParentID'=>@dataset_sushi_id, 'Comment'=>@next_dataset_comment.to_s}
+      data_set_arr = if @params['next_dataset_root']
+                       {'DataSetName'=>next_dataset_name, 'ProjectNumber'=>@project.gsub(/p/,''), 'Comment'=>@next_dataset_comment.to_s}
+                     else
+                       {'DataSetName'=>next_dataset_name, 'ProjectNumber'=>@project.gsub(/p/,''), 'ParentID'=>@dataset_sushi_id, 'Comment'=>@next_dataset_comment.to_s}
+                     end
+
       csv = CSV.readlines(@next_dataset_tsv_path, :col_sep=>"\t")
       csv.each do |row|
         if headers.empty?

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: workflow manager client.