narou 3.2.5.1 → 3.3.0

data/lib/commandbase.rb

@@ -1,16 +1,27 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
 require "optparse"
 require "termcolorlight"
-require_relative "web/worker"
+
+# help をログに記録しないために STDOUT に直接出力する
+OptionParser::Officious["help"] = proc do |parser|
+  OptionParser::Switch::NoArgument.new do |_arg|
+    STDOUT.puts parser.help
+    exit
+  end
+end
 
 module Command
   class CommandBase
+    attr_accessor :stream_io
+
     # postfixies は改行で区切ることで2パターン以上記述できる
-    def initialize(postfixies = "")
+    def initialize(postfixies = " ")
+      self.stream_io = $stdout
       @opt = OptionParser.new(nil, 20)
       command_name = self.class.to_s.scan(/::(.+)$/)[0][0].downcase
       banner = postfixies.split("\n").map.with_index { |postfix, i|
@@ -37,6 +48,11 @@ module Command
       end
     end
 
+    def display_help!
+      STDOUT.puts @opt.help
+      exit
+    end
+
     def execute(argv)
       @options.clear
       load_local_settings
@@ -103,7 +119,8 @@ module Command
     # コマンドを実行するが、アプリケーションは終了させない
     # (SystemExit を補足し、終了コードを返り値とする)
     #
-    def execute!(*argv)
+    def execute!(*argv, io: $stdout)
+      self.stream_io = io
       argv.flatten!
       execute(argv)
     rescue SystemExit => e
@@ -112,12 +129,13 @@ module Command
       0
     end
 
-    def self.execute!(*argv)
-      self.new.execute!(*argv)
+    def self.execute!(*argv, io: $stdout)
+      cmd = new
+      cmd.execute!(*argv, io: io)
     end
 
     def self.oneline_help
-      ""
+      raise "implement #{self}.oneline_help"
     end
 
     #
@@ -150,5 +168,14 @@ module Command
       end
       settings.save if modified
     end
+
+    #
+    # コマンド出力のログ保存を抑制する
+    #
+    # コマンドの中で、stream_io に対して出力している必要がある
+    #
+    def disable_logging
+      self.stream_io = stream_io.dup_with_disabled_logging
+    end
   end
 end

data/lib/commandline.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -11,31 +12,11 @@ require_relative "inventory"
 module CommandLine
   module_function
 
-  def run(*argv)
+  def run(*argv, catch_exit: false, io: $stdout)
     argv.flatten!
-    if Helper.os_windows?
-      argv.map! do |arg|
-        arg&.encode(Encoding::UTF_8)
-      end
-    end
-    argv.unshift("help") if argv.empty?
-    arg = argv.shift.downcase
-    arg = Command::Shortcuts[arg] || arg
-    arg = "help" if arg == "-h" || arg == "--help"
-    arg = "version" if arg == "-v" || arg == "--version"
-    unless Narou.already_init?
-      unless ["help", "version", "init"].include?(arg)
-        arg = "help"
-      end
-    end
-    unless Command.get_list.include?(arg)
-      error "不明なコマンドです"
-      puts
-      arg = "help"
-    end
-    if argv.empty? && STDIN.tty?
-      argv += load_default_arguments(arg)
-    end
+    argv_for_windows(argv)
+    cmd_name = take_command_name(argv)
+    proc_default_arguments(argv, cmd_name)
     if argv.delete("--multiple")
       multiple_argument_extract(argv)
     end
@@ -43,22 +24,23 @@ module CommandLine
       # pipeで接続された場合、標準入力からIDリストを受け取って引数に繋げる
       argv += (STDIN.gets || "").split
     end
-    Command.get_list[arg].new.execute(argv)
-  ensure
-    if Command::Convert.exists_sending_error_list?
-      Command::Convert.display_sending_error_list
+    command = Command.get_list[cmd_name]
+    if catch_exit
+      command.execute!(argv, io: io)
+    else
+      cmd = command.new
+      cmd.stream_io = io
+      cmd.execute(argv)
     end
+  ensure
+    Command::Convert.display_sending_error_list
   end
 
   #
   # exit を捕捉して終了コードを返す
   #
-  def run!(*argv)
-    run(*argv)
-  rescue SystemExit => e
-    e.status
-  else
-    0
+  def run!(*argv, io: $stdout)
+    run(*argv, catch_exit: true, io: io)
   end
 
   def load_default_arguments(cmd)
@@ -66,6 +48,43 @@ module CommandLine
     (default_arguments_list["default_args.#{cmd}"] || "").split
   end
 
+  def argv_for_windows(argv)
+    return unless Helper.os_windows?
+    argv.map! do |arg|
+      arg&.encode(Encoding::UTF_8)
+    end
+  end
+
+  def take_command_name(argv)
+    argv.unshift("help") if argv.empty?
+    name = argv.shift.downcase
+    name = Command::Shortcuts[name] || name
+    name = case name
+           when "-v", "--version"
+             "version"
+           when "-h", "--help"
+             "help"
+           else
+             name
+           end
+    unless Narou.already_init?
+      unless %w(help version init).include?(name)
+        name = "help"
+      end
+    end
+    unless Command.get_list.include?(name)
+      error "不明なコマンドです。narou help を確認してください"
+      exit Narou::EXIT_ERROR_CODE
+    end
+    name
+  end
+
+  def proc_default_arguments(argv, name)
+    if argv.empty? && STDIN.tty?
+      argv.concat(load_default_arguments(name))
+    end
+  end
+
   #
   # 引数をスペース以外による区切り文字で展開する
   #

data/lib/converterbase.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -55,7 +56,7 @@ class ConverterBase
     @request_insert_blank_next_line = false
     @request_skip_output_line = false
     @before_line = ""
-    @delay_outputs_buffer = ""
+    @delay_outputs_buffer = +""
     @in_comment_block = false
     @english_sentences = []
     @url_list = []
@@ -500,6 +501,15 @@ class ConverterBase
     data.gsub!(/。　/, "。")
   end
 
+  def should_word_be_hankaku?(word)
+    (word.length >= ENGLISH_SENTENCES_MIN_LENGTH || @setting.disable_alphabet_word_to_zenkaku) &&
+      word.match(/[a-z]/i)
+  end
+
+  def sentence?(match)
+    match.split(" ").size >= 2
+  end
+
   #
   # 半角アルファベットを全角に変換する
   #
@@ -515,9 +525,7 @@ class ConverterBase
       end
     else
       data.gsub!(ENGLISH_SENTENCES_CHARACTERS) do |match|
-        if match.split(" ").size >= 2 ||
-            (match.length >= ENGLISH_SENTENCES_MIN_LENGTH && match.match(/[a-z]/i)) ||
-            @setting.disable_alphabet_word_to_zenkaku
+        if sentence?(match) || should_word_be_hankaku?(match)
           @english_sentences << match
           "［＃英文＝#{@english_sentences.size - 1}］"
         else
@@ -639,7 +647,7 @@ class ConverterBase
         top = "― "
         bottom = " ―"
       end
-      str = "　　　［＃ゴシック体］#{top}"
+      str = +"　　　［＃ゴシック体］#{top}"
       str += hankaku_num_to_zenkaku_num(chapter.tr("０-９", "0-9"))
       str += "#{bottom}［＃ゴシック体終わり］"
       # 前後に空行を入れたいが、それは行処理ループ中に行う
@@ -657,7 +665,7 @@ class ConverterBase
   end
 
   def insert_blank_before_line_and_behind_to_special_chapter(line)
-    result = ""
+    result = +""
     if line =~ /［＃章見出しっぽい文＝/
       unless blank_line?(@before_line)
         result << "\n"
@@ -675,9 +683,7 @@ class ConverterBase
   end
 
   def border_symbol?(line)
-    @@symbols ||= open(File.join(Narou.get_preset_dir, "bordersymbols.txt"), "r:BOM|UTF-8") { |fp|
-      fp.read.strip
-    }
+    @@symbols ||= File.read(Narou.preset_dir.join("bordersymbols.txt"), encoding: "BOM|UTF-8")
     line =~ /^[ 　\t]*[#{@@symbols}]+$/
   end
 
@@ -689,7 +695,7 @@ class ConverterBase
   # ■などの区切りの前後には空行が必ず存在するようにする
   #
   def insert_blank_line_to_border_symbol(line)
-    result = ""
+    result = +""
     if border_symbol?(line)
       unless blank_line?(@before_line)
         result << "\n"
@@ -818,8 +824,8 @@ class ConverterBase
   # 改行がひとつもなかった場合は nil を返す
   #
   def join_inner_bracket(str)
-    joined_str = str.dup
     return nil if str.count("\n") == 0
+    joined_str = str.dup
     joined_str.gsub!(/([…―])\n/, "\\1。\n")
     joined_str = joined_str.split("\n").map { |s|
       s.sub(/^　+/, "")
@@ -1204,7 +1210,7 @@ class ConverterBase
   # 単語単位でzwsを挿入する
   #
   def insert_word_separator(str)
-    buffer = ""
+    buffer = +""
     ss = StringScanner.new(str)
     before_symbol = false
 
@@ -1265,7 +1271,7 @@ class ConverterBase
   # 文字単位でzwsを挿入する
   #
   def insert_char_separator(str)
-    buffer = ""
+    buffer = +""
     ss = StringScanner.new(str)
     before_symbol = false
     while char = ss.getch
@@ -1378,7 +1384,7 @@ class ConverterBase
         unless @delay_outputs_buffer.empty?
           @write_fp.write(@delay_outputs_buffer)
           @before_line = @delay_outputs_buffer
-          @delay_outputs_buffer = ""
+          @delay_outputs_buffer.clear
         else
           @before_line = line
         end

data/lib/database.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -42,7 +43,7 @@ class Database
   # 小説格納用のルートディレクトリを取得
   #
   def self.archive_root_path
-    @archive_root_path ||= File.expand_path(File.join(Narou.get_root_dir, ARCHIVE_ROOT_DIR_PATH))
+    @archive_root_path ||= Narou.root_dir.join(ARCHIVE_ROOT_DIR_PATH).expand_path
   end
 
   def save_database

data/lib/device.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -17,7 +18,7 @@ class Device
 
     # 栞データを管理するディレクトリのパスを取得
     def get_storage_path
-      File.join(Narou.get_misc_dir, "bookmark", @name)
+      File.join(Narou.misc_dir, "bookmark", @name)
     end
     memoize :get_storage_path
   end
@@ -40,8 +41,8 @@ class Device
   attr_reader :name, :ebook_file_ext, :display_name
 
   DEVICES = {}.tap do |h|
-    [Narou.get_root_dir, File.dirname(__FILE__)].each do |dir|
-      next unless dir   # narou init 前だと get_root_dir は nil
+    [Narou.root_dir, __dir__].each do |dir|
+      next unless dir # narou init 前だと root_dir は nil
       Dir.glob(File.join(dir, "device", "*.rb")).each do |path|
         name = File.basename(path, ".rb")
         unless h[name]

data/lib/device/epub.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/ibooks.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/ibunko.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/kindle.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/kobo.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/library/cygwin.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/library/linux.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/library/mac.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/library/windows.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/library/windows/eject.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/reader.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/diffviewer.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -26,19 +27,15 @@ class DiffViewer
     end
     old_strings.gsub!("\r", "")
     new_strings.gsub!("\r", "")
-    @builded_buffer = ""
+    @builded_buffer = +""
     @events = Diff::LCS.sdiff(old_strings.split("\n"), new_strings.split("\n"))
     build
   end
 
-  def to_s
+  def result
     @builded_buffer
   end
 
-  def view
-    puts @builded_buffer
-  end
-
   private
 
   def build
@@ -54,7 +51,7 @@ class DiffViewer
       index
     }.map { |(index, (event, str))|
       # index が途切れたら、ポジション情報を付与する
-      result = ""
+      result = +""
       if index - before_index >= 2
         result += "<bold><cyan>@@ -#{event.old_position+1}, " \
                   "+#{event.new_position+1} @@</cyan></bold>\n".termcolor
@@ -97,13 +94,13 @@ class DiffViewer
   # event.action を見てラインを装飾
   #
   def decorate_event(event)
-    result = ""
+    result = +""
     old_element = event.old_element
     new_element = event.new_element
     case event.action
     when "!"
-      old_str = ""
-      new_str = ""
+      old_str = +""
+      new_str = +""
       line_events = Diff::LCS.sdiff(old_element, new_element)
       distance = calc_levenshtein_distance(line_events)
       # レーベンシュタイン距離を正規化する