narou 1.5.11 → 1.6.0

data/lib/extensions/jruby.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+if Helper.os_windows?
+  require "fileutils"
+
+  module FileUtils
+    # マルチバイト文字を含むパスを認識出来ないため
+    def self.cp(src, dst, opt = nil)
+      open(src, "rb") do |fp|
+        File.binwrite(dst, fp.read)
+      end
+    end
+  end
+
+  class File
+    # 何故かエンコーディングエラーが出るため
+    def self.binwrite(path, data)
+      open(path, "wb") do |fp|
+        fp.write(data)
+      end
+    end
+
+    # -Dfile.encoding=UTF-8 を指定するとなぜか File.mtime がマルチバイト文字を含むパスを認識出来ないため
+    def self.mtime(path)
+      java_path = java.nio.file.FileSystems.default.getPath(path)
+      java_file_time = java.nio.file.Files.getLastModifiedTime(java_path)
+      Time.parse(java_file_time.to_s).getlocal("+09:00")
+    end
+  end
+end

data/lib/extensions/windows.rb

@@ -13,16 +13,15 @@ module WinAPI
     extend DL::Importer
   end
 
-  class InvalidOS < StandardError; end
-
   begin
-    dlload "kernel32"
-    extern "long GetLogicalDriveStrings(long, void*)"
-    extern "unsigned long SetConsoleTextAttribute(unsigned long, unsigned long)"
-    extern "unsigned long GetConsoleScreenBufferInfo(unsigned long, void*)"
-    extern "unsigned long GetStdHandle(unsigned long)"
-    extern "long GetLastError()"
+    dlload "msvcrt", "kernel32"
   rescue DL::DLError
-    raise InvalidOS, "not Windows"
+    dlload "crtdll", "kernel32"
   end
+  extern "long GetLogicalDrives()"
+  extern "unsigned long SetConsoleTextAttribute(unsigned long, unsigned long)"
+  extern "unsigned long GetConsoleScreenBufferInfo(unsigned long, void*)"
+  extern "unsigned long GetStdHandle(unsigned long)"
+  extern "long GetLastError()"
+  extern "unsigned long _getch()"
 end

data/lib/helper.rb

@@ -11,16 +11,18 @@ require "open3"
 module Helper
   extend self
 
+  HOST_OS = RbConfig::CONFIG["host_os"]
+
   def os_windows?
-    @@os_is_windows ||= RUBY_PLATFORM =~ /mswin(?!ce)|mingw|bccwin/i
+    @@os_is_windows ||= HOST_OS =~ /mswin(?!ce)|mingw|bccwin/i
   end
 
   def os_mac?
-    @@os_is_mac ||= RUBY_PLATFORM =~ /darwin/
+    @@os_is_mac ||= HOST_OS =~ /darwin/i
   end
 
   def os_cygwin?
-    @@os_is_cygwin ||= RUBY_PLATFORM =~ /cygwin/i
+    @@os_is_cygwin ||= HOST_OS =~ /cygwin/i
   end
 
   def determine_os
@@ -36,16 +38,38 @@ module Helper
     end
   end
 
-  def confirm(message)
+  def engine_jruby?
+    @@engine_is_jruby ||= RUBY_ENGINE == "jruby"
+  end
+  
+  if engine_jruby? && os_windows?
+    require_relative "extensions/windows"
+    def $stdin.getch
+      WinAPI._getch.chr
+    end
+  else
+    require "io/console"
+  end
+
+  #
+  # キーボード入力による確認をする
+  #
+  # :default: エンターを押した場合に返ってくる値
+  # :nontty_default: pipe等から接続された場合に返ってくる値
+  #
+  def confirm(message, default = false, nontty_default = true)
+    return nontty_default unless STDIN.tty?
     confirm_msg = "#{message} (y/n)?: "
     STDOUT.print confirm_msg   # Logger でロギングされないように直接標準出力に表示
-    while input = $stdin.gets
-      case input[0].downcase
+    while input = $stdin.getch
+      STDOUT.puts input
+      case input.downcase
       when "y"
         return true
       when "n"
         return false
       else
+        return default if input.strip == ""
         STDOUT.print confirm_msg
       end
     end
