autobuild 1.6.5 → 1.7.0.rc1

data/lib/autobuild/reporting.rb

@@ -37,15 +37,24 @@ module Autobuild
     def self.message(*args)
         return if silent?
         display_lock.synchronize do
-            if @last_progress_msg
-                puts
-                @last_progress_msg = nil
+            display_message(*args)
+        end
+    end
+
+    def self.display_message(*args)
+        msg =
+            if args.empty? then ""
+            else "#{color(*args)}"
             end
-            if args.empty?
-                puts
-            else
-                puts "#{color(*args)}"
+
+        size =
+            if @last_progress_msg then @last_progress_msg.size
+            else 0
             end
+
+        puts "\r#{msg}#{" " * [size - msg.size, 0].max}"
+        if @last_progress_msg
+            print "#{@last_progress_msg}"
         end
     end
 
@@ -84,8 +93,10 @@ module Autobuild
                 if options[:done_message]
                     progress(key, *options[:done_message])
                 end
-            ensure
-                progress_done(key)
+                progress_done(key, true)
+            rescue Exception => e
+                progress_done(key, false)
+                raise
             end
         end
     end
@@ -106,35 +117,101 @@ module Autobuild
             display_progress
         end
     end
-    def self.progress_done(key)
+    def self.progress_done(key, display_last = true)
         found = false
         display_lock.synchronize do
+            last_msg = nil
             progress_messages.delete_if do |msg_key, msg|
                 if msg_key == key
                     found = true
+                    last_msg = msg
                 end
             end
             if found && @last_progress_msg
-                puts
+                display_message("  #{last_msg}") if display_last && last_msg
                 display_progress
             end
         end
         found
     end
 
-    def self.display_progress
-        msg = "#{progress_messages.map(&:last).join(" | ")}"
-        if @last_progress_msg 
-            if !silent?
-                print "\r" + " " * @last_progress_msg.length
+    def self.find_common_prefix(msg, other_msg)
+        msg = msg.split(" ")
+        other_msg = other_msg.split(" ")
+        msg.each_with_index do |token, idx|
+            if other_msg[idx] != token
+                prefix = msg[0..(idx - 1)].join(" ")
+                if !prefix.empty?
+                    prefix << " "
+                end
+                return prefix
             end
         end
+        return msg
+    end
+
+    def self.format_progress_message(messages)
+        messages = messages.sort
+
+        groups = Array.new
+        groups << ["", (0...messages.size)]
+        messages.each_with_index do |msg, idx|
+            prefix, grouping = nil, false
+            messages[(idx + 1)..-1].each_with_index do |other_msg, other_idx|
+                other_idx += idx + 1
+                prefix ||= find_common_prefix(msg, other_msg)
+                break if !other_msg.start_with?(prefix)
+
+                if grouping
+                    break if prefix != groups.last[0]
+                    groups.last[1] << other_idx
+                else
+                    current_prefix, current_group = groups.last
+                    if prefix.size > current_prefix.size # create a new group from there
+                        groups.last[1] = (current_group.first..[idx-1,current_group.last].min)
+                        groups << [prefix, [idx, other_idx]]
+                        grouping = true
+                    else break
+                    end
+                end
+            end
+        end
+        if groups.last.last.last < messages.size
+            groups << ["", (groups.last.last.last + 1)...(messages.size)]
+        end
+
+        result = []
+        groups.each do |prefix, indexes|
+            if prefix.empty?
+                indexes.each do |index|
+                    result << messages[index]
+                end
+            else
+                grouped_messages = []
+                indexes.each do |index|
+                    grouped_messages << messages[index][(prefix.size)..-1]
+                end
+                if !grouped_messages.empty?
+                    result << "#{prefix}#{grouped_messages.join(", ")}"
+                end
+            end
+        end
+        result.join(" | ")
+    end
+
+    def self.display_progress
+        msg = format_progress_message(progress_messages.map(&:last))
+        last_msg_length =
+            if @last_progress_msg then @last_progress_msg.length
+            else 0
+            end
 
         if msg.empty?
-            print "\r" if !silent?
+            print "\r" + " " * last_msg_length if !silent?
             @last_progress_msg = nil
         else
-            print "\r  #{msg}" if !silent?
+            msg = "  #{msg}"
+            print "\r#{msg}#{" " * [last_msg_length - msg.length, 0].max}" if !silent?
             @last_progress_msg = msg
         end
     end

data/lib/autobuild/subcommand.rb

@@ -70,6 +70,11 @@ module Autobuild
         if @processor_count
             return @processor_count
         end
+		
+		#No parralel build on windows yet, since CPU detection is not easy do able
+		if(RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!)
+			return 1
+		end
 
         if File.file?('/proc/cpuinfo')
             cpuinfo = File.readlines('/proc/cpuinfo')
@@ -163,7 +168,7 @@ module Autobuild::Subprocess
             options[:working_directory] ||= target.working_directory
         end
 
