v0.2.4

* Use only comma separators
* A hyphen is indistinguishable from a minus sign
* Colon separators aren't as common as commas

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in uplot.gemspec

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

exe/uplot

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'uplot'
 

lib/uplot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'unicode_plot'
 require 'uplot/version'
 require 'uplot/preprocessing'

lib/uplot/command.rb

@@ -1,236 +1,34 @@
-require 'optparse'
+# frozen_string_literal: true
+
 require_relative 'preprocessing'
-require_relative 'command/params'
+require_relative 'command/parser'
 
 module Uplot
   Data = Struct.new(:headers, :series)
 
   class Command
-    attr_accessor :params, :command
-    attr_reader :main_parser, :sub_parsers, :raw_inputs, :data, :fmt
+    attr_accessor :params
+    attr_reader :raw_inputs, :data, :fmt, :parser
 
     def initialize
       @params = Params.new
 
-      @command    = nil
-      @headers    = nil
-      @delimiter  = "\t"
-      @transpose  = false
-      @output     = false
-      @count      = false
-      @fmt        = 'xyy'
-
       @raw_inputs = []
-      @debug      = false
-    end
 
-    def create_default_parser
-      OptionParser.new do |opt|
-        opt.program_name = 'uplot'
-        opt.version = Uplot::VERSION
-        opt.on('-o', '--output', TrueClass) do |v|
-          @output = v
-        end
-           .on('-d', '--delimiter VAL', String) do |v|
-          @delimiter = v
-        end
-           .on('-H', '--headers', TrueClass) do |v|
-          @headers = v
-        end
-           .on('-T', '--transpose', TrueClass) do |v|
-          @transpose = v
-        end
-           .on('-t', '--title VAL', String) do |v|
-          params.title = v
-        end
-           .on('-w', '--width VAL', Numeric) do |v|
-          params.width = v
-        end
-           .on('-h', '--height VAL', Numeric) do |v|
-          params.height = v
-        end
-           .on('-b', '--border VAL', Numeric) do |v|
-          params.border = v
-        end
-           .on('-m', '--margin VAL', Numeric) do |v|
-          params.margin = v
-        end
-           .on('-p', '--padding VAL', Numeric) do |v|
-          params.padding = v
-        end
-           .on('-c', '--color VAL', String) do |v|
-          params.color = v =~ /\A[0-9]+\z/ ? v.to_i : v.to_sym
-        end
-           .on('-x', '--xlabel VAL', String) do |v|
-          params.xlabel = v
-        end
-           .on('-y', '--ylabel VAL', String) do |v|
-          params.ylabel = v
-        end
-           .on('-l', '--labels', TrueClass) do |v|
-          params.labels = v
-        end
-           .on('--fmt VAL', String) do |v|
-          @fmt = v
-        end
-           .on('--debug', TrueClass) do |v|
-          @debug = v
-        end
-        yield opt if block_given?
-      end
-    end
-
-    def create_sub_parsers
-      parsers = Hash.new { |h, k| h[k] = create_default_parser }
-
-      parsers[:barplot] = \
-        parsers[:bar]
-        .on('--symbol VAL', String) do |v|
-          params.symbol = v
-        end
-        .on('--xscale VAL', String) do |v|
-          params.xscale = v
-        end
-        .on('--count', TrueClass) do |v|
-          @count = v
-        end
-
-      parsers[:count] = \
-        parsers[:c] # barplot -c
-        .on('--symbol VAL', String) do |v|
-          params.symbol = v
-        end
-
-      parsers[:histogram] = \
-        parsers[:hist]
-        .on('-n', '--nbins VAL', Numeric) do |v|
-          params.nbins = v
-        end
-        .on('--closed VAL', String) do |v|
-          params.closed = v
-        end
-        .on('--symbol VAL', String) do |v|
-          params.symbol = v
-        end
-
-      parsers[:lineplot] = \
-        parsers[:line]
-        .on('--canvas VAL', String) do |v|
-          params.canvas = v
-        end
-        .on('--xlim VAL', String) do |v|
-          params.xlim = get_lim(v)
-        end
-        .on('--ylim VAL', String) do |v|
-          params.ylim = get_lim(v)
-        end
-
-      parsers[:lineplots] = \
-        parsers[:lines]
-        .on('--canvas VAL', String) do |v|
-          params.canvas = v
-        end
-        .on('--xlim VAL', String) do |v|
-          params.xlim = get_lim(v)
-        end
-        .on('--ylim VAL', String) do |v|
-          params.ylim = get_lim(v)
-        end
-
-      parsers[:scatter] = \
-        parsers[:s]
-        .on('--canvas VAL', String) do |v|
-          params.canvas = v
-        end
-        .on('--xlim VAL', String) do |v|
-          params.xlim = get_lim(v)
-        end
-        .on('--ylim VAL', String) do |v|
-          params.ylim = get_lim(v)
-        end
-
-      parsers[:density] = \
-        parsers[:d]
-        .on('--grid', TrueClass) do |v|
-          params.grid = v
-        end
-        .on('--xlim VAL', String) do |v|
-          params.xlim = get_lim(v)
-        end
-        .on('--ylim VAL', String) do |v|
-          params.ylim = get_lim(v)
-        end
-
-      parsers[:boxplot] = \
-        parsers[:box]
-        .on('--xlim VAL', String) do |v|
-          params.xlim = get_lim(v)
-        end
-
-      parsers[:colors]
-        .on('-n', '--names', TrueClass) do |v|
-          @color_names = v
-        end
-
-      # Preventing the generation of new sub-commands
-      parsers.default = nil
-      parsers
-    end
-
-    def create_main_parser
-      create_default_parser do |main_parser|
-        # Usage and help messages
-        main_parser.banner = \
-          <<~MSG
-            Program: uplot (Tools for plotting on the terminal)
-            Version: #{Uplot::VERSION} (using unicode_plot #{UnicodePlot::VERSION})
-
-            Usage:   uplot <command> [options]
-
-            Command: #{sub_parsers.keys.join(' ')}
-
-            Options:
-          MSG
-      end
-    end
-
-    def parse_options(argv = ARGV)
-      @sub_parsers = create_sub_parsers
-      @main_parser = create_main_parser
-
-      begin
-        main_parser.order!(argv)
-      rescue OptionParser::ParseError => e
-        warn "uplot: #{e.message}"
-        exit 1
-      end
-
-      @command = argv.shift&.to_sym
-
-      unless sub_parsers.has_key?(command)
-        if command.nil?
-          warn main_parser.help
-        else
-          warn "uplot: unrecognized command '#{command}'"
-        end
-        exit 1
-      end
-      parser = sub_parsers[command]
-
-      begin
-        parser.parse!(argv) unless argv.empty?
-      rescue OptionParser::ParseError => e
-        warn "uplot: #{e.message}"
-        exit 1
-      end
-    end
-
-    def get_lim(str)
-      str.split(/-|:|\.\./)[0..1].map(&:to_f)
+      @parser = Parser.new
     end
 
     def run
