vll 0.1.11 → 0.1.12

data/bin/vl

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-#TODO: add column colors
-#TODO: chop long columns (option)
-
 begin
 
 require 'optparse'
@@ -108,51 +105,108 @@ end
 #------#
 
 
+#$max_widths = []
+#
+##==== line caching ====#
+#cached_lines = []
+#ARGF.each_line.with_index.reduce 0 do |pnum, (line, lnum)|
+#  cached_lines.push(line)
+#  next pnum if lnum < $options[:skip] or line =~ $options[:comment]
+#  parsed_line = CSV.parse_line(line, {:col_sep=>$options[:separator], :quote_char=>$options[:quote]})
+#  # damn you, 'csv' package!
+#  parsed_line = [] if parsed_line == nil
+#  parsed_line.each_with_index do |c, i|
+#    # damn you, 'csv' package!
+#    c = '' if c == nil
+#    c = c.inspect[1..-2]
+#    # -1 because it's possible that c is empty and i is out of range
+#    if $max_widths.fetch(i, -1) < c.length then $max_widths[i] = c.length end
+#  end
+#  (pnum += 1) < $options[:probe_lines] ? pnum : break
+#end
+##======================#
+#
+#
+#def print_line(line, lnum)
+#  if lnum < $options[:skip] or line =~ $options[:comment] then
+#    print line
+#    return
+#  end
+#  parsed_line = CSV.parse_line(line, {:col_sep=>$options[:separator], :quote_char=>$options[:quote]})
+#  # damn you, 'csv' package!
+#  parsed_line = [] if parsed_line == nil
+#  parsed_line.each_with_index do |c, i|
+#    break if i > $options[:max_n_cols]
+#    if i == $options[:max_n_cols] then
+#      print "... #{parsed_line.size - i} more columns"
+#      break
+#    end
+#
+#    # damn you, 'csv' package!
+#    c = '' if c == nil
+#    c = c.inspect[1..-2]
+#
+#    if $max_widths.fetch(i, -1) < c.length then
+#      $max_widths[i] = c.length
+#    end
+#
+#    c = c[0..$options[:chop_length]]
+#    $max_widths[i] = [$options[:chop_length], $max_widths[i]].min
+#
+#    case $options[:justify]
+#      when 'l'
+#        c = c.ljust($max_widths[i] + $options[:padding]) rescue break
+#      when 'r'
+#        c = c.rjust($max_widths[i] + $options[:padding]) rescue break
+#      when 'a'
+#        begin
+#          if Float(c) then c = c.rjust($max_widths[i] + $options[:padding]) end
+#        rescue
+#          c = c.ljust($max_widths[i] + $options[:padding])
+#        end
+#      end
+#
+#    if $options[:alternate_color] then
+#      c = c.colorize([:yellow, :blue][i % 2])
+#    end
+#
+#    print c
+#  end
+#  puts
+#rescue
+#  STDERR.puts 'vl: Pipe ended while writing.'
+#  abort
+#end
+#
+#cached_lines.each.with_index do |line, lnum|
+#  print_line(line, lnum)
+#end
+#
+#ARGF.each_line.with_index do |line, lnum|
+#  print_line(line, lnum)
+#end
+
+
+
+
+#==== new version ===#
+
+$cached_lines = []
 $max_widths = []
+$csv_options = {
+  :col_sep    => $options[:separator],
+  :quote_char => $options[:quote],
+  #:skip_lines => $options[:comment]
+}
 
-#==== line caching ====#
-cached_lines = []
-ARGF.each_line.with_index.reduce 0 do |pnum, (line, lnum)|
-  cached_lines.push(line)
-  next pnum if lnum < $options[:skip] or line =~ $options[:comment]
-  parsed_line = CSV.parse_line(line, {:col_sep=>$options[:separator], :quote_char=>$options[:quote]})
-  # damn you, 'csv' package!
-  parsed_line = [] if parsed_line == nil
-  parsed_line.each_with_index do |c, i|
-    # damn you, 'csv' package!
-    c = '' if c == nil
-    c = c.inspect[1..-2]
-    # -1 because it's possible that c is empty and i is out of range
-    if $max_widths.fetch(i, -1) < c.length then $max_widths[i] = c.length end
-  end
-  (pnum += 1) < $options[:probe_lines] ? pnum : break
-end
-#======================#
-
-
-def print_line(line, lnum)
-  if lnum < $options[:skip] or line =~ $options[:comment] then
-    print line
-    return
-  end
-  parsed_line = CSV.parse_line(line, {:col_sep=>$options[:separator], :quote_char=>$options[:quote]})
-  # damn you, 'csv' package!
-  parsed_line = [] if parsed_line == nil
-  parsed_line.each_with_index do |c, i|
+def print_row(row)
+  row.each_with_index do |c, i|
     break if i > $options[:max_n_cols]
     if i == $options[:max_n_cols] then
-      print "... #{parsed_line.size - i} more columns"
+      print "... #{row.size - i} more columns"
       break
     end
 
-    # damn you, 'csv' package!
-    c = '' if c == nil
-    c = c.inspect[1..-2]
-
-    if $max_widths.fetch(i, -1) < c.length then
-      $max_widths[i] = c.length
-    end
-
     c = c[0..$options[:chop_length]]
     $max_widths[i] = [$options[:chop_length], $max_widths[i]].min
 
@@ -176,22 +230,38 @@ def print_line(line, lnum)
     print c
   end
   puts
-rescue
-  STDERR.puts 'vl: Pipe ended while writing.'
-  abort
+#rescue
+#  STDERR.puts 'vl: Pipe ended while writing.'
+#  abort
 end
 
-cached_lines.each.with_index do |line, lnum|
-  print_line(line, lnum)
-end
+CSV.new(ARGF, $csv_options).each.with_index do |row, i|
+  row = row.map.with_index do |c, i|
+    # damn you, 'csv' package!
+    c = '' if c == nil
+    c = c.inspect[1..-2]
+    if $max_widths.fetch(i, -1) < c.length then $max_widths[i] = c.length end
+    c
+  end
 
-ARGF.each_line.with_index do |line, lnum|
-  print_line(line, lnum)
+  if i < $options[:probe_lines] then
+    $cached_lines.push(row)
+  else
+    if $cached_lines.length > 0 then
+      $cached_lines.each{|row|print_row(row)}
+      $cached_lines = []
+    end
+    print_row(row)
+  end
 end
 
-
+if $cached_lines.length > 0 then
+  $cached_lines.each{|row|print_row(row)}
+  $cached_lines = []
+end
 
 
 rescue Interrupt
 
 end
+

metadata

@@ -2,31 +2,31 @@
 name: vll
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - xzhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
-  prerelease: false
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.7
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.7
+  prerelease: false
 description: Nicely format columns of a large CSV/TSV file according to their content
   width, using first few lines as estimation thus extremely fast. Customizable.
 email: