rbbt-util 5.17.46 → 5.17.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343bf453468db2fccabfac2f4bdc61766d5a13dc
-  data.tar.gz: 99da330d0c5b25fb5c641356b8bb6db857b2631a
+  metadata.gz: a424c1af41a6ea47d6c9a0e450c2ed759840eb85
+  data.tar.gz: 9ef4162cc1a9676fc7854f59b31b49e6e9c5a57d
 SHA512:
-  metadata.gz: 740316fe25f986440370d4f3fb0bb5178f442deee5b02d5e7ad1b0129e1174846371669c0f6bf39bfc18ce24582ae69319be36521f715d242140ff4f70cb5206
-  data.tar.gz: 854f65081846e9830d4d62318d4dd5884f8421bcfb35d432c22d90c49f31f04b4df3c8ca42933fed8023991ac478ee484054f92af200b05340c8cba536b949a3
+  metadata.gz: f04c5460e1ce49c6c08e5f913a8739273b9cb6299b35821eddec73dee42c271d71d312f8bf346370dfd02a1e678645c6bd10efc356abe6849f9778781552af83
+  data.tar.gz: d080de01ac9d7f0eab395189a83cbd824e844665dcb9bb15e97856dbdf5d0e30b96135277d3ab5220115ec3730a04acb60d934c89b4625c75c0d3b026172973b

data/lib/rbbt/tsv/attach.rb

@@ -10,9 +10,9 @@ module TSV
 
     is = case
          when (String === input and not input.index("\n") and input.length < 250 and File.exists?(input))
-           CMD.cmd("sort -k1,1 -t'#{sep}' #{ input } | grep -v '^#{sep}' ", :pipe => true)
+           CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' #{ input } | grep -v '^#{sep}' ", :pipe => true)
          when (String === input or StringIO === input)
-           CMD.cmd("sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => input, :pipe => true)
+           CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => input, :pipe => true)
          else
            input
          end
@@ -70,22 +70,22 @@ module TSV
     case
     when (String === file1 and not file1 =~ /\n/ and file1.length < 250 and File.exists?(file1))
       size = CMD.cmd("wc -c '#{file1}'").read.to_f if monitor
-      file1 = CMD.cmd("sort -k1,1 -t'#{sep}' #{ file1 } | grep -v '^#{sep}' ", :pipe => true)
+      file1 = CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' #{ file1 } | grep -v '^#{sep}' ", :pipe => true)
     when (String === file1 or StringIO === file1)
       size = file1.length if monitor
-      file1 = CMD.cmd("sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file1, :pipe => true)
+      file1 = CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file1, :pipe => true)
     when TSV === file1
       size = file1.size if monitor
-      file1 = CMD.cmd("sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file1.to_s(:sort, true), :pipe => true)
+      file1 = CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file1.to_s(:sort, true), :pipe => true)
     end
 
     case
     when (String === file2 and not file2 =~ /\n/ and file2.length < 250 and File.exists?(file2))
-      file2 = CMD.cmd("sort -k1,1 -t'#{sep}' #{ file2 } | grep -v '^#{sep}' ", :pipe => true)
+      file2 = CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' #{ file2 } | grep -v '^#{sep}' ", :pipe => true)
     when (String === file2 or StringIO === file2)
-      file2 = CMD.cmd("sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file2, :pipe => true)
+      file2 = CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file2, :pipe => true)
     when TSV === file2
-      file2 = CMD.cmd("sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file2.to_s(:sort, true), :pipe => true)
+      file2 = CMD.cmd("env LC_ALL=C sort -k1,1 -t'#{sep}' | grep -v '^#{sep}'", :in => file2.to_s(:sort, true), :pipe => true)
     end
 
     begin

data/lib/rbbt/util/misc/pipes.rb

@@ -322,7 +322,7 @@ module Misc
           end
         end
 
-        sorted = CMD.cmd("sort #{cmd_args || ""}", :in => line_stream, :pipe => true)
+        sorted = CMD.cmd("env LC_ALL=C sort #{cmd_args || ""}", :in => line_stream, :pipe => true)
 
         while block = sorted.read(2048)
           sin.write block

data/share/rbbt_commands/app/template

@@ -13,10 +13,11 @@ require 'rbbt/rest/knowledge_base'
 require 'rbbt/rest/helpers'
 require 'rbbt/rest/web_tool'
 
-options = SOPT.get "-e--environment*:-p--port*:-s--server*:-b--bind*:-e--environment*:-R--RServe_session*:--finder:--views*"
+options = SOPT.get "-e--environment*:-p--port*:-s--server*:-b--bind*:-e--environment*:-R--RServe_session*:--finder:--views*:-w--workflows*"
 
 template = ARGV.first
 
+template = File.expand_path(template)
 template = template.sub('.haml','')
 
 ENV["RBBT_FINDER"] = "true" if options.include?(:finder)

data/share/rbbt_commands/tsv/sort

@@ -24,11 +24,11 @@ file = ARGV.shift
 file = STDIN if file == '-' or file.nil?
 
 
-field = options[:field]
+field = options[:field] || '2'
 if field =~ /^\d+$/
   field_pos = field.to_i
 else
-  field_pos = TSV.parse_header(file).all_fields.index(field) + 1
+  field_pos = TSV.parse_header(file, options).all_fields.index(field) + 1
 end
 
 rest = ARGV.inject("-t\"\t\" -g -k#{field_pos}"){|acc,e| acc << " '#{e}'" }

metadata

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