sushi_fabric 0.6.5 → 0.6.6
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 +4 -19
- 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: 482fa7388002463924882eba0704d0c89c977185
|
|
4
|
+
data.tar.gz: 45ad610bebc0b73eb41cbb79e7f3f60e1ac2fdcc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9b3c6547e67937eeb1a1c11f16747ffa34e41e0cf99a38dfe146bb687c95693aff61b4ecbabbbc7b1d9c80af13c084b7ebe02a113d86af0ea5adb5e353c0a980
|
|
7
|
+
data.tar.gz: 009ac062bcd120cdd2fafcef55b3a835285a628aaa8d26b08c1ff440a00f5c269b0bcb0f36b1a8b461f4da4e41223d93c9a87a9e0fc9e421824b14280d2a285b
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
# encoding: utf-8
|
|
3
|
-
# Version = '
|
|
3
|
+
# Version = '20170226-172319'
|
|
4
4
|
|
|
5
5
|
require 'csv'
|
|
6
6
|
require 'fileutils'
|
|
@@ -170,15 +170,6 @@ def save_data_set(data_set_arr, headers, rows, user=nil)
|
|
|
170
170
|
project.data_sets << data_set
|
|
171
171
|
parent_data_set.data_sets << data_set if parent_data_set
|
|
172
172
|
data_set.save
|
|
173
|
-
if SushiFabric::Application.config.fgcz?
|
|
174
|
-
# this causes sqlite3 IO error in Mac OSX (Yosemite)
|
|
175
|
-
pid = Process.fork do
|
|
176
|
-
Process.fork do
|
|
177
|
-
data_set.register_bfabric
|
|
178
|
-
end # grand-child process
|
|
179
|
-
end # child process
|
|
180
|
-
Process.waitpid pid
|
|
181
|
-
end
|
|
182
173
|
if user
|
|
183
174
|
user.data_sets << data_set
|
|
184
175
|
user.save
|
|
@@ -646,15 +637,6 @@ rm -rf #{@scratch_dir} || exit 1
|
|
|
646
637
|
project.data_sets << data_set
|
|
647
638
|
parent_data_set.data_sets << data_set if parent_data_set
|
|
648
639
|
data_set.save
|
|
649
|
-
if SushiFabric::Application.config.fgcz?
|
|
650
|
-
# this causes sqlite3 IO error in Mac OSX (Yosemite)
|
|
651
|
-
pid = Process.fork do
|
|
652
|
-
Process.fork do
|
|
653
|
-
data_set.register_bfabric
|
|
654
|
-
end # grand-child process
|
|
655
|
-
end # child process
|
|
656
|
-
Process.waitpid pid
|
|
657
|
-
end
|
|
658
640
|
if user
|
|
659
641
|
user.data_sets << data_set
|
|
660
642
|
user.save
|
|
@@ -719,6 +701,9 @@ rm -rf #{@scratch_dir} || exit 1
|
|
|
719
701
|
@current_user ||= nil
|
|
720
702
|
@next_dataset_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user)
|
|
721
703
|
|
|
704
|
+
next_dataset = DataSet.find_by_id(@next_dataset_id)
|
|
705
|
+
next_dataset.register_bfabric
|
|
706
|
+
|
|
722
707
|
# save job and dataset relation in Sushi DB
|
|
723
708
|
job_ids.each do |job_id|
|
|
724
709
|
new_job = Job.new
|
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.6.
|
|
4
|
+
version: 0.6.6
|
|
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: 2017-02-
|
|
11
|
+
date: 2017-02-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|