-        logname = File.join(logdir, "#{target_name}-#{phase}.log")
+		logname = File.join(logdir, "#{target_name.gsub(/[:]/,'_')}-#{phase.to_s.gsub(/[:]/,'_')}.log")
         if !File.directory?(File.dirname(logname))
             FileUtils.mkdir_p File.dirname(logname)
         end
@@ -206,7 +211,23 @@ module Autobuild::Subprocess
             end
             cread, cwrite = IO.pipe # to control that exec goes well
 
-            cwrite.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+			if Autoproj::OSDependencies.operating_system[0].include?("windows")
+				olddir = Dir.pwd
+				if options[:working_directory] && (options[:working_directory] != Dir.pwd)
+					Dir.chdir(options[:working_directory])
+				end
+				system(*command)
+				result=$?.success?
+				if(!result)
+					error = Autobuild::SubcommandFailed.new(target, command.join(" "), logname, "Systemcall")
+					error.phase = phase
+					raise error
+				end
+				Dir.chdir(olddir)
+				return
+			end
+			
+			cwrite.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
             pid = fork do
                 begin
@@ -324,3 +345,5 @@ module Autobuild::Subprocess
 
 end
 
+
+

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.6.5" unless defined? Autobuild::VERSION
+    VERSION = "1.7.0.rc1" unless defined? Autobuild::VERSION
 end
 
 

data/test/test_reporting.rb

@@ -0,0 +1,55 @@
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
+require 'test/unit'
+require 'tools'
+
+require 'autobuild'
+require 'tmpdir'
+require 'fileutils'
+require 'flexmock/test_unit'
+
+class TC_Reporting < Test::Unit::TestCase
+    def teardown
+        Autobuild::Package.clear
+    end
+
+    def test_format_progress_message_does_not_touch_messages_without_prefix
+        assert_equal "a | b | c",
+            Autobuild.format_progress_message(%w{a b c})
+    end
+    def test_format_progress_message_find_common_prefix_at_beginning
+        assert_equal "X a, b | c",
+            Autobuild.format_progress_message(["X a", "X b", "c"])
+    end
+    def test_format_progress_message_picks_up_bigger_prefix
+        assert_equal "X a | X y b, c | d",
+            Autobuild.format_progress_message(["X a", "X y b", "X y c", "d"])
+    end
+    def test_format_progress_message_prefix_comparison_uses_string_length
+        assert_equal "X mmmmmmmmmm a, b | X my x c | d",
+            Autobuild.format_progress_message(["X mmmmmmmmmm a", "X mmmmmmmmmm b", "X my x c", "d"])
+    end
+    def test_package_message_with_marker_inside_token
+        package = Autobuild::Package.new('pkg')
+        assert_equal 'patching pkg: unapplying', package.process_formatting_string('patching %s: unapplying')
+    end
+    def test_package_message_with_marker_at_beginning
+        package = Autobuild::Package.new('pkg')
+        assert_equal 'pkg unapplying', package.process_formatting_string('%s unapplying')
+    end
+    def test_package_message_with_marker_at_end
+        package = Autobuild::Package.new('pkg')
+        assert_equal 'patching pkg', package.process_formatting_string('patching %s')
+    end
+    def test_package_message_without_formatting
+        flexmock(Autobuild).should_receive('color').never
+        package = Autobuild::Package.new('pkg')
+        assert_equal 'patching a package pkg', package.process_formatting_string('patching a package %s')
+    end
+    def test_package_message_with_formatting
+        flexmock(Autobuild).should_receive('color').with('patching a package', :bold, :red).and_return('|patching a package|').once
+        package = Autobuild::Package.new('pkg')
+        assert_equal '|patching a package| pkg', package.process_formatting_string('patching a package %s', :bold, :red)
+    end
+end
+

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.6.5
-  prerelease: 
+  version: 1.7.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21792800 !ruby/object:Gem::Requirement
+  requirement: &10716440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *21792800
+  version_requirements: *10716440
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &21792360 !ruby/object:Gem::Requirement
+  requirement: &10716000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *21792360
+  version_requirements: *10716000
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &21791920 !ruby/object:Gem::Requirement
+  requirement: &10715560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21791920
+  version_requirements: *10715560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21791460 !ruby/object:Gem::Requirement
+  requirement: &10715120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *21791460
+  version_requirements: *10715120
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21791000 !ruby/object:Gem::Requirement
+  requirement: &10714680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *21791000
+  version_requirements: *10714680
 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)
@@ -121,6 +121,7 @@ files:
 - test/test_import_tar.rb
 - test/test_subcommand.rb
 - test/tools.rb
+- test/test_reporting.rb
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses: []
@@ -139,9 +140,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: autobuild
 rubygems_version: 1.8.11
@@ -150,6 +151,7 @@ specification_version: 3
 summary: Library to handle build systems and import mechanisms
 test_files:
 - test/test_import_cvs.rb
+- test/test_reporting.rb
 - test/test_subcommand.rb
 - test/test_import_svn.rb
 - test/test_import_tar.rb