autobuild 1.6.2.b1 → 1.6.2.b2

data/lib/autobuild/reporting.rb

@@ -15,15 +15,22 @@ require 'autobuild/config'
 require 'autobuild/exceptions'
 
 module Autobuild
+    class << self
+        attr_reader :display_lock
+    end
+    @display_lock = Mutex.new
+
     def self.message(*args)
-        if @last_progress_msg
-            puts
-            @last_progress_msg = nil
-        end
-        if args.empty?
-            puts
-        else
-            puts "#{color(*args)}"
+        display_lock.synchronize do
+            if @last_progress_msg
+                puts
+                @last_progress_msg = nil
+            end
+            if args.empty?
+                puts
+            else
+                puts "#{color(*args)}"
+            end
         end
     end
 
@@ -34,12 +41,12 @@ module Autobuild
 
     # Displays an error message
     def self.error(message)
-        Autoproj.message("  ERROR: #{message}", :red, :bold)
+        Autobuild.message("  ERROR: #{message}", :red, :bold)
     end
 
     # Displays a warning message
     def self.warn(message)
-        Autoproj.message("  WARN: #{message}", :magenta)
+        Autobuild.message("  WARN: #{message}", :magenta)
     end
 
 
@@ -50,9 +57,11 @@ module Autobuild
             options = Hash.new
         end
 
-        progress_done(key)
-        progress_messages << [key, color(*args)]
-        display_progress
+        display_lock.synchronize do
+            progress_done(key)
+            progress_messages << [key, color(*args)]
+            display_progress
+        end
 
         if block_given?
             begin
@@ -67,29 +76,33 @@ module Autobuild
     end
     def self.progress(key, *args)
         found = false
-        progress_messages.map! do |msg_key, msg|
-            if msg_key == key
-                found = true
-                [msg_key, color(*args)]
-            else
-                [msg_key, msg]
+        display_lock.synchronize do
+            progress_messages.map! do |msg_key, msg|
+                if msg_key == key
+                    found = true
+                    [msg_key, color(*args)]
+                else
+                    [msg_key, msg]
+                end
             end
+            if !found
+                progress_messages << [key, color(*args)]
+            end
+            display_progress
         end
-        if !found
-            progress_messages << [key, color(*args)]
-        end
-        display_progress
     end
     def self.progress_done(key)
         found = false
-        progress_messages.delete_if do |msg_key, msg|
-            if msg_key == key
-                found = true
+        display_lock.synchronize do
+            progress_messages.delete_if do |msg_key, msg|
+                if msg_key == key
+                    found = true
+                end
+            end
+            if found && @last_progress_msg
+                puts
+                display_progress
             end
-        end
-        if found && @last_progress_msg
-            puts
-            display_progress
         end
         found
     end
@@ -99,8 +112,11 @@ module Autobuild
         if @last_progress_msg && @last_progress_msg.length > msg.length
             print "\r" + " " * @last_progress_msg.length
         end
-        print "\r  #{msg}"
-        @last_progress_msg = msg
+        print "\r  #{msg}\r"
+        @last_progress_msg =
+            if msg.empty? then nil
+            else msg
+            end
     end
 
     # The exception type that is used to report multiple errors that occured

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.6.2.b1" unless defined? Autobuild::VERSION
+    VERSION = "1.6.2.b2" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.6.2.b1
+  version: 1.6.2.b2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17029640 !ruby/object:Gem::Requirement
+  requirement: &21511040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *17029640
+  version_requirements: *21511040
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &17029140 !ruby/object:Gem::Requirement
+  requirement: &21510560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *17029140
+  version_requirements: *21510560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17028600 !ruby/object:Gem::Requirement
+  requirement: &21510040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *17028600
+  version_requirements: *21510040
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17028140 !ruby/object:Gem::Requirement
+  requirement: &21509520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *17028140
+  version_requirements: *21509520
 description: Collection of classes to handle build systems (CMake, autotools, ...)
   and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
   to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)