@@ -54,22 +78,22 @@ module Helper
   def open_browser_linux(address, error_message)
     %w(xdg-open firefox w3m).each do |browser|
       system(%!#{browser} "#{address}"!)
-      return if $?.exitstatus != 127
+      return if $?.success?
     end
     error error_message
   end
 
   def open_directory(path, confirm_message = nil)
     if confirm_message
-      return unless confirm(confirm_message)
+      return unless confirm(confirm_message, false, false)
     end
     case determine_os
     when :windows
-      `explorer "file:///#{path.encode(Encoding::Windows_31J)}"`
+      system(%!explorer "file:///#{path.encode(Encoding::Windows_31J)}"!)
     when :cygwin
-      `cygstart "#{path}"`
+      system(%!cygstart "#{path}"!)
     when :mac
-      `open "#{path}"`
+      system(%!open "#{path}"!)
     else
       open_browser_linux(path, "フォルダが開けませんでした")
     end
@@ -80,11 +104,11 @@ module Helper
     when :windows
       escaped_url = url.gsub("%", "%^").gsub("&", "^&")
       # MEMO: start の引数を "" で囲むと動かない
-      `start #{escaped_url}`
+      system(%!start #{escaped_url}!)
     when :cygwin
-      `cygstart #{url}`
+      system(%!cygstart #{url}!)
     when :mac
-      `open "#{url}"`
+      system(%!open "#{url}"!)
     else
       open_browser_linux(url, "ブラウザが見つかりませんでした")
     end
@@ -130,6 +154,25 @@ module Helper
     `cygpath -aw \"#{path}\"`.strip
   end
 
+  #
+  # アンパサンドをエンティティに変換
+  #
+  def ampersand_to_entity(str)
+    str.gsub(/&(?!amp;)/mi, "&")
+  end
+
+  #
+  # 文章の中から挿絵注記を分離する
+  #
+  def extract_illust_chuki(str)
+    illust_chuki_array = []
+    extracted_str = str.gsub(/[ 　\t]*?(［＃挿絵（.+?）入る］)\n?/) do
+      illust_chuki_array << $1
+      ""
+    end
+    [extracted_str, illust_chuki_array]
+  end
+
   #
   # 外部コマンド実行中の待機ループの処理を書けるクラス
   #
@@ -142,29 +185,28 @@ module Helper
   #
   class AsyncCommand
     def self.exec(command, sleep_time = 0.5, &block)
-      async_command = new(command)
-      while async_command.running?
-        block.call
-        sleep(sleep_time)
-      end
-      async_command.response
-    end
-
-    def initialize(command)
-      @command_response = nil
-      @command_running = true
-      Thread.new do
-        @command_response = Open3.capture3(command)
-        @command_running = false
-      end
-    end
-
-    def running?
-      @command_running
-    end
-
-    def response
-      @command_response
+      Thread.new {
+        loop do
+          block.call if block
+          sleep(sleep_time)
+        end
+      }.tap { |th|
+        if Helper::engine_jruby?
+          # MEMO:
+          #   Open3.capture3 - 全く動かない
+          #   `` バッククウォート - 出力が文字化けする
+          res = Open3.popen3(command) { |i, o, e|
+            i.close
+            `cd`   # create dummy Process::Status object to $?
+            [o.read, e.read, $?]
+          }
+        else
+          res = Open3.capture3(command)
+        end
+        th.kill
+        return res
+      }
     end
   end
 end
+

data/lib/illustration.rb

@@ -11,7 +11,7 @@ require "open-uri"
 class Illustration
   ILLUST_DIR = "挿絵/"
   NAROU_ILLUST_URL = "http://%s.mitemin.net/userpageimage/viewimage/icode/%s/"
-  NAROU_ILLUST_TAG_PATTERN = /^<(i[0-9]+)\|([0-9]+)>\n?/m
+  NAROU_ILLUST_TAG_PATTERN = /[ 　\t]*?<(i[0-9]+)\|([0-9]+)>\n?/m
 
   MIME = { "image/jpeg" => "jpg", "image/png" => "png", "image/gif" => "gif", "image/bmp" => "bmp" }
 

data/lib/inspector.rb

@@ -19,7 +19,7 @@ class Inspector
 
   KLASS_TAG = { ERROR => "エラー", WARNING =>  "警告", INFO => "INFO" }
 
-  IGNORE_INDENT_CHAR = "(（「『〈《≪【〔―・※［〝"
+  IGNORE_INDENT_CHAR = "(（「『〈《≪【〔―・※［〝\n"
   AUTO_INDENT_THRESHOLD_RATIO = 0.5   # 括弧等を除く全ての行のうちこの割合以上字下げされてなければ強制字下げする
 
   attr_writer :messages, :subtitle
@@ -197,7 +197,7 @@ class Inspector
       target_line_count = a.count
     }.each { |line|
       head = line[0]
-      unless head == " " || head == "　"
+      if head != " " && head != "　"
         dont_indent_line_count += 1
       end
     }

data/lib/inventory.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require "yaml"
+require_relative "narou"
+
+#
+# Narou.rbのシステムが記録するデータ単位
+#
+# .narou ディレクトリにYAMLファイルとして保存される
+#
+module Inventory
+  def self.load(name, scope)
+    @@cache ||= {}
+    return @@cache[name] if @@cache[name]
+    {}.tap { |h|
+      h.extend(Inventory)
+      h.init(name, scope)
+      @@cache[name] = h
+    }
+  end
+
+  def init(name, scope)
+    dir = case scope
+          when :local
+            Narou.get_local_setting_dir
+          when :global
+            Narou.get_global_setting_dir
+          else
+            raise "Unknown scope"
+          end
+    return nil unless dir
+    @inventory_file_path = File.join(dir, name + ".yaml")
+    if File.exists?(@inventory_file_path)
+      self.merge!(YAML.load_file(@inventory_file_path))
+    end
+  end
+
+  def save
+    unless @inventory_file_path
+      raise "not initialized setting dir yet"
+    end
+    File.write(@inventory_file_path, YAML.dump(self))
+  end
+end
+

data/lib/logger.rb

@@ -7,6 +7,18 @@ require "singleton"
 require "stringio"
 require_relative "color"
 
+class String
+  def escape
+    TermColor.escape(self)
+  end
+
+  if RUBY_ENGINE == "jruby"
+    def termcolor
+      TermColor.parse(self.dup.force_encoding(Encoding::ASCII_8BIT))
+    end
+  end
+end
+
 if $disable_color
   class String
     def termcolor
@@ -26,6 +38,18 @@ module LoggerModule
   end
 
   def silent
+    if block_given?
+      if /^(.+?):(\d+)/ =~ caller.first
+        file = $1
+        line = $2.to_i
+        error_msg = "Did you mean: silence\n"
+        str = File.read(file).split("\n")[line-1]
+        error_msg += "in #{file}:#{line}\n"
+        error_msg += str + "\n"
+        error_msg +=  " " * str.index("silent") + "~~~~~~"
+        raise error_msg
+      end
+    end
     @is_silent
   end
 
@@ -46,7 +70,7 @@ module LoggerModule
   end
 
   def save(path)
-    File.write(path, string)
+    File.write(path, strip_color(string))
   end
 
   def write_console(str, target)
@@ -73,7 +97,7 @@ class Logger < StringIO
     if str.encoding == Encoding::ASCII_8BIT
       str.force_encoding(Encoding::UTF_8)
     end
-    super(strip_color(str))
+    super(str)
     write_console(str, STDOUT)
   end
 end
@@ -91,13 +115,13 @@ class LoggerError < StringIO
     if str.encoding == Encoding::ASCII_8BIT
       str.force_encoding(Encoding::UTF_8)
     end
-    super(strip_color(str))
+    super(str)
     write_console(str, STDERR)
   end
 end
 
 def error(str)
-  warn "<red>[ERROR]</red> #{str}".termcolor
+  warn "<bold><red>[ERROR]</red></bold> #{TermColor.escape(str)}".termcolor
 end
 
 $stdout = Logger.get

data/lib/narou.rb

@@ -5,8 +5,10 @@
 
 require "fileutils"
 require_relative "helper"
-require_relative "localsetting"
-require_relative "globalsetting"
+require_relative "inventory"
+if Helper.engine_jruby?
+  require_relative "extensions/jruby"
+end
 
 module Narou
   extend self
@@ -32,7 +34,7 @@ module Narou
       drive_letter = $&
     end
     while path != ""
-      if File.directory?("#{path}/#{LOCAL_SETTING_DIR}")
+      if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR}")
         @@root_dir = drive_letter + path
         break
       end
@@ -75,7 +77,7 @@ module Narou
   end
 
   def alias_to_id(target)
-    aliases = LocalSetting.get["alias"]
+    aliases = Inventory.load("alias", :local)
     if aliases[target]
       return aliases[target]
     end
@@ -84,7 +86,7 @@ module Narou
 
   def novel_frozen?(target)
     id = Downloader.get_id_by_target(target) or return false
-    LocalSetting.get["freeze"].include?(id)
+    Inventory.load("freeze", :local).include?(id)
   end
 
   def get_preset_dir
@@ -110,7 +112,7 @@ module Narou
   #
   def get_aozoraepub3_path
     return @@aozora_jar_path if @@aozora_jar_path
-    global_setting_aozora_path = GlobalSetting.get["global_setting"]["aozoraepub3dir"]
+    global_setting_aozora_path = Inventory.load("global_setting", :global)["aozoraepub3dir"]
     if global_setting_aozora_path
       aozora_jar_path = create_aozoraepub3_jar_path(global_setting_aozora_path)
       if File.exists?(aozora_jar_path)
@@ -149,7 +151,7 @@ module Narou
   require_relative "device"
 
   def get_device(device_name = nil)
-    device_name = LocalSetting.get["local_setting"]["device"] unless device_name
+    device_name = Inventory.load("local_setting", :local)["device"] unless device_name
     if device_name && Device.exists?(device_name)
       return Device.create(device_name)
     end