autoproj 1.7.20 → 1.7.21.b1

data/bin/autoproj

@@ -260,21 +260,21 @@ EOTEXT
 
     if Autoproj::CmdLine.update_envsh?
         Autoproj.export_env_sh
-        Autoproj.progress "autoproj: updated #{Autoproj.root_dir}/env.sh", :green
+        Autoproj.message "autoproj: updated #{Autoproj.root_dir}/env.sh", :green
     end
 
     if Autoproj::CmdLine.show_statistics?
         per_phase = Hash.new
         per_type  = Hash.new
 
-        Autoproj.progress
-        Autoproj.progress "statistics about the build", :bold
+        Autoproj.message
+        Autoproj.message "statistics about the build", :bold
 
         Autoproj.manifest.each_package.sort_by(&:name).each do |pkg|
             next if pkg.statistics.empty?
 
             if per_phase.empty?
-                Autoproj.progress "detailed per package"
+                Autoproj.message "detailed per package"
             end
 
             puts "  #{pkg.name}: %.1fs" % [pkg.statistics.values.inject(&:+)]
@@ -289,21 +289,21 @@ EOTEXT
         end
 
         if !per_type.empty?
-            Autoproj.progress
-            Autoproj.progress "detailed per package type"
+            Autoproj.message
+            Autoproj.message "detailed per package type"
             per_type.each do |pkg_type, phases|
-                Autoproj.progress "  #{pkg_type.name}: %.1fs" % [phases.values.inject(&:+)]
+                Autoproj.message "  #{pkg_type.name}: %.1fs" % [phases.values.inject(&:+)]
                 phases.each_key.sort.each do |phase_name|
-                    Autoproj.progress "    #{phase_name}: %.1fs" % [phases[phase_name]]
+                    Autoproj.message "    #{phase_name}: %.1fs" % [phases[phase_name]]
                 end
             end
         end
 
         if !per_phase.empty?
-            Autoproj.progress
-            Autoproj.progress "summary per phase"
+            Autoproj.message
+            Autoproj.message "summary per phase"
             per_phase.keys.sort.each do |phase_name|
-                Autoproj.progress "  #{phase_name}: %.1fs" % [per_phase[phase_name]]
+                Autoproj.message "  #{phase_name}: %.1fs" % [per_phase[phase_name]]
             end
         end
     end

data/bin/autoproj_bootstrap

@@ -57,7 +57,7 @@ module Autoproj
         string
     end
 
-    def self.progress(str)
+    def self.message(str)
         STDERR.puts "  #{str}"
     end
 end
@@ -66,7 +66,7 @@ module Autobuild
     def self.do_update
         true
     end
-    def self.progress(str)
+    def self.message(str)
         STDERR.puts "  #{str}"
     end
 
@@ -168,7 +168,7 @@ module Autoproj
         def self.load_default
             file = ENV['AUTOPROJ_DEFAULT_OSDEPS'] || AUTOPROJ_OSDEPS
             if !File.file?(file)
-                Autoproj.progress "WARN: #{file} (from AUTOPROJ_DEFAULT_OSDEPS) is not a file, falling back to #{AUTOPROJ_OSDEPS}"
+                Autoproj.warn "#{file} (from AUTOPROJ_DEFAULT_OSDEPS) is not a file, falling back to #{AUTOPROJ_OSDEPS}"
                 file = AUTOPROJ_OSDEPS
             end
             OSDependencies.load(file)
@@ -188,7 +188,7 @@ module Autoproj
         # install RubyGems packages
         def gem_fetcher
             if !@gem_fetcher
-                Autobuild.progress "looking for RubyGems updates"
+                Autoproj.message "looking for RubyGems updates"
                 @gem_fetcher = Gem::SpecFetcher.fetcher
             end
             @gem_fetcher
@@ -318,7 +318,7 @@ module Autoproj
                     @operating_system = [names.split(','), versions.split(',')]
                 end
             else
-                Autoproj.progress "  autodetecting the operating system"
+                Autoproj.message "  autodetecting the operating system"
                 name, versions = os_from_lsb
                 if name
                     if name != "debian"
@@ -411,7 +411,7 @@ module Autoproj
             if package_name =~ /^(\w[a-z0-9+-.]+)/
                 @dpkg_installed_packages.include?($1)
             else
-                Autoproj.progress "WARN: #{package_name} is not a valid Debian package name"
+                Autoproj.warn "#{package_name} is not a valid Debian package name"
                 false
             end
         end
@@ -527,7 +527,7 @@ fi
                     end
                 end
                 if Autoproj.verbose
-                    Autoproj.progress "selected OS version #{found} for osdep #{name}: #{version_entry.inspect}"
+                    Autoproj.message "selected OS version #{found} for osdep #{name}: #{version_entry.inspect}"
                 end
 
                 if !version_entry
@@ -1052,17 +1052,17 @@ So, what do you want ? (all, ruby, os or none)
                     user_shell_script = generate_user_os_script(os_names, os_packages)
                 end
                 if osdeps_interaction(osdeps, os_packages, user_shell_script, silent?)
-                    Autoproj.progress "  installing OS packages: #{os_packages.sort.join(", ")}"
+                    Autoproj.message "  installing OS packages: #{os_packages.sort.join(", ")}"
 
                     if Autoproj.verbose
-                        Autoproj.progress "Generating installation script for non-ruby OS dependencies"
-                        Autoproj.progress shell_script
+                        Autoproj.message "Generating installation script for non-ruby OS dependencies"
+                        Autoproj.message shell_script
                     end
 
                     File.open('/tmp/autoproj_osdeps_lock', 'w') do |lock_io|
                         begin
                             while !lock_io.flock(File::LOCK_EX | File::LOCK_NB)
-                                Autoproj.progress "  waiting for other autoproj instances to finish their osdeps installation"
+                                Autoproj.message "  waiting for other autoproj instances to finish their osdeps installation"
                                 sleep 5
                             end
 
@@ -1104,7 +1104,7 @@ So, what do you want ? (all, ruby, os or none)
                 end
 
                 if gems_interaction(gems, cmdlines, silent?)
-                    Autobuild.progress "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+                    Autoproj.message "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
 
                     cmdlines.each do |c|
                         Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
@@ -1182,7 +1182,7 @@ module Autoproj
             validate(answer)
 
         rescue InputError => e
-            Autoproj.progress("invalid value: #{e.message}", :red)
+            Autoproj.message("invalid value: #{e.message}", :red)
             retry
         end
 
@@ -1250,7 +1250,7 @@ module Autoproj
                 if doc[-1, 1] != "?"
                     doc = "#{doc}:"
                 end
-                Autoproj.progress "  #{doc} #{value}"
+                Autoproj.message "  #{doc} #{value}"
                 @user_config[key] = [value, true]
             end
             value
@@ -1449,9 +1449,9 @@ module Autoproj
             if shell_kind =~ /^\w+$/
                 shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
                 if File.exists?(shell_file)
-                    Autoproj.progress
-                    Autoproj.progress "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
-                    Autoproj.progress "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
+                    Autoproj.message
+                    Autoproj.message "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
+                    Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
                     Autobuild.env_source_file(shell_file)
                 end
             end
@@ -1500,7 +1500,7 @@ module Autoproj
 
             output = `ldd -r #{name} 2>&1`
             if output =~ /undefined symbol/
-                Autoproj.progress("  WARN: #{name} has undefined symbols", :magenta)
+                Autoproj.message("  WARN: #{name} has undefined symbols", :magenta)
             end
         end
     end

data/lib/autoproj/autobuild.rb

@@ -61,12 +61,12 @@ module Autobuild
             post_install do
                 path = File.join(prefix, 'lib', 'pkgconfig')
                 Dir.glob(File.join(path, "#{name}-*.pc")) do |pcfile|
-                    Autoproj.progress "  removing obsolete file #{pcfile}", :bold
+                    Autoproj.message "  removing obsolete file #{pcfile}", :bold
                     FileUtils.rm_f pcfile
                 end
                 pcfile = File.join(path, "orogen-project-#{name}.pc")
                 if File.exists?(pcfile)
-                    Autoproj.progress "  removing obsolete file #{pcfile}", :bold
+                    Autoproj.message "  removing obsolete file #{pcfile}", :bold
                     FileUtils.rm_f pcfile
                 end
             end
@@ -78,7 +78,7 @@ module Autobuild
             post_install do
                 path = File.join(prefix, *path)
                 if File.exists?(path)
-                    Autoproj.progress "  removing obsolete file #{path}", :bold
+                    Autoproj.message "  removing obsolete file #{path}", :bold
                     FileUtils.rm_f path
                 end
             end
@@ -180,16 +180,16 @@ module Autoproj
     class Reporter < Autobuild::Reporter
         def error(error)
             error_lines = error.to_s.split("\n")
