helper.rb in narou-1.6.0

- old
+ new

@@ -9,20 +9,22 @@
 # 雑多なお助けメソッド群
 #
 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
     case
     when os_windows?
@@ -34,59 +36,81 @@
     else
       :other
     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
   end
 
   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
   end
 
   def open_browser(url)
     case determine_os
     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
   end
 
@@ -129,10 +153,29 @@
   def convert_to_windows_path(path)
     `cygpath -aw \"#{path}\"`.strip
   end
 
   #
+  # アンパサンドをエンティティに変換
+  #
+  def ampersand_to_entity(str)
+    str.gsub(/&(?!amp;)/mi, "&amp;")
+  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
+
+  #
   # 外部コマンド実行中の待機ループの処理を書けるクラス
   #
   # response = Helper::AsyncCommand.exec("処理に時間がかかる外部コマンド") do
   #   print "*"
   # end
@@ -140,31 +183,30 @@
   #   puts "成功しました"
   # end
   #
   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
+      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
-
-    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
-    end
   end
 end
+