progress 1.1.3 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/progress.rb

@@ -66,6 +66,13 @@ class Progress
       if levels.empty?
         @started_at = Time.now
         @eta = nil
+        @semaphore = Mutex.new
+        @beeper = Thread.new do
+          loop do
+            sleep 3
+            print_message
+          end
+        end
       end
       levels << new(title, total)
       print_message true
@@ -190,39 +197,51 @@ class Progress
       end
     end
 
+    def lock(force)
+      if force ? @semaphore.lock : @semaphore.try_lock
+        begin
+          yield
+        ensure
+          @semaphore.unlock
+        end
+      end
+    end
+
     def print_message(force = false)
-      if force || time_to_print?
-        inner = 0
-        parts, parts_cl = [], []
-        levels.reverse.each do |level|
-          inner = current = level.to_f(inner)
-          value = current.zero? ? '......' : "#{'%5.1f' % (current * 100.0)}%"
-
-          title = level.title ? "#{level.title}: " : nil
-          if !highlight? || value == '100.0%'
-            parts << "#{title}#{value}"
-          else
-            parts << "#{title}\e[1m#{value}\e[0m"
+      lock force do
+        if force || time_to_print?
+          inner = 0
+          parts, parts_cl = [], []
+          levels.reverse.each do |level|
+            inner = current = level.to_f(inner)
+            value = current.zero? ? '......' : "#{'%5.1f' % (current * 100.0)}%"
+
+            title = level.title ? "#{level.title}: " : nil
+            if !highlight? || value == '100.0%'
+              parts << "#{title}#{value}"
+            else
+              parts << "#{title}\e[1m#{value}\e[0m"
+            end
+            parts_cl << "#{title}#{value}"
           end
-          parts_cl << "#{title}#{value}"
-        end
 
-        eta_string = eta(inner)
-        message = "#{parts.reverse * ' > '}#{eta_string}"
-        message_cl = "#{parts_cl.reverse * ' > '}#{eta_string}"
+          eta_string = eta(inner)
+          message = "#{parts.reverse * ' > '}#{eta_string}"
+          message_cl = "#{parts_cl.reverse * ' > '}#{eta_string}"
 
-        if note = levels.last && levels.last.note
-          message << " - #{note}"
-          message_cl << " - #{note}"
-        end
+          if note = levels.last && levels.last.note
+            message << " - #{note}"
+            message_cl << " - #{note}"
+          end
 
-        if lines?
-          io.puts message
-        else
-          io << message << "\e[K\r"
-        end
+          if lines?
+            io.puts message
+          else
+            io << message << "\e[K\r"
+          end
 
-        set_title message_cl
+          set_title message_cl
+        end
       end
     end
   end

data/progress.gemspec

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{progress}
-  s.version = "1.1.3"
+  s.name = "progress"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Kuchin"]
-  s.date = %q{2011-01-15}
+  s.date = "2011-10-17"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -30,15 +30,11 @@ Gem::Specification.new do |s|
     "spec/progress_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/toy/progress}
+  s.homepage = "http://github.com/toy/progress"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
-  s.summary = %q{Show progress of long running tasks}
-  s.test_files = [
-    "spec/progress_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Show progress of long running tasks"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +03:00
-default_executable: 
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -86,7 +85,6 @@ files:
 - progress.gemspec
 - spec/progress_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/toy/progress
 licenses: 
 - MIT
@@ -116,10 +114,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Show progress of long running tasks
-test_files: 
-- spec/progress_spec.rb
-- spec/spec_helper.rb
+test_files: []
+