autobuild 1.7.0.rc2 → 1.7.0.rc3

data/lib/autobuild/reporting.rb

@@ -33,6 +33,15 @@ module Autobuild
         Autobuild.silent = silent
     end
 
+    def self.progress_display_enabled?
+        @progress_display_enabled
+    end
+
+    def self.progress_display_enabled=(value)
+        @progress_display_enabled = value
+    end
+
+    @progress_display_enabled = true
 
     def self.message(*args)
         return if silent?
@@ -47,6 +56,11 @@ module Autobuild
             else "#{color(*args)}"
             end
 
+        if !Autobuild.progress_display_enabled?
+            puts msg
+            return
+        end
+
         size =
             if @last_progress_msg then @last_progress_msg.size
             else 0
@@ -84,7 +98,11 @@ module Autobuild
         progress_done(key)
         display_lock.synchronize do
             progress_messages << [key, color(*args)]
-            display_progress
+            if Autobuild.progress_display_enabled?
+                display_progress
+            else
+                display_message("  " + color(*args))
+            end
         end
 
         if block_given?
@@ -114,9 +132,13 @@ module Autobuild
             if !found
                 progress_messages << [key, color(*args)]
             end
+
+            return if !Autobuild.progress_display_enabled?
+
             display_progress
         end
     end
+
     def self.progress_done(key, display_last = true)
         found = false
         display_lock.synchronize do
@@ -127,9 +149,13 @@ module Autobuild
                     last_msg = msg
                 end
             end
-            if found && @last_progress_msg
-                display_message("  #{last_msg}") if display_last && last_msg
-                display_progress
+            if found
+                if display_last
+                    display_message("  #{last_msg}")
+                end
+                if @last_progress_msg
+                    display_progress
+                end
             end
         end
         found
@@ -207,13 +233,22 @@ module Autobuild
             end
 
         if msg.empty?
-            print "\r" + " " * last_msg_length if !silent?
+            blank = " " * last_msg_length
             @last_progress_msg = nil
         else
             msg = "  #{msg}"
-            print "\r#{msg}#{" " * [last_msg_length - msg.length, 0].max}" if !silent?
+            blank = " " * [last_msg_length - msg.length, 0].max
             @last_progress_msg = msg
         end
+
+        if !silent?
+            if Autobuild.progress_display_enabled?
+                print "\r#{msg}#{blank}"
+                print "\r#{msg}"
+            elsif @last_progress_msg
+                puts msg
+            end
+        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.7.0.rc2" unless defined? Autobuild::VERSION
+    VERSION = "1.7.0.rc3" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.0.rc2
+  version: 1.7.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9890940 !ruby/object:Gem::Requirement
+  requirement: &24357060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *9890940
+  version_requirements: *24357060
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &9890480 !ruby/object:Gem::Requirement
+  requirement: &24356620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *9890480
+  version_requirements: *24356620
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &9890020 !ruby/object:Gem::Requirement
+  requirement: &24356180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9890020
+  version_requirements: *24356180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9889580 !ruby/object:Gem::Requirement
+  requirement: &24355740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *9889580
+  version_requirements: *24355740
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9889000 !ruby/object:Gem::Requirement
+  requirement: &24355300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *9889000
+  version_requirements: *24355300
 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)