houcluttex 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7d8c81d46c8d8a380f7a3cf3d1fa1d43478792fa2825c6556a68f50a44ad11
-  data.tar.gz: c8b68498ba79dc4c5af70f4e70347da2d0856acecd91bc5064156486bcff7b5b
+  metadata.gz: 611c1ee3802bd076e4b6a0b055e9123311584ce405285de0b3e45e3cc476db5e
+  data.tar.gz: 66b69c57438a06bf69d8e249395e39f21a491a5a144a5f6a6aa24bbdc7d63791
 SHA512:
-  metadata.gz: 3644ae35c0c01fc72e4f1dc3088eaa3f0eef243ff5a8040fa323d6c2a24a8bf46b7061e0e09d97be2bdeaa0d2fc0877a182028990708d78a67ac98e0daf5f46e
-  data.tar.gz: c195e7e359de0479f30813570601014918d3cf9a92446f111c96a5b24b95f04329e1e871f58c083eea1aafb362591df6a9a7bb537a3ee5b4f34b7eb567a8c63a
+  metadata.gz: 11e6b07578483d287142caefda22fb38c8826667d942ecf368371fbee13b3321380292ab2aade41ddf621216249d81aff541e16998f5c5692fac10ccedee8527
+  data.tar.gz: 8bee1ab0a03d305bf5cb64dc663f6a763d481fb5aa5d6a6dcb795340797609bb21432b1ee55615ddbd409b8a48bb17d6e027fbb99c46c04be773598c21219989

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in houcluttex.gemspec
 gemspec

data/Rakefile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 task default: :spec

data/exe/houcluttex

@@ -2,16 +2,49 @@
 # frozen_string_literal: true
 
 require 'fileutils'
+require 'rbconfig'
 require 'shellwords'
 require 'yaml'
 
+IS_WINDOWS = %w[mswin msys mingw cygwin bccwin wince emc].any?{|s| RbConfig::CONFIG['host_os'].include?(s)}
+
 def convert_bool(str)
-    case str.downcase
-    when 'yes', 'true'
-        true
-    when 'no', 'false'
-        false
-    end
+  case str.downcase
+  when 'yes', 'true'
+    true
+  when 'no', 'false'
+    false
+  end
+end
+
+def log(str, color_mode, color_fg = nil, color_bg = nil, bold = nil)
+  use_color = color_mode == 'always' || (color_mode == 'auto' && !IS_WINDOWS)
+  s = String.new('')
+  s << "\e[1m" if use_color && bold
+  s << "\e[3#{color_fg}m" if use_color && color_fg
+  s << "\e[4#{color_bg}m" if use_color && color_bg
+  s << str
+  s << "\e[0m" if use_color && (bold || color_fg)
+  warn s
+end
+
+def log_info(str, config)
+  return unless config['verbose']
+  log("[houcluttex] info: #{str}", config['color'] || 'auto', 2)
+end
+
+def log_warn(str, config)
+  log("[houcluttex] warn: #{str}", config['color'] || 'auto', 3, nil, true)
+end
+
+def log_error(str, config)
+  log("[houcluttex] error: #{str}", config['color'] || 'auto', 1, nil, true)
+end
+
+def version
+  require 'houcluttex/version'
+  puts "houcluttex v#{Houcluttex::VERSION}"
+  exit
 end
 
 config_file = %w[houcluttex.yml houcluttex.yaml houcluttex_config.yml houcluttex_config.yaml houcluttexrc .houcluttexrc].find{|e| File.exist?(e)}
@@ -21,142 +54,159 @@ config_file = %w[houcluttex.yml houcluttex.yaml houcluttex_config.yml houcluttex
 argv = ARGV.dup
 config_by_args = {}
 remain_args = []
+ignored_args = []
 
 until argv.empty?
-    arg = argv.shift
-    if arg == '--'
-        remain_args += argv
-        argv = []
-    elsif arg.start_with?('--')
-        m = arg.match(/\A--([^=]+)(=(.*))?\z/)
-        case m[1]
-        when 'fresh', 'change-directory', 'watch', 'verbose', 'shell-escape', 'shell-restricted', 'file-line-error', 'halt-on-error'
-            config_by_args[m[1]] = true
-        when 'no-change-directory', 'no-shell-escape', 'no-file-line-error', 'no-halt-on-error'
-            config_by_args[m[1][3..-1]] = false
-        when 'tex-options', 'dvipdfmx-options'
-            config_by_args[m[1][0..-2]] ||= []
-            config_by_args[m[1][0..-2]] += (m[3] || argv.shift).shellsplit
-        when 'tex-option', 'dvipdfmx-option'
-            config_by_args[m[1]] ||= []
-            config_by_args[m[1]] << (m[3] || argv.shift)
-        when 'includeonly', 'package-support'
-            config_by_args[m[1]] = (m[3] || argv.shift).split(',')
-        when 'input'
-            raise 'cannot use `--input` option in command-line'
-        when 'config'
-            config_file = m[3] || argv.shift
-        when 'cluttex-path', 'engine', 'output', 'max-iterations', 'color', 'make-depends', 'engine-executable', 'makeindex', 'bibtex', 'biber', 'makeglossaries', 'synctex', 'interaction', 'jobname', 'fmt', 'output-directory', 'output-format'
-            config_by_args[m[1]] = m[3] || argv.shift
-        else
-            warn "option `--#{m[1]}` is ignored"
-        end
-    elsif arg.start_with?('-')
-        a = arg[1..-1]
-        case a
-        when 'e'
-            config_by_args['engine'] = argv.shift
-        when 'o'
-            config_by_args['output'] = argv.shift
-        when 'V'
-            config_by_args['verbose'] = true
-        when 'shell-escape', 'shell-restricted', 'file-line-error', 'halt-on-error'
-            config_by_args[a] = true
-        when 'no-shell-escape', 'no-file-line-error', 'no-halt-on-error'
-            config_by_args[a[3..-1]] = false
-        when 'synctex', 'interaction', 'jobname', 'fmt', 'output-directory', 'output-format'
-            config_by_args[a] = argv.shift
-        else
-            warn "option `-#{arg}` is ignored"
-        end
+  arg = argv.shift
+  if arg == '--'
+    remain_args += argv
+    argv = []
+  elsif arg.start_with?('--')
+    m = arg.match(/\A--([^=]+)(=(.*))?\z/)
+    key = m[1]
+    value = -> {m[3] || argv.shift}
+    case key
+    when 'fresh', 'change-directory', 'watch', 'verbose', 'shell-escape', 'shell-restricted', 'file-line-error', 'halt-on-error'
+      config_by_args[key] = true
+    when 'no-change-directory', 'no-shell-escape', 'no-file-line-error', 'no-halt-on-error'
+      config_by_args[key[3..-1]] = false
+    when 'tex-options', 'dvipdfmx-options'
+      config_by_args[key[0..-2]] ||= []
+      config_by_args[key[0..-2]] += value[].shellsplit
+    when 'tex-option', 'dvipdfmx-option'
+      config_by_args[key] ||= []
+      config_by_args[key] << value[]
+    when 'includeonly', 'package-support'
+      config_by_args[key] = value[].split(',')
+    when 'color'
+      config_by_args[key] = m[3] || 'always'
+    when 'input'
+      ignored_args << arg
+      value[]
+    when 'config'
+      config_file = value[]
+    when 'version'
+      version
+    when 'cluttex-path', 'engine', 'output', 'max-iterations', 'make-depends', 'engine-executable', 'makeindex', 'bibtex', 'biber', 'makeglossaries', 'synctex', 'interaction', 'jobname', 'fmt', 'output-directory', 'output-format'
+      config_by_args[key] = value[]
     else
-        remain_args << arg
+      ignored_args << arg
     end
+  elsif arg.start_with?('-')
+    key = arg[1..-1]
+    case key
+    when 'e'
+      config_by_args['engine'] = argv.shift
+    when 'o'
+      config_by_args['output'] = argv.shift
+    when 'v'
+      version
+    when 'V'
+      config_by_args['verbose'] = true
+    when 'shell-escape', 'shell-restricted', 'file-line-error', 'halt-on-error'
+      config_by_args[key] = true
+    when 'no-shell-escape', 'no-file-line-error', 'no-halt-on-error'
+      config_by_args[key[3..-1]] = false
+    when 'synctex', 'interaction', 'jobname', 'fmt', 'output-directory', 'output-format'
+      config_by_args[key] = argv.shift
+    else
+      ignored_args << arg
+    end
+  else
+    remain_args << arg
+  end
 end
 
 # load yaml
 config = config_file ? YAML.load_file(config_file) : {}
 
 # decide input file
-raise 'multiple input files' if remain_args.size >= 2
+if remain_args.size >= 2
+  log_error('multiple input files', config)
+  exit 1
+end
+
 config['input'] = remain_args[0] unless remain_args.empty?
-raise 'no input file' unless config['input']
+unless config['input']
+  log_error('no input file', config)
+  exit 1
+end
 
 # parse magic comments
 
 loop do
-    raise "input file `#{config['input']}` does not exist" unless File.exist?(config['input'])
-
-    root_file = nil
-    File.foreach(config['input']) do |line|
-        next if line.strip.empty?
-        break unless line[0] == '%'
-        m = line.match(/^%\s*!TEX (\S+)\s*=\s*(.*?)\s*$/)
-        next unless m
-        key = m[1].tr('_-', '').downcase
-        value = m[2]
-        case key
-        when 'root'
-            root_file = value
-        when 'engine', 'synctex', 'jobname', 'makeindex', 'bibtex'
-            config[key] = value
-        when 'program'
-            config['engine'] = value
-        when 'format', 'outputformat'
-            config['output-format'] = value
-        when 'outputdirectory'
-            config['output-directory'] = value
-        when 'enablesynctex'
-            value = convert_bool(value)
-            raise 'magic option `enableSynctex` must be boolean' if value.nil?
-            config['synctex'] = value ? (config['synctex'] || 1) : nil
-        when 'enableshellescape'
-            value = convert_bool(value)
-            raise 'magic option `enableShellEscape` must be boolean' if value.nil?
-            config['shell-escape'] = value
-        else
-            warn "magic comment `#{m[1]}` is ignored"
-        end
+  log_info("input file: #{config['input']}", config)
+  raise "input file `#{config['input']}` does not exist" unless File.exist?(config['input'])
+
+  root_file = nil
+  File.open(config['input'], external_encoding: 'utf-8') do |io|
+    io.each do |line|
+      next if line.strip.empty?
+      break unless line[0] == '%'
+      m = line.match(/^%\s*!TEX (\S+)\s*=\s*(.*?)\s*$/)
+      next unless m
+      key = m[1].tr('_-', '').downcase
+      value = m[2]
+      case key
+      when 'root'
+        root_file = value
+      when 'engine', 'synctex', 'jobname', 'makeindex', 'bibtex'
+        config[key] = value
+      when 'program'
+        config['engine'] = value
+      when 'format', 'outputformat'
+        config['output-format'] = value
+      when 'outputdirectory'
+        config['output-directory'] = value
+      when 'enablesynctex'
+        value = convert_bool(value)
+        raise 'magic option `enableSynctex` must be boolean' if value.nil?
+        config['synctex'] = value ? (config['synctex'] || 1) : nil
+      when 'enableshellescape'
+        value = convert_bool(value)
+        raise 'magic option `enableShellEscape` must be boolean' if value.nil?
+        config['shell-escape'] = value
+      else
+        log_warn("magic comment `#{m[1]}` is ignored", config)
+      end
     end
-    break if root_file.nil? || config['input'] == root_file
-    config['input'] = root_file
+  end
+  break if root_file.nil? || config['input'] == root_file
+  config['input'] = root_file
 end
 
 # merge config
 config.merge!(config_by_args)
 
+log_warn("option #{ignored_args.map{|e| "`#{e}`"}.join(', ')} is ignored", config) unless ignored_args.empty?
+
 # specify command
 config['cluttex-path'] ||= 'cluttex'
 `type #{config['cluttex-path']} 2>&1`
 raise "command `#{config['cluttex-path']}` not found" unless $?.success?
 
-if config['verbose']
-    warn 'ClutTeX options:'
-    config.each do |k, v|
-        warn "  #{k}: #{v.inspect}"
-    end
-end
+log_info("configurations: #{config.inspect}", config)
 
 # generate command
 
 cmd_args = []
 
 config.each do |k, v|
-    next if v.nil?
-    case k
-    when 'cluttex-path', 'input'
-        nil
-    when 'tex-option', 'dvipdfmx-option'
-        v.each{|e| cmd_args << "--#{k}=#{e}"} unless v.empty?
-    when 'includeonly', 'package-support'
-        cmd_args << (v.is_a?(Array) ? "--#{k}=#{v.join(',')}" : "--#{k}=#{v}") unless v.empty?
-    when 'fresh', 'watch', 'verbose', 'shell-restricted'
-        cmd_args << "--#{k}" if v
-    when 'change-directory', 'shell-escape', 'file-line-error', 'halt-on-error'
-        cmd_args << (v ? "--#{k}" : "--no-#{k}")
-    else
-        cmd_args << "--#{k}=#{v}"
-    end
+  next if v.nil?
+  case k
+  when 'cluttex-path', 'input'
+    nil
+  when 'tex-option', 'dvipdfmx-option'
+    v.each{|e| cmd_args << "--#{k}=#{e}"} unless v.empty?
+  when 'includeonly', 'package-support'
+    cmd_args << (v.is_a?(Array) ? "--#{k}=#{v.join(',')}" : "--#{k}=#{v}") unless v.empty?
+  when 'fresh', 'watch', 'verbose', 'shell-restricted'
+    cmd_args << "--#{k}" if v
+  when 'change-directory', 'shell-escape', 'file-line-error', 'halt-on-error'
+    cmd_args << (v ? "--#{k}" : "--no-#{k}")
+  else
+    cmd_args << "--#{k}=#{v}"
+  end
 end
 
 cmd_args << '--'
@@ -164,4 +214,6 @@ cmd_args << config['input']
 
 FileUtils.mkdir_p(config['output-directory']) if config['output-directory']
 
+log_info("args: #{cmd_args.inspect}", config)
+
 system(config['cluttex-path'], *cmd_args)

data/houcluttex.gemspec

@@ -5,25 +5,25 @@ $:.unshift(lib) unless $:.include?(lib)
 require 'houcluttex/version'
 
 Gem::Specification.new do |spec|
-    spec.name = 'houcluttex'
-    spec.version       = Houcluttex::VERSION
-    spec.authors       = ['Ishotihadus']
-    spec.email         = ['hanachan.pao@gmail.com']
+  spec.name = 'houcluttex'
+  spec.version       = Houcluttex::VERSION
+  spec.authors       = ['Ishotihadus']
+  spec.email         = ['hanachan.pao@gmail.com']
 
-    spec.summary       = 'configurable cluttex wrapper'
-    spec.description   = 'configurable cluttex wrapper'
-    spec.homepage      = 'https://github.com/ishotihadus/houcluttex'
-    spec.license       = 'MIT'
+  spec.summary       = 'configurable cluttex wrapper'
+  spec.description   = 'configurable cluttex wrapper'
+  spec.homepage      = 'https://github.com/ishotihadus/houcluttex'
+  spec.license       = 'MIT'
 
-    # Specify which files should be added to the gem when it is released.
-    # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-    spec.files = Dir.chdir(File.expand_path(__dir__)) do
-        `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/})}
-    end
-    spec.bindir        = 'exe'
-    spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f)}
-    spec.require_paths = ['lib']
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/})}
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f)}
+  spec.require_paths = ['lib']
 
-    spec.add_development_dependency 'bundler'
-    spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 end

data/lib/houcluttex.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'houcluttex/version'

data/lib/houcluttex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Houcluttex
-    VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houcluttex
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ishotihadus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: configurable cluttex wrapper