rbbt-util 5.25.34 → 5.25.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a19151d029e95e791eb078a3674524810940988
-  data.tar.gz: 828a0fadafa776b7e8b78dc44463fc506414205c
+  metadata.gz: 5c6d0758e3a1fb39aad8fe7f3f2a077299e5f7b8
+  data.tar.gz: c03e87fa3dca241c06e1512b98d9832502a428fb
 SHA512:
-  metadata.gz: 869494e15e50643fbf9f5256af85d7632ce8874ccb648b620db68ced62f27ae845d5d0ec0a8cbe447affae8ab7c1679317df8919d6f1f2e4b6458ba61d1bdb04
-  data.tar.gz: 282f5414814f58c91ba166ba8bf78e74051720a87983b29d482cb19b69c03c6dc56d80b98e5f43b85aaf7abd10115e9dc12c653b8e7f0f1d6b72bee43ee21345
+  metadata.gz: cc83f79920d2738482acb2a7af927851752d5604e6ddd3961ffaca60f5e988c988fb8cb6496fb47f1f75e54f6ddc64b9aac5513e9e7daa1648413fc098151841
+  data.tar.gz: d59e75e983e285216095f902cd5cd83402a45700c31d5b8bb8c3b6acee976c723bdb46334e6cea2e2d0a80d8ddf5749b8b0989e360ee3c09ceeb9c27882ab678

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -73,11 +73,12 @@ module TSV
 
     begin
       error = false
+      fields = tsv.fields
       if callback
         bar.init if bar
         tsv.through options[:key_field], options[:fields] do |k,v|
           begin
-            callback.call yield(k,v)
+            callback.call yield(k,v,fields)
           rescue Exception
             Log.exception $!
             raise $!
@@ -89,7 +90,7 @@ module TSV
         bar.init if bar
         tsv.through options[:key_field], options[:fields] do |k,v|
           begin
-            yield k,v 
+            yield k,v,fields
           ensure
             bar.tick if bar
           end
@@ -243,9 +244,9 @@ module TSV
         bar.init if bar
         exception = nil
         begin
-          TSV::Parser.traverse(io, options) do |k,v|
+          TSV::Parser.traverse(io, options) do |k,v,f|
             begin
-              callback.call yield k, v
+              callback.call yield k, v,f
             rescue Exception
               exception = $!
               raise $!

data/lib/rbbt/tsv/parser.rb

@@ -619,7 +619,7 @@ module TSV
             key, values = self.get_values parts
             values = self.cast_values values if self.cast?
             
-            yield key, values
+            yield key, values, fields
 
             line = stream.gets
 

data/lib/rbbt/util/version.rb

@@ -9,8 +9,12 @@ module Rbbt
     version = if dir.VERSION.exists?
       dir.VERSION.read
     elsif dir[".git"].exists?
-      head = dir[".git"]["HEAD"].read.split(" ").last.strip
-      dir[".git"][head].read.strip
+      begin
+        head = dir[".git"]["HEAD"].read.split(" ").last.strip
+        dir[".git"][head].read.strip
+      rescue
+        nil
+      end
     elsif libname.include?("-")
       name,_sep, v = libname.partition("-")
       if v =~ /^\d+\.\d+\.\d+$/

data/test/rbbt/tsv/test_parser.rb

@@ -13,13 +13,14 @@ A B C D E
       EOF
       Open.write(file, str)
       Open.open(file) do |io|
-        parser = TSV::Parser.new(io, :merge => true, :zipped => true, :type => :double)
+        parser = TSV::Parser.new(io, :merge => true, :zipped => true)
         parser.traverse do |k,v|
           assert v.length > 1
         end
       end
     end
   end
+
   def test_traverse
 
     content =<<-EOF
@@ -49,5 +50,24 @@ row1    a|aa|aaa    b    Id1|Id2
     end
   end
 
+  def test_fields
+    TmpFile.with_file do |tmpdir|
+      file = File.join(tmpdir, 'file')
+      str =<<-EOF
+#: :type=:flat#:sep=' '
+#Key Value
+a b c d e
+A B C D E
+      EOF
+      Open.write(file, str)
+      Open.open(file) do |io|
+        parser = TSV::Parser.new(io, :merge => true, :zipped => true, :type => :double)
+        parser.traverse do |k,v,f|
+          assert_equal f, %w(Value)
+        end
+      end
+    end
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.25.34
+  version: 5.25.35
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake