rsyntaxtree 1.0.7 → 1.1.0

data/bin/rsyntaxtree

@@ -1,66 +1,58 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
-$LOAD_PATH << File.join( File.dirname(__FILE__), '../lib')
-
-require 'rsyntaxtree'
+require_relative '../lib/rsyntaxtree'
+require_relative '../lib/rsyntaxtree/utils'
 require 'optimist'
-require 'utils'
 
-opts = Optimist::options do
-  version "RSyntaxTree #{RSyntaxTree::VERSION} (c) 2021 Yoichiro Hasebe"
-  banner <<-EOS
-RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
+opts = Optimist.options do
+  version "RSyntaxTree #{RSyntaxTree::VERSION} (c) 2023 Yoichiro Hasebe"
+  banner <<~BANNER
+    RSyntaxTree, (linguistic) syntax tree generator written in Ruby.
 
-Usage:
-       rsyntaxtree [options] "[VP [VP [V set] [NP bracket notation]] [ADV here]]"
-where [options] are:
-EOS
+    Usage:
+           1) rsyntaxtree [options] "[VP [VP [V set] [NP bracket notation]] [ADV here]]"
+           2) rsyntaxtree [options] "/path/to/text/file"
+    where [options] are:
+  BANNER
 
-  opt :outdir, "Output directory",
-      :default => "./"
-  opt :format, "Output format: png, gif, jpg, pdf, or svg",
-      :default => "png"
-  opt :leafstyle, "visual style of tree leaves: auto, triangle, bar, or nothing",
-      :default => "auto"
-  opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk",
-      :default => "sans"
-  opt :font, "Path to a ttf font used to generate tree (optional)", :type => String
-  opt :fontsize, "Size: 8-26",
-      :default => 16
-  opt :margin, "Margin: 0-10",
-      :default => 1
-  opt :vheight, "Connector Height: 0.5-5.0",
-    :default => 2.0
-  opt :color, "Color text and bars: on or off",
-      :default => "on"
-  opt :symmetrize, "Generate radically symmetrical, balanced tree: on or off",
-      :default => "off"
-  opt :transparent, "Make background transparent: on or off",
-      :default => "off"
-  opt :polyline, "draw polyline connectors: on or off",
-      :default => "off"
+  opt :outdir, "Output directory", default: "./"
+  opt :format, "Output format: png, gif, jpg, pdf, or svg", default: "png"
+  opt :leafstyle, "visual style of tree leaves: auto, triangle, bar, or nothing", default: "auto"
+  opt :fontstyle, "Font style (available when ttf font is specified): sans, serif, cjk", default: "sans"
+  opt :font, "Path to a ttf font used to generate tree (optional)", type: String
+  opt :fontsize, "Size: 8-26", default: 16
+  opt :margin, "Margin: 0-10", default: 1
+  opt :vheight, "Connector Height: 0.5-5.0", default: 2.0
+  opt :color, "Color text and bars: on or off", default: "on"
+  opt :symmetrize, "Generate radically symmetrical, balanced tree: on or off", default: "off"
+  opt :transparent, "Make background transparent: on or off", default: "off"
+  opt :polyline, "draw polyline connectors: on or off", default: "off"
 end
 
-Optimist::die :outdir, "must be an exsting directory path" unless FileTest::directory?(opts[:outdir])
-Optimist::die :format, "must be png, jpg, gif, or svg" unless /\A(png|jpg|gif|pdf|svg)\z/ =~ opts[:format]
-Optimist::die :leafstyle, "must be auto, triangle, bar, or nothing" unless /\A(auto|triangle|bar|nothing)\z/ =~ opts[:leafstyle]
-Optimist::die :fontstyle, "must be sans, serif, cjk" unless /\A(sans|serif|cjk)\z/ =~ opts[:fontstyle]
-Optimist::die :font, "must be path to an existing ttf font" if opts[:font] && !File::exists?(opts[:font])
-Optimist::die :fontsize, "must be in the range of 8-26" unless opts[:fontsize] >= 8 && opts[:fontsize] <= 26
-Optimist::die :color, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:color]
-Optimist::die :symmetrize, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:symmetrize]
-Optimist::die :margin, "must be in the range of 0-10" if opts[:margin] < 0 || opts[:margin] > 10
-Optimist::die :vheight, "must be in the range of 0.5-5.0" if opts[:vheight] < 0.5 || opts[:vheight] > 5.0
-Optimist::die :transparent, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:transparent]
-Optimist::die :polyline, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:polyline]
+Optimist.die :outdir, "must be an exsting directory path" unless FileTest.directory?(opts[:outdir])
+Optimist.die :format, "must be png, jpg, gif, or svg" unless /\A(png|jpg|gif|pdf|svg)\z/ =~ opts[:format]
+Optimist.die :leafstyle, "must be auto, triangle, bar, or nothing" unless /\A(auto|triangle|bar|nothing)\z/ =~ opts[:leafstyle]
+Optimist.die :fontstyle, "must be sans, serif, cjk" unless /\A(sans|serif|cjk)\z/ =~ opts[:fontstyle]
+Optimist.die :font, "must be path to an existing ttf font" if opts[:font] && !File.exist?(opts[:font])
+Optimist.die :fontsize, "must be in the range of 8-26" unless opts[:fontsize] >= 8 && opts[:fontsize] <= 26
+Optimist.die :color, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:color]
+Optimist.die :symmetrize, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:symmetrize]
+Optimist.die :margin, "must be in the range of 0-10" if opts[:margin].negative? || opts[:margin] > 10
+Optimist.die :vheight, "must be in the range of 0.5-5.0" if opts[:vheight] < 0.5 || opts[:vheight] > 5.0
+Optimist.die :transparent, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:transparent]
+Optimist.die :polyline, "must be either on or off" unless /\A(on|off|true|false)\z/ =~ opts[:polyline]
 
 string_opts = {}
 opts.each do |key, value|
   string_opts[key.to_sym] = value unless key == :font && !value
 end
 
-data = ARGV[0]
+data = if File.exist?(File.expand_path(ARGV[0]))
+         File.read ARGV[0]
+       else
+         ARGV[0]
+       end
 
 begin
   RSyntaxTree::RSGenerator.check_data(data)
@@ -89,7 +81,7 @@ begin
 rescue RSTError => e
   puts e
   exit
-rescue => e
+rescue StandardError => e
   p e
   puts "Error: something unexpected occurred"
   exit

data/docs/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the
@@ -27,5 +29,5 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do
 end
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
+gem "wdm", "~> 0.1.1", platforms: [:mingw, :x64_mingw, :mswin]
 gem "webrick"

data/docs/_layouts/default.html

@@ -35,7 +35,7 @@
       {{ content }}
 
       <footer class="site-footer" style='border-top-width: 0; text-align: center;'>
-        <div> <span class="site-footer-credits">© Yoichiro HASEBE 2009-2022</span></div>
+        <div> <span class="site-footer-credits">© Yoichiro HASEBE 2009-2023</span></div>
         {% include social_media_links.html %}
       </footer>
     </main>