youplot 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39029ea73cd1233a1ad890343381986b5fcf46e1e7619708cd0329269d07135c
-  data.tar.gz: '08662eaab8c28351e57727c69f2f5479e1950d3cbbad7d65ab61ec8994830fec'
+  metadata.gz: 6bfd3292028fb88c3a5c902884d6c3dd17f59292eb4980b09a75396c921cb46f
+  data.tar.gz: '00524329ddcea39543d4a064e5f930c417544f86a853f538823eb6ece37ac255'
 SHA512:
-  metadata.gz: 7f24fc609bf6501d9b9f6a6452db84d015cfbea7fe6c3a86f4d69ab31043c5a99d9907fe8dbf34f2672589fbfa99e51cde6cfab578c1ef570552e649a7ebfb10
-  data.tar.gz: 6fb46f5492480a385dec175d022e693442c43cdead3b5bd948dfdc0030a81d661ea5363cb386c9c9f7da5e25329cdc11c286d78985cc9383f7032a3a56a8435a
+  metadata.gz: 3b37389aab9904bc7129397a8c04b6a1d6e244bc1af986f57d21131eec55cf7051308a7eabc2e81d17e8e4838d45d9c5d6cc65169375329e9884726a2ea49408
+  data.tar.gz: 6a1c8605980520e8d0bae43b0302d6e07d5511e6bf85d0fd3def1c6c994ed5e1375a076af69ef843b2a1a0f5e7bbbb877148ef03bf833a734c53c1115e59c0fd

data/README.md

@@ -1,10 +1,10 @@
 <p align="center">
