autobuild 1.6.1 → 1.6.2.b1

data/lib/autobuild/config.rb

@@ -242,7 +242,7 @@ module Autobuild
     def self.apply(packages, buildname = "autobuild")
         if Autobuild.mail[:to]
             if !Autobuild::HAS_RMAIL
-                STDERR.puts "RMail is not available. Mail notification is disabled"
+                Autobuild.warn "RMail is not available. Mail notification is disabled"
             else
                 Reporting << MailReporter.new(Autobuild.mail)
             end

data/lib/autobuild/exceptions.rb

@@ -18,8 +18,6 @@ module Autobuild
             dir =
                 if target.respond_to?(:srcdir)
                     "(#{target.srcdir})"
-                else
-                    puts target.inspect
                 end
             target_name =
                 if target.respond_to?(:name)

data/lib/autobuild/import/archive.rb

@@ -59,13 +59,13 @@ module Autobuild
                 if mtime && size
                     do_update = (size != cached_size || mtime > cached_mtime)
                 elsif mtime
-                    $stderr.puts "WARNING: size is not available for #{@url}, relying on modification time"
+                    package.warn "%s: archive size is not available for #{@url}, relying on modification time"
                     do_update = (mtime > cached_mtime)
                 elsif size
-                    $stderr.puts "WARNING: modification time is not available for #{@url}, relying on size"
+                    package.warn "%s: archive modification time is not available for #{@url}, relying on size"
                     do_update = (size != cached_size)
                 else
-                    $stderr.puts "WARNING: neither size nor modification time available for #{@url}, will always update"
+                    package.warn "%s: neither the archive size nor its modification time available for #{@url}, will always update"
                     do_update = true
                 end
             end

data/lib/autobuild/import/git.rb

@@ -21,11 +21,11 @@ module Autobuild
             end
 
             if branch
-                STDERR.puts "WARN: the git importer now expects you to provide the branch as a named option"
-                STDERR.puts "WARN: this form is deprecated:"
-                STDERR.puts "WARN:    Autobuild.git 'git://gitorious.org/rock/buildconf.git', 'master'"
-                STDERR.puts "WARN: and should be replaced by"
-                STDERR.puts "WARN:    Autobuild.git 'git://gitorious.org/rock/buildconf.git', :branch => 'master'"
+                Autobuild.warn "the git importer now expects you to provide the branch as a named option"
+                Autobuild.warn "this form is deprecated:"
+                Autobuild.warn "   Autobuild.git 'git://gitorious.org/rock/buildconf.git', 'master'"
+                Autobuild.warn "and should be replaced by"
+                Autobuild.warn "   Autobuild.git 'git://gitorious.org/rock/buildconf.git', :branch => 'master'"
             end
 
             gitopts, common = Kernel.filter_options options, :push_to => nil, :branch => nil, :tag => nil, :commit => nil

data/lib/autobuild/importer.rb

@@ -65,7 +65,26 @@ class Importer
     # [:patches] a list of patch to apply after import
     #
     # More options are specific to each importer type.
-    def initialize(options); @options = options end
+    def initialize(options)
+        @options = options.dup
+    end
+
+    # The number of times update / checkout should be retried before giving up.
+    # The default is 0 (do not retry)
+    #
+    # Set either with #retry_count= or by setting the :retry_count option when
+    # constructing this importer
+    def retry_count
+        @options[:retry_count] || 0
+    end
+
+    # Sets the number of times update / checkout should be retried before giving
+    # up. 0 (the default) disables retrying.
+    #
+    # See also #retry_count
+    def retry_count=(count)
+        @options[:retry_count] = count
+    end
 
     def patches
         if @options[:patches].respond_to?(:to_ary)
@@ -85,65 +104,79 @@ class Importer
             patch(package, kept_patches)
         end
 
-        package.progress_start "updating %s" do
-            update(package)
-            patch(package)
-        end
-        package.updated = true
-    rescue Interrupt
-        raise
-    rescue ::Exception => original_error
-        # If the package is patched, it might be that the update
-        # failed because we needed to unpatch first. Try it out
-        #
-        # This assumes that importing data with conflict will
-        # make the import fail, but not make the patch
-        # un-appliable. Importers that do not follow this rule
-        # will have to unpatch by themselves.
-        cur_patches = currently_applied_patches(package)
-        if cur_patches.empty?
-            return fallback(original_error, package, :import, package)
-        end
-
-        package.message "update failed and some patches are applied, retrying after removing all patches first"
-        begin
-            patch(package, [])
-
-        rescue ::Exception => e
-            # The unpatching failed. The importer probably did
-            # change the files in a way that made the patching
-            # impossible to reverse. Just raise the original
-            # error (which hopefully should be the importer
-            # message that says that there are conflicts)
-            raise original_error
-        end
-
+        retry_count = 0
         begin
             package.progress_start "updating %s" do
                 update(package)
-                patch(package)
             end
-            package.updated = true
         rescue Interrupt
             raise
-        rescue ::Exception => e
-            fallback(e, package, :import, package)
+        rescue ::Exception => original_error
+            # If the package is patched, it might be that the update
+            # failed because we needed to unpatch first. Try it out
+            #
+            # This assumes that importing data with conflict will
+            # make the import fail, but not make the patch
+            # un-appliable. Importers that do not follow this rule
+            # will have to unpatch by themselves.
+            cur_patches = currently_applied_patches(package)
+            if !cur_patches.empty?
+                package.message "update failed and some patches are applied, retrying after removing all patches first"
+                begin
+                    patch(package, [])
+                    return perform_update(package)
+                rescue Interrupt
+                    raise
+                rescue ::Exception
+                    raise original_error
+                end
+            end
+
+            retry_count += 1
+            if retry_count > self.retry_count
+                raise
+            end
+            package.message "update failed in #{package.srcdir}, retrying (#{retry_count}/#{self.retry_count})"
+            retry
         end
+
+        patch(package)
+        package.updated = true
+    rescue Interrupt
+        raise
+    rescue Autobuild::Exception => e
+        fallback(e, package, :import, package)
     end
 
     def perform_checkout(package)
         package.progress_start "checking out %s" do
-            checkout(package)
-            patch(package)
+            retry_count = 0
+            begin
+                checkout(package)
+            rescue Interrupt
+                raise
+            rescue ::Exception
+                retry_count += 1
+                if retry_count > self.retry_count
+                    raise
+                end
+                package.message "checkout of %s failed, deleting the source directory #{package.srcdir} and retrying (#{retry_count}/#{self.retry_count})"
+                FileUtils.rm_rf package.srcdir
+                retry
+            end
         end
+
+        patch(package)
         package.updated = true
-    rescue Autobuild::Exception => e
-        FileUtils.rm_rf package.srcdir
-        fallback(e, package, :import, package)
+    rescue Interrupt
+        raise
     rescue ::Exception
         package.message "checkout of %s failed, deleting the source directory #{package.srcdir}"
         FileUtils.rm_rf package.srcdir
         raise
+    rescue Autobuild::Exception => e
+        FileUtils.rm_rf package.srcdir
+        fallback(e, package, :import, package)
     end
 
     # Performs the import of +package+
@@ -155,7 +188,7 @@ class Importer
                     perform_update(package)
                 else
                     if Autobuild.verbose
-                        puts "  not updating #{package.name}"
+                        package.message "%s: not updating"
                     end
                     return
                 end

data/lib/autobuild/package.rb

@@ -273,6 +273,18 @@ module Autobuild
             msg
         end
 
+        # Display a progress message. %s in the string is replaced by the
+        # package name
+        def warn(warning_string)
+            message("  WARN: #{warning_string}", :magenta)
+        end
+
+        # Display a progress message. %s in the string is replaced by the
+        # package name
+        def error(error_string)
+            message("  ERROR: #{error_string}", :red, :bold)
+        end
+
         # Display a progress message. %s in the string is replaced by the
         # package name
         def message(*args)
@@ -366,9 +378,7 @@ module Autobuild
                 @installed_doc = false
                 catch(:doc_disabled) do
                     begin
-                        Dir.chdir(srcdir) do
-                            yield if block_given?
-                        end
+                        yield if block_given?
 
                         unless @installed_doc
                             install_doc
@@ -380,11 +390,11 @@ module Autobuild
                         if Autobuild.doc_errors
                             raise
                         else
-                            STDERR.puts "W: failed to generate documentation for #{name}"
+                            warn "%s: failed to generate documentation"
                             if e.kind_of?(SubcommandFailed)
-                                STDERR.puts "W: see #{e.logfile} for more details"
+                                warn "%s: see #{e.logfile} for more details"
                             else
-                                STDERR.puts "W: #{e.message}"
+                                warn "%s: #{e.message}"
                             end
                         end
                     end
@@ -464,7 +474,7 @@ module Autobuild
                 next if @dependencies.include?(pkg.name)
 
                 if Autobuild.verbose
-                    STDERR.puts "  #{name} depends on #{pkg.name}"
+                    Autobuild.message "#{name} depends on #{pkg.name}"
                 end
 
 		task "#{name}-import"  => "#{pkg.name}-import"
@@ -486,7 +496,7 @@ module Autobuild
 		@@provides[p] = self 
 
                 if Autobuild.verbose
-                    STDERR.puts "  #{name} provides #{p}"
+                    Autobuild.message "#{name} provides #{p}"
                 end
 
 		task p => name

data/lib/autobuild/packages/autotools.rb

@@ -40,12 +40,10 @@ module Autobuild
         def with_doc(target = 'doc')
             task "#{name}-doc" => configurestamp
             doc_task do
-                in_dir(builddir) do
-                    progress_start "generating documentation for %s" do
-                        Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
-                    end
-                    yield if block_given?
+                progress_start "generating documentation for %s" do
+                    Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target, :working_directory => builddir)
                 end
+                yield if block_given?
             end
         end
 
@@ -165,7 +163,7 @@ module Autobuild
 		new_opt = testflags.find { |o| !options.include?(o) }
 		if old_opt || new_opt
                     if Autobuild.verbose
-                        STDERR.puts "  forcing reconfiguration of #{name} (#{old_opt} != #{new_opt})"
+                        Autobuild.message "forcing reconfiguration of #{name} (#{old_opt} != #{new_opt})"
                     end
 		    FileUtils.rm_f configurestamp # to force reconfiguration
 		end

data/lib/autobuild/packages/cmake.rb

@@ -162,7 +162,6 @@ module Autobuild
 
             doxyfile_in = File.join(srcdir, "Doxyfile.in")
             if !File.file?(doxyfile_in)
-                puts "NO INTERNAL: #{name}"
                 return false
             end
             File.readlines(doxyfile_in).each do |line|
@@ -272,7 +271,7 @@ module Autobuild
                     old_value = cache_line.split("=")[1].chomp if cache_line
                     if !old_value || !equivalent_option_value?(old_value, value)
                         if Autobuild.debug
-                            puts "option '#{name}' changed value: '#{old_value}' => '#{value}'"
+                            message "%s: option '#{name}' changed value: '#{old_value}' => '#{value}'"
                         end
                         if old_value
                             message "%s: changed value of #{name} from #{old_value} to #{value}"
@@ -285,7 +284,7 @@ module Autobuild
                 end
                 if did_change
                     if Autobuild.debug
-                        puts "CMake configuration changed, forcing a reconfigure"
+                        message "%s: CMake configuration changed, forcing a reconfigure"
                     end
                     FileUtils.rm_f cmake_cache
                 end

data/lib/autobuild/packages/genom.rb

@@ -67,7 +67,7 @@ module Autobuild
                             currentBuffer = nil
                         elsif currentBuffer =~ /^\s*(?:codels_)?requires.*;$/
                             # Check that the regexp is not too strict
-                            STDERR.puts "failed to match #{currentBuffer}"
+                            warn "%s: failed to match #{currentBuffer}"
                         end
                     end
                 end

data/lib/autobuild/packages/orogen.rb

@@ -198,7 +198,7 @@ module Autobuild
             # and if so add it into our dependency list
             if rtt = Autobuild::Package["pkgconfig/orocos-rtt-#{orocos_target}"]
                 if Autobuild.verbose
-                    STDERR.puts "orogen: found #{rtt.name} which provides the RTT"
+                    message "orogen: found #{rtt.name} which provides the RTT"
                 end
                 depends_on rtt.name
             end

data/lib/autobuild/parallel.rb

@@ -42,13 +42,9 @@ module Autobuild
 
         def process_finished_task(task, processed, queue)
             processed << task
-            #puts "finished #{task} (#{task.object_id}), considering dependencies"
             reverse_dependencies[task].each do |candidate|
                 if candidate.prerequisite_tasks.all? { |t| processed.include?(t) }
-                    #puts "  adding #{candidate}"
                     queue << candidate
-                else
-                    #puts "  rejecting #{candidate} (#{candidate.prerequisite_tasks.find_all { |t| !processed.include?(t) }.map(&:name).join(", ")})"
                 end
             end
         end
@@ -70,7 +66,6 @@ module Autobuild
 
         def discover_dependencies(t)
             return if tasks.include?(t) # already discovered or being discovered
-            #puts "adding #{t}"
             tasks << t
 
             t.prerequisite_tasks.each do |dep_t|
@@ -88,12 +83,6 @@ module Autobuild
                 discover_dependencies(t)
             end
             @roots = tasks.find_all { |t| t.prerequisite_tasks.empty? }.to_set
-
-            #puts "roots:"
-            roots.each do |t|
-                #puts "  #{t}"
-            end
-            #puts
             
             # Build a reverse dependency graph (i.e. a mapping from a task to
             # the tasks that depend on it)
@@ -122,7 +111,6 @@ module Autobuild
                 end
 
                 pending_task = queue.pop
-                #puts "#{processed.size} tasks processed so far, #{tasks.size} total"
                 if pending_task.instance_variable_get(:@already_invoked) || !pending_task.needed?
                     process_finished_task(pending_task, processed, queue)
                     next
@@ -144,20 +132,11 @@ module Autobuild
                 end
 
                 worker = available_workers.pop
-                #puts "queueing #{pending_task}"
                 worker.queue(pending_task)
             end
 
             if processed.size != tasks.size
                 with_cycle = tasks.to_set
-                (tasks.to_set - processed).each do |pending_task|
-                    pending_task.prerequisite_tasks.each do |t|
-                        if !processed.include?(t)
-                            #puts "#{pending_task} => #{t}"
-                        end
-                    end
-                end
-                raise "cycle in task graph"
                 raise "cycle in task graph: #{with_cycle.map(&:name).sort.join(", ")}"
             end
         end

data/lib/autobuild/reporting.rb

@@ -32,6 +32,17 @@ module Autobuild
     end
     @progress_messages = Array.new
 
+    # Displays an error message
+    def self.error(message)
+        Autoproj.message("  ERROR: #{message}", :red, :bold)
+    end
+
+    # Displays a warning message
+    def self.warn(message)
+        Autoproj.message("  WARN: #{message}", :magenta)
+    end
+
+
     def self.progress_start(key, *args)
         if args.last.kind_of?(Hash)
             options = Kernel.validate_options args.pop, :done_message => nil
@@ -76,7 +87,7 @@ module Autobuild
                 found = true
             end
         end
-        if found
+        if found && @last_progress_msg
             puts
             display_progress
         end

data/lib/autobuild/subcommand.rb

@@ -110,7 +110,7 @@ module Autobuild
         # If the cpuinfo detection fails, inform the user and set it to 1
         if !@processor_count
             # Hug... What kind of system is it ?
-            STDERR.puts "INFO: cannot autodetect the number of CPUs on this sytem"
+            Autobuild.message "INFO: cannot autodetect the number of CPUs on this sytem"
             @processor_count = 1
         end
 
@@ -168,7 +168,7 @@ module Autobuild::Subprocess
         end
 
 	if Autobuild.verbose
-	    puts "#{target_name}: running #{command.join(" ")}\n    (output goes to #{logname})"
+	    Autobuild.message "#{target_name}: running #{command.join(" ")}\n    (output goes to #{logname})"
 	end
 
         open_flag = if Autobuild.keep_oldlogs then 'a'

data/lib/autobuild/timestamps.rb

@@ -32,7 +32,7 @@ module Autobuild
 	exclude.each { |rx| raise unless Regexp === rx }
         exclude << (/#{Regexp.quote(STAMPFILE)}$/)
 
-        puts "getting tree timestamp for #{path}" if Autobuild.debug
+        Autobuild.message "getting tree timestamp for #{path}" if Autobuild.debug
         latest = Time.at(0)
         latest_file = ""
 
@@ -40,7 +40,7 @@ module Autobuild
             Find.prune if File.basename(p) =~ /^\./
             exclude.each { |pattern| 
                 if p =~ pattern
-                    puts "  excluding #{p}" if Autobuild.debug
+                    Autobuild.message "  excluding #{p}" if Autobuild.debug
                     Find.prune
                 end
             }
@@ -53,7 +53,7 @@ module Autobuild
             end
         }
 
-        puts "  newest file: #{latest_file} at #{latest}" if Autobuild.debug
+        Autobuild.message "  newest file: #{latest_file} at #{latest}" if Autobuild.debug
         return latest_file, latest
     end
 
@@ -97,7 +97,7 @@ module Autobuild
     end
 
     def self.touch_stamp(stampfile)
-        puts "Touching #{stampfile}" if Autobuild.debug
+        Autobuild.message "Touching #{stampfile}" if Autobuild.debug
         dir = File.dirname(stampfile)
         if File.exists?(dir) && !File.directory?(dir)
             raise "#{dir} exists and is not a directory"

data/lib/autobuild/version.rb

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

metadata

@@ -1,95 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autobuild
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 1
-  version: 1.6.1
+version: !ruby/object:Gem::Version
+  version: 1.6.2.b1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17029640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilrb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17029640
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: &17029140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *17029140
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &17028600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *17028600
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &17028140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id004
-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) integrated software project management tool.
+  prerelease: false
+  version_requirements: *17028140
+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)
+  integrated software project management tool.
 email: rock-dev@dfki.de
-executables: 
+executables:
 - autobuild
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Changes.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - Changes.txt
 - Manifest.txt
 - README.txt
@@ -135,40 +113,32 @@ files:
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: autobuild
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
-test_files: 
+test_files:
+- test/test_import_cvs.rb
+- test/test_subcommand.rb
 - test/test_import_svn.rb
 - test/test_import_tar.rb
-- test/test_subcommand.rb
-- test/test_import_cvs.rb