-            Autoproj.progress("Build failed", :bold, :red)
-            Autoproj.progress("#{error_lines.shift}", :bold, :red)
+            Autoproj.message("Build failed", :bold, :red)
+            Autoproj.message("#{error_lines.shift}", :bold, :red)
             error_lines.each do |line|
-                Autoproj.progress line
+                Autoproj.message line
             end
         end
         def success
-            Autoproj.progress("Build finished successfully at #{Time.now}", :bold, :green)
+            Autoproj.message("Build finished successfully at #{Time.now}", :bold, :green)
             if Autobuild.post_success_message
-                Autoproj.progress Autobuild.post_success_message
+                Autoproj.message Autobuild.post_success_message
             end
         end
     end
@@ -452,18 +452,19 @@ def ruby_package(options)
 
         # Set up code
         pkg.post_install do
-            Autobuild.progress "setting up Ruby package #{pkg.name}"
-            Autobuild.update_environment pkg.srcdir
-            # Add lib/ unconditionally, as we know that it is a ruby package.
-            # Autobuild will add it only if there is a .rb file in the directory
-            libdir = File.join(pkg.srcdir, 'lib')
-            if File.directory?(libdir)
-                Autobuild.env_add_path 'RUBYLIB', libdir
-            end
+            pkg.progress_start "setting up Ruby package %s" do
+                Autobuild.update_environment pkg.srcdir
+                # Add lib/ unconditionally, as we know that it is a ruby package.
+                # Autobuild will add it only if there is a .rb file in the directory
+                libdir = File.join(pkg.srcdir, 'lib')
+                if File.directory?(libdir)
+                    Autobuild.env_add_path 'RUBYLIB', libdir
+                end
 
-            if pkg.rake_setup_task && File.file?(File.join(pkg.srcdir, 'Rakefile'))
-                Autobuild::Subprocess.run pkg, 'post-install',
-                    'rake', pkg.rake_setup_task
+                if pkg.rake_setup_task && File.file?(File.join(pkg.srcdir, 'Rakefile'))
+                    Autobuild::Subprocess.run pkg, 'post-install',
+                        'rake', pkg.rake_setup_task, :working_directory => pkg.srcdir
+                end
             end
         end
 
@@ -474,8 +475,9 @@ def ruby_package(options)
         # rake_doc_task to nil
         if !pkg.has_doc? && pkg.rake_doc_task
             pkg.doc_task do
-                pkg.progress "generating documentation for %s"
-                Autobuild::Subprocess.run pkg, 'doc', 'rake', pkg.rake_doc_task
+                pkg.progress_start "generating documentation for %s" do
+                    Autobuild::Subprocess.run pkg, 'doc', 'rake', pkg.rake_doc_task, :working_directory => pkg.srcdir
+                end
             end
         end
     end

data/lib/autoproj/cmdline.rb

@@ -10,34 +10,24 @@ module Autoproj
     @verbose = false
     @console = HighLine.new
 
-    def self.progress(*args)
+    def self.message(*args)
         if !silent?
-            if args.empty?
-                puts
-            elsif CmdLine.color?
-                STDERR.puts console.color(*args)
-            else
-                STDERR.puts args.first
-            end
+            Autobuild.message(*args)
         end
     end
 
     def self.color(*args)
-        if CmdLine.color?
-            console.color(*args)
-        else
-            args.first
-        end
+        Autobuild.color(*args)
     end
 
     # Displays an error message
     def self.error(message)
-        Autoproj.progress("  ERROR: #{message}", :red, :bold)
+        Autoproj.message("  ERROR: #{message}", :red, :bold)
     end
 
     # Displays a warning message
     def self.warn(message)
-        Autoproj.progress("  WARN: #{message}", :magenta)
+        Autoproj.message("  WARN: #{message}", :magenta)
     end
 
     module CmdLine
@@ -161,7 +151,7 @@ module Autoproj
             # First things first, see if we need to update ourselves
             if Autoproj.osdeps.install(%w{autobuild autoproj})
                 puts
-                Autoproj.progress 'autoproj and/or autobuild has been updated, restarting autoproj'
+                Autoproj.message 'autoproj and/or autobuild has been updated, restarting autoproj'
                 puts
 
                 # We updated autobuild or autoproj themselves ... Restart !
@@ -197,11 +187,11 @@ module Autoproj
 
             # Load the required autobuild definitions
             if !silent
-                Autoproj.progress("autoproj: loading ...", :bold)
+                Autoproj.message("autoproj: loading ...", :bold)
                 if !Autoproj.reconfigure?
-                    Autoproj.progress("run 'autoproj reconfigure' to change configuration options", :bold)
-                    Autoproj.progress("and use 'autoproj switch-config' to change the remote source for", :bold)
-                    Autoproj.progress("autoproj's main build configuration", :bold)
+                    Autoproj.message("run 'autoproj reconfigure' to change configuration options", :bold)
+                    Autoproj.message("and use 'autoproj switch-config' to change the remote source for", :bold)
+                    Autoproj.message("autoproj's main build configuration", :bold)
                 end
             end
             manifest.each_autobuild_file do |source, name|
@@ -226,7 +216,7 @@ module Autoproj
                 next if !File.directory?(full_path)
 
                 if handler = Autoproj.package_handler_for(full_path)
-                    Autoproj.progress "  auto-adding #{pkg_or_set} #{"in #{layout_level} " if layout_level != "/"}using the #{handler.gsub(/_package/, '')} package handler"
+                    Autoproj.message "  auto-adding #{pkg_or_set} #{"in #{layout_level} " if layout_level != "/"}using the #{handler.gsub(/_package/, '')} package handler"
                     Autoproj.in_package_set(manifest.local_package_set, manifest.file) do
                         send(handler, pkg_or_set)
                     end
@@ -264,7 +254,7 @@ module Autoproj
             # Update the remote sources if there are any
             if manifest.has_remote_sources?
                 if manifest.should_update_remote_sources
-                    Autoproj.progress("autoproj: updating remote definitions of package sets", :bold)
+                    Autoproj.message("autoproj: updating remote definitions of package sets", :bold)
                 end
 
                 # If we need to install some packages to import our remote sources, do it
@@ -275,7 +265,7 @@ module Autoproj
                 if manifest.should_update_remote_sources
                     manifest.update_remote_sources
                 end
-                Autoproj.progress
+                Autoproj.message
             end
         end
 
@@ -386,52 +376,52 @@ module Autoproj
             end
 
             if package_sets.empty?
-                Autoproj.progress("autoproj: no package sets defined in autoproj/manifest", :bold, :red)
+                Autoproj.message("autoproj: no package sets defined in autoproj/manifest", :bold, :red)
                 return
             end
 
-            Autoproj.progress
-            Autoproj.progress("autoproj: package sets", :bold)
+            Autoproj.message
+            Autoproj.message("autoproj: package sets", :bold)
             package_sets.sort_by(&:name).each do |pkg_set|
                 next if pkg_set.empty?
                 if pkg_set.imported_from
-                    Autoproj.progress "#{pkg_set.name} (imported by #{pkg_set.imported_from.name})"
+                    Autoproj.message "#{pkg_set.name} (imported by #{pkg_set.imported_from.name})"
                 else
-                    Autoproj.progress "#{pkg_set.name} (listed in manifest)"
+                    Autoproj.message "#{pkg_set.name} (listed in manifest)"
                 end
                 if pkg_set.local?
-                    Autoproj.progress "  local set in #{pkg_set.local_dir}"
+                    Autoproj.message "  local set in #{pkg_set.local_dir}"
                 else
-                    Autoproj.progress "  from:  #{pkg_set.vcs}"
-                    Autoproj.progress "  local: #{pkg_set.local_dir}"
+                    Autoproj.message "  from:  #{pkg_set.vcs}"
+                    Autoproj.message "  local: #{pkg_set.local_dir}"
                 end
 
                 imports = pkg_set.each_imported_set.to_a
                 if !imports.empty?
-                    Autoproj.progress "  imports #{imports.size} package sets"
+                    Autoproj.message "  imports #{imports.size} package sets"
                     if !pkg_set.auto_imports?
-                        Autoproj.progress "    automatic imports are DISABLED for this set"
+                        Autoproj.message "    automatic imports are DISABLED for this set"
                     end
                     imports.each do |imported_set|
-                        Autoproj.progress "    #{imported_set.name}"
+                        Autoproj.message "    #{imported_set.name}"
                     end
                 end
 
                 set_packages = pkg_set.each_package.sort_by(&:name)
-                Autoproj.progress "  defines: #{set_packages.map(&:name).join(", ")}"
+                Autoproj.message "  defines: #{set_packages.map(&:name).join(", ")}"
             end
 
-            Autoproj.progress
-            Autoproj.progress("autoproj: metapackages", :bold)
+            Autoproj.message
+            Autoproj.message("autoproj: metapackages", :bold)
             metapackages.sort_by(&:name).each do |metap|
