rbbt-util 5.17.57 → 5.17.58
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/util/misc/pipes.rb +6 -1
- data/lib/rbbt/workflow/step.rb +5 -1
- data/test/rbbt/util/misc/test_pipes.rb +25 -1
- 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: ee31ce6439a3f9de23c9c37452dc0b40037a0815
|
4
|
+
data.tar.gz: 4928e05c224b503008194c134ba51a67b1071376
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1b0c9aca5781800e9ce22b786e4d319463acdd65113f3e23a92fabef4db823c025e72bfd8b6c0a9265e818ee650dad5288dff21a649ef4fa5f4ab0bddc90c22a
|
7
|
+
data.tar.gz: a606383b7f88098aacfd0575a1b2765b64e38ebb0bf1820a59599748b99f95d5f5070d30755534486fe4ce7d6260920bb5e815bd8bfe8384ed148b55b07833a4
|
data/lib/rbbt/util/misc/pipes.rb
CHANGED
@@ -497,7 +497,7 @@ module Misc
|
|
497
497
|
if sort
|
498
498
|
stream1 = Misc.sort_stream stream1
|
499
499
|
stream2 = Misc.sort_stream stream2
|
500
|
-
|
500
|
+
compare_lines(stream1, stream2, args, false)
|
501
501
|
else
|
502
502
|
erase = []
|
503
503
|
|
@@ -525,4 +525,9 @@ module Misc
|
|
525
525
|
self.compare_lines(stream1, stream2, '-2 -3', sort)
|
526
526
|
end
|
527
527
|
|
528
|
+
def self.select_lines(stream1, stream2, sort)
|
529
|
+
self.compare_lines(stream1, stream2, '-1 -2', sort)
|
530
|
+
end
|
531
|
+
|
532
|
+
|
528
533
|
end
|
data/lib/rbbt/workflow/step.rb
CHANGED
@@ -260,7 +260,11 @@ class Step
|
|
260
260
|
step.task_name.to_sym == name.to_sym
|
261
261
|
}
|
262
262
|
raise "Dependency step not found: #{ name }" if deps.empty?
|
263
|
-
deps.
|
263
|
+
if (deps & self.dependencies).any?
|
264
|
+
(deps & self.dependencies).first
|
265
|
+
else
|
266
|
+
deps.first
|
267
|
+
end
|
264
268
|
end
|
265
269
|
end
|
266
270
|
end
|
@@ -103,7 +103,31 @@ line1
|
|
103
103
|
Log.severity = 0
|
104
104
|
TmpFile.with_file(text1) do |file1|
|
105
105
|
TmpFile.with_file(text2) do |file2|
|
106
|
-
|
106
|
+
assert ! Misc.remove_lines(file1, file2, true).read.split("\n").include?("line1")
|
107
|
+
assert Misc.remove_lines(file1, file2, true).read.split("\n").include?("line2")
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
111
|
+
|
112
|
+
|
113
|
+
|
114
|
+
def test_select_lines
|
115
|
+
text1 =<<-EOF
|
116
|
+
line1
|
117
|
+
line2
|
118
|
+
line3
|
119
|
+
line4
|
120
|
+
EOF
|
121
|
+
text2 =<<-EOF
|
122
|
+
line3
|
123
|
+
line1
|
124
|
+
EOF
|
125
|
+
|
126
|
+
Log.severity = 0
|
127
|
+
TmpFile.with_file(text1) do |file1|
|
128
|
+
TmpFile.with_file(text2) do |file2|
|
129
|
+
assert Misc.select_lines(file1, file2, true).read.split("\n").include?("line1")
|
130
|
+
assert ! Misc.select_lines(file1, file2, true).read.split("\n").include?("line2")
|
107
131
|
end
|
108
132
|
end
|
109
133
|
end
|
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.17.
|
4
|
+
version: 5.17.58
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Miguel Vazquez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-07-
|
11
|
+
date: 2015-07-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|