rbbt-util 5.21.37 → 5.21.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78be312f6bb148f4e418c5b7e1db7882d07de211
-  data.tar.gz: e6fe03044a0b18a86bbdca5fb34f812ea30d2272
+  metadata.gz: cd8af3e8cd66f4c08804641788f1ae6384343f09
+  data.tar.gz: ee6b16cea96ef6699bc8f9b1fa359c6af2bc6d5a
 SHA512:
-  metadata.gz: 8b2737f05aeff25db35e32cedd1f1e711157fe52f81a86ed0c3fcef55f69914e3ceb35eba88f75ac910fb6ffa59b312935841b2c2f095b4420373a0e6b62f2c6
-  data.tar.gz: c24625b00ec05ad1a8ecb83baa3f9043b75392bd71adce65805e61657581a5275eb3057b90eb882ebbf75dbc8da00c0e85fe128aa2ddbd2b7174dc269e633457
+  metadata.gz: ca555f21bd75ca53a3c74c92fa9e611dbbad7c09249c8d4bd3b041e0c498e7712fbe28384f3d397708cadda1efe4231e416d5e13b28fb313260b9de5ff1abecc
+  data.tar.gz: 5ea4b7dd1719264f3e9688aa8655b4ecee425306a5181e67de03b30ee592982c2217e3a7ed9f3f0203d0cb7b1265024a246ee2420c3ea3e77df81a447dbacea2

data/lib/rbbt/association/database.rb

@@ -109,7 +109,7 @@ module Association
           [parts[@key_field], parts.values_at(*@fields)]
         end
       end
-    when :double, :list, :single
+    when :double
       class << parser
         def get_values(parts)
           [parts[@key_field].split(@sep2,-1), parts.values_at(*@fields).collect{|v| v.nil? ? [] : v.split(@sep2,-1) }]

data/lib/rbbt/association/open.rb

@@ -11,7 +11,8 @@ module Association
     options = options.nil? ? {} : options.dup
     persist_options = persist_options.nil? ?  Misc.pull_keys(options, :persist)  : persist_options.dup 
 
-    options = Misc.add_defaults options, :zipped => true, :monitor => {:desc => "Opening database #{Misc.fingerprint file}"}
+    options = Misc.add_defaults options, :zipped => true, :merge => true, :monitor => {:desc => "Opening database #{Misc.fingerprint file}"}
+    options[:zipped] = false unless options[:merge]
     persist_options = Misc.add_defaults persist_options, :persist => true, :dir => Rbbt.var.associations
     persist = persist_options[:persist]
 
@@ -28,7 +29,7 @@ module Association
 
       data.serializer = :double if data.respond_to? :serializer
       tsv.with_unnamed do
-        tsv.with_monitor(options[:monitor]) do
+        tsv.with_monitor("Saving database #{Misc.fingerprint file}") do
           tsv.through do |k,v|
             data[k] = v
           end

data/lib/rbbt/tsv/parser.rb

@@ -430,11 +430,11 @@ module TSV
         self.instance_eval do alias cast_values cast_values_double end
         case
         when (merge and not zipped)
-            self.instance_eval do alias add_to_data add_to_data_merge end
+          self.instance_eval do alias add_to_data add_to_data_merge end
         when (merge and zipped)
-            self.instance_eval do alias add_to_data add_to_data_merge_zipped end
+          self.instance_eval do alias add_to_data add_to_data_merge_zipped end
         when zipped
-            self.instance_eval do alias add_to_data add_to_data_zipped end
+          self.instance_eval do alias add_to_data add_to_data_zipped end
         else
           self.instance_eval do alias add_to_data add_to_data_no_merge_double end
         end

data/lib/rbbt/tsv/stream.rb

@@ -279,15 +279,40 @@ module TSV
   end
 
 
-  def self.reorder_stream_tsv(stream, key_field, fields)
+  def self.reorder_stream_tsv(stream, key_field, fields=nil, zipped = true)
     parser = TSV::Parser.new TSV.get_stream(stream), :key_field => key_field, :fields => fields
     dumper_options = parser.options
     dumper = TSV::Dumper.new dumper_options
     dumper.init 
-    TSV.traverse parser, :into => dumper do |key,values|
-      key = key.first if Array === key
-      values = [values] unless Array === values
-      [key, values]
+    case parser.type
+    when :single
+      TSV.traverse parser, :into => dumper do |keys,values|
+        key = keys.first
+        [key, [values]]
+      end
+    when :double
+      TSV.traverse parser, :into => dumper do |keys,values|
+        raise [keys, values].inspect if keys.include? 'gain'
+        res = []
+        keys.each_with_index do |key,i|
+          vs = zipped ?  values.collect{|l| l.length == 1 ? l : [l[i]] } : values
+          res << [key, vs]
+        end
+        res.extend MultipleResult
+        res
+      end
+    when :list
+      TSV.traverse parser, :into => dumper do |keys,values|
+        key = keys.first
+        [key, values]
+      end
+    when :flat
+      TSV.traverse parser, :into => dumper do |keys,values|
+        key = keys.first
+        [key, values]
+      end
+    else
+      raise "Unknown type: " << parser.type.to_s
     end
     dumper
   end

data/share/rbbt_commands/workflow/task

@@ -447,7 +447,7 @@ when (defined?(WorkflowRESTClient) and WorkflowRESTClient::RemoteStep)
     res.join if res.respond_to? :join
   elsif res.nil?
     job.join
-    puts Open.read(job.path, :nocache => true)
+    puts Open.read(job.path, :nocache => true, :nofail => true)
   else
     puts res.to_s
   end

data/test/rbbt/tsv/test_stream.rb

@@ -246,7 +246,7 @@ row4  BBB CC
 
     s = StringIO.new text
     dumper = TSV.reorder_stream_tsv(s, "LabelC", %w(Row LabelA))
-    tsv = TSV.open TSV.collapse_stream(dumper.stream).stream.read
+    tsv = TSV.open TSV.collapse_stream(dumper.stream)
     assert_equal %w(row2 row4), tsv["CC"]["Row"]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.37
+  version: 5.21.38
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake