rbbt-util 5.17.53 → 5.17.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9998932f7037c551f4aef97c75fa09296f0e4cba
-  data.tar.gz: c52cab12dc83feea2d889ecffbc2e07472e02b61
+  metadata.gz: 0eff9b6b56a7749a8fc52d8f0d9ffc155ea26063
+  data.tar.gz: d2cc3438a4cf6e5f9763c5b251033f6cdea12e8b
 SHA512:
-  metadata.gz: b7030c7870cc8ea1ca80d76509c4526ae5435321dcd22561a661c6b57fb190d641a010b9b222e1295504807c7fd226fb4642e8c00e9ac2b02c33aa678b9a0141
-  data.tar.gz: 02546e560b57a8bce92689137e58b4dfe8165e5095cf9382a98f6c588b19970b2b2a75dace012ba2067fb38312b9cdd83d4fea17769f85d7bae6265bf9f8592b
+  metadata.gz: 2c83cd765452233e52d64988cbc025d30d98ba122dd167b2c854088a4f3840d775dc6c1381612f40e41dd289fd24ccb1ddb1e9b20ba3682040247275b3f78779
+  data.tar.gz: 30ec09cac18261e1daa67b79071a6eeb918be77f4cb6c4283441de9094fb1bc93dcac2e8905038b086c7d4e9b2fbff67e57f82f58f7621f89a1603e55fc96265

data/lib/rbbt/util/log/progress/report.rb

@@ -85,7 +85,7 @@ module Log
         if @max
           return str << " " << Log.color(:yellow, "waiting on #{@max} #{bytes ? 'bytes' : 'items'}") 
         else
-          return str << " " << Log.color(:yellow, "waiting - #{Process.pid}") 
+          return str << " " << Log.color(:yellow, "waiting - PID: #{Process.pid}") 
         end
       end
       str << " " << thr_msg

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

@@ -300,10 +300,12 @@ module Misc
   def self.sort_stream(stream, header_hash = "#", cmd_args = "-u")
     Misc.open_pipe do |sin|
       begin
-        if defined? Step and Step === stream
-          step = stream
-          stream = stream.get_stream || stream.path.open
-        end
+        #if defined? Step and Step === stream
+        #  step = stream
+        #  stream = stream.get_stream || stream.path.open
+        #end
+
+        stream = TSV.get_stream stream
 
         line = stream.gets
         while line =~ /^#{header_hash}/ do
@@ -491,4 +493,36 @@ module Misc
     end
   end
 
+  def self.compare_lines(stream1, stream2, args, sort = false)
+    if sort
+      stream1 = Misc.sort_stream stream1
+      stream2 = Misc.sort_stream stream2
+      remove_lines(stream1, stream2, false)
+    else
+      erase = []
+
+      if Path === stream1 or (String === stream1 and File.exists? stream1)
+        file1 = stream1
+      else
+        file1 = TmpFile.tmp_file
+        erase << file1
+        Open.write(file1, TSV.get_stream(stream1))
+      end
+
+      if Path === stream2 or (String === stream2 and File.exists? stream2)
+        file2 = stream2
+      else
+        file2 = TmpFile.tmp_file
+        erase << file2
+        Open.write(file2, TSV.get_stream(stream2))
+      end
+
+      CMD.cmd("comm #{args} '#{file1}' '#{file2}'", :pipe => true, :post => Proc.new{ erase.each{|f| FileUtils.rm f } }) 
+    end
+  end
+
+  def self.remove_lines(stream1, stream2, sort)
+    self.compare_lines(stream1, stream2, '-2 -3', sort)
+  end
+
 end

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

@@ -87,4 +87,24 @@ row1 A B C
       assert_equal text, io.read
     end
   end
+
+  def test_remove_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|
+        ppp Misc.remove_lines(file1, file2, true).read
+      end
+    end
+  end
 end

metadata

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