-                Autoproj.progress "#{metap.name}"
-                Autoproj.progress "  includes: #{metap.packages.map(&:name).sort.join(", ")}"
+                Autoproj.message "#{metap.name}"
+                Autoproj.message "  includes: #{metap.packages.map(&:name).sort.join(", ")}"
             end
 
             packages_not_present = []
 
-            Autoproj.progress
-            Autoproj.progress("autoproj: packages", :bold)
+            Autoproj.message
+            Autoproj.message("autoproj: packages", :bold)
             all_packages.to_a.sort_by(&:first).map(&:last).each do |pkg, pkg_set|
                 if File.exists?(File.join(pkg.srcdir, "manifest.xml"))
                     manifest.load_package_manifest(pkg.name)
@@ -440,48 +430,48 @@ module Autoproj
 
                 pkg_manifest = pkg.description
                 vcs_def = manifest.importer_definition_for(pkg.name)
-                Autoproj.progress "#{pkg.name}#{": #{pkg_manifest.short_documentation}" if pkg_manifest && pkg_manifest.short_documentation}", :bold
+                Autoproj.message "#{pkg.name}#{": #{pkg_manifest.short_documentation}" if pkg_manifest && pkg_manifest.short_documentation}", :bold
                 tags = pkg.tags.to_a
                 if tags.empty?
-                    Autoproj.progress "   no tags"
+                    Autoproj.message "   no tags"
                 else
-                    Autoproj.progress "   tags: #{pkg.tags.to_a.sort.join(", ")}"
+                    Autoproj.message "   tags: #{pkg.tags.to_a.sort.join(", ")}"
                 end
-                Autoproj.progress "   defined in package set #{pkg_set}"
+                Autoproj.message "   defined in package set #{pkg_set}"
                 if File.directory?(pkg.srcdir)
-                    Autoproj.progress "   checked out in #{pkg.srcdir}"
+                    Autoproj.message "   checked out in #{pkg.srcdir}"
                 else
-                    Autoproj.progress "   will be checked out in #{pkg.srcdir}"
+                    Autoproj.message "   will be checked out in #{pkg.srcdir}"
                 end
-                Autoproj.progress "   #{vcs_def.to_s}"
+                Autoproj.message "   #{vcs_def.to_s}"
 
                 if !File.directory?(pkg.srcdir)
                     packages_not_present << pkg.name
-                    Autoproj.progress "   NOT checked out yet, reported dependencies will be partial"
+                    Autoproj.message "   NOT checked out yet, reported dependencies will be partial"
                 end
 
                 optdeps = pkg.optional_dependencies.to_set
                 real_deps = pkg.dependencies.to_a
                 actual_real_deps = real_deps.find_all { |dep_name| !optdeps.include?(dep_name) }
                 if !actual_real_deps.empty?
-                    Autoproj.progress "   deps: #{actual_real_deps.join(", ")}"
+                    Autoproj.message "   deps: #{actual_real_deps.join(", ")}"
                 end
 
                 selected_opt_deps, opt_deps = optdeps.partition { |dep_name| real_deps.include?(dep_name) }
                 if !selected_opt_deps.empty?
-                    Autoproj.progress "   enabled opt deps: #{selected_opt_deps.join(", ")}"
+                    Autoproj.message "   enabled opt deps: #{selected_opt_deps.join(", ")}"
                 end
                 if !opt_deps.empty?
-                    Autoproj.progress "   disabled opt deps: #{opt_deps.join(", ")}"
+                    Autoproj.message "   disabled opt deps: #{opt_deps.join(", ")}"
                 end
 
                 if !pkg.os_packages.empty?
-                    Autoproj.progress "   OSdeps: #{pkg.os_packages.to_a.sort.join(", ")}"
+                    Autoproj.message "   OSdeps: #{pkg.os_packages.to_a.sort.join(", ")}"
                 end
             end
 
             if !packages_not_present.empty?
-                Autoproj.progress
+                Autoproj.message
                 Autoproj.warn "the following packages are not yet checked out:"
                 packages_not_present.each_slice(4) do |*packages|
                     Autoproj.warn "  #{packages.join(", ")}"
@@ -508,7 +498,7 @@ module Autoproj
                 next if !File.directory?(sel)
                 while sel != '/'
                     if handler = Autoproj.package_handler_for(sel)
-                        Autoproj.progress "  auto-adding #{sel} using the #{handler.gsub(/_package/, '')} package handler"
+                        Autoproj.message "  auto-adding #{sel} using the #{handler.gsub(/_package/, '')} package handler"
                         sel = File.expand_path(sel)
                         relative_to_root = Pathname.new(sel).relative_path_from(Pathname.new(Autoproj.root_dir))
                         pkg = Autoproj.in_package_set(manifest.local_package_set, manifest.file) do
@@ -524,10 +514,10 @@ module Autoproj
             end
 
             if !nonresolved.empty?
-                Autoproj.progress("autoproj: wrong package selection on command line, cannot find a match for #{nonresolved.to_a.join(", ")}", :red)
+                Autoproj.message("autoproj: wrong package selection on command line, cannot find a match for #{nonresolved.to_a.join(", ")}", :red)
                 exit 1
             elsif Autoproj.verbose
-                Autoproj.progress "will install #{selected_packages.to_a.join(", ")}"
+                Autoproj.message "will install #{selected_packages.to_a.join(", ")}"
             end
             selected_packages
         end
@@ -667,7 +657,7 @@ module Autoproj
             end
 
             if Autoproj.verbose
-                Autoproj.progress "autoproj: finished importing packages"
+                Autoproj.message "autoproj: finished importing packages"
             end
             if Autoproj::CmdLine.list_newest?
                 fields = []
@@ -686,7 +676,7 @@ module Autoproj
                 end
                 format = "  %-#{field_sizes[0]}s %-#{field_sizes[1]}s at %-#{field_sizes[2]}s"
                 fields.each do |line|
-                    Autoproj.progress(format % line)
+                    Autoproj.message(format % line)
                 end
             end
 
@@ -696,9 +686,9 @@ module Autoproj
         def self.build_packages(selected_packages, all_enabled_packages)
             if Autoproj::CmdLine.doc?
                 Autobuild.only_doc = true
-                Autoproj.progress("autoproj: building and installing documentation", :bold)
+                Autoproj.message("autoproj: building and installing documentation", :bold)
             else
-                Autoproj.progress("autoproj: building and installing packages", :bold)
+                Autoproj.message("autoproj: building and installing packages", :bold)
             end
 
             if Autoproj::CmdLine.update_os_dependencies?
@@ -914,6 +904,10 @@ where 'mode' is one of:
                 opts.on("--show", "in osdeps mode, show a per-package listing of the OS dependencies instead of installing them") do
                     @show_osdeps = true
                 end
+                opts.on('--version') do
+                    Autoproj.message "autoproj v#{Autoproj::VERSION}"
+                    Autoproj.message "autobuild v#{Autobuild::VERSION}"
+                end
                 opts.on("--all", "in osdeps mode, install both OS packages and RubyGem packages, regardless of the otherwise selected mode") do
                     @osdeps_forced_mode = 'all'
                 end
@@ -1210,21 +1204,21 @@ where 'mode' is one of:
                 end
 
                 if last_was_in_sync
-                    Autoproj.progress(": local and remote are in sync", :green)
+                    Autoproj.message(": local and remote are in sync", :green)
                 end
 
                 last_was_in_sync = false
                 STDERR.print "#{pkg_name}:"
 
                 if lines.size == 1
-                    Autoproj.progress lines.first
+                    Autoproj.message lines.first
                 else
-                    Autoproj.progress
-                    Autoproj.progress lines.join("\n")
+                    Autoproj.message
+                    Autoproj.message lines.join("\n")
                 end
             end
             if last_was_in_sync
-                Autoproj.progress(": local and remote are in sync", :green)
+                Autoproj.message(": local and remote are in sync", :green)
             end
             return result
         end
@@ -1238,13 +1232,13 @@ where 'mode' is one of:
                 end
 
             if !sources.empty?
-                Autoproj.progress("autoproj: displaying status of configuration", :bold)
+                Autoproj.message("autoproj: displaying status of configuration", :bold)
                 display_status(sources)
                 STDERR.puts
             end
 
 
-            Autoproj.progress("autoproj: displaying status of packages", :bold)
+            Autoproj.message("autoproj: displaying status of packages", :bold)
             packages = packages.sort.map do |pkg_name|
                 Autobuild::Package[pkg_name]
             end
@@ -1401,12 +1395,12 @@ where 'mode' is one of:
             if ENV['GEM_HOME'] && Autoproj.in_autoproj_installation?(ENV['GEM_HOME']) &&
                 ENV['GEM_HOME'] != gem_home
                 if !File.exists?(gem_home)