-      parse_options
+      parser.parse_options
+      command   = parser.command
+      params    = parser.params
+      delimiter = parser.delimiter
+      transpose = parser.transpose
+      headers   = parser.headers
+      output    = parser.output
+      count     = parser.count
+      fmt       = parser.fmt
+      debug     = parser.debug
 
       if command == :colors
         Plot.colors
@@ -241,7 +39,7 @@ module Uplot
       while input = Kernel.gets(nil)
         input.freeze
         @raw_inputs << input
-        @data = Preprocessing.input(input, @delimiter, @headers, @transpose)
+        @data = Preprocessing.input(input, delimiter, headers, transpose)
         pp @data if @debug
         case command
         when :bar, :barplot
@@ -264,7 +62,7 @@ module Uplot
           raise "unrecognized plot_type: #{command}"
         end.render($stderr)
 
-        print input if @output
+        print input if output
       end
     end
   end

lib/uplot/command/params.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uplot
   class Command
     Params = Struct.new(

lib/uplot/command/parser.rb

@@ -0,0 +1,224 @@
+# frozen_string_literal: true
+
+require 'optparse'
+require_relative 'params'
+
+module Uplot
+  class Command
+    class Parser
+      attr_reader :command, :params,
+                  :delimiter, :transpose, :headers, :output, :count, :fmt, :debug
+
+      def initialize
+        @command = nil
+        @params = Params.new
+
+        @delimiter  = "\t"
+        @transpose  = false
+        @headers    = nil
+        @output     = false
+        @count      = false
+        @fmt        = 'xyy'
+        @debug      = false
+      end
+
+      def create_default_parser
+        OptionParser.new do |opt|
+          opt.program_name = 'uplot'
+          opt.version = Uplot::VERSION
+          opt.on('-O', '--output', TrueClass) do |v|
+            @output = v
+          end
+          opt.on('-d', '--delimiter VAL', 'use DELIM instead of TAB for field delimiter', String) do |v|
+            @delimiter = v
+          end
+          opt.on('-H', '--headers', 'specify that the input has header row', TrueClass) do |v|
+            @headers = v
+          end
+          opt.on('-T', '--transpose', TrueClass) do |v|
+            @transpose = v
+          end
+          opt.on('-t', '--title VAL', 'print string on the top of plot', String) do |v|
+            params.title = v
+          end
+          opt.on('-x', '--xlabel VAL', 'print string on the bottom of the plot', String) do |v|
+            params.xlabel = v
+          end
+          opt.on('-y', '--ylabel VAL', 'print string on the far left of the plot', String) do |v|
+            params.ylabel = v
+          end
+          opt.on('-w', '--width VAL', 'number of characters per row', Integer) do |v|
+            params.width = v
+          end
+          opt.on('-h', '--height VAL', 'number of rows', Numeric) do |v|
+            params.height = v
+          end
+          opt.on('-b', '--border VAL', 'specify the style of the bounding box', String) do |v|
+            params.border = v.to_sym
+          end
+          opt.on('-m', '--margin VAL', 'number of spaces to the left of the plot', Numeric) do |v|
+            params.margin = v
+          end
+          opt.on('-p', '--padding VAL', 'space of the left and right of the plot', Numeric) do |v|
+            params.padding = v
+          end
+          opt.on('-c', '--color VAL', 'color of the drawing', String) do |v|
+            params.color = v =~ /\A[0-9]+\z/ ? v.to_i : v.to_sym
+          end
+          opt.on('--[no-]labels', 'hide the labels', TrueClass) do |v|
+            params.labels = v
+          end
+          opt.on('--fmt VAL', 'xyy, xyxy', String) do |v|
+            @fmt = v
+          end
+          opt.on('--debug', TrueClass) do |v|
+            @debug = v
+          end
+          yield opt if block_given?
+        end
+      end
+
+      def main_parser
+        @main_parser ||= create_default_parser do |main_parser|
+          # Usage and help messages
+          main_parser.banner = \
+            <<~MSG
+              Program: uplot (Tools for plotting on the terminal)
+              Version: #{Uplot::VERSION} (using unicode_plot #{UnicodePlot::VERSION})
+
+              Usage:   uplot <command> [options]
+
+              Command: barplot    bar
+                       histogram  hist
+                       lineplot   line
+                       scatter    s
+                       density    d
+                       boxplot    box
+                       colors
+
+              Options:
+            MSG
+        end
+      end
+
+      def sub_parser
+        @sub_parser ||= create_default_parser do |parser|
+          parser.banner = <<~MSG
+            Usage: uplot #{command} [options]
+
+            Options:
+          MSG
+
+          case command
+          when nil
+            warn main_parser.help
+            exit 1
+
+          when :barplot, :bar
+            parser.on('--symbol VAL', String) do |v|
+              params.symbol = v
+            end
+            parser.on('--xscale VAL', String) do |v|
+              params.xscale = v
+            end
+            parser.on('--count', TrueClass) do |v|
+              @count = v
+            end
+
+          when :count, :c
+            parser.on('--symbol VAL', String) do |v|
+              params.symbol = v
+            end
+
+          when :histogram, :hist
+            parser.on('-n', '--nbins VAL', Numeric) do |v|
+              params.nbins = v
+            end
+            parser.on('--closed VAL', String) do |v|
+              params.closed = v
+            end
+            parser.on('--symbol VAL', String) do |v|
+              params.symbol = v
+            end
+
+          when :lineplot, :line
+            parser.on('--canvas VAL', String) do |v|
+              params.canvas = v
+            end
+            parser.on('--xlim VAL', Array) do |v|
+              params.xlim = v.take(2)
+            end
+            parser.on('--ylim VAL', Array) do |v|
+              params.ylim = v.take(2)
+            end
+
+          when :lineplots, :lines
+            parser.on('--canvas VAL', String) do |v|
+              params.canvas = v
+            end
+            parser.on('--xlim VAL', Array) do |v|
+              params.xlim = v.take(2)
+            end
+            parser.on('--ylim VAL', Array) do |v|
+              params.ylim = v.take(2)
+            end
+
+          when :scatter, :s
+            parser.on('--canvas VAL', String) do |v|
+              params.canvas = v
+            end
+            parser.on('--xlim VAL', Array) do |v|
+              params.xlim = v.take(2)
+            end
+            parser.on('--ylim VAL', Array) do |v|
+              params.ylim = v.take(2)
+            end
+
+          when :density, :d
+            parser.on('--grid', TrueClass) do |v|
+              params.grid = v
+            end
+            parser.on('--xlim VAL', Array) do |v|
+              params.xlim = v.take(2)
+            end
+            parser.on('--ylim VAL', Array) do |v|
+              params.ylim = v.take(2)
+            end
+
+          when :boxplot, :box
+            parser.on('--xlim VAL', Array) do |v|
+              params.xlim = v.take(2)
+            end
+
+          when :colors
+            parser.on('-n', '--names', TrueClass) do |v|
+              @color_names = v
+            end
+
+          else
+            warn "uplot: unrecognized command '#{command}'"
+            exit 1
+          end
+        end
+      end
+
+      def parse_options(argv = ARGV)
+        begin
+          main_parser.order!(argv)
+        rescue OptionParser::ParseError => e
+          warn "uplot: #{e.message}"
+          exit 1
+        end
+
+        @command = argv.shift&.to_sym
+
+        begin
+          sub_parser.parse!(argv)
+        rescue OptionParser::ParseError => e
+          warn "uplot: #{e.message}"
+          exit 1
+        end
+      end
+    end
+  end
+end

lib/uplot/plot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'unicode_plot'
 
 module Uplot

lib/uplot/preprocessing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module Uplot

lib/uplot/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uplot
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'
 end

test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 SimpleCov.start
 

test/uplot/command_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper.rb'
 
 class UplotCommandTest < Test::Unit::TestCase

test/uplot/plot_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper.rb'
 
 class UplotPlotTest < Test::Unit::TestCase

test/uplot/preprocessing_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper.rb'
 
 class UplotPreprocessingTest < Test::Unit::TestCase

test/uplot_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class UplotTest < Test::Unit::TestCase

uplot.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/uplot/version'
 
 Gem::Specification.new do |spec|