sushi_fabric 1.0.8 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be295ca72915f5b15f5d1b06c062eedd66c2ebbf392f3e3263483d5b803249a4
-  data.tar.gz: d40e4224538f01ac25adf99eb3c701daf04d22a0a1be0f1a935173f798b23007
+  metadata.gz: d8673a804328196ed41af9ab969a5ae84871bcdfe642e699c7564d9a30ebeb5b
+  data.tar.gz: 3749f2baffa9e17e37e26e36d5942bcef0d70d0ad6e1b34844892e48ab2e9482
 SHA512:
-  metadata.gz: e141d4d84bf0efea4180f578b345b8daf037bf1fd62147f1ac9e40e1684dcbdecc428994ff651b364ddcc0ec48d8c2d6a6ca952e7ad493ce4d3d3048a695acf2
-  data.tar.gz: d16896e1fabc9c4bb683c0268fbb6908c3b9a8f2fe037b669ce5f7aad89b5c982c21f66f73561be787025d48667fed09f2a4d402a3de5ed7ba4110fd39dea122
+  metadata.gz: 0dc67d3759495c74ca090c919843dd2be3a05243a74bf9ad5a4966c9522d9434216320a9ad98edcb01eea7207f7caececa1212c4c0cefef7f561fe5710690121
+  data.tar.gz: 1e81885828d563c1008c1b80b40f88fd9045de043715ca99c60b900dedb8671eda0746d90fb1a4505332230c0294cad073001c2b9af6ca3643f756e4e7f9f395

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20210304-164250'
+# Version = '20211015-142855'
 
 require 'csv'
 require 'fileutils'
@@ -20,6 +20,7 @@ module SushiFabric
     config.scratch_dir = '/tmp/scratch'
     config.module_source = nil
     config.course_mode = nil
+    config.rails_host = nil
   end
 
   # load custmized parameters if there is
@@ -41,6 +42,7 @@ module SushiFabric
     config.scratch_dir = '/tmp/scratch'
     config.module_source = nil
     config.course_mode = nil
+    config.rails_host = nil
   end
 end
       EOF
@@ -53,7 +55,7 @@ end
   SUSHI_APP_DIR = config.sushi_app_dir
   SCRATCH_DIR = config.scratch_dir
   MODULE_SOURCE = config.module_source
-  
+  RAILS_HOST = config.rails_host 
   unless File.exist?(GSTORE_DIR)
     FileUtils.mkdir_p GSTORE_DIR
   end
@@ -432,7 +434,8 @@ class SushiApp
                               @logger.error("# Error in checking modules ")
                               @logger.error("# Please check if all modules are correctly installed, searched #{@modules.join(",")} but only detected #{modules_with_version.join(",")}")
                               @logger.error("#"*100)
-                              "exit # Please check if all modules are correctly installed, searched #{@modules.join(",")} but only detected #{modules_with_version.join(",")}"
+                              # "exit # Please check if all modules are correctly installed, searched #{@modules.join(",")} but only detected #{modules_with_version.join(",")}"
+                              ""
                             end
                           else
                             ""
@@ -522,8 +525,8 @@ rm -rf #{@scratch_dir} || exit 1
     script_content = File.read(job_script)
     job_id = 0
     begin
-      job_id = @workflow_manager.start_monitoring(job_script, @user, 0, script_content, project_number, gsub_options.join(' '), @gstore_script_dir)
-      #job_id = @workflow_manager.start_monitoring2(job_script, script_content, @user, project_number, gsub_options.join(' '), @gstore_script_dir)
+      #job_id = @workflow_manager.start_monitoring(job_script, @user, 0, script_content, project_number, gsub_options.join(' '), @gstore_script_dir)
+      job_id = @workflow_manager.start_monitoring3(job_script, script_content, @user, project_number, gsub_options.join(' '), @gstore_script_dir, @next_dataset_id, RAILS_HOST)
     rescue => e
       time = Time.now.strftime("[%Y.%m.%d %H:%M:%S]")
       @logger.error("*"*50)

data/lib/sushi_fabric/version.rb

@@ -1,3 +1,3 @@
 module SushiFabric
-  VERSION = "1.0.8"
+  VERSION = "1.1.2"
 end

data/sushi_fabric.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.2.10"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.2
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: workflow manager client.