autoproj 1.7.15.rc2 → 1.7.15.rc3

data/History.txt

@@ -19,6 +19,9 @@
    to use OS packages in version-dependent setup (i.e. different packages for
    ruby 1.8 and 1.9 for instance)
  * fix the auto-add feature
+ * add the --no-color option for non-console outputs (think build servers)
+ * splitted the "Build failed: reason" line into two lines to allow extraction
+   by Jenkins
 
 = Version 1.7.14
  * fix support for local package sets, i.e. package sets that are saved in

data/lib/autoproj/autobuild.rb

@@ -152,7 +152,8 @@ module Autoproj
     class Reporter < Autobuild::Reporter
         def error(error)
             error_lines = error.to_s.split("\n")
-            Autoproj.progress("Build failed: #{error_lines.shift}", :bold, :red)
+            Autoproj.progress("Build failed", :bold, :red)
+            Autoproj.progress("#{error_lines.shift}", :bold, :red)
             error_lines.each do |line|
                 Autoproj.progress line
             end

data/lib/autoproj/cmdline.rb

@@ -14,14 +14,20 @@ module Autoproj
         if !silent?
             if args.empty?
                 puts
-            else
+            elsif CmdLine.color?
                 STDERR.puts console.color(*args)
+            else
+                STDERR.puts args.first
             end
         end
     end
 
     def self.color(*args)
-        console.color(*args)
+        if CmdLine.color?
+            console.color(*args)
+        else
+            args.first
+        end
     end
 
     # Displays an error message
@@ -744,6 +750,8 @@ module Autoproj
         def self.show_statistics?; !!@show_statistics end
         def self.ignore_dependencies?; @ignore_dependencies end
 
+        def self.color?; @color end
+
         def self.osdeps?; @mode == "osdeps" end
         def self.show_osdeps?; @mode == "osdeps" && @show_osdeps end
         def self.revshow_osdeps?; @mode == "osdeps" && @revshow_osdeps end
@@ -774,6 +782,7 @@ module Autoproj
             force_re_build_with_depends = nil
             @only_config = false
             @partial_build = false
+            @color = true
             Autobuild.doc_errors = false
             Autobuild.do_doc = false
             Autobuild.only_doc = false
@@ -849,6 +858,9 @@ where 'mode' is one of:
                 opts.on("--reconfigure", "re-ask all configuration options (build modes only)") do
                     Autoproj.reconfigure = true
                 end
+                opts.on("--[no-]color", "enable or disable color in status messages (enabled by default)") do |flag|
+                    @color = flag
+                end
                 opts.on("--version", "displays the version and then exits") do
                     puts "autoproj v#{Autoproj::VERSION}"
                     exit(0)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.15.rc2"
+    VERSION = "1.7.15.rc3"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 15424057
+  hash: 15424059
   prerelease: 7
   segments: 
   - 1
   - 7
   - 15
   - rc
-  - 2
-  version: 1.7.15.rc2
+  - 3
+  version: 1.7.15.rc3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild