rbbt-util 5.19.20 → 5.19.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cc27beb6c6dcec86da8a9864ceb2f2e29bb9fe0
-  data.tar.gz: 8e7ef407be5734415e5b37fb986a3c2b8727cdc8
+  metadata.gz: ca3e2230936d064486604218af99737d45910c46
+  data.tar.gz: 99ad2aabb12f79e52ecd2eb1a94caa56ab0f0a8a
 SHA512:
-  metadata.gz: 5df62f3fc2a24c1abbf7e17b85308b780157a01a18d0112c8cfdcb75d7c4904fb3c410190faf74981d585d7d15e1607f06408dbd178246cfe6439af12e6813f5
-  data.tar.gz: a5cf866869dc753912df0abc3f9c846c922617c9eaa674a05c20a90a42f774e6ff17d3fba5838889070bc7f62a0d87f4c4da955720afd0a42defdeb15e9b2d2d
+  metadata.gz: d04573a2275622180dabe063a3f3b13e7bd82c2e6fc4da9b3099170199136e292b7cb94490722e063895d6e019bd054513abfb1ddfda4f98df4b5b94f5bf8f8e
+  data.tar.gz: 4a66cb6cd9336bdd807371228061d3ccfa4df6c7069cd45dd08a5b0ba716d6978b74230c6568dde0a848c7d6a4a134a5463a238c8791ba6c087ad96797b700a6

data/lib/rbbt/tsv/manipulate.rb

@@ -242,7 +242,7 @@ module TSV
   end
 
   def reorder(new_key_field = nil, new_fields = nil, options = {}) 
-    zipped, uniq = Misc.process_options options, :zipped, :uniq
+    zipped, uniq, merge = Misc.process_options options, :zipped, :uniq, :merge
 
     persist_options = Misc.pull_keys options, :persist
     persist_options[:prefix] = "Reorder"
@@ -257,7 +257,15 @@ module TSV
       with_unnamed do
         if zipped or (type != :double and type != :flat)
           new_key_field_name, new_field_names = through new_key_field, new_fields, uniq, zipped do |key, value|
-            data[key] = value.clone if Array === value
+            if merge and data[key]
+              new_values = data[key].dup
+              value.each_with_index do |v,i|
+                new_values[i] = [new_values[i], v].flatten
+              end
+              data[key] = new_values if Array === value
+            else
+              data[key] = value.clone if Array === value
+            end
           end
         else
           case type 

data/lib/rbbt/util/cmd.rb

@@ -219,7 +219,7 @@ module CMD
 
       Process.waitpid pid
 
-      if not $?.success?
+      if not $?.success? and not no_fail
         raise ProcessFailed.new "Command [#{pid}] #{cmd} failed with error status #{$?.exitstatus}.\n#{err}"
       else
         Log.log err, stderr if Integer === stderr and log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.19.20
+  version: 5.19.21
 platform: ruby
 authors:
 - Miguel Vazquez