rbbt-util 5.17.43 → 5.17.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07109a9c34d01c741b7d550de080d87cf28f40ea
-  data.tar.gz: c9d2484d8009620f89182520325d9e391939f6cd
+  metadata.gz: d1611ca04d7763d056195c336284ad3f6fbd325a
+  data.tar.gz: 54faf03af65f34c0dacb980cbbe16d5651e4046d
 SHA512:
-  metadata.gz: cbe6b76dde5bc3efae6216ccc460e23825fd4ec1a932fb8db1d256151492df02edbc1792d0fa64340712d04af5c2d4e1c9a9dcf0be9f97b3e6663cd0836fa196
-  data.tar.gz: 999911ac50fa6ed050222d86b00d5a795b77686ba565536e1a19ca7aaab1258376a3f9510bbcfb5807cd38089d0b6bb805183550efa580bb9662d10783c300e8
+  metadata.gz: 6a4aa49d73e3aa4635035b4d6fb9057efd2021682d3e78f4d3f2d1b9e9bdf86fc2fa2e2c410f11fc107e2e9057be78d9212a32d4bea3f7ae348c04e99fa64ff9
+  data.tar.gz: 5fc7d1e9c24789539e02df1d618c50f09dbb4c724107f368d7d18145be56c3db8f467c2cea57f5dc752cd80bc2be497a6bca61cc9f86ec9c140bac58176d29e4

data/bin/rbbt

@@ -195,6 +195,9 @@ begin
         load dir[$command].find
         exit 0
       end
+    when File.exists?($command)
+      load $command
+      exit 0
     else
       error = "Command '#{$command }' not understood"
       rbbt_usage($previous_commands)

data/lib/rbbt/tsv/manipulate.rb

@@ -262,19 +262,21 @@ module TSV
         else
           case type 
           when :double
-            new_key_field_name, new_field_names = through new_key_field, new_fields, uniq, zipped do |key, value|
-              if data[key] 
-                current = data[key].dup
-                value.each_with_index do |v, i|
-                  if current[i]
-                    current[i] += v if v
-                  else
-                    current[i] = v || []
+            new_key_field_name, new_field_names = through new_key_field, new_fields, uniq, zipped do |keys, value|
+              keys.each do |key|
+                if data[key] 
+                  current = data[key].dup
+                  value.each_with_index do |v, i|
+                    if current[i]
+                      current[i] += v if v
+                    else
+                      current[i] = v || []
+                    end
                   end
+                  data[key] = current 
+                else
+                  data[key] = value.collect{|v| v.nil? ? nil : v.dup}
                 end
-                data[key] = current 
-              else
-                data[key] = value.collect{|v| v.nil? ? nil : v.dup}
               end
             end
           when :flat

data/share/rbbt_commands/tsv/attach

@@ -3,12 +3,40 @@
 require 'rbbt-util'
 require 'rbbt/util/simpleopt'
 
+$0 = "rbbt #{$previous_commands*""} #{ File.basename(__FILE__) }" if $previous_commands
 
-file = ARGV.shift
-identifiers = ARGV.shift
-format = ARGV.shift
+options = SOPT.setup <<EOF
 
-file = STDIN if file == '-'
+Description
 
-puts TSV.open(file).attach identifiers, :fields => [format]
+$ rbbt tsv attach <file1> <file2> [<file3> ...] [options]
 
+Use - to read from STDIN
+
+-f--fields* Fields to attach (all if not specified)
+-h--help Print this help
+
+EOF
+if options[:help]
+  if defined? rbbt_usage
+    rbbt_usage 
+  else
+    puts SOPT.usage
+  end
+  exit 0
+end
+
+file1, *rest = ARGV
+fields = options[:fields]
+
+fields = fields ? fields.split(/[,|]/).collect{|f| f.strip} : nil
+
+tsv = TSV.open(file1)
+
+rest.each do |file2|
+  file_fields = TSV.parse_header(file2).all_fields - tsv.all_fields
+  these_fields = fields ? fields & file_fields : nil
+  tsv = tsv.attach file2, :fields => these_fields
+end
+
+puts tsv.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.43
+  version: 5.17.44
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake