sushi_fabric 0.1.5 → 0.1.6

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20140313-161006'
+# Version = '20140314-104422'
 
 require 'csv'
 require 'fileutils'
@@ -62,6 +62,7 @@ end
     require "#{SUSHI_APP_DIR}/app/models/project"
     require "#{SUSHI_APP_DIR}/app/models/data_set"
     require "#{SUSHI_APP_DIR}/app/models/sample"
+    require "#{SUSHI_APP_DIR}/app/models/job"
   else
     NO_ROR = true
   end
@@ -258,7 +259,7 @@ class SushiApp
       parameterset_tsv.each do |row|
         header, value = row
         headers << header
-        @params[header] = if @params.data_type(header) == String
+        @params[header] = if @params.data_type(header) == String or value == nil
                             value
                           else
                             eval(value)
@@ -542,11 +543,27 @@ rm -rf #{@scratch_dir} || exit 1
       end
       unless NO_ROR
         @next_dataset_id = save_data_set(data_set_arr.to_a.flatten, headers, rows)
+
+        # save job and dataset relation in Sushi DB
+        job_ids.each do |job_id|
+          new_job = Job.new
+          new_job.submit_job_id = job_id.to_i
+          new_job.next_dataset_id = @next_dataset_id
+          new_job.save
+          new_job.data_set.jobs << new_job
+          new_job.data_set.save
+        end
+
       end
     end
-    Thread.new do
+    t = Thread.new do
       copy_dataset_parameter_jobscripts
     end
+    if Thread.main == Thread.current # in case of running script directly on terminal
+      warn "copy dataset, parameter, jobscripts..."
+      t.join
+      warn "copy finish."
+    end
   end
   def test_run
     set_dir_paths

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152943400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2152943400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152942940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152942940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library provides us with the methods to submit a job cooperating
   with workflow manager.
 email:
@@ -75,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: workflow manager client.