ripe 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +9 -0
- data/lib/ripe/blocks/block.rb +2 -0
- data/lib/ripe/blocks/liquid_block.rb +2 -0
- data/lib/ripe/blocks/multi_block.rb +2 -0
- data/lib/ripe/blocks/parallel_block.rb +2 -0
- data/lib/ripe/blocks/serial_block.rb +2 -0
- data/lib/ripe/blocks/working_block.rb +2 -0
- data/lib/ripe/cli.rb +1 -1
- data/lib/ripe/dsl.rb +9 -0
- data/lib/ripe/version.rb +1 -1
- data/lib/ripe/worker_controller.rb +4 -1
- data/lib/ripe/worker_controller/preparer.rb +16 -6
- data/lib/ripe/worker_controller/syncer.rb +5 -2
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 13032eb238736b94168961b94cfd79896ad89ffd
|
4
|
+
data.tar.gz: 6951a4e3da93749f18e44618f7ddc617edafad44
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b3538313e05b7189027942f553b8886993ff361b49b99b61c8ca91af91baf319e95f51d511bb32556501ca3b7caa5d499d7acda98bf4e7318265596c2ece29c8
|
7
|
+
data.tar.gz: 733a2265845c4c8049756d9e06f23337a034714a97d19d232db3c7052610eb322d23f5b79a55273ba95f9f40e95ba9fd5217ce50f9b4cd2552c498d1fa73696d
|
data/CHANGELOG.md
ADDED
@@ -0,0 +1,9 @@
|
|
1
|
+
v0.2.2
|
2
|
+
------
|
3
|
+
|
4
|
+
This release mostly contains console-related bugfixes.
|
5
|
+
|
6
|
+
- Fix bugs related to displaying workers in tabular format in the console.
|
7
|
+
- Fix bug causing ripe to crash when no blocks are prepared for a sample.
|
8
|
+
|
9
|
+
<!-- vim: set syntax=markdown: -->
|
data/lib/ripe/blocks/block.rb
CHANGED
data/lib/ripe/cli.rb
CHANGED
data/lib/ripe/dsl.rb
CHANGED
data/lib/ripe/version.rb
CHANGED
@@ -36,10 +36,14 @@ module Ripe
|
|
36
36
|
# Apply the workflow to each sample
|
37
37
|
sample_blocks = prepare_sample_blocks(samples, callback, params)
|
38
38
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
39
|
+
if sample_blocks
|
40
|
+
# Split samples into groups of +:group_num+ samples and produce a
|
41
|
+
# worker from each of these groups.
|
42
|
+
@workers = sample_blocks.each_slice(params[:group_num].to_i).map do |worker_blocks|
|
43
|
+
prepare_worker(worker_blocks, params)
|
44
|
+
end
|
45
|
+
else
|
46
|
+
[]
|
43
47
|
end
|
44
48
|
end
|
45
49
|
|
@@ -80,8 +84,14 @@ module Ripe
|
|
80
84
|
|
81
85
|
def prepare_sample_blocks(samples, callback, params)
|
82
86
|
sample_blocks = samples.map do |sample|
|
83
|
-
block = callback.call(sample, params)
|
84
|
-
|
87
|
+
block = callback.call(sample, params)
|
88
|
+
|
89
|
+
if block
|
90
|
+
# No need to prune if callback returns nil
|
91
|
+
block = block.prune(params[:mode].to_sym == :force,
|
92
|
+
params[:mode].to_sym == :depend)
|
93
|
+
end
|
94
|
+
|
85
95
|
if block != nil
|
86
96
|
puts "Preparing sample #{sample}"
|
87
97
|
{sample => block}
|
@@ -56,7 +56,7 @@ module Ripe
|
|
56
56
|
# @return [void]
|
57
57
|
|
58
58
|
def update_running_workers
|
59
|
-
|
59
|
+
workers = @running_jobs.map do |job|
|
60
60
|
worker = DB::Worker.find_by(moab_id: job[:moab_id])
|
61
61
|
if worker
|
62
62
|
worker.update(time: job[:time])
|
@@ -69,8 +69,10 @@ module Ripe
|
|
69
69
|
})
|
70
70
|
end
|
71
71
|
end
|
72
|
-
worker
|
72
|
+
worker # This is +nil+ if worker is not found (other running jobs
|
73
|
+
# that are independent from the current ripe repo).
|
73
74
|
end
|
75
|
+
@workers += workers.compact
|
74
76
|
end
|
75
77
|
|
76
78
|
##
|
@@ -108,6 +110,7 @@ module Ripe
|
|
108
110
|
time: stdout[/Resources:.*,walltime=([0-9]{1,2}(\:[0-9]{2})+)$/, 1],
|
109
111
|
status: :completed,
|
110
112
|
})
|
113
|
+
worker
|
111
114
|
end
|
112
115
|
end
|
113
116
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ripe
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Nicolas De Jay
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-07-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -217,6 +217,7 @@ files:
|
|
217
217
|
- ".gitignore"
|
218
218
|
- ".ruby-version"
|
219
219
|
- ".travis.yml"
|
220
|
+
- CHANGELOG.md
|
220
221
|
- Gemfile
|
221
222
|
- Guardfile
|
222
223
|
- LICENSE.txt
|