autoproj 1.5.6 → 1.5.7

data/History.txt

@@ -1,3 +1,14 @@
+= Version 1.5.7
+ * allow using options and constants in the manifest as well
+   This is so that we can use variables in the VCS definition for package sets.
+ * display a status message before we access the RubyGems server. Ruby may block
+   there in some cases, and it therefore gives a clue at what is actually
+   failing.
+ * fix autoproj status with remote sources: display the source name instead of
+   the URL
+ * fix symlink in autoproj/remotes after a checkout. The URL was used instead of
+   the source name. Further updates were fixing it.
+
 = Version 1.5.6
  * quickfix stupid bug in 1.5.5
 

data/bin/autoproj

@@ -9,7 +9,6 @@ require 'autoproj'
 require 'autoproj/autobuild'
 require 'open-uri'
 require 'autoproj/cmdline'
-require 'pp'
 
 require 'highline'
 include Autoproj

data/doc/guide/src/autoproj_bootstrap

@@ -278,7 +278,7 @@ module Autoproj
 
 
         def generate_os_script(dependencies)
-            os_name, os_version = operating_system
+            os_name, os_version = OSDependencies.operating_system
             os_packages, shell_snippets = resolve_os_dependencies(dependencies)
 
             "#! /bin/bash\n" +

data/lib/autoproj/autobuild.rb

@@ -328,7 +328,6 @@ def not_on(*architectures)
 
     os = OSDependencies.operating_system
     matching_archs = architectures.find_all { |arch| arch[0] == os[0] }
-    STDERR.puts matching_archs.inspect
     if matching_archs.empty?
         return yield
     elsif matching_archs.all? { |arch| arch[1] && !os[1].include?(arch[1].downcase) }

data/lib/autoproj/cmdline.rb

@@ -37,6 +37,12 @@ module Autoproj
                 Autoproj.env_add 'PATH', bindir
             end
 
+            # We load the local init.rb first so that the manifest loading
+            # process can use options defined there for the autoproj version
+            # control information (for instance)
+            local_source = LocalSource.new
+            Autoproj.load_if_present(local_source, local_source.local_dir, "init.rb")
+
             manifest_path = File.join(Autoproj.config_dir, 'manifest')
             Autoproj.manifest = Manifest.load(manifest_path)
 
@@ -604,6 +610,12 @@ where 'mode' is one of:
             packages.each do |pkg|
                 lines = []
 
+                pkg_name =
+                    if pkg.respond_to?(:text_name)
+                        pkg.text_name
+                    else pkg.autoproj_name
+                    end
+
                 if !pkg.importer.respond_to?(:status)
                     lines << color("  the #{pkg.importer.class.name.gsub(/.*::/, '')} importer does not support status display", :bold, :red)
                 elsif !File.directory?(pkg.srcdir)
@@ -618,9 +630,9 @@ where 'mode' is one of:
                     when Autobuild::Importer::Status::UP_TO_DATE
                         if !status.uncommitted_code
                             if last_was_in_sync
-                                STDERR.print ", #{pkg.autoproj_name}"
+                                STDERR.print ", #{pkg_name}"
                             else
-                                STDERR.print pkg.autoproj_name
+                                STDERR.print pkg_name
                             end
                             last_was_in_sync = true
                             next
@@ -655,11 +667,7 @@ where 'mode' is one of:
                 end
 
                 last_was_in_sync = false
-                if pkg.respond_to?(:text_name)
-                    STDERR.print "#{pkg.text_name}:"
-                else
-                    STDERR.print "#{pkg.autoproj_name}:"
-                end
+                STDERR.print "#{pkg_name}:"
 
                 if lines.size == 1
                     STDERR.puts lines.first

data/lib/autoproj/manifest.rb

@@ -166,13 +166,59 @@ module Autoproj
         if !data.respond_to?(:to_str)
             return data
         end
-
-        definitions.each do |name, expanded|
-            data = data.gsub /\$#{Regexp.quote(name)}\b/, expanded
+        definitions = { 'HOME' => ENV['HOME'] }.merge(definitions)
+
+        data = data.gsub /\$(\w+)/ do |constant_name|
+            constant_name = constant_name[1..-1]
+            if !(value = definitions[constant_name])
+                if !(value = Autoproj.user_config(constant_name))
+                    if !block_given? || !(value = yield(constant_name))
+                        raise ArgumentError, "cannot find a definition for $#{constant_name}"
+                    end
+                end
+            end
+            value
         end
         data
     end
 
+    def self.expand(value, definitions = Hash.new)
+        if value.respond_to?(:to_hash)
+            value.dup.each do |name, definition|
+                value[name] = expand(definition, definitions)
+            end
+            value
+        else
+            value = single_expansion(value, definitions)
+            if contains_expansion?(value)
+                raise ConfigError, "some expansions are not defined in #{value.inspect}"
+            end
+            value
+        end
+    end
+
+    # True if the given string contains expansions
+    def self.contains_expansion?(string); string =~ /\$/ end
+
+    def self.resolve_one_constant(name, value, result, definitions)
+        result[name] = single_expansion(value, result) do |missing_name|
+            result[missing_name] = resolve_one_constant(missing_name, definitions.delete(missing_name), definitions)
+        end
+    end
+
+    def self.resolve_constant_definitions(constants)
+        constants = constants.dup
+        constants['HOME'] = ENV['HOME']
+        
+        result = Hash.new
+        while !constants.empty?
+            name  = constants.keys.first
+            value = constants.delete(name)
+            resolve_one_constant(name, value, result, constants)
+        end
+        result
+    end
+
     # A source is a version control repository which contains general source
     # information with package version control information (source.yml file),
     # package definitions (.autobuild files), and finally definition of
@@ -314,43 +360,21 @@ module Autoproj
             @source_definition = raw_description_file
             load_name
 
+            
             # Compute the definition of constants
             begin
                 constants = source_definition['constants'] || Hash.new
-                constants['HOME'] = ENV['HOME']
-
-                redo_expansion = true
-                @constants_definitions = constants 
-                while redo_expansion
-                    redo_expansion = false
-                    constants.dup.each do |name, url|
-                        # Extract all expansions in the url
-                        if url =~ /\$(\w+)/
-                            expansion_name = $1
-
-                            if constants[expansion_name]
-                                constants[name] = single_expansion(url)
-                            else
-                                begin constants[name] = single_expansion(url,
-                                                 expansion_name => Autoproj.user_config(expansion_name))
-                                rescue ConfigError => e
-                                    raise ConfigError, "constant '#{expansion_name}', used in the definition of '#{name}' is defined nowhere"
-                                end
-                            end
-                            redo_expansion = true
-                        end
-                    end
-                end
+                @constants_definitions = Autoproj.resolve_constant_definitions(constants)
 
             rescue ConfigError => e
                 raise ConfigError, "#{File.join(local_dir, "source.yml")}: #{e.message}", e.backtrace
             end
         end
 
-        # True if the given string contains expansions
-        def contains_expansion?(string); string =~ /\$/ end
-
         def single_expansion(data, additional_expansions = Hash.new)
+            if !source_definition
+                load_description_file
+            end
             Autoproj.single_expansion(data, additional_expansions.merge(constants_definitions))
         end
 
@@ -361,19 +385,7 @@ module Autoproj
             if !source_definition
                 load_description_file
             end
-
-            if data.respond_to?(:to_hash)
-                data.dup.each do |name, value|
-                    data[name] = expand(value, additional_expansions)
-                end
-            else
-                data = single_expansion(data, additional_expansions)
-                if contains_expansion?(data)
-                    raise ConfigError, "some expansions are not defined in #{data.inspect}"
-                end
-            end
-
-            data
+            Autoproj.expand(data, additional_expansions.merge(constants_definitions))
         end
 
         # Returns the default importer definition for this package set, as a
@@ -610,16 +622,24 @@ module Autoproj
             !!data['auto_update']
         end
 
+        attr_reader :constant_definitions
+
 	def initialize(file, data)
             @file = file
 	    @data = data
             @packages = Hash.new
             @package_manifests = Hash.new
             @automatic_exclusions = Hash.new
+            @constants_definitions = Hash.new
 
             if Autoproj.has_config_key?('manifest_source')
                 @vcs = Autoproj.normalize_vcs_definition(Autoproj.user_config('manifest_source'))
             end
+            if data['constants']
+                @constant_definitions = Autoproj.resolve_constant_definitions(data['constants'])
+            else
+                @constant_definitions = Hash.new
+            end
 	end
 
         # True if the given package should not be built, with the packages that
@@ -741,6 +761,7 @@ module Autoproj
             # either vcs_type:url or just url. In the latter case, we expect
             # 'url' to be a path to a local directory
             vcs_def = begin
+                          spec = Autoproj.expand(spec, constant_definitions)
                           Autoproj.normalize_vcs_definition(spec)
                       rescue ConfigError => e
                           raise ConfigError, "in #{file}: #{e.message}"
@@ -901,8 +922,9 @@ module Autoproj
             FileUtils.rm_rf remotes_symlinks_dir
             FileUtils.mkdir remotes_symlinks_dir
             # Create symbolic links from .remotes/weird_url to
-            # autoproj/remotes/name
+            # autoproj/remotes/name. Explicitely load the source name first
             each_remote_source(false) do |source|
+                source.load_name
                 FileUtils.ln_sf source.raw_local_dir, File.join(remotes_symlinks_dir, source.name)
             end
         end

data/lib/autoproj/osdeps.rb

@@ -326,6 +326,7 @@ module Autoproj
             end
 
             if !gems.empty?
+                Autobuild.progress "looking for RubyGems updates"
                 # Don't install gems that are already there ...
                 gems.delete_if do |name|
                     version_requirements = Gem::Requirement.default

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.5.6"
+    VERSION = "1.5.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 6
-  version: 1.5.6
+  - 7
+  version: 1.5.7
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 +02:00
+date: 2010-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency