autoproj 1.12.6 → 1.13.0.b1

data/lib/autoproj/ops/tools.rb

@@ -24,8 +24,8 @@ module Autoproj
                 @@packages.delete(text_name)
             end
 
-            def import(only_local = false)
-                importer.import(self, only_local)
+            def import(options = Hash.new)
+                importer.import(self, options)
             end
 
             def add_stat(*args)
@@ -49,7 +49,12 @@ module Autoproj
 
         def load_autoprojrc
             # Load the user-wide autoproj RC file
-            if home_dir = Dir.home
+            home_dir =
+                begin Dir.home
+                rescue ArgumentError
+                end
+
+            if home_dir
                 rcfile = File.join(home_dir, '.autoprojrc')
                 if File.file?(rcfile)
                     Kernel.load rcfile
@@ -87,6 +92,34 @@ module Autoproj
             end
         end
 
+        def resolve_selection(user_selection, options = Hash.new)
+            options = Kernel.validate_options options,
+                recursive: true,
+                ignore_non_imported_packages: false
+
+            resolved_selection = CmdLine.
+                resolve_user_selection(user_selection, filter: false)
+            if options[:ignore_non_imported_packages]
+                manifest.each_autobuild_package do |pkg|
+                    if !File.directory?(pkg.srcdir)
+                        manifest.ignore_package(pkg.name)
+                    end
+                end
+            end
+            resolved_selection.filter_excluded_and_ignored_packages(manifest)
+
+            packages =
+                if options[:recursive]
+                    CmdLine.import_packages(
+                        resolved_selection,
+                        warn_about_ignored_packages: false)
+                else
+                    resolved_selection.to_a
+                end
+
+            packages
+        end
+
         extend Tools
     end
     end

data/lib/autoproj/osdeps.rb

@@ -369,6 +369,17 @@ fi
                         "zypper -n install '%s'")
             end
 
+            def filter_uptodate_packages(packages)
+                result = `LANG=C rpm -q --whatprovides '#{packages.join("' '")}'`
+                has_all_pkgs = $?.success?
+
+                if !has_all_pkgs
+                    return packages # let zypper filter, we need root now anyways
+                else 
+                    return []
+                end
+            end
+
             def install(packages)
                 patterns, packages = packages.partition { |pkg| pkg =~ /^@/ }
                 patterns = patterns.map { |str| str[1..-1] }
@@ -401,21 +412,21 @@ fi
                 result = `LANG=C rpm -q --queryformat "%{NAME}\n" '#{packages.join("' '")}'`
 
                 installed_packages = []
-		new_packages = []
+                new_packages = []
                 result.split("\n").each_with_index do |line, index|
-		    line = line.strip
+                    line = line.strip
                     if line =~ /package (.*) is not installed/
-			package_name = $1
-			if !packages.include?(package_name) # something is wrong, fallback to installing everything
-			    return packages
-			end
+                        package_name = $1
+                        if !packages.include?(package_name) # something is wrong, fallback to installing everything
+                            return packages
+                        end
                         new_packages << package_name
-		    else 
-			package_name = line.strip
-			if !packages.include?(package_name) # something is wrong, fallback to installing everything
-			    return packages
-			end
-		        installed_packages << package_name
+                    else 
+                        package_name = line.strip
+                        if !packages.include?(package_name) # something is wrong, fallback to installing everything
+                            return packages
+                        end
+                        installed_packages << package_name
                     end
                 end
                 new_packages
@@ -533,13 +544,13 @@ fi
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
                     p_gems = File.join(p, '.gems')
                     if File.directory?(p_gems)
-                        Autobuild.env_add_path 'GEM_PATH', p_gems
-                        Autobuild.env_add_path 'PATH', File.join(p_gems, 'bin')
+                        Autobuild.env_push_path 'GEM_PATH', p_gems
+                        Autobuild.env_push_path 'PATH', File.join(p_gems, 'bin')
                     end
                 end
-                Autobuild.env_add_path 'GEM_PATH', gem_home
+                Autobuild.env_push_path 'GEM_PATH', gem_home
                 Autobuild.env_set 'GEM_HOME', gem_home
-                Autobuild.env_add_path 'PATH', "#{gem_home}/bin"
+                Autobuild.env_push_path 'PATH', "#{gem_home}/bin"
 
                 # Now, reset the directories in our own RubyGems instance
                 Gem.paths = ENV
@@ -549,6 +560,7 @@ fi
                 if cache = cache_dir
                     gem_cache_dir = File.join(gem_home, 'cache')
                     if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
+                        FileUtils.mkdir_p gem_home
                         FileUtils.rm_rf gem_cache_dir
                         Autoproj.create_symlink(cache, gem_cache_dir)
                     end

data/lib/autoproj/package_definition.rb

@@ -32,6 +32,19 @@ module Autoproj
             @autobuild, @package_set, @file =
                 autobuild, package_set, file
             @user_blocks = []
+            @modes = ['import', 'build']
+        end
+
+        # The modes in which this package will be used
+        #
+        # Mainly used during dependency resolution to disable unneeded
+        # dependencies
+        #
+        # @return [Array<String>]
+        def modes
+            @modes + autobuild.utilities.values.
+                find_all { |u| u.enabled? }.
+                map(&:name)
         end
 
         # The package name

data/lib/autoproj/package_manifest.rb

@@ -70,46 +70,49 @@ module Autoproj
             @xml = doc
         end
 
-        def each_dependency(&block)
-            if block_given?
-                each_os_dependency(&block)
-                each_package_dependency(&block)
-            else
-                enum_for(:each_dependency, &block)
+        def each_dependency(in_modes = Array.new, &block)
+            return enum_for(__method__) if !block_given?
+
+            depend_nodes = xml.elements.to_a('package/depend') +
+                xml.elements.to_a('package/depend_optional') +
+                xml.elements.to_a('package/rosdep')
+            in_modes.each do |m|
+                depend_nodes += xml.elements.to_a("package/#{m}_depend")
             end
-        end
 
-        def each_os_dependency
-            if block_given?
-                xml.elements.each('package/rosdep') do |node|
-                    yield(node.attributes['name'], false)
+            depend_nodes.each do |node|
+                dependency = node.attributes['package'] || node.attributes['name']
+                optional   = (node.attributes['optional'].to_s == '1' || node.name == "depend_optional")
+                modes      = node.attributes['modes'].to_s.split(',')
+                if node.name =~ /^(\w+)_depend$/
+                    modes << $1
+                end
+                if !modes.empty? && modes.none? { |m| in_modes.include?(m) }
+                    next
                 end
-                package.os_packages.each do |name|
-                    yield(name, false)
+
+                if dependency
+                    yield(dependency, optional)
+                elsif node.name == 'rosdep'
+                    raise ConfigError.new, "manifest of #{package.name} has a <rosdep> tag without a 'name' attribute"
+                else
+                    raise ConfigError.new, "manifest of #{package.name} has a <#{node.name}> tag without a 'package' attribute"
                 end
-            else
-                enum_for :each_os_dependency
             end
-        end
 
-        def each_package_dependency
-            if block_given?
-                depend_nodes = xml.elements.to_a('package/depend') +
-                    xml.elements.to_a('package/depend_optional')
+            package.os_packages.each do |name|
+                yield(name, false)
+            end
+        end
 
-                depend_nodes.each do |node|
-                    dependency = node.attributes['package']
-                    optional = (node.attributes['optional'].to_s == '1' || node.name == "depend_optional")
+        def each_os_dependency(modes = Array.new, &block)
+            Autoproj.warn "PackageManifest#each_os_dependency called, fix your code"
+            return each_dependency(modes, &block)
+        end
 
-                    if dependency
-                        yield(dependency, optional)
-                    else
-                        raise ConfigError.new, "manifest of #{package.name} has a <depend> tag without a 'package' attribute"
-                    end
-                end
-            else
-                enum_for :each_package_dependency
-            end
+        def each_package_dependency(modes = Array.new)
+            Autoproj.warn "PackageManifest#each_os_dependency called, fix your code"
+            return each_dependency(modes, &block)
         end
 
         def each_maintainer

data/lib/autoproj/package_set.rb

@@ -56,6 +56,9 @@ module Autoproj
         attr_reader :source_definition
         attr_reader :constants_definitions
 
+        # The set of overrides defined in this package set
+        attr_reader :overrides
+
         # Sets the auto_imports flag
         #
         # @see auto_imports?
@@ -89,6 +92,7 @@ module Autoproj
             @vcs = vcs
             @osdeps = OSDependencies.new
             @all_osdeps = []
+            @overrides = Array.new
 
             @provides = Set.new
             @imports  = Set.new
@@ -114,11 +118,14 @@ module Autoproj
         # True if this source has already been checked out on the local autoproj
         # installation
         def present?; File.directory?(raw_local_dir) end
+        # True if this is the main package set (i.e. the main autoproj
+        # configuration)
+        def main?; false end
         # True if this source is local, i.e. is not under a version control
         def local?; vcs.local? end
         # True if this source defines nothing
         def empty?
-            !source_definition['version_control'] && !source_definition['overrides']
+            !source_definition['version_control'] && overrides.empty?
                 !each_package.find { true } &&
                 !File.exists?(File.join(raw_local_dir, "overrides.rb")) &&
                 !File.exists?(File.join(raw_local_dir, "init.rb"))
@@ -133,7 +140,9 @@ module Autoproj
                 Hash.new
             else
                 package = create_autobuild_package
-                package.importer.snapshot(package, target_dir)
+                if package.importer.respond_to?(:snapshot)
+                    package.importer.snapshot(package, target_dir)
+                end
             end
         end
 
@@ -326,6 +335,15 @@ module Autoproj
             end
 
             parse_source_definition
+            @overrides = load_overrides
+        end
+
+        def load_overrides
+            if data = source_definition['overrides']
+                [[source_file, data]]
+            else
+                []
+            end
         end
 
         def parse_source_definition
@@ -377,6 +395,10 @@ module Autoproj
         #
         # The returned value is a VCSDefinition object.
         def version_control_field(package_name, section_name, validate = true)
+            vcs_field( source_definition, package_name, section_name, validate )
+        end
+
+        def vcs_field( source_definition, package_name, section_name, validate )
             urls = source_definition['urls'] || Hash.new
             urls['HOME'] = ENV['HOME']
 
@@ -395,6 +417,10 @@ module Autoproj
             if all_vcs
                 all_vcs.each do |spec|
                     spec = spec.dup
+                    if !spec.kind_of?(Hash)
+                        raise ConfigError.new, "wrong format for the #{spec} entry, expected #{spec} followed by a colon and one importer option per following line"
+                    end
+
                     if spec.values.size != 1
                         # Maybe the user wrote the spec like
                         #   - package_name:
@@ -495,16 +521,23 @@ module Autoproj
         # @param [VCSDefinition] the vcs to be updated
         # @return [VCSDefinition] the new, updated vcs object
         def overrides_for(package_name, vcs)
-            new_spec, new_raw_entry = version_control_field(package_name, 'overrides', false)
-            return vcs if !new_spec
+            overrides.each do |file, override|
+                new_spec, new_raw_entry = 
+                    Autoproj.in_file file do
+                        vcs_field(Hash['overrides' => override], package_name, 'overrides', false)
+                    end
 
-            Autoproj.in_file source_file do
-                begin
-                    vcs.update(new_spec, new_raw_entry)
-                rescue ConfigError => e
-                    raise ConfigError.new, "invalid resulting VCS specification in the overrides section for package #{package_name}: #{e.message}"
+                if new_spec
+                    Autoproj.in_file file do
+                        begin
+                            vcs = vcs.update(new_spec, new_raw_entry)
+                        rescue ConfigError => e
+                            raise ConfigError.new, "invalid resulting VCS specification in the overrides section for package #{package_name}: #{e.message}"
+                        end
+                    end
                 end
             end
+            vcs
         end
 
         # Enumerates the Autobuild::Package instances that are defined in this
@@ -547,6 +580,10 @@ module Autoproj
             'main configuration'
         end
 
+        def main?
+            true
+        end
+
         def local?
             true
         end
@@ -563,12 +600,12 @@ module Autoproj
             File.join(Autoproj.config_dir, "manifest")
         end
 
-        def overrides_yml_path
+        def overrides_file_path
             File.join(Autoproj.config_dir, "overrides.yml")
         end
 
         def source_file
-            overrides_yml_path
+            manifest_path
         end
 
         # Returns the default importer for this package set
@@ -580,21 +617,41 @@ module Autoproj
         def load_description_file
             @source_definition = raw_description_file
             parse_source_definition
+            @overrides = load_overrides
+        end
+
+        def load_overrides
+            files = Dir.glob(File.join( Autoproj.overrides_dir, "*.yml" ) ).sort
+            overrides = files.map do |file|
+                source_data = Autoproj.in_file(file, Autoproj::YAML_LOAD_ERROR) do
+                    YAML.load(File.read(file)) || Array.new
+                end
+                source_data =
+                    if source_data.respond_to?(:to_ary)
+                        source_data
+                    else source_data['overrides'] || Array.new
+                    end
+                [file, source_data]
+            end
+            overrides + super
         end
 
         def raw_description_file
-            if File.file?(overrides_yml_path)
-                description = Autoproj.in_file(overrides_yml_path, Autoproj::YAML_LOAD_ERROR) do
-                    YAML.load(File.read(overrides_yml_path)) || Hash.new
+            description = Hash[
+                'imports' => Array.new,
+                'version_control' => Array.new,
+                'overrides' => Array.new]
+            if File.file?(overrides_file_path)
+                overrides_data = Autoproj.in_file(overrides_file_path, Autoproj::YAML_LOAD_ERROR) do
+                    YAML.load(File.read(overrides_file_path)) || Hash.new
                 end
-            else
-                description = Hash.new
+                description = description.merge(overrides_data)
             end
 
             manifest_data = Autoproj.in_file(manifest_path, Autoproj::YAML_LOAD_ERROR) do
                 YAML.load(File.read(manifest_path)) || Hash.new
             end
-            description['imports'] = (description['imports'] || Array.new).
+            description['imports'] = description['imports'].
                 concat(manifest_data['package_sets'] || Array.new)
             description['name'] = name
             description

data/lib/autoproj/system.rb

@@ -36,23 +36,26 @@ module Autoproj
             return @root_dir
         end
 
-        root_dir_rx =
-            if Autobuild.windows? then /^[a-zA-Z]:\\\\$/
-            else /^\/$/
+        path = Pathname.pwd
+        while !path.root?
+            if (path + "autoproj" + 'manifest').file?
+                break
             end
-
-        while root_dir_rx !~ dir && !File.directory?(File.join(dir, "autoproj"))
-            dir = File.dirname(dir)
+            path = path.parent
         end
-        if root_dir_rx =~ dir
+
+        if path.root?
             raise UserError, "not in a Autoproj installation"
         end
 
-        #Preventing backslashed in path, that might be confusing on some path compares
+        result = path.to_s
+        # I don't know if this is still useful or not ... but it does not hurt
+        #
+        # Preventing backslashed in path, that might be confusing on some path compares
         if Autobuild.windows?
-            dir = dir.gsub(/\\/,'/')
+            result = result.gsub(/\\/,'/')
         end
-        dir
+        result
     end
 
     # Returns the configuration directory for this autoproj installation.
@@ -63,6 +66,16 @@ module Autoproj
         File.join(root_dir, "autoproj")
     end
 
+    OVERRIDES_DIR = "overrides.d"
+
+    # Returns the directory containing overrides files
+    #
+    # If the current directory is not in an autoproj installation,
+    # raises UserError.
+    def self.overrides_dir
+        File.join(config_dir, OVERRIDES_DIR)
+    end
+
     # @deprecated use Autobuild.find_in_path instead
     #
     # Warning: the autobuild method returns nil (instead of raising) if the