progress 0.0.9.0 → 0.0.9.1

data/VERSION.yml

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

data/lib/progress.rb

@@ -28,9 +28,9 @@ class Progress
   #     end
   #   end
   # ==== To output progress as lines (not trying to stay on line)
-  #   Progress.start('Test', 1000, :lines => true) do
-  #     1000.times{ Progress.step }
-  #   end
+  #   Progress.lines = true
+  # ==== To force highlight
+  #   Progress.highlight = true
   def self.start(title, total = 1, options = {})
     levels << new(title, total, levels.length, options)
     print_message
@@ -86,21 +86,54 @@ protected
       @io.puts if levels.empty?
     end
 
+    def io
+      @io ||= $stderr
+    end
+
     def io=(io)
       @io = io
     end
 
+    def lines=(value)
+      @lines = !!value
+    end
+    def lines?
+      if @lines.nil?
+        @lines = !io.tty?
+      end
+      @lines
+    end
+
+    def highlight=(value)
+      @highlight = !!value
+    end
+    def highlight?
+      if @highlight.nil?
+        @highlight = !!io.tty?
+      end
+      @highlight
+    end
+
   protected
 
     def print_message
       message = levels.map{ |level| level.message } * ' > '
-      @io ||= $stderr
-      @io.sync = true
-      if @io.tty? && !levels.any?{ |level| level.options[:lines] }
-        @io.print message.ljust(@previous_length || 0).gsub(/\d+\.\d+/){ |s| s == '100.0' ? s : "\e[1m#{s}\e[0m" } + "\r"
+      io.sync = true
+
+      unless lines?
+        previous_length = @previous_length || 0
         @previous_length = message.length
+        message = message.ljust(previous_length, '>') + "\r"
+      end
+
+      if highlight?
+        message.gsub!(/\d+\.\d+/){ |s| s == '100.0' ? s : "\e[1m#{s}\e[0m" }
+      end
+
+      unless lines?
+        io.print message
       else
-        @io.puts message
+        io.puts message
       end
     end
 

data/progress.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{progress}
-  s.version = "0.0.9.0"
+  s.version = "0.0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["toy"]
-  s.date = %q{2009-07-20}
+  s.date = %q{2009-07-28}
   s.description = %q{A library to show progress of long running tasks.}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "lib/progress/enumerable.rb", "lib/progress/integer.rb", "lib/progress/with_progress.rb", "lib/progress.rb", "README.rdoc", "tasks/rspec.rake"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Progress", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{progress}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A library to show progress of long running tasks.}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  version: 0.0.9.0
+  version: 0.0.9.1
 platform: ruby
 authors: 
 - toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 +04:00
+date: 2009-07-28 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: progress
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A library to show progress of long running tasks.