narou 1.7.2 → 2.0.0

data/lib/eventable.rb

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+module Narou::Eventable
+  EVENTS_CONTAINER = {}
+
+  def self.included(base)
+    super
+    base.extend(ClassMethods)
+    EVENTS_CONTAINER[base] = {}
+  end
+
+  class NonBlockError < StandardError; end
+
+  module ClassMethods
+    def add_event_listener(event_name, &block)
+      raise NonBlockError unless block_given?
+      stack = EVENTS_CONTAINER[self][event_name] ||= []
+      stack.push(block)
+    end
+
+    def trigger_event(event_name, *argv)
+      stack = EVENTS_CONTAINER[self][event_name]
+      return unless stack
+      stack.each do |block|
+        block.call(*argv)
+      end
+    end
+  end
+
+  def add_event_listener(event_name, once = false, &block)
+    raise NonBlockError unless block_given?
+    @__events_container ||= {}
+    stack = @__events_container[event_name] ||= []
+    stack.push([block, once])
+  end
+
+  def remove_event_listener(event_name, &block)
+    @__events_container ||= {}
+    if block_given?
+      events = @__events_container[event_name]
+      if events
+        events.reject! do |values|
+          values[0] == block
+        end
+      end
+    else
+      @__events_container.delete(event_name)
+    end
+  end
+
+  def trigger_event(event_name, *argv)
+    @__events_container ||= {}
+    stack = @__events_container[event_name]
+    return unless stack
+    stack.reject! do |block, once|
+      block.call(*argv)
+      once
+    end
+  end
+
+  alias :on :add_event_listener
+  alias :off :remove_event_listener
+  alias :trigger :trigger_event
+
+  def one(event_name, &block)
+    add_event_listener(event_name, true, &block)
+  end
+end
+

data/lib/helper.rb

@@ -51,30 +51,6 @@ module Helper
     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.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
-  end
-
   def open_browser_linux(address, error_message)
     %w(xdg-open firefox w3m).each do |browser|
       system(%!#{browser} "#{address}"!)
@@ -85,7 +61,7 @@ module Helper
 
   def open_directory(path, confirm_message = nil)
     if confirm_message
-      return unless confirm(confirm_message, false, false)
+      return unless Narou::Input.confirm(confirm_message, false, false)
     end
     case determine_os
     when :windows
@@ -173,6 +149,95 @@ module Helper
     [extracted_str, illust_chuki_array]
   end
 
+  class InvalidVariableType < StandardError
+    def initialize(type)
+      super("値が #{Helper.variable_type_to_description(type).rstrip} ではありません")
+    end
+  end
+
+  class UnknownVariableType < StandardError
+    def initialize(type)
+      super("unknwon variable type (:#{type})")
+    end
+  end
+
+  class InvalidVariableName < StandardError; end
+
+  #
+  # 与えられた型情報の意味文字列を取得
+  #
+  def variable_type_to_description(type)
+    case type
+    when :boolean
+      "true/false  "
+    when :integer
+      "整数        "
+    when :float
+      "小数点数    "
+    when :string
+      "文字列      "
+    when :directory
+      "フォルダパス"
+    when :file
+      "ファイルパス"
+    else
+      raise UnknownVariableType, type
+    end
+  end
+
+  #
+  # 文字列データを指定された型にキャストする
+  #
+  def string_cast_to_type(value, type)
+    result = nil
+    case type
+    when :boolean
+      case value.strip.downcase
+      when "true"
+        result = true
+      when "false"
+        result = false
+      else
+        raise InvalidVariableType, type
+      end
+    when :integer
+      begin
+        result = Integer(value)
+      rescue
+        raise InvalidVariableType, type
+      end
+    when :float
+      begin
+        result = Float(value)
+      rescue
+        raise InvalidVariableType, type
+      end
+    when :directory, :file
+      if File.method("#{type}?").call(value)
+        result = File.expand_path(value)
+      else
+        raise InvalidVariableType, type
+      end
+    when :string
+      result = value
+    else
+      raise UnknownVariableType, type
+    end
+    result
+  end
+
+  TYPE_OF_VALUE = {
+    TrueClass => :boolean, FalseClass => :boolean, Fixnum => :integer,
+    Float => :float, String => :string
+  }
+
+  #
+  # Rubyの変数がなんの型かシンボルで取得
+  #
+  def type_of_value(value)
+    TYPE_OF_VALUE[value.class]
+  end
+
   #
   # 外部コマンド実行中の待機ループの処理を書けるクラス
   #
@@ -191,19 +256,22 @@ module Helper
           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)
+        begin
+          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
+        ensure
+          th.kill
         end
-        th.kill
         return res
       }
     end

data/lib/ini.rb

@@ -106,7 +106,8 @@ class Ini
           fp.puts("[#{section}]")
         end
         values.each do |key, value|
-          fp.puts(key + DELIMITER + value)
+          value = "\"#{value}\"" if value.kind_of?(String)
+          fp.puts("#{key} #{DELIMITER} #{value}")
         end
       end
     end

