autoproj 1.6.0.rc3 → 1.6.0.rc4

data/doc/guide/src/autoproj_bootstrap

@@ -567,8 +567,12 @@ module Autoproj
 
                 if automatic_osdeps_mode == ASK && (os_def || !gems.empty?)
                     if !os_def
+                        print "Should I install the RubyGems packages ? [yes] "
+                    else
                         print "Should I install these packages ? [yes] "
+                    end
                     STDOUT.flush
+
                     do_osdeps = nil
                     while do_osdeps.nil?
                         answer = STDIN.readline.chomp

data/lib/autoproj/cmdline.rb

@@ -48,7 +48,7 @@ module Autoproj
 	    else
 		# Ask the user for the automatic_osdeps option
 		doc_string =<<-EOT
-#{color("Should autoproj handle the OS package installation automatically (yes, no, wait or ask) ?", :bold)}
+#{Autoproj.color("Should autoproj handle the OS package installation automatically (yes, no, wait or ask) ?", :bold)}
     If you say "no", the list of OS dependencies that need to be installed will be listed,
     and autoproj will go on, assuming that you have installed them yourself. If you say
     "ask", you will be prompted each time a package needs to be installed. Finally, if you
@@ -197,8 +197,9 @@ module Autoproj
             # source.yml files)
             manifest.load_importers
 
-            # Configuration is finished, so all relevant configuration options should
-            # have been asked to the user. Save it.
+            # We finished loading the configuration files. Not all configuration
+            # is done (since we need to process the package setup blocks), but
+            # save the current state of the configuration anyway.
             Autoproj.save_config
 
             # Loads OS package definitions once and for all
@@ -268,6 +269,10 @@ module Autoproj
                     pkg.user_block[pkg.autobuild]
                 end
             end
+
+            # We now have processed the process setup blocks. All configuration
+            # should be done and we can save the configuration data.
+            Autoproj.save_config
         end
 
 
@@ -558,7 +563,7 @@ where 'mode' is one of:
   status: displays the state of the packages w.r.t. their source VCS
   list-sets:   list all available package sets
   update: only import/update packages, do not build them
-  update-sets: update the package sets definitions, but not the packages themselves
+  update-config: only update the configuration
 
 -- Autoproj Configuration
   bootstrap: starts a new autoproj installation. Usage:
@@ -722,7 +727,13 @@ where 'mode' is one of:
                 Autobuild.do_build  = false
                 Autobuild.do_update = false
                 @update_os_dependencies = false
-            when "update-sets"
+            when "update-config"
+                @only_config = true
+                Autobuild.do_update = true
+                @update_os_dependencies = false
+                Autobuild.do_build = false
+            when "update-sets" # provided for backward compatibility
+                Autoproj.warn("update-sets is deprecated. Use update-config instead")
                 @only_config = true
                 Autobuild.do_update = true
                 @update_os_dependencies = false
@@ -756,13 +767,13 @@ where 'mode' is one of:
                     end
 
                 if !pkg.importer.respond_to?(:status)
-                    lines << color("  the #{pkg.importer.class.name.gsub(/.*::/, '')} importer does not support status display", :bold, :red)
+                    lines << Autoproj.color("  the #{pkg.importer.class.name.gsub(/.*::/, '')} importer does not support status display", :bold, :red)
                 elsif !File.directory?(pkg.srcdir)
-                    lines << color("  is not imported yet", :magenta)
+                    lines << Autoproj.color("  is not imported yet", :magenta)
                 else
                     status = pkg.importer.status(pkg)
                     if status.uncommitted_code
-                        lines << color("  contains uncommitted modifications", :red)
+                        lines << Autoproj.color("  contains uncommitted modifications", :red)
                     end
 
                     case status.status
@@ -776,27 +787,27 @@ where 'mode' is one of:
                             last_was_in_sync = true
                             next
                         else
-                            lines << color("  local and remote are in sync", :green)
+                            lines << Autoproj.color("  local and remote are in sync", :green)
                         end
                     when Autobuild::Importer::Status::ADVANCED
-                        lines << color("  local contains #{status.local_commits.size} commit that remote does not have:", :magenta)
+                        lines << Autoproj.color("  local contains #{status.local_commits.size} commit that remote does not have:", :magenta)
                         status.local_commits.each do |line|
-                            lines << color("    #{line}", :magenta)
+                            lines << Autoproj.color("    #{line}", :magenta)
                         end
                     when Autobuild::Importer::Status::SIMPLE_UPDATE
-                        lines << color("  remote contains #{status.remote_commits.size} commit that local does not have:", :magenta)
+                        lines << Autoproj.color("  remote contains #{status.remote_commits.size} commit that local does not have:", :magenta)
                         status.remote_commits.each do |line|
-                            lines << color("    #{line}", :magenta)
+                            lines << Autoproj.color("    #{line}", :magenta)
                         end
                     when Autobuild::Importer::Status::NEEDS_MERGE
-                        lines << color("  local and remote have diverged with respectively #{status.local_commits.size} and #{status.remote_commits.size} commits each", :magenta)
+                        lines << Autoproj.color("  local and remote have diverged with respectively #{status.local_commits.size} and #{status.remote_commits.size} commits each", :magenta)
                         lines << "  -- local commits --"
                         status.local_commits.each do |line|
-                            lines << color("   #{line}", :magenta)
+                            lines << Autoproj.color("   #{line}", :magenta)
                         end
                         lines << "  -- remote commits --"
                         status.remote_commits.each do |line|
-                            lines << color("   #{line}", :magenta)
+                            lines << Autoproj.color("   #{line}", :magenta)
                         end
                     end
                 end
@@ -904,13 +915,22 @@ where 'mode' is one of:
             vcs = Autoproj.normalize_vcs_definition(vcs_def)
 
             # Install the OS dependencies required for this VCS
+            handle_automatic_osdeps
             osdeps = Autoproj::OSDependencies.load_default
             osdeps.install([vcs.type])
 
             # Now check out the actual configuration
             config_dir = File.join(Dir.pwd, "autoproj")
             if delete_current
-                FileUtils.rm_rf config_dir
+                # Find a backup name for it
+                backup_base_name = backup_name = "#{config_dir}.bak"
+                index = 0
+                while File.directory?(backup_name)
+                    backup_name = "#{backup_base_name}-#{index}.bak"
+                    index += 1
+                end
+                    
+                FileUtils.mv config_dir, backup_name
             end
             Autoproj::Manifest.update_source(vcs, "autoproj main configuration", 'autoproj_config', config_dir)
 
@@ -923,6 +943,16 @@ manifest_source:
     #{vcs_def.map { |k, v| "#{k}: #{v}" }.join("\n    ")}
                 EOTEXT
             end
+        rescue Exception
+            if backup_name
+                FileUtils.rm_rf config_dir if config_dir
+                FileUtils.mv backup_name, config_dir
+            end
+            raise
+        ensure
+            if backup_name
+                FileUtils.rm_rf backup_name
+            end
         end
 
         def self.bootstrap(*args)

data/lib/autoproj/osdeps.rb

@@ -479,9 +479,18 @@ module Autoproj
                     puts
                 end
 
-                if automatic_osdeps_mode == ASK && (os_def || !gems.empty?)
+                if automatic_osdeps_mode == ASK
                     if !os_def
-                        print "Should I install the RubyGems packages ? [yes] "
+                        if gems.empty?
+                            # Nothing we can do, but the users required "ASK".
+                            # So, at least, let him press enter
+                            print "There are external packages, but I can't install them on this OS. Press ENTER to continue"
+                            STDOUT.flush
+                            STDIN.readline
+                            do_osdeps = false
+                        else
+                            print "Should I install the RubyGems packages ? [yes] "
+                        end
                     else
                         print "Should I install these packages ? [yes] "
                     end
@@ -555,7 +564,7 @@ module Autoproj
                 end
 
                 cmdline = [Autobuild.tool('gem'), 'install']
-                if Autobuild::OSDependencies.gem_with_prerelease
+                if Autoproj::OSDependencies.gem_with_prerelease
                     cmdline << "--prerelease"
                 end
                 cmdline.concat(gems)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.0.rc3"
+    VERSION = "1.6.0.rc4"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
+  hash: 977940589
   prerelease: true
   segments: 
   - 1
   - 6
   - 0
-  - rc3
-  version: 1.6.0.rc3
+  - rc4
+  version: 1.6.0.rc4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +02:00
+date: 2010-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 5
@@ -36,9 +39,11 @@ dependencies:
   name: rmail
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -50,9 +55,11 @@ dependencies:
   name: utilrb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -64,9 +71,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -78,9 +87,11 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
@@ -92,9 +103,11 @@ dependencies:
   name: rubyforge
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -106,9 +119,11 @@ dependencies:
   name: webgen
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 5
@@ -120,9 +135,11 @@ dependencies:
   name: rdoc
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 4
@@ -134,9 +151,11 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 6
@@ -244,16 +263,20 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -262,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of robotics software