sushi_fabric 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421e4d98836d811c29a9505c92431cfba77493f7
-  data.tar.gz: be96d93239a860afbdfd11410e6060a36a8ccf77
+  metadata.gz: 482fa7388002463924882eba0704d0c89c977185
+  data.tar.gz: 45ad610bebc0b73eb41cbb79e7f3f60e1ac2fdcc
 SHA512:
-  metadata.gz: 7d2c87a012a8ae0391da8259e60b07fc3fe5bd94a67c367f7fd4bbc67c011b83a0e235ed2e1b853f0cfd7d58da7ab096ee32bbf7f4cc8e7eb6d4540c605ac6e7
-  data.tar.gz: 93164b5065d7282093cf13164dae8a3ea79136e4f13b6de93a8569e57fc71c0464679fed6a79463d5332f7a1ab7de1bae9ccbac0968f1423f4814c381297bf47
+  metadata.gz: 9b3c6547e67937eeb1a1c11f16747ffa34e41e0cf99a38dfe146bb687c95693aff61b4ecbabbbc7b1d9c80af13c084b7ebe02a113d86af0ea5adb5e353c0a980
+  data.tar.gz: 009ac062bcd120cdd2fafcef55b3a835285a628aaa8d26b08c1ff440a00f5c269b0bcb0f36b1a8b461f4da4e41223d93c9a87a9e0fc9e421824b14280d2a285b

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20170224-143655'
+# Version = '20170226-172319'
 
 require 'csv'
 require 'fileutils'
@@ -170,15 +170,6 @@ def save_data_set(data_set_arr, headers, rows, user=nil)
       project.data_sets << data_set
       parent_data_set.data_sets << data_set if parent_data_set
       data_set.save
-      if SushiFabric::Application.config.fgcz?
-        # this causes sqlite3 IO error in Mac OSX (Yosemite)
-        pid = Process.fork do
-          Process.fork do
-            data_set.register_bfabric
-          end # grand-child process
-        end # child process
-        Process.waitpid pid
-      end
       if user
         user.data_sets << data_set
         user.save
@@ -646,15 +637,6 @@ rm -rf #{@scratch_dir} || exit 1
         project.data_sets << data_set
         parent_data_set.data_sets << data_set if parent_data_set
         data_set.save
-        if SushiFabric::Application.config.fgcz?
-          # this causes sqlite3 IO error in Mac OSX (Yosemite)
-          pid = Process.fork do
-            Process.fork do
-              data_set.register_bfabric
-            end # grand-child process
-          end # child process
-          Process.waitpid pid
-        end
         if user
           user.data_sets << data_set
           user.save
@@ -719,6 +701,9 @@ rm -rf #{@scratch_dir} || exit 1
         @current_user ||= nil
         @next_dataset_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user)
 
+        next_dataset = DataSet.find_by_id(@next_dataset_id)
+        next_dataset.register_bfabric
+
         # save job and dataset relation in Sushi DB
         job_ids.each do |job_id|
           new_job = Job.new

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler