rbbt-util 5.21.131 → 5.21.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f68eea441653388fb59fd05ae206e5b120b8eb
-  data.tar.gz: 88a93f9598386c6605e086ce575c2d0ff31a3146
+  metadata.gz: 6d87c122f2c6434f71705d01b2ca0244288de9f2
+  data.tar.gz: d74204053afa22ffe1c51491c771c50bd6fee793
 SHA512:
-  metadata.gz: 2d21f9912e46073ec0c7593e15702be44445f9928405d70a5dd9c2d92c53d42cd0f04be8c9a33f9dd6dd29229ca4ec39a902cf3dc55682b15b7c9c081a5092c0
-  data.tar.gz: 22a459d7ed570054f06d3d33b9202ac577bded51a21c105669afa7e1d3cff160973a9f03bf3252f88518ade85418ba087430426f9fc5ecb3f3b7bcbdc9539c26
+  metadata.gz: 07aef5902630d2f53c8156407fbf5e16e9a460f0da45f1f9762b10529f40103e0936941226df2e3a1de1e78c8df02e1855c2f5a4bce61b6f3a17c50e000000ea
+  data.tar.gz: 8b426c640fe68261450a6ab12895cabdf548737de2ad196677d271116770f69dcb9e797c44625aa9129dd6b4884180cba3cfa3989a60afa4cab9e3ae9cb1be75

data/lib/rbbt/tsv/parser.rb

@@ -408,6 +408,7 @@ module TSV
       @header_options = parse_header(stream)
 
       options = @header_options.merge options
+      options = Misc.add_defaults options, :fields => [1] if options[:type] == :single and options[:fields].nil?
 
       @type ||= Misc.process_options(options, :type) || :double
       @type ||= :double

data/share/install/software/lib/install_helpers

@@ -140,7 +140,7 @@ build(){
     echo `pwd`
     ls
 
-    if [ -f Makefile.am -a -n -f configure ]; then
+    if [ -f Makefile.am -a ! -f configure ]; then
       autoreconf
     fi
 

data/share/rbbt_commands/workflow/task

@@ -119,7 +119,7 @@ def fix_options(workflow, task, job_options)
                         when value == '-'
                           array_separator ||= "\n"
                           STDIN.read
-                        when (String === value and File.exist?(value) and not input_options[name][:nofile])
+                        when (String === value and File.exist?(value) and not (input_options[name] && input_options[name][:nofile]))
                           array_separator ||= "\n"
                           Open.read(value)
                         else

data/test/rbbt/test_tsv.rb

@@ -92,6 +92,19 @@ row1    a|aa|aaa    b    Id1|Id2
 row2    A    B    Id3
     EOF
 
+    TmpFile.with_file(content) do |filename|
+      tsv = TSV.open(filename, :sep => /\s+/, :type => :single)
+      assert_equal tsv.fields, ["ValueA"]
+    end
+  end
+
+  def test_tsv_field_selection
+    content =<<-EOF
+#Id    ValueA    ValueB    OtherID
+row1    a|aa|aaa    b    Id1|Id2
+row2    A    B    Id3
+    EOF
+
     TmpFile.with_file(content) do |filename|
       tsv = TSV.open(filename, :sep => /\s+/, :key_field => 0)
       assert_equal ["a", "aa", "aaa"], tsv["row1"][0]

data/test/rbbt/tsv/test_parser.rb

@@ -25,10 +25,11 @@ row1    a|aa|aaa    b    Id1|Id2
       end
 
       TSV::Parser.traverse(Open.open(filename), :sep => /\s+/, :fields => [1], :type => :flat) do |k,v|
-        assert_equal "row1", k
+        assert_equal ["row1"], k
         assert_equal %w(a aa aaa), v
       end
     end
   end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.131
+  version: 5.21.132
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake