rbbt-util 5.17.57 → 5.17.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6d3652efed8fd7e0054efa634c13ddf13370cb
-  data.tar.gz: 8053d9cda8fd1b932907edb6602d2669c96d5914
+  metadata.gz: ee31ce6439a3f9de23c9c37452dc0b40037a0815
+  data.tar.gz: 4928e05c224b503008194c134ba51a67b1071376
 SHA512:
-  metadata.gz: 782f3d879090ce75c0ae7599263e1687f67a5069af1b73ded77b044cf300b99d6aa1a86f880b16372f043a2f18e4f76ba8a9f35613943829e1cc650e6fca701a
-  data.tar.gz: bd1c28d289356c875702ccfdc3e8f76f13106f1e32fba04a472d5a3dde7486734e55d0f75477af57ad24a81fdd754b95f8bb659c3fd5f9ae49a9db6a07d18d1d
+  metadata.gz: 1b0c9aca5781800e9ce22b786e4d319463acdd65113f3e23a92fabef4db823c025e72bfd8b6c0a9265e818ee650dad5288dff21a649ef4fa5f4ab0bddc90c22a
+  data.tar.gz: a606383b7f88098aacfd0575a1b2765b64e38ebb0bf1820a59599748b99f95d5f5070d30755534486fe4ce7d6260920bb5e815bd8bfe8384ed148b55b07833a4

data/lib/rbbt/util/misc/pipes.rb

@@ -497,7 +497,7 @@ module Misc
     if sort
       stream1 = Misc.sort_stream stream1
       stream2 = Misc.sort_stream stream2
-      remove_lines(stream1, stream2, false)
+      compare_lines(stream1, stream2, args, false)
     else
       erase = []
 
@@ -525,4 +525,9 @@ module Misc
     self.compare_lines(stream1, stream2, '-2 -3', sort)
   end
 
+  def self.select_lines(stream1, stream2, sort)
+    self.compare_lines(stream1, stream2, '-1 -2', sort)
+  end
+
+
 end

data/lib/rbbt/workflow/step.rb

@@ -260,7 +260,11 @@ class Step
                          step.task_name.to_sym == name.to_sym
                        }
                        raise "Dependency step not found: #{ name }" if deps.empty?
-                       deps.first
+                       if (deps & self.dependencies).any?
+                         (deps & self.dependencies).first
+                       else
+                         deps.first
+                       end
                      end
   end
 end

data/test/rbbt/util/misc/test_pipes.rb

@@ -103,7 +103,31 @@ line1
     Log.severity = 0
     TmpFile.with_file(text1) do |file1|
       TmpFile.with_file(text2) do |file2|
-        ppp Misc.remove_lines(file1, file2, true).read
+        assert ! Misc.remove_lines(file1, file2, true).read.split("\n").include?("line1")
+        assert Misc.remove_lines(file1, file2, true).read.split("\n").include?("line2")
+      end
+    end
+  end
+
+
+
+  def test_select_lines
+    text1 =<<-EOF
+line1
+line2
+line3
+line4
+    EOF
+    text2 =<<-EOF
+line3
+line1
+    EOF
+
+    Log.severity = 0
+    TmpFile.with_file(text1) do |file1|
+      TmpFile.with_file(text2) do |file2|
+        assert Misc.select_lines(file1, file2, true).read.split("\n").include?("line1")
+        assert ! Misc.select_lines(file1, file2, true).read.split("\n").include?("line2")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.57
+  version: 5.17.58
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake