autoproj 1.6.0.rc4 → 1.6.0.rc5

data/lib/autoproj/cmdline.rb

@@ -43,29 +43,25 @@ module Autoproj
                 Autoproj.change_option('automatic_osdeps', mode, true)
             end
 
-	    if Autoproj.has_config_key?("automatic_osdeps")
-		doc_string = "Should autoproj handle the OS package installation automatically (yes, no, wait or ask) ?"
-	    else
-		# Ask the user for the automatic_osdeps option
-		doc_string =<<-EOT
-#{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
-    say "wait", autoproj will simply wait for you to press ENTER to continue after it prompted
-    you for the dependencies.
-
-    This value can be changed anytime by calling an autoproj operation with the --reconfigure
-    option (e.g. autoproj update --reconfigure). Moreover, the "autoproj osdeps" call will
-    always allow you to install OS dependencies through autoproj.
-
-		EOT
-		doc_string = doc_string.strip
-	    end
+            short_doc = "Should autoproj handle the OS package installation automatically (yes, no, wait or ask) ?"
+            long_doc =<<-EOT
+* if you say "yes", the OS dependencies will be handled by autoproj.
+* 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.
+* if you say "wait", autoproj will simply wait for you to press ENTER to continue
+  after it prompted you for the dependencies.
+    
+This value can be changed anytime by calling an autoproj operation
+with the --reconfigure option (e.g. autoproj update --reconfigure).
+Moreover, the "autoproj osdeps" call will always allow you to install
+OS dependencies through autoproj.
+            EOT
+            long_doc = long_doc.strip
 
 	    Autoproj.configuration_option 'automatic_osdeps', 'string',
 		:default => 'yes',
-		:doc => doc_string do |value|
+		:doc => [short_doc, long_doc] do |value|
                     begin
                         Autoproj::BuildOption.validate_boolean(value, Hash.new)
                     rescue Autoproj::InputError
@@ -160,6 +156,9 @@ module Autoproj
             # First things first, see if we need to update ourselves
             if Autoproj.osdeps.install(%w{autobuild autoproj})
                 # We updated autobuild or autoproj themselves ... Restart !
+                #
+                # ...But first save the configuration (!)
+                Autoproj.save_config
                 require 'rbconfig'
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
                 exec(ruby, $0, *ARGV)
@@ -561,7 +560,7 @@ where 'mode' is one of:
 -- Status & Update
   envsh: update the env.sh script
   status: displays the state of the packages w.r.t. their source VCS
-  list-sets:   list all available package sets
+  list:   list all available packages
   update: only import/update packages, do not build them
   update-config: only update the configuration
 
@@ -738,7 +737,7 @@ where 'mode' is one of:
                 Autobuild.do_update = true
                 @update_os_dependencies = false
                 Autobuild.do_build = false
-            when "list-sets"
+            when "list", "list-sets"
                 @only_config = true
                 @display_configuration = true
                 Autobuild.do_update = false
@@ -970,6 +969,8 @@ manifest_source:
                 FileUtils.cp_r ENV['GEM_HOME'], ".gems"
                 ENV['GEM_HOME'] = File.join(Dir.pwd, ".gems")
 
+                Autoproj.save_config
+
                 require 'rbconfig'
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
                 exec ruby, $0, *ARGV

data/lib/autoproj/manifest.rb

@@ -937,8 +937,8 @@ module Autoproj
                     dest = File.readlink(symlink_dest)
                     if dest != source.raw_local_dir
                         FileUtils.rm_f symlink_dest
+                        FileUtils.ln_sf source.raw_local_dir, symlink_dest
                     end
-                    FileUtils.ln_sf source.raw_local_dir, symlink_dest
                 else
                     FileUtils.rm_f symlink_dest
                     FileUtils.ln_sf source.raw_local_dir, symlink_dest

data/lib/autoproj/options.rb

@@ -18,18 +18,36 @@ module Autoproj
             end
         end
 
+        def short_doc
+            if short_doc = options[:short_doc]
+                short_doc
+            elsif doc = options[:doc]
+                if doc.respond_to?(:to_ary) then doc.first
+                else doc
+                end
+            else "#{name} (no documentation for this option)"
+            end
+        end
+
         def doc
-            options[:doc] || "#{name} (no documentation for this option)"
+            doc = (options[:doc] || "#{name} (no documentation for this option)")
+            if doc.respond_to?(:to_ary) # multi-line
+                first_line = Autoproj.color(doc[0, 1], :bold)
+                remaining = doc[1..-1].join("\n").split("\n").join("\n    ")
+                first_line + "\n    " + remaining
+            else
+                doc
+            end
         end
 
-        def ask(current_value)
+        def ask(current_value, doc = nil)
             default_value =
 		if current_value then current_value.to_s
 		elsif options[:default] then options[:default].to_str
 		else ''
 		end
 
-            STDOUT.print "  #{doc} [#{default_value}] "
+            STDOUT.print "  #{doc || self.doc} [#{default_value}] "
             STDOUT.flush
             answer = STDIN.readline.chomp
             if answer == ''
@@ -92,7 +110,7 @@ module Autoproj
             value = configure(key)
         else
             if !seen
-                doc = @declared_options[key].doc
+                doc = @declared_options[key].short_doc
                 if doc[-1, 1] != "?"
                     doc = "#{doc}:"
                 end

data/lib/autoproj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 977940589
+  hash: 977940586
   prerelease: true
   segments: 
   - 1
   - 6
   - 0
-  - rc4
-  version: 1.6.0.rc4
+  - rc5
+  version: 1.6.0.rc5
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2010-08-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency