rbbt-util 5.21.78 → 5.21.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/share/Rlib/util.R +13 -5
- data/share/rbbt_commands/workflow/task +4 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6643742cb59acfc08425d4ec6c6796bd300fada7
|
|
4
|
+
data.tar.gz: 2351b438d3a5f6f270e54643fd82b3d5466f8e69
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ad3faa128f65be8d20566da34e756ac9c68ae4766450982ba61fdfb5e599e3593427e2c4ca86d03694796d42f74167b1528f2ef6cc23b7368c604baf45af98d6
|
|
7
|
+
data.tar.gz: ee4da1fc28221199b1418f868aff6324a6c4b9f21aa6293de2b4f3c2160b8613d172f40b9503748084382718eaa5bdf325795632eab79ae75b7f187989586ac1
|
data/share/Rlib/util.R
CHANGED
|
@@ -39,22 +39,30 @@ rbbt.job <- function(workflow, task, load=TRUE, flat = FALSE, type = 'tsv', jobn
|
|
|
39
39
|
|
|
40
40
|
str = paste(str, code, sep="\n")
|
|
41
41
|
|
|
42
|
-
str = paste(str, paste("Workflow.require_workflow '", workflow, "'", sep=""), sep="\n")
|
|
42
|
+
str = paste(str, paste("wf = Workflow.require_workflow '", workflow, "'", sep=""), sep="\n")
|
|
43
43
|
|
|
44
44
|
args_list = list(...)
|
|
45
45
|
args_strs = c()
|
|
46
46
|
for (input in names(args_list)){
|
|
47
47
|
value = args_list[[input]]
|
|
48
|
+
input = sub('input\\.', '', input)
|
|
48
49
|
if (!is.numeric(value)){
|
|
49
|
-
|
|
50
|
+
if (value == TRUE){
|
|
51
|
+
value = 'true'
|
|
52
|
+
}else{
|
|
53
|
+
if (value == FALSE){
|
|
54
|
+
value = 'false'
|
|
55
|
+
}else{
|
|
56
|
+
value = paste("'", value, "'", sep="")
|
|
57
|
+
}
|
|
58
|
+
}
|
|
50
59
|
}
|
|
51
60
|
args_strs = c(args_strs, paste(":",input,' => ',value, sep=""))
|
|
52
61
|
}
|
|
53
62
|
|
|
54
63
|
args_str = paste(args_strs, sep=",")
|
|
55
|
-
str = paste(str, paste(
|
|
56
|
-
|
|
57
|
-
rbbt.ruby(str, load, flat, type)
|
|
64
|
+
str = paste(str, paste('wf.job(:', task, ", '", jobname, "', ", args_str,').produce.path', sep=""), sep="\n")
|
|
65
|
+
return(rbbt.ruby(str, load, flat, type));
|
|
58
66
|
}
|
|
59
67
|
|
|
60
68
|
rbbt.ruby.substitutions <- function(script, substitutions = list(), ...){
|
|
@@ -317,9 +317,11 @@ begin
|
|
|
317
317
|
|
|
318
318
|
case
|
|
319
319
|
when res.respond_to?(:gets)
|
|
320
|
-
|
|
321
|
-
|
|
320
|
+
begin
|
|
321
|
+
Misc.consume_stream(res, false, out)
|
|
322
|
+
rescue EOFError, IOError
|
|
322
323
|
end
|
|
324
|
+
res.join if res.respond_to? :join
|
|
323
325
|
when Array === res
|
|
324
326
|
out.puts res * "\n"
|
|
325
327
|
when TSV === res
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rbbt-util
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.21.
|
|
4
|
+
version: 5.21.80
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Miguel Vazquez
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-04-
|
|
11
|
+
date: 2017-04-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|