youplot 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b3b1cbdabc0a74b4010d13fa59fe9724ac9c07783414a7a7584f8cab27b49ec
-  data.tar.gz: f5cf98b592a248c4d74e06078d97050e85c892e94c0dd78ec17e92f6bdc856d0
+  metadata.gz: a924bdaf315e9b7b8afa65d0f02cdbb22c213fbf80908e2ae30d12d1bc3d9338
+  data.tar.gz: ea42f957954e37d8d1f4eaf3c789e52188f96aff1afbf99dae6179be14ab06d5
 SHA512:
-  metadata.gz: aebe50c600b66e9cb8e3a64da3ddafff70472f495d51b812987cc835017ca19fd1347fbe2ee88fac66e111837ffef59bf6c271f2f6515ae7e60a526050ded5b3
-  data.tar.gz: b37e2a5a2d8eb33700690d28b6e6f5851fbefb0e88ae10bcb6d9f65f06f966c31b81c7587135c6d296bde0caefbc81239046ec06535cefa9329f2ac6d8a8788f
+  metadata.gz: 602975a225b979ad6ca2a43ef038f18a23b48f034ddb2a06ffa3f4ca0d61cb805e6ef314afd00a897f8bc869fcce8b27fee895ac6e0f3f82bc7cbe8531369632
+  data.tar.gz: 0d9f77815d3c2e7f338dfe42f0b501a51dd9dd3de06cc367a7ee3de52e049a6a7e55ee3afc4cc2a525a724b07412f5807feba3c9aea33966d407d38d96fb8601

data/README.md

@@ -241,6 +241,10 @@ bundle exec rake install   # Installation from source code
 bundle exec exe/uplot      # Run youplot (Try out the edited code)
 ```
 
+    Do you need commit rights to my repository?
+    Do you want to get admin rights and take over the project?
+    If so, please feel free to contact us.
+
 ### Acknowledgements
 
 * [sampo grafiikka](https://jypg.net/sampo_grafiikka) - Project logo creation

data/lib/youplot/command.rb

@@ -40,6 +40,24 @@ 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
@@ -63,9 +81,15 @@ module YouPlot
       # normal mode
       else
         # Sometimes the input file does not end with a newline code.
-        while (input = Kernel.gets(nil))
+        begin
+          begin
+            input = Kernel.gets(nil)
+          rescue Errno::ENOENT => e
+            warn e.message
+            next
+          end
           main(input)
-        end
+        end until input
       end
     end
 
@@ -135,7 +159,12 @@ module YouPlot
       rescue CSV::MalformedCSVError => e
         warn 'Failed to parse the text. '
         warn 'Please try to set the correct character encoding with --encoding option.'
-        raise e
+        warn e.backtrace.grep(/youplot/).first
+        exit 1
+      rescue ArgumentError => e
+        warn 'Failed to parse the text. '
+        warn e.backtrace.grep(/youplot/).first
+        exit 1
       end
 
       data

data/lib/youplot/parser.rb

@@ -9,7 +9,8 @@ module YouPlot
     class Error < StandardError; end
 
     attr_reader :command, :options, :params,
-                :main_parser, :sub_parser
+                :main_parser, :sub_parser,
+                :config_file, :config
 
     def initialize
       @command = nil
@@ -28,6 +29,55 @@ module YouPlot
       )
 
       @params = Parameters.new
+
+      if @config_file = find_config_file
+        ENV['MYYOUPLOTRC'] = @config_file
+        @config = read_config_file(config_file)
+        configure(config)
+      end
+    end
+
+    def candidate_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']
+      paths
+    end
+
+    def find_config_file
+      config_file_path = nil
+      candidate_paths.each do |file|
+        path = File.expand_path(file)
+        if File.exist?(path)
+          config_file_path = path
+          break
+        end
+      end
+      config_file_path
+    end
+
+    def read_config_file(path)
+      require 'yaml'
+      YAML.load_file(path)
+    end
+
+    def configure(config)
+      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
+        elsif param_members.include?(k)
+          @params[k] = v
+        else
+          raise Error, "Unknown option/param: #{k}"
+        end
+      end
     end
 
     def create_base_parser
@@ -277,6 +327,8 @@ module YouPlot
           options[:color_names] = v
         end
 
+      when :config
+
       else
         error_message = "uplot: unrecognized command '#{command}'"
         if YouPlot.run_as_executable?

data/lib/youplot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: youplot
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2022-08-02 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.2.26
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A command line tool for Unicode Plotting