vll 0.1.13 → 0.1.14

data/bin/vl

@@ -5,6 +5,7 @@ begin
 require 'optparse'
 require 'colorize'
 require 'csv'
+require 'pp'
 
 $options = {
   :padding => 1,
@@ -16,6 +17,7 @@ $options = {
   :alternate_color => false,
   :chop_length => 1024,
   :max_n_cols => 200,
+  :return_char => ["\n", "\r", "\r\n"],
 }
 
 
@@ -105,51 +107,109 @@ end
 #------#
 
 
-$max_widths = []
+#$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
 
-#==== 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|
+
+#==== new version ===#
+
+$cached_lines = []
+$max_widths = []
+$csv_options = {
+  :col_sep    => $options[:separator],
+  :quote_char => $options[:quote],
+  :row_sep => $options[:return_char],
+  #:skip_lines => $options[:comment]
+}
+
+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
 
@@ -173,97 +233,58 @@ def print_line(line, lnum)
     print c
   end
   puts
-rescue
-  STDERR.puts 'vl: Pipe ended while writing.'
-  abort
+#rescue Exception => e
+#  #STDERR.puts 'vl: Pipe ended while writing.'
+#  pp e
+#  throw e
 end
 
-cached_lines.each.with_index do |line, lnum|
-  print_line(line, lnum)
-end
+(1..1.0/0).each do |i|
+  if ARGF.eof? then
+    break
+  end
 
-ARGF.each_line.with_index do |line, lnum|
-  print_line(line, lnum)
-end
+  line = ARGF.readline
 
+  if i < $options[:skip] or line =~ $options[:comment] then
+    print line
+    next
+  end
 
+  begin
+    row = CSV.parse_line(line, $csv_options)
+  rescue CSV::MalformedCSVError => e
+    line = line + ARGF.readline
+    if line.length < 10000 then
+      retry
+    else
+      throw e
+    end
+  end
 
+  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
 
-#==== new version ===#
+  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
 
-#$cached_lines = []
-#$max_widths = []
-#$csv_options = {
-#  :col_sep    => $options[:separator],
-#  :quote_char => $options[:quote],
-#  :skip_lines => $options[:comment]
-#}
-#
-#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 "... #{row.size - i} more columns"
-#      break
-#    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
-#
-#CSV.new(ARGF, $csv_options).each.with_index do |row, i|
-#  if i < $options[:skip] then
-#    puts 'break!'
-#    break
-#  end
-#
-#  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
-#
-#  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
+if $cached_lines.length > 0 then
+  $cached_lines.each{|row|print_row(row)}
+  $cached_lines = []
+end
 
 
 rescue Interrupt

metadata

@@ -2,7 +2,7 @@
 name: vll
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - xzhu
@@ -39,7 +39,7 @@ extra_rdoc_files: []
 files:
 - bin/vl
 - bin/vll
-homepage: 
+homepage: https://github.com/w9/vll
 licenses:
 - MIT
 post_install_message: 
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: