youplot 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a924bdaf315e9b7b8afa65d0f02cdbb22c213fbf80908e2ae30d12d1bc3d9338
-  data.tar.gz: ea42f957954e37d8d1f4eaf3c789e52188f96aff1afbf99dae6179be14ab06d5
+  metadata.gz: 725b5bffb6d597af728d9b57aedea75dbdf62182ab5c211c4ecdca35b686cb69
+  data.tar.gz: 7eb1d48b2ba900f9955b0cb257f95d79646101598b86d841951b3271b55e0d2b
 SHA512:
-  metadata.gz: 602975a225b979ad6ca2a43ef038f18a23b48f034ddb2a06ffa3f4ca0d61cb805e6ef314afd00a897f8bc869fcce8b27fee895ac6e0f3f82bc7cbe8531369632
-  data.tar.gz: 0d9f77815d3c2e7f338dfe42f0b501a51dd9dd3de06cc367a7ee3de52e049a6a7e55ee3afc4cc2a525a724b07412f5807feba3c9aea33966d407d38d96fb8601
+  metadata.gz: 0ead7ed4edd2948b03f14b77256b03aaaef25f69795c61483b1440c2f6572a29b99d90336a0852e56f5f1c1331d8a9ae47bac421e2c444c282e1814658bd464e
+  data.tar.gz: e76b86a9c7ef5df17cc97e1f5b5c860d82c7d7650b6606d687d26ff24664032a52053f3c00bdbd8d072d8b95ce4ab2506f4119ae7ccf75791fcd4e9bd1838d29

data/README.md

@@ -211,6 +211,14 @@ The following sub-commands are available.
 
 * Not yet supported.
 
+### YouPlot Configuration (youplotrc)
+
+You can specify default options in a configuration file in YAML format. For more information, enter the following command.
+
+```
+uplot --config
+```
+
 ## Tools that are useful to use with YouPlot
 
 * [csvtk](https://github.com/shenwei356/csvtk)

data/lib/youplot/command.rb

@@ -40,24 +40,6 @@ module YouPlot
         return
       end
 
-      # config command
-      if @command == :config
-        if ENV['MYYOUPLOTRC']
-          puts "config file : #{ENV['MYYOUPLOTRC']}"
-          puts parser.config.inspect
-        else
-          puts <<~EOS
-            You don't have a config file. The default config file paths are:
-            ./.youplot.yml, ./.youplotrc, ~/.youplot.yml, ~/.youplotrc
-            You can specify a config file with the environment variable MYYOUPLOTRC.
-            File format is YAML. For example:
-            width : 40
-            height : 20
-          EOS
-        end
-        return
-      end
-
       # progressive mode
       if options[:progressive]
         stop = false
@@ -178,9 +160,9 @@ module YouPlot
         @backend.barplot(data, params, count: true, reverse: options[:reverse])
       when :hist, :histogram
         @backend.histogram(data, params)
-      when :line, :lineplot
+      when :line, :lineplot, :l
         @backend.line(data, params, options[:fmt])
-      when :lines, :lineplots
+      when :lines, :lineplots, :ls
         @backend.lines(data, params, options[:fmt])
       when :scatter, :s
         @backend.scatter(data, params, options[:fmt])

data/lib/youplot/parser.rb

@@ -29,53 +29,59 @@ module YouPlot
       )
 
       @params = Parameters.new
+    end
 
-      if @config_file = find_config_file
-        ENV['MYYOUPLOTRC'] = @config_file
-        @config = read_config_file(config_file)
-        configure(config)
-      end
+    def apply_config_file
+      return if !config_file && find_config_file.nil?
+
+      read_config_file
+      configure
     end
 
-    def candidate_paths
+    def config_file_candidate_paths
+      # keep the order of the paths
       paths = []
       paths << ENV['MYYOUPLOTRC'] if ENV['MYYOUPLOTRC']
       paths << '.youplot.yml'
       paths << '.youplotrc'
-      paths << File.join(ENV['HOME'], '.youplotrc') if ENV['HOME']
-      paths << File.join(ENV['HOME'], '.youplot.yml') if ENV['HOME']
+      if ENV['HOME']
+        paths << File.join(ENV['HOME'], '.youplotrc')
+        paths << File.join(ENV['HOME'], '.youplot.yml')
+        paths << File.join(ENV['HOME'], '.config', 'youplot', 'youplotrc')
+        paths << File.join(ENV['HOME'], '.config', 'youplot', 'youplot.yml')
+      end
       paths
     end
 
     def find_config_file
-      config_file_path = nil
-      candidate_paths.each do |file|
+      config_file_candidate_paths.each do |file|
         path = File.expand_path(file)
-        if File.exist?(path)
-          config_file_path = path
-          break
-        end
+        next unless File.exist?(path)
+
+        @config_file = path
+        ENV['MYYOUPLOTRC'] = path
+        return @config_file
       end
-      config_file_path
+      nil
     end
 
-    def read_config_file(path)
+    def read_config_file
       require 'yaml'
-      YAML.load_file(path)
+      @config = YAML.load_file(config_file)
     end
 
-    def configure(config)
+    def configure
       option_members = @options.members
       param_members = @params.members
       # It would be more useful to be able to configure by plot type
       config.each do |k, v|
         k = k.to_sym
         if option_members.include?(k)
-          @options[k] = v
+          @options[k] ||= v
         elsif param_members.include?(k)
-          @params[k] = v
+          @params[k] ||= v
         else
-          raise Error, "Unknown option/param: #{k}"
+          raise Error, "Unknown option/param in config file: #{k}"
         end
       end
     end
@@ -154,6 +160,9 @@ module YouPlot
           puts parser.help
           exit if YouPlot.run_as_executable?
         end
+        parser.on('--config FILE', 'specify a config file') do |v|
+          @config_file = v
+        end
         parser.on('--debug', TrueClass, 'print preprocessed data') do |v|
           options[:debug] = v
         end
@@ -185,6 +194,7 @@ module YouPlot
               colors     color         show the list of available colors
 
           General options:
+              --config                 print config file info
               --help                   print command specific help menu
               --version                print the version of YouPlot
         MSG
@@ -192,10 +202,36 @@ module YouPlot
       # Help for the main parser is simple.
       # Simply show the banner above.
       main_parser.on('--help', 'print sub-command help menu') do
-        puts main_parser.banner
-        puts
-        exit if YouPlot.run_as_executable?
+        show_main_help
       end
+
+      main_parser.on('--config', 'show config file info') do
+        show_config_info
+      end
+    end
+
+    def show_main_help(out = $stdout)
+      out.puts main_parser.banner
+      out.puts
+      exit if YouPlot.run_as_executable?
+    end
+
+    def show_config_info
+      if ENV['MYYOUPLOTRC']
+        puts "config file : #{ENV['MYYOUPLOTRC']}"
+        puts config.inspect
+      else
+        puts <<~EOS
+          Configuration file not found.
+          It should be a YAML file, like this example:
+            width : 40
+            height : 20
+          By default, YouPlot will look for the configuration file in these locations:
+          #{config_file_candidate_paths.map { |s| '  ' + s }.join("\n")}
+          If you have the file elsewhere, you can specify its location with the `MYYOUPLOTRC` environment variable.
+        EOS
+      end
+      exit if YouPlot.run_as_executable?
     end
 
     def sub_parser_add_symbol
@@ -265,10 +301,13 @@ module YouPlot
       case command
 
       # If you type only `uplot` in the terminal.
+      # Output help to standard error output.
       when nil
-        warn main_parser.banner
-        warn "\n"
-        exit 1 if YouPlot.run_as_executable?
+        show_main_help($stderr)
+
+      # Output help to standard output.
+      when :help
+        show_main_help
 
       when :barplot, :bar
         sub_parser_add_symbol
@@ -291,14 +330,14 @@ module YouPlot
           params.nbins = v
         end
 
-      when :lineplot, :line
+      when :lineplot, :line, :l
         sub_parser_add_canvas
         sub_parser_add_grid
         sub_parser_add_fmt_yx
         sub_parser_add_ylim
         sub_parser_add_xlim
 
-      when :lineplots, :lines
+      when :lineplots, :lines, :ls
         sub_parser_add_canvas
         sub_parser_add_grid
         sub_parser_add_fmt_xyxy
@@ -327,16 +366,19 @@ module YouPlot
           options[:color_names] = v
         end
 
+      # Currently it simply displays the configuration file,
+      # but in the future this may be changed to open a text editor like Vim
+      # to edit the configuration file.
       when :config
+        show_config_info
 
       else
-        error_message = "uplot: unrecognized command '#{command}'"
-        if YouPlot.run_as_executable?
-          warn error_message
-          exit 1
-        else
-          raise Error, error_message
-        end
+        error_message = "YouPlot: unrecognized command '#{command}'"
+        raise Error, error_message unless YouPlot.run_as_executable?
+
+        warn error_message
+        exit 1
+
       end
     end
 
@@ -344,7 +386,7 @@ module YouPlot
       begin
         create_main_parser.order!(argv)
       rescue OptionParser::ParseError => e
-        warn "uplot: #{e.message}"
+        warn "YouPlot: #{e.message}"
         exit 1 if YouPlot.run_as_executable?
       end
 
@@ -353,7 +395,14 @@ module YouPlot
       begin
         create_sub_parser&.parse!(argv)
       rescue OptionParser::ParseError => e
-        warn "uplot: #{e.message}"
+        warn "YouPlot: #{e.message}"
+        exit 1 if YouPlot.run_as_executable?
+      end
+
+      begin
+        apply_config_file
+      rescue StandardError => e
+        warn "YouPlot: #{e.message}"
         exit 1 if YouPlot.run_as_executable?
       end
     end

data/lib/youplot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: youplot
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode_plot
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: A command line tool for Unicode Plotting