v0.4.2

This is to keep consistency with other options

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         os:   ['ubuntu', 'macos']
-        ruby: [ '2.6', '2.7', '3.0' ]
+        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0' ]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

README.md

@@ -1,16 +1,19 @@
-<p align="center">
+<div align="center">
-  <img src="logo.svg" width="60%" height="60%" />
+  <img src="logo.svg" width="66%" height="66%" />
-</p>
   
-![Build Status](https://github.com/kojix2/youplot/workflows/test/badge.svg)
+  <hr>
-[![Gem Version](https://badge.fury.io/rb/youplot.svg)](https://badge.fury.io/rb/youplot)
-[![Docs Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://rubydoc.info/gems/youplot)
-[![The MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.txt)
-[![DOI](https://zenodo.org/badge/283230219.svg)](https://zenodo.org/badge/latestdoi/283230219)
   
-YouPlot is a command line tool for Unicode Plotting working with data from standard stream.
+  ![Build Status](https://github.com/red-data-tools/YouPlot/workflows/test/badge.svg)
+  [![Gem Version](https://badge.fury.io/rb/youplot.svg)](https://badge.fury.io/rb/youplot)
+  [![Docs Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://rubydoc.info/gems/youplot)
+  [![The MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.txt)
+  [![DOI](https://zenodo.org/badge/283230219.svg)](https://zenodo.org/badge/latestdoi/283230219)
   
-:bar_chart: Powered by [UnicodePlot](https://github.com/red-data-tools/unicode_plot.rb)
+  YouPlot is a command line tool that draws plots in a terminal.
+
+  :bar_chart: Powered by [UnicodePlot](https://github.com/red-data-tools/unicode_plot.rb)
+  
+</div>
 
 ## Installation
 
@@ -230,8 +233,8 @@ uplot colors
 YouPlot is a library under development, so even small improvements like typofix are welcome!
 Please feel free to send us your pull requests.
 
-* [Report bugs](https://github.com/kojix2/youplot/issues)
+* [Report bugs](https://github.com/red-data-tools/YouPlot/issues)
-* Fix bugs and [submit pull requests](https://github.com/kojix2/youplot/pulls)
+* Fix bugs and [submit pull requests](https://github.com/red-data-tools/YouPlot/pulls)
 * Write, clarify, or fix documentation
   * English corrections by native speakers are welcome.
 * Suggest or add new features
@@ -249,7 +252,6 @@ bundle exec rake install   # Installation from source code
 
 ### Acknowledgements
 
-* [Red Data Tools](https://github.com/red-data-tools) - Technical support
 * [sampo grafiikka](https://jypg.net/sampo_grafiikka) - Project logo creation
 * [yutaas](https://github.com/yutaas) - English proofreading
 

lib/youplot/backends/processing.rb

@@ -6,22 +6,30 @@ module YouPlot
     module Processing
       module_function
 
-      def count_values(arr, tally: true)
+      def count_values(arr, tally: true, reverse: false)
         # tally was added in Ruby 2.7
-        if tally && Enumerable.method_defined?(:tally)
+        result = \
-          arr.tally
+          if tally && Enumerable.method_defined?(:tally)
-        else
+            arr.tally
-          # value_counts Enumerable::Statistics
+          else
-          arr.value_counts(dropna: false)
+            # value_counts Enumerable::Statistics
-        end
+            arr.value_counts(dropna: false)
-          .sort do |a, b|
-            # compare values
-            r = b[1] <=> a[1]
-            # If the values are the same, compare by name
-            r = a[0] <=> b[0] if r == 0
-            r
           end
-          .transpose
+
+        # sorting
+        result = result.sort do |a, b|
+          # compare values
+          r = b[1] <=> a[1]
+          # If the values are the same, compare by name
+          r = a[0] <=> b[0] if r.zero?
+          r
+        end
+
+        # --reverse option
+        result.reverse! if reverse
+
+        # prepare for barplot
+        result.transpose
       end
     end
   end

lib/youplot/backends/unicode_plot.rb

@@ -14,12 +14,12 @@ module YouPlot
 
       module_function
 
-      def barplot(data, params, fmt = nil, count: false)
+      def barplot(data, params, fmt = nil, count: false, reverse: false)
         headers = data.headers
         series = data.series
         # `uplot count`
         if count
-          series = Processing.count_values(series[0])
+          series = Processing.count_values(series[0], reverse: reverse)
           params.title = headers[0] if headers
         end
         if series.size == 1

lib/youplot/command.rb

@@ -146,7 +146,7 @@ module YouPlot
       when :bar, :barplot
         @backend.barplot(data, params, options[:fmt])
       when :count, :c
-        @backend.barplot(data, params, count: true)
+        @backend.barplot(data, params, count: true, reverse: options[:reverse])
       when :hist, :histogram
         @backend.histogram(data, params)
       when :line, :lineplot

lib/youplot/dsv.rb

@@ -14,7 +14,7 @@ module YouPlot
 
       # Remove blank lines
       arr.delete_if do |i|
-        i == [] or i.all? nil
+        i == [] or i.all?(&:nil?)
       end
 
       # get header

lib/youplot/options.rb

@@ -11,8 +11,8 @@ module YouPlot
     :fmt,
     :progressive,
     :encoding,
-    :color_names,
+    :reverse,      # count
-    :debug,
+    :color_names,  # color
-    keyword_init: true
+    :debug
   )
 end

lib/youplot/parser.rb

@@ -15,16 +15,16 @@ module YouPlot
       @command = nil
 
       @options = Options.new(
-        delimiter: "\t",
+        "\t",    # elimiter:
-        transpose: false,
+        false,   # transpose:
-        headers: nil,
+        nil,     # headers:
-        pass: false,
+        false,   # pass:
-        output: $stderr,
+        $stderr, # output:
-        fmt: 'xyy',
+        'xyy',   # fmt:
-        progressive: false,
+        false,   # progressive:
-        encoding: nil,
+        nil,     # encoding:
-        color_names: false,
+        false,   # color_names:
-        debug: false
+        false    # debug:
       )
 
       @params = Parameters.new
@@ -64,7 +64,7 @@ module YouPlot
         parser.on('-y', '--ylabel STR', String, 'print string on the far left of the plot') do |v|
           params.ylabel = v
         end
-        parser.on('-w', '--width INT', Integer, 'number of characters per row') do |v|
+        parser.on('-w', '--width INT', Numeric, 'number of characters per row') do |v|
           params.width = v
         end
         parser.on('-h', '--height INT', Numeric, 'number of rows') do |v|
@@ -118,7 +118,7 @@ module YouPlot
 
           Program: YouPlot (Tools for plotting on the terminal)
           Version: #{YouPlot::VERSION} (using UnicodePlot #{UnicodePlot::VERSION})
-          Source:  https://github.com/kojix2/youplot
+          Source:  https://github.com/red-data-tools/YouPlot
 
           Usage:   uplot <command> [options] <in.tsv>
 
@@ -163,20 +163,21 @@ module YouPlot
     end
 
     def sub_parser_add_canvas
-      sub_parser.on_head('--canvas STR', String, 'type of canvas') do |v|
+      canvas_types = UnicodePlot::Canvas::CANVAS_CLASS_MAP.keys.join(', ')
+      sub_parser.on_head('--canvas STR', String, 'type of canvas', "(#{canvas_types})") do |v|
         params.canvas = v.to_sym
       end
     end
 
     def sub_parser_add_xlim
       sub_parser.on_head('--xlim FLOAT,FLOAT', Array, 'plotting range for the x coordinate') do |v|
-        params.xlim = v
+        params.xlim = v.map(&:to_f)
       end
     end
 
     def sub_parser_add_ylim
       sub_parser.on_head('--ylim FLOAT,FLOAT', Array, 'plotting range for the y coordinate') do |v|
-        params.ylim = v
+        params.ylim = v.map(&:to_f)
       end
     end
 
@@ -226,6 +227,9 @@ module YouPlot
         sub_parser_add_xscale
 
       when :count, :c
+        sub_parser.on_head('-r', '--reverse', TrueClass, 'reverse the result of comparisons') do |v|
+          options.reverse = v
+        end
         sub_parser_add_symbol
         sub_parser_add_xscale
 
@@ -270,7 +274,7 @@ module YouPlot
         sub_parser_add_xlim
 
       when :colors, :color, :colours, :colour
-        sub_parser.on_head('-n', '--names', 'show color names only', TrueClass) do |v|
+        sub_parser.on_head('-n', '--names', TrueClass, 'show color names only') do |v|
           options[:color_names] = v
         end
 

lib/youplot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YouPlot
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

test/fixtures/iris-count.txt

@@ -0,0 +1,38 @@
+                     sepal_length
+       ┌                                        ┐ 
+   5.0 ┤■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 10.0   
+   5.1 ┤■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 9.0       
+   6.3 ┤■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 9.0       
+   5.7 ┤■■■■■■■■■■■■■■■■■■■■■■■■■■■ 8.0           
+   6.7 ┤■■■■■■■■■■■■■■■■■■■■■■■■■■■ 8.0           
+   5.5 ┤■■■■■■■■■■■■■■■■■■■■■■■■ 7.0              
+   5.8 ┤■■■■■■■■■■■■■■■■■■■■■■■■ 7.0              
+   6.4 ┤■■■■■■■■■■■■■■■■■■■■■■■■ 7.0              
+   4.9 ┤■■■■■■■■■■■■■■■■■■■■ 6.0                  
+   5.4 ┤■■■■■■■■■■■■■■■■■■■■ 6.0                  
+   5.6 ┤■■■■■■■■■■■■■■■■■■■■ 6.0                  
+   6.0 ┤■■■■■■■■■■■■■■■■■■■■ 6.0                  
+   6.1 ┤■■■■■■■■■■■■■■■■■■■■ 6.0                  
+   4.8 ┤■■■■■■■■■■■■■■■■■ 5.0                     
+   6.5 ┤■■■■■■■■■■■■■■■■■ 5.0                     
+   4.6 ┤■■■■■■■■■■■■■■ 4.0                        
+   5.2 ┤■■■■■■■■■■■■■■ 4.0                        
+   6.2 ┤■■■■■■■■■■■■■■ 4.0                        
+   6.9 ┤■■■■■■■■■■■■■■ 4.0                        
+   7.7 ┤■■■■■■■■■■■■■■ 4.0                        
+   4.4 ┤■■■■■■■■■■ 3.0                            
+   5.9 ┤■■■■■■■■■■ 3.0                            
+   6.8 ┤■■■■■■■■■■ 3.0                            
+   7.2 ┤■■■■■■■■■■ 3.0                            
+   4.7 ┤■■■■■■■ 2.0                               
+   6.6 ┤■■■■■■■ 2.0                               
+   4.3 ┤■■■ 1.0                                   
+   4.5 ┤■■■ 1.0                                   
+   5.3 ┤■■■ 1.0                                   
+   7.0 ┤■■■ 1.0                                   
+   7.1 ┤■■■ 1.0                                   
+   7.3 ┤■■■ 1.0                                   
+   7.4 ┤■■■ 1.0                                   
+   7.6 ┤■■■ 1.0                                   
+   7.9 ┤■■■ 1.0                                   
+       └                                        ┘ 

test/youplot/iris_test.rb

@@ -40,6 +40,8 @@ class YouPlotIRISTest < Test::Unit::TestCase
     assert_equal fixture('iris-barplot.txt'), @stderr_file.read
   end
 
+  # barplot doesn't make sense, but just to make sure it works.
+
   test :bar do
     YouPlot::Command.new(['bar', '-H', '-d,', '-t', 'IRIS-BARPLOT']).run
     assert_equal fixture('iris-barplot.txt'), @stderr_file.read
@@ -55,6 +57,8 @@ class YouPlotIRISTest < Test::Unit::TestCase
     assert_equal fixture('iris-histogram.txt'), @stderr_file.read
   end
 
+  # Yeah, lineplot/lineplots don't make sense too.
+
   test :lineplot do
     YouPlot::Command.new(['lineplot', '-H', '-d,', '-t', 'IRIS-LINEPLOT']).run
     assert_equal fixture('iris-lineplot.txt'), @stderr_file.read
@@ -105,15 +109,20 @@ class YouPlotIRISTest < Test::Unit::TestCase
     assert_equal fixture('iris-boxplot.txt'), @stderr_file.read
   end
 
-  # test :c do
+  # Yeah, lineplot/lineplots don't make sense too.
-  #   YouPlot::Command.new(['count', '-H', '-d,']).run
+  # Just checking the behavior.
-  #   assert_equal fixture('iris-count.txt'), @stderr_file.read
-  # end
 
-  # test :count do
+  test :c do
-  #   YouPlot::Command.new(['c', '-H', '-d,']).run
+    YouPlot::Command.new(['count', '-H', '-d,']).run
-  #   assert_equal fixture('iris-count.txt'), @stderr_file.read
+    assert_equal fixture('iris-count.txt'), @stderr_file.read
-  # end
+  end
+
+  test :count do
+    YouPlot::Command.new(['c', '-H', '-d,']).run
+    assert_equal fixture('iris-count.txt'), @stderr_file.read
+  end
+
+  # Output options.
 
   test :plot_output_stdout do
     YouPlot::Command.new(['bar', '-o', '-H', '-d,', '-t', 'IRIS-BARPLOT']).run

youplot.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'A command line tool for Unicode Plotting'
   spec.description   = 'A command line tool for Unicode Plotting'
-  spec.homepage      = 'https://github.com/kojix2/youplot'
+  spec.homepage      = 'https://github.com/red-data-tools/YouPlot'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')