sushi_fabric 0.9.2 → 0.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/sushi_fabric/sushiApp.rb +20 -6
- data/lib/sushi_fabric/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 84de00c578f9193950709558ab94634ef637a12e
|
|
4
|
+
data.tar.gz: fb3af7878169c568fdcf8d291dcc354ef3fa5142
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7e83696b93bbc02318541f5e7be8fe406d86ab2330fc28b2a1ec3b256a568bff3b4e3771b925a83adceec0c6984ff0f842d4a924f94b52ee46b4c34aec558128
|
|
7
|
+
data.tar.gz: 32e32f6a899a3e1d435da76c945a3c76835ff8cc0fb02b8b484fc36333dc5b03b02be9a5f7f14cfaaba56fcab1e58e638fa2e2478f036c685fed9b456cbf6195
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
# encoding: utf-8
|
|
3
|
-
# Version = '
|
|
3
|
+
# Version = '20191114-151205'
|
|
4
4
|
|
|
5
5
|
require 'csv'
|
|
6
6
|
require 'fileutils'
|
|
@@ -631,11 +631,8 @@ rm -rf #{@scratch_dir} || exit 1
|
|
|
631
631
|
@out.close
|
|
632
632
|
end
|
|
633
633
|
def sample_mode
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
@dataset = Hash[*row.map{|key,value| [key.gsub(/\[.+\]/,'').strip, value]}.flatten]
|
|
637
|
-
if selected_samples[@dataset['Name']]
|
|
638
|
-
## WRITE THE JOB SCRIPT
|
|
634
|
+
set_job_script =-> (dataset_) do
|
|
635
|
+
@dataset = dataset_
|
|
639
636
|
sample_name = @dataset['Name']||@dataset.first
|
|
640
637
|
@job_script = if @dataset_sushi_id and dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
|
|
641
638
|
File.join(@job_script_dir, @analysis_category + '_' + sample_name) + '_' + dataset.name.gsub(/\s+/,'_') + '.sh'
|
|
@@ -645,8 +642,25 @@ rm -rf #{@scratch_dir} || exit 1
|
|
|
645
642
|
make_job_script
|
|
646
643
|
@job_scripts << @job_script
|
|
647
644
|
@result_dataset << next_dataset
|
|
645
|
+
end
|
|
646
|
+
selected_samples = Hash[*@params['samples'].split(',').map{|sample_name| [sample_name, true]}.flatten]
|
|
647
|
+
last_sample = nil
|
|
648
|
+
@dataset_hash.each do |row|
|
|
649
|
+
@dataset = Hash[*row.map{|key,value| [key.gsub(/\[.+\]/,'').strip, value]}.flatten]
|
|
650
|
+
if selected_samples[@dataset['Name']]
|
|
651
|
+
header = if header_ = row.keys.find{|h| h.tag?('Last')}
|
|
652
|
+
header_.gsub(/\[.+\]/,'').strip
|
|
653
|
+
end
|
|
654
|
+
if header and eval(@dataset[header])
|
|
655
|
+
last_sample = @dataset
|
|
656
|
+
else
|
|
657
|
+
set_job_script.(@dataset)
|
|
658
|
+
end
|
|
648
659
|
end
|
|
649
660
|
end
|
|
661
|
+
if last_sample
|
|
662
|
+
set_job_script.(last_sample)
|
|
663
|
+
end
|
|
650
664
|
end
|
|
651
665
|
def dataset_mode
|
|
652
666
|
selected_samples = Hash[*@params['samples'].split(',').map{|sample_name| [sample_name, true]}.flatten]
|
data/lib/sushi_fabric/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sushi_fabric
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Functional Genomics Center Zurich
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-11-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|