-  <img src="https://user-images.githubusercontent.com/5798442/103439598-9e952a00-4c81-11eb-881f-67c593bb7861.png" width="75%" height="75%" />
-</p>
+  <img src="logo.svg" width="60%" height="60%" />
+</7>
 
 ![Build Status](https://github.com/kojix2/youplot/workflows/test/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/youplot.svg)](https://badge.fury.io/rb/youplot)
-[![Docs Latest](https://img.shields.io/badge/docs-latest-blue.svg)](https://rubydoc.info/gems/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)
 
@@ -216,6 +216,8 @@ uplot colors
 
 ## Contributing
 
+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)
 * Fix bugs and [submit pull requests](https://github.com/kojix2/youplot/pulls)
 * Write, clarify, or fix documentation
@@ -226,8 +228,8 @@ uplot colors
 ### Development
 
 ```sh
-git clone https://github.com/your_name/GR.rb # Clone the Git repo
-cd GR.rb
+# fork the main repository by clicking the Fork button. 
+git clone https://github.com/your_name/YouPlot
 bundle install             # Install the gem dependencies
 bundle exec rake test      # Run the test
 bundle exec rake install   # Installation from source code

data/lib/youplot/backends/unicode_plot_backend.rb

@@ -39,19 +39,7 @@ module YouPlot
           labels = series[x_col]
           values = series[y_col].map(&:to_f)
         end
-        begin
-          UnicodePlot.barplot(labels, values, **params.to_hc)
-        # UnicodePlot error:
-        # All values have to be positive. Negative bars are not supported.
-        rescue ArgumentError => e
-          if YouPlot.run_as_executable?
-            warn e.backtrace[0]
-            warn "\e[35m#{e}\e[0m"
-            exit 1
-          else
-            raise e
-          end
-        end
+        UnicodePlot.barplot(labels, values, **params.to_hc)
       end
 
       def histogram(data, params)
@@ -190,18 +178,24 @@ module YouPlot
       def check_series_size(data, fmt)
         series = data.series
         if series.size == 1
-          warn 'youplot: There is only one series of input data. Please check the delimiter.'
-          warn ''
-          warn "  Headers: \e[35m#{data.headers.inspect}\e[0m"
-          warn "  The first item is: \e[35m\"#{series[0][0]}\"\e[0m"
-          warn "  The last item is : \e[35m\"#{series[0][-1]}\"\e[0m"
+          warn <<~EOS
+            youplot: There is only one series of input data. Please check the delimiter.
+
+            Headers: \e[35m#{data.headers.inspect}\e[0m
+            The first item is: \e[35m\"#{series[0][0]}\"\e[0m
+            The last item is : \e[35m\"#{series[0][-1]}\"\e[0m
+          EOS
+          # NOTE: Error messages cannot be colored.
           YouPlot.run_as_executable ? exit(1) : raise(Error)
         end
         if fmt == 'xyxy' && series.size.odd?
-          warn 'YouPlot: In the xyxy format, the number of series must be even.'
-          warn ''
-          warn "  Number of series: \e[35m#{series.size}\e[0m"
-          warn "  Headers: \e[35m#{data.headers.inspect}\e[0m"
+          warn <<~EOS
+            YouPlot: In the xyxy format, the number of series must be even.
+
+            Number of series: \e[35m#{series.size}\e[0m
+            Headers: \e[35m#{data.headers.inspect}\e[0m
+          EOS
+          # NOTE: Error messages cannot be colored.
           YouPlot.run_as_executable ? exit(1) : raise(Error)
         end
       end

data/lib/youplot/command.rb

@@ -65,7 +65,17 @@ module YouPlot
 
       pp @data if options[:debug]
 
-      plot = create_plot
+      if YouPlot.run_as_executable?
+        begin
+          plot = create_plot
+        rescue ArgumentError => e
+          warn e.backtrace[0]
+          warn "\e[35m#{e}\e[0m"
+          exit 1
+        end
+      else
+        plot = create_plot
+      end
       output_plot(plot)
     end
 

data/lib/youplot/command/options.rb

@@ -7,9 +7,9 @@ module YouPlot
       :transpose,
       :headers,
       :pass,
-      :progressive,
       :output,
       :fmt,
+      :progressive,
       :encoding,
       :color_names,
       :debug,

data/lib/youplot/command/parser.rb

@@ -22,6 +22,7 @@ module YouPlot
           pass: false,
           output: $stderr,
           fmt: 'xyy',
+          progressive: false,
           encoding: nil,
           color_names: false,
           debug: false
@@ -70,7 +71,8 @@ module YouPlot
           parser.on('-h', '--height INT', Numeric, 'number of rows') do |v|
             params.height = v
           end
-          parser.on('-b', '--border STR', String, 'specify the style of the bounding box') do |v|
+          border_options = UnicodePlot::BORDER_MAP.keys.join(', ')
+          parser.on('-b', '--border STR', String, 'specify the style of the bounding box', "(#{border_options})") do |v|
             params.border = v.to_sym
           end
           parser.on('-m', '--margin INT', Numeric, 'number of spaces to the left of the plot') do |v|
@@ -88,6 +90,12 @@ module YouPlot
           parser.on('-p', '--progress', TrueClass, 'progressive mode [experimental]') do |v|
             options[:progressive] = v
           end
+          parser.on('-C', '--color-output', TrueClass, 'colorize even if writing to a pipe') do |v|
+            UnicodePlot::StyledPrinter.define_method(:color?){ |o| true }
+          end
+          parser.on('-M', '--monochrome', TrueClass, 'no colouring even if writing to a tty') do |v|
+            UnicodePlot::StyledPrinter.define_method(:color?){ |o| false }
+          end
           parser.on('--encoding STR', String, 'Specify the input encoding') do |v|
             options[:encoding] = v
           end
@@ -151,7 +159,7 @@ module YouPlot
       def sub_parser_add_xscale
         xscale_options = UnicodePlot::ValueTransformer::PREDEFINED_TRANSFORM_FUNCTIONS.keys.join(', ')
         sub_parser.on_head('--xscale STR', String, "axis scaling (#{xscale_options})") do |v|
-          params.xscale = v
+          params.xscale = v.to_sym
         end
       end
 
@@ -163,13 +171,13 @@ module YouPlot
 
       def sub_parser_add_xlim
         sub_parser.on_head('--xlim FLOAT,FLOAT', Array, 'plotting range for the x coordinate') do |v|
-          params.xlim = v.take(2)
+          params.xlim = v
         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.take(2)
+          params.ylim = v
         end
       end
 

data/lib/youplot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: youplot
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode_plot
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: A command line tool for Unicode Plotting