data/lib/input.rb

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require "termcolorlight"
+
+module Narou
+  module Input
+    module_function
+
+    #
+    # 肯定か否定かの確認を入力
+    #
+    # default: エンターを押した場合に返ってくる値
+    # nontty_default: pipe等から接続された場合に返ってくる値
+    # @return: yes = true, no = false
+    #
+    def confirm(message, default = false, nontty_default = true)
+      return nontty_default unless $stdin.tty?
+      confirm_msg = "#{message} (y/n)?: "
+      print confirm_msg
+      while input = $stdin.getch
+        puts input
+        case input.downcase
+        when "y"
+          return true
+        when "n"
+          return false
+        else
+          return default if input.strip == ""
+          print confirm_msg
+        end
+      end
+    end
+
+    #
+    # 選択肢を表示して選択させる
+    #
+    # choices: { 選択肢: 説明 } のハッシュ形式で渡す。選択出来ない状況(pipe等)の場合に返す
+    #          値は :default の要素を返す。:default がない場合は先頭の要素
+    # @return: 選ばれた選択肢を返す
+    #
+    # @example:
+    #   choices = { "ja" => "日本語", "en" => "English", default: "ja" }
+    #   Narou::Input.choose("select a language?", choices)
+    #
+    def choose(title, message, choices)
+      default = choices[:default] || choices.first[0]
+      return default unless $stdin.tty?
+      puts title
+      puts message
+      choices.each do |name, help|
+        next if name == :default
+        puts "<bold>#{name}</bold>: #{help}".termcolor
+      end
+      loop do
+        print "> "
+        input = $stdin.gets.strip.downcase
+        if key = choices.keys.delete(input)
+          return key
+        end
+        puts "選択肢の中にありません。もう一度入力して下さい"
+      end
+    end
+  end
+end
+

data/lib/inventory.rb

@@ -22,6 +22,10 @@ module Inventory
     }
   end
 
+  def self.clear
+    @@cache = {}
+  end
+
   def init(name, scope)
     dir = case scope
           when :local

data/lib/kindlestrip.rb

@@ -231,7 +231,7 @@ if __FILE__ == $0
     puts "Usage:"
     puts "    %s <infile> <outfile> <strippeddatafile>" % File.basename(__FILE__)
     puts "<strippeddatafile> is optional."
-    exit 1
+    exit Narou::EXIT_ERROR_CODE
   else
     infile = ARGV[0]
     outfile = ARGV[1]
@@ -243,7 +243,7 @@ if __FILE__ == $0
       end
     rescue StripException => e
       warn "Error: #{e.message}"
-      exit 1
+      exit Narou::EXIT_ERROR_CODE
     end
   end
 end

data/lib/logger.rb

@@ -3,8 +3,8 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-require "singleton"
 require "stringio"
+require "termcolorlight"
 require_relative "color"
 
 if $disable_color
@@ -15,7 +15,9 @@ if $disable_color
   end
 end
 
-module LoggerModule
+module Narou end unless defined?(Narou)
+
+module Narou::LoggerModule
   def initialize
     super
     @is_silent = false
@@ -49,6 +51,24 @@ module LoggerModule
     self.silent = tmp
   end
 
+  #
+  # 標準出力($stdout)のバッファリング＋取得
+  #
+  # キャプチャー用途なので標準エラーはキャプチャーしない
+  # ansicolor_strip :: エスケープシーケンスを除去するか
+  #
+  def capture(ansicolor_strip = true, &block)
+    raise "#capture block given" unless block
+    temp_stream = $stdout
+    $stdout = self.class.new
+    $stdout.silence do
+      block.call
+    end
+    buffer = $stdout.string
+    $stdout = temp_stream
+    ansicolor_strip ? strip_color(buffer) : buffer
+  end
+
   def strip_color(str)
     if $disable_color
       str
@@ -72,14 +92,9 @@ module LoggerModule
   end
 end
 
-class Logger < StringIO
-  include Singleton
-  include LoggerModule
+class Narou::Logger < StringIO
+  include Narou::LoggerModule
   
-  def self.get
-    instance
-  end
-
   def write(str)
     str = str.to_s
     if str.encoding == Encoding::ASCII_8BIT
@@ -88,15 +103,14 @@ class Logger < StringIO
     super(str)
     write_console(str, STDOUT)
   end
-end
 
-class LoggerError < StringIO
-  include Singleton
-  include LoggerModule
-  
-  def self.get
-    instance
+  def tty?
+    STDOUT.tty?
   end
+end
+
+class Narou::LoggerError < StringIO
+  include Narou::LoggerModule
 
   def write(str)
     str = str.to_s
@@ -106,11 +120,19 @@ class LoggerError < StringIO
     super(str)
     write_console(str, STDERR)
   end
+
+  def tty?
+    STDERR.tty?
+  end
+end
+
+def warn(str)
+  puts str
 end
 
 def error(str)
-  warn "<bold><red>[ERROR]</red></bold> #{str.escape}".termcolor
+  puts "<bold><red>[ERROR]</red></bold> ".termcolor + str
 end
 
-$stdout = Logger.get
-$stderr = LoggerError.get
+$stdout = Narou::Logger.new
+$stderr = Narou::LoggerError.new