lib/progressbar.rb in narou-3.2.5.1 vs lib/progressbar.rb in narou-3.3.0

@@ -1,42 +1,46 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
 class ProgressBar
   class OverRangeError < StandardError; end
-  
-  def initialize(max, interval = 1, width = 50, char = "*")
+
+  attr_reader :io
+
+  def initialize(max, interval = 1, width = 50, char = "*", io: $stdout)
     @max = max == 0 ? 1.0 : max.to_f
     @interval = interval
     @width = width
     @char = char
     @counter = 0
+    @io = io
   end
 
   def output(num)
-    return if silence?
+    return if silent?
     if num > @max
       raise OverRangeError, "`#{num}` over `#{@max}(max)`"
     end
     @counter += 1
     return unless @counter % @interval == 0
     ratio = calc_ratio(num)
     now = (@width * ratio).round
     rest = @width - now
-    STDOUT.print "[" + @char * now + ' ' * rest + "] #{(ratio * 100).round}%\r"
+    io.stream.print format("[%s%s] %d%%\r", @char * now, " " * rest, (ratio * 100).round)
   end
 
   def clear
-    return if silence?
-    STDOUT.print " " * 79 + "\r"
+    return if silent?
+    io.stream.print "\e[2K\r" # 行削除して行頭へ移動
   end
 
   def calc_ratio(num)
     num / @max
   end
 
-  def silence?
-    $debug || ENV["NAROU_ENV"] == "test"
+  def silent?
+    ENV["NAROU_ENV"] == "test" || !io.tty? || io.silent?
   end
 end