sushi_fabric 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4330f4843df678b5bd74f9c43ac7abcf036dc2b47284c7301d1b93b2e386bf40
-  data.tar.gz: 7f1d59a9197e1c545fd8d3fdf9d98002fc05fd89ecd1651f62e6b238b43038e9
+  metadata.gz: 28252c62a5ac77892808193b02a694e48bf56c5f28cbe11ad8c26eb3076fd5d4
+  data.tar.gz: 9c15be2d98e78916fac71ebd653761e50b0b0f6ace6698ee15a277d73e28aea8
 SHA512:
-  metadata.gz: 9f410544c24ec5ea2e8aa0815764cd1543d86ecc710aa514b224c724d698888acd4a2dc317889eeed02f36e300d66d9ed553641078aa5cb4b3eca193d8a838d8
-  data.tar.gz: b7eb98af2294187665b83c5d5594f988f9495b9831cc7d9da0d5513dfd4c9abd838080d9b33ca76d7a00d40923f0075458019ea1fae721008934540be6829883
+  metadata.gz: 67e11563c751c2c2905f8109046d376c24fd16418707d7e39be79fae7b6c93a01a300cbed6d5fdcf97984af1e613510602a44add4358528affb58fe3b0de0994
+  data.tar.gz: 368bebe991f06642d8202eb7f65a97cb2dd6e762e01c712a1841e16350513dd45b59ef8b822a049163c383f5a00698057740faac540584158b71f97885e9b069

data/lib/sushi_fabric/sushiApp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20230623-175030'
+# Version = '20231208-144616'
 
 require 'csv'
 require 'fileutils'
@@ -233,6 +233,7 @@ class SushiApp
   attr_accessor :next_dataset_bfabric_application_number
   attr_reader :inactivate_nodes
   attr_reader :employee
+  attr_accessor :queue
 
   def initialize
     @gstore_dir = GSTORE_DIR
@@ -496,13 +497,13 @@ conda activate sushi
       if dest_dirs.uniq.length == 1 and greq
         src_file = src_files.join(" ")
         dest_dir = dest_dirs.first
-        @out.print copy_commands(src_file, dest_dir).join("\n"), "\n"
+        @out.print copy_commands(src_file, dest_dir, nil, @queue).join("\n"), "\n"
       else
         @output_files.map{|header| next_dataset[header]}.each do |file|
           # in actual case, to save under /srv/gstore/
           src_file = File.basename(file)
           dest_dir = File.dirname(File.join(@gstore_dir, file))
-          @out.print copy_commands(src_file, dest_dir).join("\n"), "\n"
+          @out.print copy_commands(src_file, dest_dir, nil, @queue).join("\n"), "\n"
         end
       end
     end
@@ -632,12 +633,12 @@ rm -rf #{@scratch_dir} || exit 1
     end
     file_path
   end
-  def copy_commands(org_dir, dest_parent_dir, now=nil)
+  def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
     @workflow_manager||=DRbObject.new_with_uri(WORKFLOW_MANAGER)
     com = ''
     cnt_retry = 0
     begin
-      com = @workflow_manager.copy_commands(org_dir, dest_parent_dir, now)
+      com = @workflow_manager.copy_commands(org_dir, dest_parent_dir, now, queue)
     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.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_fabric
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler