workflow_manager 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe52e6872d013e7c86bea746410f6786d8d64b6
-  data.tar.gz: 6db534367d4b234040572026efc61c139e30b7b3
+  metadata.gz: ba0d8879b9dc7850e9ddbb73d4dc54d8f686f011
+  data.tar.gz: 218364f9fa70f524b56d289fb7ebc2fe342b0c32
 SHA512:
-  metadata.gz: 0ecc086c0f2e8200c6b93bc0ceb8ac27475dc931427fc6b74d313708410aee9462542d7a399da83695fb64be7114835d50ac7d7c3742b6794a3bd9b4e7d59ce0
-  data.tar.gz: 0e4d97bd541c4febc08b59dbe259fdcfba204e23b597125439374c91b288dbd5d09981cf0e9fcda2c16384caf573bd595b29d0c1ed6727c8f5571a3806c033e6
+  metadata.gz: 5671382dbb6a9f3d7cffb59ea8e0358799bf1c6ce16747817698bd1daddf6f129ce9013e5363b4f15b1c9dd5448a4aeab2faabe4a015f499f4cb35582a813e0a
+  data.tar.gz: f9f402db0e61dd33ff665b650c79642c3bcd704d44692f005e06f5561fd412d54db1947e345ac7a7f6777d1c4d70d8aec318969998d0a18c98a546e049988e6a

data/bin/wfm_job_list

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 # 20121112 masa workflow manager client
-Version = '20131108-112017'
+Version = '20170608-103901'
 
 require 'drb/drb' 
 require 'workflow_manager/optparse_ex'
@@ -19,6 +19,7 @@ end
 opt = OptionParser.new do |o|
   o.banner = "Usage:\n #{File.basename(__FILE__)} [options]"
 #  o.on(:user, 'sushi lover', '-u user', '--user', 'who submitted?')
+  o.on(:job_ids, nil, '-j job_ids', '--job_ids', 'job id list (e.g. 10001,10002,10003: comma separate without space)')
   o.on(:project, nil, '-p project', '--project', 'project number')
   o.on(:server, 'druby://localhost:12345', '-d server', '--server', 'workflow manager URI (default: druby://localhost:12345)')
   o.parse!(ARGV)
@@ -43,4 +44,8 @@ if wfmrc
   end
 end
 workflow_manager = DRbObject.new_with_uri(uri)
-puts workflow_manager.job_list(with_result, project_number)
+if opt.job_ids
+  puts workflow_manager.job_list(with_result, project_number, job_ids:opt.job_ids)
+else
+  puts workflow_manager.job_list(with_result, project_number)
+end

data/lib/workflow_manager/server.rb

@@ -365,9 +365,11 @@ module WorkflowManager
       #@statuses.close
       stat
     end
-    def job_list(with_results=false, project_number=nil)
+    def job_list(with_results=false, project_number=nil, job_ids:nil)
       s = []
-      #@statuses.open(@db_stat)
+      job_idsh = if job_ids
+                   Hash[*(job_ids.split(',')).map{|job_id| [job_id, true]}.flatten]
+                 end
       @statuses.transaction do |statuses|
         statuses.each do |key, value|
           if project_number 
@@ -378,7 +380,9 @@ module WorkflowManager
             s << [key, value]
           end
         end
-      #@statuses.close
+      end
+      if job_ids
+        s = s.select{|job_id, stat| job_idsh[job_id]}
       end
       s.sort_by{|key, value| value.split(',')[2]}.reverse.map{|v| v.join(',')}.join("\n")
     end

data/lib/workflow_manager/version.rb

@@ -1,3 +1,3 @@
 module WorkflowManager
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workflow_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler