v0.1.3

.gitignore

@@ -6,4 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 *.lock

README.md

@@ -7,7 +7,7 @@ Create ASCII charts on the terminal with data from standard streams in the pipel
 
 :bar_chart: Powered by [UnicodePlot](https://github.com/red-data-tools/unicode_plot.rb)
 
-:construction: Under development
+:construction: Under development! :construction:
 
 ## Installation
 

lib/uplot/command.rb

@@ -1,52 +1,88 @@
 require 'optparse'
 require 'csv'
+require 'unicode_plot'
 
 module Uplot
   class Command
     def initialize(argv)
-      @params = {}
-      @ptype = nil
-      @headers = nil
+      @params    = {}
+      @ptype     = nil
+      @headers   = nil
       @delimiter = "\t"
-      @output = false
+      @transpose = false
+      @output    = false
+      @count     = false
+      @fmt       = 'xyy'
+      @debug     = false
       parse_options(argv)
     end
 
     def create_parser
-      OptionParser.new do |opt|
-        opt.on('-o', '--output', TrueClass)     { |v| @output = v }
-        opt.on('-d', '--delimiter VAL', String) { |v| @delimiter = v }
-        opt.on('-H', '--headers', TrueClass)    { |v| @headers = v }
-        opt.on('-t', '--title VAL', String)     { |v| @params[:title] = v }
-        opt.on('-w', '--width VAL', Numeric)    { |v| @params[:width] = v }
-        opt.on('-h', '--height VAL', Numeric)   { |v| @params[:height] = v }
-        opt.on('-b', '--border VAL', Numeric)   { |v| @params[:border] = v }
-        opt.on('-m', '--margin VAL', Numeric)   { |v| @params[:margin] = v }
-        opt.on('-p', '--padding VAL', Numeric)  { |v| @params[:padding] = v }
-        opt.on('-l', '--labels', TrueClass)     { |v| @params[:labels] = v }
-      end
+      OptionParser.new
+                  .on('-o', '--output', TrueClass) { |v| @output = v }
+                  .on('-d', '--delimiter VAL', String) { |v| @delimiter = v }
+                  .on('-H', '--headers', TrueClass)    { |v| @headers = v }
+                  .on('-T', '--transpose', TrueClass)  { |v| @transpose = v }
+                  .on('-t', '--title VAL', String)     { |v| @params[:title] = v }
+                  .on('-w', '--width VAL', Numeric)    { |v| @params[:width] = v }
+                  .on('-h', '--height VAL', Numeric)   { |v| @params[:height] = v }
+                  .on('-b', '--border VAL', Numeric)   { |v| @params[:border] = v }
+                  .on('-m', '--margin VAL', Numeric)   { |v| @params[:margin] = v }
+                  .on('-p', '--padding VAL', Numeric)  { |v| @params[:padding] = v }
+                  .on('-c', '--color VAL', String)     { |v| @params[:color] = v.to_sym }
+                  .on('-l', '--labels', TrueClass)     { |v| @params[:labels] = v }
+                  .on('--fmt VAL', String)             { |v| @fmt = v }
+                  .on('--debug', TrueClass)            { |v| @debug = v }
     end
 
     def parse_options(argv)
-      main_parser            = create_parser
-      parsers                = Hash.new { |h, k| h[k] = create_parser }
-      parsers['hist']        .on('--nbins VAL', Numeric) { |v| @params[:nbins] = v }
-      parsers['histogram']   = parsers['hist']
-      parsers['lineplot']    = parsers['line']
-      parsers['lineplots']   = parsers['lines']
-      parsers['scatterplot'] = parsers['scatter']
-      parsers['barplot']     = parsers['bar']
-      parsers['boxplot']     = parsers['box']
-      parsers.default        = nil
+      main_parser          = create_parser
+      parsers              = Hash.new { |h, k| h[k] = create_parser }
+      parsers['barplot']   = parsers['bar']
+                             .on('--symbol VAL', String) { |v| @params[:symbol] = v }
+                             .on('--xscale VAL', String) { |v| @params[:xscale] = v }
+                             .on('--xlabel VAL', String) { |v| @params[:xlabel] = v }
+                             .on('--count', TrueClass)   { |v| @count = v }
+      parsers['count']     = parsers['c'] # barplot -c
+                             .on('--symbol VAL', String) { |v| @params[:symbol] = v }
+      parsers['histogram'] = parsers['hist']
+                             .on('-n', '--nbins VAL', Numeric) { |v| @params[:nbins] = v }
+                             .on('--closed VAL', String) { |v| @params[:closed] = v }
+                             .on('--symbol VAL', String) { |v| @params[:symbol] = v }
+      parsers['lineplot']  = parsers['line']
+                             .on('--canvas VAL', String) { |v| @params[:canvas] = v }
+                             .on('--xlim VAL', String)   { |v| @params[:xlim] = get_lim(v) }
+                             .on('--ylim VAL', String)   { |v| @params[:ylim] = get_lim(v) }
+      parsers['lineplots'] = parsers['lines']
+                             .on('--canvas VAL', String) { |v| @params[:canvas] = v }
+                             .on('--xlim VAL', String)   { |v| @params[:xlim] = get_lim(v) }
+                             .on('--ylim VAL', String)   { |v| @params[:ylim] = get_lim(v) }
+      parsers['scatter']   = parsers['s']
+                             .on('--canvas VAL', String) { |v| @params[:canvas] = v }
+                             .on('--xlim VAL', String)   { |v| @params[:xlim] = get_lim(v) }
+                             .on('--ylim VAL', String)   { |v| @params[:ylim] = get_lim(v) }
+      parsers['density']   = parsers['d']
+                             .on('--grid', TrueClass)    { |v| @params[:grid] = v }
+                             .on('--xlim VAL', String)   { |v| @params[:xlim] = get_lim(v) }
+                             .on('--ylim VAL', String)   { |v| @params[:ylim] = get_lim(v) }
+      parsers['boxplot']   = parsers['box']
+                             .on('--xlim VAL', String)   { |v| @params[:xlim] = get_lim(v) }
+      parsers.default      = nil
 
       main_parser.banner = <<~MSG
-        Usage:\tuplot <command> [options]
-        Command:\t#{parsers.keys.join(' ')}
+        Program: Uplot (Tools for plotting on the terminal)
+        Version: #{Uplot::VERSION} (using unicode_plot #{UnicodePlot::VERSION})
+
+        Usage:   uplot <command> [options]
+
+        Command: #{parsers.keys.join(' ')}
+
       MSG
       main_parser.order!(argv)
       @ptype = argv.shift
 
       unless parsers.has_key?(@ptype)
+        puts main_parser.help
         warn "unrecognized command '#{@ptype}'"
         exit 1
       end
@@ -59,17 +95,23 @@ module Uplot
       while input = Kernel.gets(nil)
         input.freeze
         data, headers = preprocess(input)
+        pp input: input, data: data, headers: headers if @debug
         case @ptype
+        when 'bar', 'barplot'
+          barplot(data, headers)
+        when 'count', 'c'
+          @count = true
+          barplot(data, headers)
         when 'hist', 'histogram'
           histogram(data, headers)
         when 'line', 'lineplot'
           line(data, headers)
-        when 'lines'
+        when 'lines', 'lineplots'
           lines(data, headers)
         when 'scatter', 'scatterplot'
           scatter(data, headers)
-        when 'bar', 'barplot'
-          barplot(data, headers)
+        when 'density'
+          density(data, headers)
         when 'box', 'boxplot'
           boxplot(data, headers)
         end.render($stderr)
@@ -78,19 +120,41 @@ module Uplot
       end
     end
 
+    # https://stackoverflow.com/q/26016632
+    def transpose2(arr) # Should be renamed
+      Array.new(arr.map(&:length).max) { |i| arr.map { |e| e[i] } }
+    end
+
     def preprocess(input)
       data = CSV.parse(input, col_sep: @delimiter)
-      if @headers
-        headers = data.shift
-        data = data.transpose
-        [data, headers]
+      data.delete([]) # Remove blank lines.
+      data.delete_if { |i| i.all? nil } # Room for improvement.
+      p parsed_csv: data if @debug
+      headers = nil
+      if @transpose
+        if @headers
+          headers = []
+          # each but destructive like map
+          data.each { |series| headers << series.shift }
+        end
       else
-        data = data.transpose
-        [data, nil]
+        headers = data.shift if @headers
+        data = transpose2(data)
       end
+      [data, headers]
+    end
+
+    def preprocess_count(data)
+      if Enumerable.method_defined? :tally
+        data[0].tally
+      else # https://github.com/marcandre/backports tally
+        data[0].each_with_object(Hash.new(0)) { |item, res| res[item] += 1 }
+               .tap { |h| h.default = nil }
+      end.sort { |a, b| a[1] <=> b[1] }.reverse.transpose
     end
 
     def barplot(data, headers)
+      data = preprocess_count(data) if @count
       @params[:title] ||= headers[1] if headers
       UnicodePlot.barplot(data[0], data[1].map(&:to_f), **@params)
     end
@@ -101,13 +165,18 @@ module Uplot
       UnicodePlot.histogram(series, **@params.compact)
     end
 
+    def get_lim(str)
+      str.split(/-|:|\.\./)[0..1].map(&:to_f)
+    end
+
     def line(data, headers)
       if data.size == 1
-        @params[:name] ||= headers[0] if headers
+        @params[:ylabel] ||= headers[0] if headers
         y = data[0]
         x = (1..y.size).to_a
       else
-        @params[:name] ||= headers[1] if headers
+        @params[:xlabel] ||= headers[0] if headers
+        @params[:ylabel] ||= headers[1] if headers
         x = data[0]
         y = data[1]
       end
@@ -116,34 +185,69 @@ module Uplot
       UnicodePlot.lineplot(x, y, **@params.compact)
     end
 
-    def lines(data, headers)
+    def get_method2(method1)
+      (method1.to_s + '!').to_sym
+    end
+
+    def xyy_plot(data, headers, method1) # improve method name
+      method2 = get_method2(method1)
       data.map! { |series| series.map(&:to_f) }
       @params[:name] ||= headers[1] if headers
-      plot = UnicodePlot.lineplot(data[0], data[1], **@params.compact)
+      @params[:xlabel] ||= headers[0] if headers
+      @params[:ylim] ||= data[1..-1].flatten.minmax # need?
+      plot = UnicodePlot.public_send(method1, data[0], data[1], **@params.compact)
       2.upto(data.size - 1) do |i|
-        UnicodePlot.lineplot!(plot, data[0], data[i], name: headers[i])
+        UnicodePlot.public_send(method2, plot, data[0], data[i], name: headers[i])
       end
       plot
     end
 
+    def xyxy_plot(data, headers, method1) # improve method name
+      method2 = get_method2(method1)
+      data.map! { |series| series.map(&:to_f) }
+      data = data.each_slice(2).to_a
+      @params[:name] ||= headers[0] if headers
+      @params[:xlim] = data.map(&:first).flatten.minmax
+      @params[:ylim] = data.map(&:last).flatten.minmax
+      x1, y1 = data.shift
+      plot = UnicodePlot.public_send(method1, x1, y1, **@params.compact)
+      data.each_with_index do |(xi, yi), i|
+        UnicodePlot.public_send(method2, plot, xi, yi, name: headers[(i + 1) * 2])
+      end
+      plot
+    end
+
+    def lines(data, headers)
+      case @fmt
+      when 'xyy'
+        xyy_plot(data, headers, :lineplot)
+      when 'xyxy'
+        xyxy_plot(data, headers, :lineplot)
+      end
+    end
+
     def scatter(data, headers)
-      data.map! { |series| series.map(&:to_f) }
-      @params[:name] ||= headers[1] if headers
-      plot = UnicodePlot.scatterplot(data[0], data[1], **@params.compact)
-      2.upto(data.size - 1) do |i|
-        UnicodePlot.scatterplot!(plot, data[0], data[i], name: headers[i])
+      case @fmt
+      when 'xyy'
+        xyy_plot(data, headers, :scatterplot)
+      when 'xyxy'
+        xyxy_plot(data, headers, :scatterplot)
+      end
+    end
+
+    def density(data, headers)
+      case @fmt
+      when 'xyy'
+        xyy_plot(data, headers, :densityplot)
+      when 'xyxy'
+        xyxy_plot(data, headers, :densityplot)
       end
-      plot
     end
 
     def boxplot(data, headers)
-      headers ||= (1..data.size).to_a
+      headers ||= (1..data.size).map(&:to_s)
       data.map! { |series| series.map(&:to_f) }
-      plot = UnicodePlot.boxplot(headers[0], data[0], **@params.compact)
-      1.upto(data.size - 1) do |i|
-        UnicodePlot.boxplot!(plot, headers[i], data[i])
-      end
-      plot
+      UnicodePlot.boxplot(headers, data, **@params.compact)
     end
   end
 end

lib/uplot/version.rb

@@ -1,3 +1,3 @@
 module Uplot
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

test/fixtures/iris.csv

@@ -0,0 +1,152 @@
+sepal_length,sepal_width,petal_length,petal_width,species
+5.1,3.5,1.4,0.2,Iris-setosa
+4.9,3.0,1.4,0.2,Iris-setosa
+4.7,3.2,1.3,0.2,Iris-setosa
+4.6,3.1,1.5,0.2,Iris-setosa
+5.0,3.6,1.4,0.2,Iris-setosa
+5.4,3.9,1.7,0.4,Iris-setosa
+4.6,3.4,1.4,0.3,Iris-setosa
+5.0,3.4,1.5,0.2,Iris-setosa
+4.4,2.9,1.4,0.2,Iris-setosa
+4.9,3.1,1.5,0.1,Iris-setosa
+5.4,3.7,1.5,0.2,Iris-setosa
+4.8,3.4,1.6,0.2,Iris-setosa
+4.8,3.0,1.4,0.1,Iris-setosa
+4.3,3.0,1.1,0.1,Iris-setosa
+5.8,4.0,1.2,0.2,Iris-setosa
+5.7,4.4,1.5,0.4,Iris-setosa
+5.4,3.9,1.3,0.4,Iris-setosa
+5.1,3.5,1.4,0.3,Iris-setosa
+5.7,3.8,1.7,0.3,Iris-setosa
+5.1,3.8,1.5,0.3,Iris-setosa
+5.4,3.4,1.7,0.2,Iris-setosa
+5.1,3.7,1.5,0.4,Iris-setosa
+4.6,3.6,1.0,0.2,Iris-setosa
+5.1,3.3,1.7,0.5,Iris-setosa
+4.8,3.4,1.9,0.2,Iris-setosa
+5.0,3.0,1.6,0.2,Iris-setosa
+5.0,3.4,1.6,0.4,Iris-setosa
+5.2,3.5,1.5,0.2,Iris-setosa
+5.2,3.4,1.4,0.2,Iris-setosa
+4.7,3.2,1.6,0.2,Iris-setosa
+4.8,3.1,1.6,0.2,Iris-setosa
+5.4,3.4,1.5,0.4,Iris-setosa
+5.2,4.1,1.5,0.1,Iris-setosa
+5.5,4.2,1.4,0.2,Iris-setosa
+4.9,3.1,1.5,0.1,Iris-setosa
+5.0,3.2,1.2,0.2,Iris-setosa
+5.5,3.5,1.3,0.2,Iris-setosa
+4.9,3.1,1.5,0.1,Iris-setosa
+4.4,3.0,1.3,0.2,Iris-setosa
+5.1,3.4,1.5,0.2,Iris-setosa
+5.0,3.5,1.3,0.3,Iris-setosa
+4.5,2.3,1.3,0.3,Iris-setosa
+4.4,3.2,1.3,0.2,Iris-setosa
+5.0,3.5,1.6,0.6,Iris-setosa
+5.1,3.8,1.9,0.4,Iris-setosa
+4.8,3.0,1.4,0.3,Iris-setosa
+5.1,3.8,1.6,0.2,Iris-setosa
+4.6,3.2,1.4,0.2,Iris-setosa
+5.3,3.7,1.5,0.2,Iris-setosa
+5.0,3.3,1.4,0.2,Iris-setosa
+7.0,3.2,4.7,1.4,Iris-versicolor
+6.4,3.2,4.5,1.5,Iris-versicolor
+6.9,3.1,4.9,1.5,Iris-versicolor
+5.5,2.3,4.0,1.3,Iris-versicolor
+6.5,2.8,4.6,1.5,Iris-versicolor
+5.7,2.8,4.5,1.3,Iris-versicolor
+6.3,3.3,4.7,1.6,Iris-versicolor
+4.9,2.4,3.3,1.0,Iris-versicolor
+6.6,2.9,4.6,1.3,Iris-versicolor
+5.2,2.7,3.9,1.4,Iris-versicolor
+5.0,2.0,3.5,1.0,Iris-versicolor
+5.9,3.0,4.2,1.5,Iris-versicolor
+6.0,2.2,4.0,1.0,Iris-versicolor
+6.1,2.9,4.7,1.4,Iris-versicolor
+5.6,2.9,3.6,1.3,Iris-versicolor
+6.7,3.1,4.4,1.4,Iris-versicolor
+5.6,3.0,4.5,1.5,Iris-versicolor
+5.8,2.7,4.1,1.0,Iris-versicolor
+6.2,2.2,4.5,1.5,Iris-versicolor
+5.6,2.5,3.9,1.1,Iris-versicolor
+5.9,3.2,4.8,1.8,Iris-versicolor
+6.1,2.8,4.0,1.3,Iris-versicolor
+6.3,2.5,4.9,1.5,Iris-versicolor
+6.1,2.8,4.7,1.2,Iris-versicolor
+6.4,2.9,4.3,1.3,Iris-versicolor
+6.6,3.0,4.4,1.4,Iris-versicolor
+6.8,2.8,4.8,1.4,Iris-versicolor
+6.7,3.0,5.0,1.7,Iris-versicolor
+6.0,2.9,4.5,1.5,Iris-versicolor
+5.7,2.6,3.5,1.0,Iris-versicolor
+5.5,2.4,3.8,1.1,Iris-versicolor
+5.5,2.4,3.7,1.0,Iris-versicolor
+5.8,2.7,3.9,1.2,Iris-versicolor
+6.0,2.7,5.1,1.6,Iris-versicolor
+5.4,3.0,4.5,1.5,Iris-versicolor
+6.0,3.4,4.5,1.6,Iris-versicolor
+6.7,3.1,4.7,1.5,Iris-versicolor
+6.3,2.3,4.4,1.3,Iris-versicolor
+5.6,3.0,4.1,1.3,Iris-versicolor
+5.5,2.5,4.0,1.3,Iris-versicolor
+5.5,2.6,4.4,1.2,Iris-versicolor
+6.1,3.0,4.6,1.4,Iris-versicolor
+5.8,2.6,4.0,1.2,Iris-versicolor
+5.0,2.3,3.3,1.0,Iris-versicolor
+5.6,2.7,4.2,1.3,Iris-versicolor
+5.7,3.0,4.2,1.2,Iris-versicolor
+5.7,2.9,4.2,1.3,Iris-versicolor
+6.2,2.9,4.3,1.3,Iris-versicolor
+5.1,2.5,3.0,1.1,Iris-versicolor
+5.7,2.8,4.1,1.3,Iris-versicolor
+6.3,3.3,6.0,2.5,Iris-virginica
+5.8,2.7,5.1,1.9,Iris-virginica
+7.1,3.0,5.9,2.1,Iris-virginica
+6.3,2.9,5.6,1.8,Iris-virginica
+6.5,3.0,5.8,2.2,Iris-virginica
+7.6,3.0,6.6,2.1,Iris-virginica
+4.9,2.5,4.5,1.7,Iris-virginica
+7.3,2.9,6.3,1.8,Iris-virginica
+6.7,2.5,5.8,1.8,Iris-virginica
+7.2,3.6,6.1,2.5,Iris-virginica
+6.5,3.2,5.1,2.0,Iris-virginica
+6.4,2.7,5.3,1.9,Iris-virginica
+6.8,3.0,5.5,2.1,Iris-virginica
+5.7,2.5,5.0,2.0,Iris-virginica
+5.8,2.8,5.1,2.4,Iris-virginica
+6.4,3.2,5.3,2.3,Iris-virginica
+6.5,3.0,5.5,1.8,Iris-virginica
+7.7,3.8,6.7,2.2,Iris-virginica
+7.7,2.6,6.9,2.3,Iris-virginica
+6.0,2.2,5.0,1.5,Iris-virginica
+6.9,3.2,5.7,2.3,Iris-virginica
+5.6,2.8,4.9,2.0,Iris-virginica
+7.7,2.8,6.7,2.0,Iris-virginica
+6.3,2.7,4.9,1.8,Iris-virginica
+6.7,3.3,5.7,2.1,Iris-virginica
+7.2,3.2,6.0,1.8,Iris-virginica
+6.2,2.8,4.8,1.8,Iris-virginica
+6.1,3.0,4.9,1.8,Iris-virginica
+6.4,2.8,5.6,2.1,Iris-virginica
+7.2,3.0,5.8,1.6,Iris-virginica
+7.4,2.8,6.1,1.9,Iris-virginica
+7.9,3.8,6.4,2.0,Iris-virginica
+6.4,2.8,5.6,2.2,Iris-virginica
+6.3,2.8,5.1,1.5,Iris-virginica
+6.1,2.6,5.6,1.4,Iris-virginica
+7.7,3.0,6.1,2.3,Iris-virginica
+6.3,3.4,5.6,2.4,Iris-virginica
+6.4,3.1,5.5,1.8,Iris-virginica
+6.0,3.0,4.8,1.8,Iris-virginica
+6.9,3.1,5.4,2.1,Iris-virginica
+6.7,3.1,5.6,2.4,Iris-virginica
+6.9,3.1,5.1,2.3,Iris-virginica
+5.8,2.7,5.1,1.9,Iris-virginica
+6.8,3.2,5.9,2.3,Iris-virginica
+6.7,3.3,5.7,2.5,Iris-virginica
+6.7,3.0,5.2,2.3,Iris-virginica
+6.3,2.5,5.0,1.9,Iris-virginica
+6.5,3.0,5.2,2.0,Iris-virginica
+6.2,3.4,5.4,2.3,Iris-virginica
+5.9,3.0,5.1,1.8,Iris-virginica
+

uplot.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'unicode_plot'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'test-unit'
 end