rbbt-util 5.25.34 → 5.25.35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/tsv/parallel/traverse.rb +5 -4
- data/lib/rbbt/tsv/parser.rb +1 -1
- data/lib/rbbt/util/version.rb +6 -2
- data/test/rbbt/tsv/test_parser.rb +21 -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: 5c6d0758e3a1fb39aad8fe7f3f2a077299e5f7b8
|
4
|
+
data.tar.gz: c03e87fa3dca241c06e1512b98d9832502a428fb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cc83f79920d2738482acb2a7af927851752d5604e6ddd3961ffaca60f5e988c988fb8cb6496fb47f1f75e54f6ddc64b9aac5513e9e7daa1648413fc098151841
|
7
|
+
data.tar.gz: d59e75e983e285216095f902cd5cd83402a45700c31d5b8bb8c3b6acee976c723bdb46334e6cea2e2d0a80d8ddf5749b8b0989e360ee3c09ceeb9c27882ab678
|
@@ -73,11 +73,12 @@ module TSV
|
|
73
73
|
|
74
74
|
begin
|
75
75
|
error = false
|
76
|
+
fields = tsv.fields
|
76
77
|
if callback
|
77
78
|
bar.init if bar
|
78
79
|
tsv.through options[:key_field], options[:fields] do |k,v|
|
79
80
|
begin
|
80
|
-
callback.call yield(k,v)
|
81
|
+
callback.call yield(k,v,fields)
|
81
82
|
rescue Exception
|
82
83
|
Log.exception $!
|
83
84
|
raise $!
|
@@ -89,7 +90,7 @@ module TSV
|
|
89
90
|
bar.init if bar
|
90
91
|
tsv.through options[:key_field], options[:fields] do |k,v|
|
91
92
|
begin
|
92
|
-
yield k,v
|
93
|
+
yield k,v,fields
|
93
94
|
ensure
|
94
95
|
bar.tick if bar
|
95
96
|
end
|
@@ -243,9 +244,9 @@ module TSV
|
|
243
244
|
bar.init if bar
|
244
245
|
exception = nil
|
245
246
|
begin
|
246
|
-
TSV::Parser.traverse(io, options) do |k,v|
|
247
|
+
TSV::Parser.traverse(io, options) do |k,v,f|
|
247
248
|
begin
|
248
|
-
callback.call yield k, v
|
249
|
+
callback.call yield k, v,f
|
249
250
|
rescue Exception
|
250
251
|
exception = $!
|
251
252
|
raise $!
|
data/lib/rbbt/tsv/parser.rb
CHANGED
data/lib/rbbt/util/version.rb
CHANGED
@@ -9,8 +9,12 @@ module Rbbt
|
|
9
9
|
version = if dir.VERSION.exists?
|
10
10
|
dir.VERSION.read
|
11
11
|
elsif dir[".git"].exists?
|
12
|
-
|
13
|
-
|
12
|
+
begin
|
13
|
+
head = dir[".git"]["HEAD"].read.split(" ").last.strip
|
14
|
+
dir[".git"][head].read.strip
|
15
|
+
rescue
|
16
|
+
nil
|
17
|
+
end
|
14
18
|
elsif libname.include?("-")
|
15
19
|
name,_sep, v = libname.partition("-")
|
16
20
|
if v =~ /^\d+\.\d+\.\d+$/
|
@@ -13,13 +13,14 @@ A B C D E
|
|
13
13
|
EOF
|
14
14
|
Open.write(file, str)
|
15
15
|
Open.open(file) do |io|
|
16
|
-
parser = TSV::Parser.new(io, :merge => true, :zipped => true
|
16
|
+
parser = TSV::Parser.new(io, :merge => true, :zipped => true)
|
17
17
|
parser.traverse do |k,v|
|
18
18
|
assert v.length > 1
|
19
19
|
end
|
20
20
|
end
|
21
21
|
end
|
22
22
|
end
|
23
|
+
|
23
24
|
def test_traverse
|
24
25
|
|
25
26
|
content =<<-EOF
|
@@ -49,5 +50,24 @@ row1 a|aa|aaa b Id1|Id2
|
|
49
50
|
end
|
50
51
|
end
|
51
52
|
|
53
|
+
def test_fields
|
54
|
+
TmpFile.with_file do |tmpdir|
|
55
|
+
file = File.join(tmpdir, 'file')
|
56
|
+
str =<<-EOF
|
57
|
+
#: :type=:flat#:sep=' '
|
58
|
+
#Key Value
|
59
|
+
a b c d e
|
60
|
+
A B C D E
|
61
|
+
EOF
|
62
|
+
Open.write(file, str)
|
63
|
+
Open.open(file) do |io|
|
64
|
+
parser = TSV::Parser.new(io, :merge => true, :zipped => true, :type => :double)
|
65
|
+
parser.traverse do |k,v,f|
|
66
|
+
assert_equal f, %w(Value)
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
52
72
|
end
|
53
73
|
|
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.25.
|
4
|
+
version: 5.25.35
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Miguel Vazquez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-03-
|
11
|
+
date: 2019-03-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|