progress 0.1.1.1 → 0.1.1.2

data/VERSION.yml

@@ -1 +1 @@
-[0, 1, 1, 1]
+[0, 1, 1, 2]

data/lib/progress.rb

@@ -131,25 +131,26 @@ class Progress
 
     def print_message
       messages = []
-      messages_hl = []
       inner = 0
       levels.reverse.each do |l|
         current = l.to_f(inner)
         value = current == 0 ? '......' : '%5.1f%%' % (current * 100.0)
-        messages << "#{l.title}: #{value}"
-        messages_hl << "#{l.title}: #{value == '100.0' ? value : "\e[1m#{value}\e[0m"}" if highlight?
+        messages << "#{l.title}: #{!highlight? || value == '100.0%' ? value : "\e[1m#{value}\e[0m"}"
         inner = current
       end
       message = messages.reverse * ' > '
 
       unless lines?
         previous_length = @previous_length || 0
-        @previous_length = message.length
-        message = message.ljust(previous_length, ' ') + "\r"
+        message_cl = if highlight?
+          message.gsub(/\033\[(0|1)m/, '')
+        else
+          message
+        end
+        @previous_length = message_cl.length
+        message = "#{message}#{' ' * [previous_length - message_cl.length, 0].max}]\r"
       end
 
-      message = messages_hl.reverse * ' > ' if highlight?
-
       lines? ? io.puts(message) : io.print(message)
     end
   end

data/progress.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{progress}
-  s.version = "0.1.1.1"
+  s.version = "0.1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["toy"]

data/spec/progress_spec.rb

@@ -1,11 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-Progress.start('Test') do
-  Progress.start('Test') do
-    'qwerty'
-  end
-end
-
 describe Progress do
   before :each do
     @io = StringIO.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.1
+  version: 0.1.1.2
 platform: ruby
 authors: 
 - toy