bin/autoproj_bootstrap in autoproj-1.7.20 vs bin/autoproj_bootstrap in autoproj-1.7.21.b1

@@ -55,20 +55,20 @@
 
     def self.color(string, *args)
         string
     end
 
-    def self.progress(str)
+    def self.message(str)
         STDERR.puts "  #{str}"
     end
 end
 
 module Autobuild
     def self.do_update
         true
     end
-    def self.progress(str)
+    def self.message(str)
         STDERR.puts "  #{str}"
     end
 
     class << self
         attr_reader :programs
@@ -166,11 +166,11 @@
 
         AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
         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)
         end
 
@@ -186,11 +186,11 @@
 
         # The Gem::SpecFetcher object that should be used to query RubyGems, and
         # 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
         end
 
@@ -316,11 +316,11 @@
                 else
                     names, versions = user_os.split(':')
                     @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"
                         if File.exists?("/etc/debian_version")
                             @operating_system = [[name, "debian"], versions]
@@ -409,11 +409,11 @@
             end
             
             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
 
         GAIN_ROOT_ACCESS = <<-EOSCRIPT
@@ -525,11 +525,11 @@
                                 any? { |v| Regexp.new(v) =~ os_ver }
                         end
                     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
                     return WRONG_OS_VERSION
                 end
@@ -1050,21 +1050,21 @@
                 if handled_os
                     shell_script = generate_auto_os_script(os_names, os_packages)
                     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
 
                             Tempfile.open('osdeps_sh') do |io|
                                 io.puts "#! /bin/bash"
@@ -1102,11 +1102,11 @@
                 with_version.each do |name, v|
                     cmdlines << base_cmdline + [name, "-v", v]
                 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
                     end
                     did_something = true
@@ -1180,11 +1180,11 @@
                 answer = default_value
             end
             validate(answer)
 
         rescue InputError => e
-            Autoproj.progress("invalid value: #{e.message}", :red)
+            Autoproj.message("invalid value: #{e.message}", :red)
             retry
         end
 
         def validate(value)
             value = BuildOption.send("validate_#{type}", value, options)
@@ -1248,11 +1248,11 @@
             if !seen
                 doc = @declared_options[key].short_doc
                 if doc[-1, 1] != "?"
                     doc = "#{doc}:"
                 end
-                Autoproj.progress "  #{doc} #{value}"
+                Autoproj.message "  #{doc} #{value}"
                 @user_config[key] = [value, true]
             end
             value
         end
     end
@@ -1447,13 +1447,13 @@
         if Autoproj.shell_helpers? && shell = ENV['SHELL']
             shell_kind = File.basename(shell)
             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
         end
 
@@ -1498,10 +1498,10 @@
             next unless name =~ /\.so$/
             next if exclude_paths.find { |p| name =~ p }
 
             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
 end