-                    Autoproj.progress "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
+                    Autoproj.message "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
                     FileUtils.cp_r ENV['GEM_HOME'], gem_home
                 end
                 ENV['GEM_HOME'] = gem_home
 
-                Autoproj.progress "restarting bootstrapping from #{Dir.pwd}"
+                Autoproj.message "restarting bootstrapping from #{Dir.pwd}"
 
                 require 'rbconfig'
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
@@ -1422,7 +1416,7 @@ where 'mode' is one of:
 
             if args.size == 1 # the user asks us to download a manifest
                 manifest_url = args.first
-                Autoproj.progress("autoproj: downloading manifest file #{manifest_url}", :bold)
+                Autoproj.message("autoproj: downloading manifest file #{manifest_url}", :bold)
                 manifest_data =
                     begin open(manifest_url) { |file| file.read }
                     rescue
@@ -1495,8 +1489,8 @@ export PATH=$GEM_HOME/bin:$PATH
                 end
 
                 if !result.empty?
-                    Autoproj.progress pkg.name
-                    Autoproj.progress "  #{result.join("\n  ")}"
+                    Autoproj.message pkg.name
+                    Autoproj.message "  #{result.join("\n  ")}"
                 end
             end
         end
@@ -1534,9 +1528,9 @@ export PATH=$GEM_HOME/bin:$PATH
                         io.write xml.to_xml
                     end
                     if !manifest
-                        Autoproj.progress "created #{path}"
+                        Autoproj.message "created #{path}"
                     else
-                        Autoproj.progress "modified #{path}"
+                        Autoproj.message "modified #{path}"
                     end
                 end
             end
@@ -1555,10 +1549,10 @@ export PATH=$GEM_HOME/bin:$PATH
                 package  = Autobuild::Package[package_name]
                 importer = package.importer
                 if !importer
-                    Autoproj.progress "cannot snapshot #{package_name} as it has no importer"
+                    Autoproj.message "cannot snapshot #{package_name} as it has no importer"
                     next
                 elsif !importer.respond_to?(:snapshot)
-                    Autoproj.progress "cannot snapshot #{package_name} as the #{importer.class} importer does not support it"
+                    Autoproj.message "cannot snapshot #{package_name} as the #{importer.class} importer does not support it"
                     next
                 end
 
@@ -1771,8 +1765,8 @@ export PATH=$GEM_HOME/bin:$PATH
 
 
             root = Pathname.new(Autoproj.root_dir)
-            Autoproj.progress
-            Autoproj.progress "The following directories are not part of a package used in the current autoproj installation", :bold
+            Autoproj.message
+            Autoproj.message "The following directories are not part of a package used in the current autoproj installation", :bold
             unused.to_a.sort.each do |dir|
                 puts "  #{Pathname.new(dir).relative_path_from(root)}"
             end

data/lib/autoproj/manifest.rb

@@ -1483,7 +1483,7 @@ module Autoproj
                     next if updated_sets.has_key?(pkg_set.repository_id)
 
                     if !pkg_set.explicit?
-                        Autoproj.progress "  #{pkg_set.imported_from.name}: auto-importing #{pkg_set.name}"
+                        Autoproj.message "  #{pkg_set.imported_from.name}: auto-importing #{pkg_set.name}"
                     end
                     known_remotes << update_remote_set(pkg_set, remotes_symlinks_dir)
                     updated_sets[pkg_set.repository_id] = pkg_set
@@ -2014,7 +2014,7 @@ module Autoproj
                 end
                 if ignored?(pkg)
                     if Autoproj.verbose
-                        Autoproj.progress "ignoring osdeps package #{pkg}"
+                        Autoproj.message "ignoring osdeps package #{pkg}"
                     end
                     true
                 end

data/lib/autoproj/options.rb

@@ -61,7 +61,7 @@ module Autoproj
             validate(answer)
 
         rescue InputError => e
-            Autoproj.progress("invalid value: #{e.message}", :red)
+            Autoproj.message("invalid value: #{e.message}", :red)
             retry
         end
 
@@ -129,7 +129,7 @@ module Autoproj
                 if doc[-1, 1] != "?"
                     doc = "#{doc}:"
                 end
-                Autoproj.progress "  #{doc} #{value}"
+                Autoproj.message "  #{doc} #{value}"
                 @user_config[key] = [value, true]
             end
             value

data/lib/autoproj/osdeps.rb

@@ -69,7 +69,7 @@ module Autoproj
         def self.load_default
             file = ENV['AUTOPROJ_DEFAULT_OSDEPS'] || AUTOPROJ_OSDEPS
             if !File.file?(file)
-                Autoproj.progress "WARN: #{file} (from AUTOPROJ_DEFAULT_OSDEPS) is not a file, falling back to #{AUTOPROJ_OSDEPS}"
+                Autoproj.warn "#{file} (from AUTOPROJ_DEFAULT_OSDEPS) is not a file, falling back to #{AUTOPROJ_OSDEPS}"
                 file = AUTOPROJ_OSDEPS
             end
             OSDependencies.load(file)
@@ -89,7 +89,7 @@ module Autoproj
         # install RubyGems packages
         def gem_fetcher
             if !@gem_fetcher
-                Autobuild.progress "looking for RubyGems updates"
+                Autoproj.message "looking for RubyGems updates"
                 @gem_fetcher = Gem::SpecFetcher.fetcher
             end
             @gem_fetcher
@@ -219,7 +219,7 @@ module Autoproj
                     @operating_system = [names.split(','), versions.split(',')]
                 end
             else
-                Autoproj.progress "  autodetecting the operating system"
+                Autoproj.message "  autodetecting the operating system"
                 name, versions = os_from_lsb
                 if name
                     if name != "debian"
@@ -312,7 +312,7 @@ module Autoproj
             if package_name =~ /^(\w[a-z0-9+-.]+)/
                 @dpkg_installed_packages.include?($1)
             else
-                Autoproj.progress "WARN: #{package_name} is not a valid Debian package name"
+                Autoproj.warn "#{package_name} is not a valid Debian package name"
                 false
             end
         end
@@ -428,7 +428,7 @@ fi
                     end
                 end
                 if Autoproj.verbose
-                    Autoproj.progress "selected OS version #{found} for osdep #{name}: #{version_entry.inspect}"
+                    Autoproj.message "selected OS version #{found} for osdep #{name}: #{version_entry.inspect}"
                 end
 
                 if !version_entry
@@ -953,17 +953,17 @@ So, what do you want ? (all, ruby, os or none)
                     user_shell_script = generate_user_os_script(os_names, os_packages)
                 end
                 if osdeps_interaction(osdeps, os_packages, user_shell_script, silent?)
-                    Autoproj.progress "  installing OS packages: #{os_packages.sort.join(", ")}"
+                    Autoproj.message "  installing OS packages: #{os_packages.sort.join(", ")}"
 
                     if Autoproj.verbose
-                        Autoproj.progress "Generating installation script for non-ruby OS dependencies"
-                        Autoproj.progress shell_script
+                        Autoproj.message "Generating installation script for non-ruby OS dependencies"
+                        Autoproj.message shell_script
                     end
 
                     File.open('/tmp/autoproj_osdeps_lock', 'w') do |lock_io|
                         begin
                             while !lock_io.flock(File::LOCK_EX | File::LOCK_NB)
-                                Autoproj.progress "  waiting for other autoproj instances to finish their osdeps installation"
+                                Autoproj.message "  waiting for other autoproj instances to finish their osdeps installation"
                                 sleep 5
                             end
 
@@ -1005,7 +1005,7 @@ So, what do you want ? (all, ruby, os or none)
                 end
 
                 if gems_interaction(gems, cmdlines, silent?)
-                    Autobuild.progress "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+                    Autoproj.message "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
 
                     cmdlines.each do |c|
                         Autobuild::Subprocess.run 'autoproj', 'osdeps', *c

data/lib/autoproj/system.rb

@@ -132,9 +132,9 @@ module Autoproj
             if shell_kind =~ /^\w+$/
                 shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
                 if File.exists?(shell_file)
-                    Autoproj.progress
-                    Autoproj.progress "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
-                    Autoproj.progress "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
+                    Autoproj.message
+                    Autoproj.message "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
+                    Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
                     Autobuild.env_source_file(shell_file)
                 end
             end
@@ -183,7 +183,7 @@ module Autoproj
 
             output = `ldd -r #{name} 2>&1`
             if output =~ /undefined symbol/
-                Autoproj.progress("  WARN: #{name} has undefined symbols", :magenta)
+                Autoproj.message("  WARN: #{name} has undefined symbols", :magenta)
             end
         end
     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.20"
+    VERSION = "1.7.21.b1"
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: 
+  hash: 141
+  prerelease: 7
   segments: 
   - 1
   - 7
-  - 20
-  version: 1.7.20
+  - 21
+  - b
+  - 1
+  version: 1.7.21.b1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-25 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -186,12 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild