autobuild 1.5.20 → 1.5.21.rc1

data/Changes.txt

@@ -1,3 +1,15 @@
+== Version 1.5.21
+* add an argument to status() to avoid using the network (for importers that can
+  do that, i.e. git)
+* disable changing the subprocess priorities by default. This is so that people
+  can use 'nice' on the autobuild script if they don't know that autobuild
+  supports changing the priority itself.
+* add the Autobuild.ignore_errors option. If set, the build will go on even if
+  some errors occur. Errors are properly reported at the end of the build.
+* git: update branch tracking information to track the specified branch
+* git: offer a way to specify a push URL, in cases where having separate
+  read-only and read-write URLs make sense.
+
 == Version 1.5.20
 * cmake: inform the user if a CMake configuration value gets changed
 

data/lib/autobuild/config.rb

@@ -1,6 +1,7 @@
 require 'optparse'
 require 'rake'
 require 'singleton'
+require 'highline'
 
 # Evaluates +script+ in autobuild context
 def Autobuild(&script)
@@ -43,12 +44,22 @@ module Autobuild
 	# The directory in which logs are saved. Defaults to PREFIX/log.
         attr_writer :logdir
 
+        # A HighLine object that allows to colorize the output
+        attr_reader :console
+
         # True if we build and if the build is applied on all packages
         def full_build?
             do_build && !only_doc && packages.empty?
         end
     end
-    DEFAULT_OPTIONS = { :nice => 0,
+
+    @console = HighLine.new
+
+    def self.color(*args)
+        console.color(*args)
+    end
+
+    DEFAULT_OPTIONS = { :nice => nil,
         :srcdir => Dir.pwd, :prefix => Dir.pwd, :logdir => nil,
         :verbose => false, :debug => false, :do_build => true, :do_forced_build => false, :do_rebuild => false, :do_update => true, 
         :daemonize => false, :packages => [], :default_packages => [],

data/lib/autobuild/configurable.rb

@@ -76,22 +76,26 @@ module Autobuild
 
         def prepare
             Autobuild.source_tree srcdir do |pkg|
-		pkg.exclude << Regexp.new("^#{Regexp.quote(builddir)}")
+                pkg.exclude << Regexp.new("^#{Regexp.quote(builddir)}")
                 pkg.exclude << Regexp.new("^#{doc_dir}") if doc_dir
-	    end
+            end
 
             super
 
             stamps = dependencies.map { |pkg| Autobuild::Package[pkg].installstamp }
             file configurestamp => stamps do
-                ensure_dependencies_installed
-                configure
+                isolate_errors do
+                    ensure_dependencies_installed
+                    configure
+                end
             end
             task "#{name}-prepare" => configurestamp
 
             file buildstamp => [ srcdir, configurestamp ] do
-                ensure_dependencies_installed
-                build
+                isolate_errors do
+                    ensure_dependencies_installed
+                    build
+                end
             end
             task "#{name}-build" => buildstamp
 
@@ -116,4 +120,3 @@ module Autobuild
     end
 end
 
-

data/lib/autobuild/import/git.rb

@@ -28,10 +28,11 @@ module Autobuild
                 STDERR.puts "WARN:    Autobuild.git 'git://github.com/doudou/autobuild.git', :branch => 'master'"
             end
 
-            gitopts, common = Kernel.filter_options options, :branch => nil, :tag => nil, :commit => nil
+            gitopts, common = Kernel.filter_options options, :push_to => nil, :branch => nil, :tag => nil, :commit => nil
             if gitopts[:branch] && branch
                 raise ConfigException, "git branch specified with both the option hash and the explicit parameter"
             end
+            @push_to = gitopts[:push_to]
             branch = gitopts[:branch] || branch
             tag    = gitopts[:tag]
             commit = gitopts[:commit]
@@ -45,8 +46,18 @@ module Autobuild
             super(common)
         end
 
+        # The remote repository URL.
+        #
+        # See also #push_to
         attr_accessor :repository
 
+        # If set, this URL will be listed as a pushurl for the tracked branch.
+        # It makes it possible to have a read-only URL for fetching and specify
+        # a push URL for people that have commit rights
+        #
+        # #repository is always used for read-only operations
+        attr_reader :push_to
+
         # The branch this importer is tracking
         #
         # If set, both commit and tag have to be nil.
@@ -87,8 +98,18 @@ module Autobuild
                 # Update the remote definition
                 Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                "--replace-all", "remote.autobuild.url", repository)
+                if push_to
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                                   "--replace-all", "remote.autobuild.pushurl", push_to)
+                end
                 Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                "--replace-all", "remote.autobuild.fetch",  "+refs/heads/*:refs/remotes/autobuild/*")
+                if branch
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                                   "--replace-all", "branch.#{branch}.remote",  "autobuild")
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                                   "--replace-all", "branch.#{branch}.merge", "refs/heads/#{branch}")
+                end
 
                 # We are checking out a specific commit. We just call git fetch
                 if commit 
@@ -119,12 +140,19 @@ module Autobuild
 
         # Returns a Importer::Status object that represents the status of this
         # package w.r.t. the root repository
-        def status(package)
-            validate_srcdir(package)
+        def status(package, only_local = false)
             Dir.chdir(package.srcdir) do
-                remote_commit = fetch_remote(package)
-                if !remote_commit
-                    return
+                validate_srcdir(package)
+                remote_commit = nil
+                if only_local
+                    Dir.chdir(package.srcdir) do
+                        remote_commit = `git show-ref -s refs/heads/#{branch}`.chomp
+                    end
+                else	
+                    remote_commit = fetch_remote(package)
+                    if !remote_commit
+                        return
+                    end
                 end
 
                 status = merge_status(remote_commit)

data/lib/autobuild/package.rb

@@ -4,6 +4,10 @@ require 'autobuild/subcommand'
 
 module Autobuild
     TARGETS = %w{import prepare build}
+
+    class << self
+        attr_accessor :ignore_errors
+    end
     
     # Basic block for the autobuilder
     #
@@ -112,11 +116,15 @@ module Autobuild
             @doc_target_dir ||= name
 
 	    # Define the default tasks
-	    task "#{name}-import" do import end
+	    task "#{name}-import" do
+                isolate_errors { import }
+            end
 	    task :import => "#{name}-import"
 
 	    # Define the prepare task
-	    task "#{name}-prepare" => "#{name}-import" do prepare end
+	    task "#{name}-prepare" => "#{name}-import" do
+                isolate_errors { prepare }
+            end
 	    task :prepare => "#{name}-prepare"
 
 	    task "#{name}-build" => "#{name}-prepare"
@@ -154,14 +162,53 @@ module Autobuild
             end
         end
 
+        # Returns true if one of the operations applied on this package failed
+        def failed?
+            !!@failure
+        end
+
+        # If something failed on this package, returns the corresponding
+        # exception object. Otherwise, returns nil
+        attr_reader :failure
+
+        # If Autobuild.ignore_errors is set, an exception raised from within the
+        # provided block will be filtered out, only displaying a message instead
+        # of stopping the build
+        #
+        # Moreover, the package will be marked as "failed" and isolate_errors
+        # will subsequently be a noop. I.e. if +build+ fails, +install+ will do
+        # nothing.
+        def isolate_errors
+            # Don't do anything if we already have failed
+            return if failed?
+
+            begin yield
+            rescue Exception => e
+                @failure = e
+
+                if Autobuild.ignore_errors
+                    lines = e.to_s.split("\n")
+                    progress(lines.shift, :red, :bold)
+                    lines.each do |line|
+                        progress(line)
+                    end
+                    nil
+                else
+                    raise
+                end
+            end
+        end
+
         # Call the importer if there is one. Autodetection of "provides" should
         # be done there as well. See the documentation of Autobuild::Package for
         # more information.
 	def import
-            @importer.import(self) if @importer
+            if @importer
+                @importer.import(self)
+            end
 
-	    # Add the dependencies declared in spec
-	    depends_on *@spec_dependencies if @spec_dependencies
+            # Add the dependencies declared in spec
+            depends_on *@spec_dependencies if @spec_dependencies
 
             if File.directory?(prefix)
                 Autobuild.update_environment prefix
@@ -176,22 +223,36 @@ module Autobuild
 
             stamps = dependencies.map { |p| Package[p].installstamp }
 
-	    file installstamp => stamps do
-                install
-	    end
+            file installstamp => stamps do
+                isolate_errors { install }
+            end
             task "#{name}-build" => installstamp
         end
 
         # Display a progress message. %s in the string is replaced by the
         # package name
-        def progress(msg)
-            Autobuild.progress(msg % [name])
+        def progress(*args)
+            if !args.empty?
+                begin args[0] = args[0] % [name]
+                rescue ArgumentError
+                    # Don't try to format strings that can't be formatted
+                end
+
+                Autobuild.progress(*args)
+            else
+                Autobuild.progress
+            end
         end
 
         # Display a progress message, and later on update it with a progress
         # value. %s in the string is replaced by the package name
-        def progress_with_value(msg)
-            Autobuild.progress_with_value(msg % [name])
+        def progress_with_value(*args)
+            if !args.empty?
+                args[0] = args[0] % [name]
+                Autobuild.progress_with_value(*args)
+            else
+                Autobuild.progress_with_value
+            end
         end
 
         def progress_value(value)

data/lib/autobuild/packages/autotools.rb

@@ -179,6 +179,7 @@ module Autobuild
 	    end
 
             file conffile do
+                isolate_errors do
                 Dir.chdir(srcdir) do
                     if using[:autogen].nil?
                         using[:autogen] = %w{autogen autogen.sh}.find { |f| File.exists?(f) }
@@ -205,6 +206,7 @@ module Autobuild
                         end
                     end
                 end
+                end
             end
 
             return conffile

data/lib/autobuild/packages/genom.rb

@@ -131,19 +131,23 @@ module Autobuild
             file buildstamp => genomstamp
 	    file genomstamp => genom_dependencies
             file genomstamp => srcdir do
-                Dir.chdir(srcdir) do
-                    progress "generating GenoM files for %s"
-                    Subprocess.run(self, 'genom', *cmdline)
-		end
+                isolate_errors do
+                    Dir.chdir(srcdir) do
+                        progress "generating GenoM files for %s"
+                        Subprocess.run(self, 'genom', *cmdline)
+                    end
+                end
             end
 
             acuser = File.join(srcdir, "configure.ac.user")
             file File.join(srcdir, 'configure') => acuser do
-                # configure does not depend on the .gen file
-                # since the generation takes care of rebuilding configure
-                # if .gen has changed
-                progress "generating build system for %s"
-                Dir.chdir(srcdir) { Subprocess.run(self, 'genom', File.expand_path('autogen')) }
+                isolate_errors do
+                    # configure does not depend on the .gen file
+                    # since the generation takes care of rebuilding configure
+                    # if .gen has changed
+                    progress "generating build system for %s"
+                    Dir.chdir(srcdir) { Subprocess.run(self, 'genom', File.expand_path('autogen')) }
+                end
             end
 
 	    super("#{srcdir}/autoconf/configure.ac")

data/lib/autobuild/packages/orogen.rb

@@ -272,7 +272,7 @@ module Autobuild
 
             file configurestamp => genstamp
             file genstamp => File.join(srcdir, orogen_file) do
-                regen
+                isolate_errors { regen }
             end
 
             with_doc

data/lib/autobuild/reporting.rb

@@ -15,24 +15,52 @@ require 'autobuild/config'
 require 'autobuild/exceptions'
 
 module Autobuild
-    def self.progress(msg)
+    def self.progress(*args)
         if @last_msg
             progress_value(100)
             puts
         end
         @last_msg = nil
-        puts "  #{msg}"
+
+        if args.empty?
+            puts
+        else
+            puts "  #{color(*args)}"
+        end
     end
-    def self.progress_with_value(msg)
+    def self.progress_with_value(*args)
         if @last_msg
             progress_value(100)
             puts
         end
-        @last_msg = msg
-        print "  #{msg}"
+        @last_msg = "  #{color(args[0], *args[1..-1])}"
+
+        print @last_msg
     end
     def self.progress_value(value)
-        print "\r  #{@last_msg} (#{value}%)"
+        print "\r#{@last_msg} (#{value}%)"
+    end
+
+    # The exception type that is used to report multiple errors that occured
+    # when ignore_errors is set
+    class CompositeException < Autobuild::Exception
+        # The array of exception objects representing all the errors that
+        # occured during the build
+        attr_reader :original_errors
+
+        def initialize(original_errors)
+            @original_errors = original_errors
+        end
+
+        def mail?; true end
+
+        def to_s
+            result = ["#{original_errors.size} errors occured"]
+            original_errors.each_with_index do |e, i|
+                result << "(#{i}) #{e.to_s}"
+            end
+            result.join("\n")
+        end
     end
 
     ## The reporting module provides the framework
@@ -48,6 +76,21 @@ module Autobuild
         def self.report
             begin
                 yield
+
+                # If ignore_erorrs is true, check if some packages have failed
+                # on the way. If so, raise an exception to inform the user about
+                # it
+                errors = []
+                Autobuild::Package.each do |name, pkg|
+                    if pkg.failed?
+                        errors << pkg.failure
+                    end
+                end
+
+                if !errors.empty?
+                    raise CompositeException.new(errors)
+                end
+
             rescue Autobuild::Exception => e
                 error(e)
                 exit(1) if e.fatal?

data/lib/autobuild/subcommand.rb

@@ -143,7 +143,9 @@ module Autobuild::Subprocess
             pid = fork do
                 cwrite.sync = true
                 begin
-                    Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
+                    if Autobuild.nice
+                        Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
+                    end
 
                     if outwrite
                         outread.close

data/lib/autobuild/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 5
-  - 20
-  version: 1.5.20
+  - 21
+  - rc1
+  version: 1.5.21.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 7
@@ -42,7 +41,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -57,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 0
@@ -72,7 +69,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 3
@@ -88,7 +84,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -104,12 +99,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id006
 description: |-
@@ -196,19 +190,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild
@@ -217,7 +211,7 @@ signing_key:
 specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies
 test_files: 
-- test/test_import_tar.rb
-- test/test_import_cvs.rb
 - test/test_import_svn.rb
+- test/test_import_tar.rb
 - test/test_subcommand.rb
+- test/test_import_cvs.rb