autoproj 1.7.14.rc2 → 1.7.14.rc4

data/bin/autoproj-query

@@ -13,6 +13,14 @@ parser = OptionParser.new do |opt|
   Finds packages that match query_string and displays information about them (one per line)
   By default, only the package name is displayed. It can be customized with the --format option
 
+  QUERY KEYS
+    autobuild.name: the package name
+    autobuild.srcdir: the package source directory
+    autobuild.class.name: the package class
+    vcs.type: the VCS type (as used in the source.yml files)
+    vcs.url: the URL from the VCS. The exact semantic of it depends on the VCS type
+    package_set.name: the name of the package set that defines the package
+
   FORMAT SPECIFICATION
 
   The format is a string in which special values can be expanded using a $VARNAME format. The following variables are accepted:

data/bin/autoproj_bootstrap

@@ -116,8 +116,10 @@ module Autoproj
             attr_reader :aliases
             attr_accessor :force_osdeps
             attr_accessor :gem_with_prerelease
+            attr_accessor :gem_doc
         end
         @aliases = Hash.new
+        @gem_doc = false
 
         attr_writer :silent
         def silent?; @silent end
@@ -474,12 +476,30 @@ fi
 
 	    # If data is a hash, it means we have to check the OS version as well
             if data.kind_of?(Hash)
-                version_entry = data.find do |version_list, _|
-                    version_list.to_s.split(',').
-                        map(&:downcase).
-                        any? do |v|
-                            os_versions.any? { |osv| Regexp.new(v) =~ osv }
+                # Look in +data+ for specific version. We look, in order, in the
+                # os_versions field (detected OS versions), and return the first
+                # matching entry
+                version_entry = nil
+                # First, look for an exact match
+                found = os_versions.find do |os_ver|
+                    version_entry = data.find do |version_list, _|
+                        version_list.to_s.split(',').
+                            map(&:downcase).
+                            any? { |v| v == os_ver }
+                    end
+                end
+                if !found
+                    # Then relax the matching ...
+                    found = os_versions.find do |os_ver|
+                        version_entry = data.find do |version_list, _|
+                            version_list.to_s.split(',').
+                                map(&:downcase).
+                                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}"
                 end
 
                 if !version_entry
@@ -499,7 +519,7 @@ fi
 		# Single package
                 return [PACKAGES, [data.to_str]]
             else
-                raise ConfigError.new, "invalid package specificiation #{data} in #{source_of(name)}"
+                raise ConfigError.new, "invalid package specification #{data} in #{source_of(name)}"
             end
         end
 
@@ -1026,6 +1046,10 @@ So, what do you want ? (all, ruby, os or none)
                 guess_gem_program
 
                 base_cmdline = [Autobuild.tool('gem'), 'install']
+                if !OSDependencies.gem_doc
+                    base_cmdline << '--no-rdoc' << '--no-ri'
+                end
+
                 if Autoproj::OSDependencies.gem_with_prerelease
                     base_cmdline << "--prerelease"
                 end
@@ -1534,7 +1558,6 @@ libxslt:
   arch: libxslt
   gentoo: dev-libs/libxslt
   debian,ubuntu: libxslt1-dev
-rdoc: gem
 
 EODEFS
 
@@ -1565,7 +1588,7 @@ rescue Autoproj::ConfigError => e
 end
 
 # Now try to find out the name of the gem binary
-PACKAGES      = %w{rdoc autobuild libxml2 libxslt zlib build-essential lsb_release}
+PACKAGES      = %w{autobuild libxml2 libxslt zlib build-essential lsb_release}
 
 ENV['RUBYOPT']  = "-rubygems"
 require 'rubygems'

data/lib/autoproj/autobuild.rb

@@ -98,77 +98,16 @@ module Autobuild
         def depends_on(name)
             if Autoproj::CmdLine.ignore_dependencies?
                 return
-            elsif Autoproj.manifest.ignored?(name)
-                return
             end
 
             @os_packages ||= Set.new
-            @ignored_os_dependencies ||= Set.new
-
-            if @os_packages.include?(name) || @ignored_os_dependencies.include?(name)
-                return
-            end
-
-            explicit_selection  = Autoproj.manifest.explicitly_selected_package?(name)
-	    osdeps_availability = Autoproj.osdeps.availability_of(name)
-            available_as_source = Autobuild::Package[name]
-
-            osdeps_overrides = Autoproj.manifest.osdeps_overrides[name]
-            if osdeps_overrides
-                source_packages = osdeps_overrides[:packages]
-                if source_packages.empty?
-                    source_packages << name
-                end
-                force_source_usage = osdeps_overrides[:force]
-                available_as_source = true
-            end
-
-	    # Prefer OS packages to source packages
-            if force_source_usage && !source_packages.any? { |pkg_name| Autoproj.manifest.excluded?(pkg_name) }
-                source_packages.each do |pkg_name|
-                    __depends_on__(pkg_name)
+            Autoproj.manifest.resolve_package_name(name).each do |type, pkg|
+                if type == :osdeps
+                    @os_packages << pkg
+                elsif type == :package
+                    __depends_on__(pkg)
+                else raise Autoproj::InternalError, "expected package type to be either :osdeps or :package, got #{type.inspect}"
                 end
-            elsif !explicit_selection 
-                if osdeps_availability == Autoproj::OSDependencies::AVAILABLE
-                    @os_packages << name
-                    return
-                elsif osdeps_availability == Autoproj::OSDependencies::IGNORE
-                    return
-                end
-
-                if osdeps_availability == Autoproj::OSDependencies::UNKNOWN_OS
-                    # If we can't handle that OS, but other OSes have a
-                    # definition for it, we assume that it can be installed as
-                    # an external package. However, if it is also available as a
-                    # source package, prompt the user
-                    if !available_as_source || explicit_osdeps_selection(name)
-                        @os_packages << name
-                        return
-                    end
-                end
-
-
-                if !available_as_source
-                    begin
-                        # Call osdeps to get a proper error message
-                        osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set, name => [self.name])
-                        Autoproj.osdeps.resolve_os_dependencies(osdeps)
-                    rescue Autoproj::ConfigError => e
-                        if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.installs_os_packages?
-                            Autoproj.warn "in #{File.join(srcdir, 'manifest.xml')}: #{e.message}"
-                            Autoproj.warn "this osdeps dependency is simply ignored as you asked autoproj to not install osdeps packages"
-                            @ignored_os_dependencies << name
-                            # We are not asked to install OS packages, just ignore
-                            return
-                        end
-                        raise
-                    end
-                    # Should never reach further than that
-                end
-                __depends_on__(name) # to get the error message
-            else
-                # Normal dependency
-                __depends_on__(name)
             end
         end
 

data/lib/autoproj/default.osdeps

@@ -32,8 +32,6 @@ ruby19:
     gem:
         - rake
 
-rdoc: gem
-
 build-essential:
     debian,ubuntu: build-essential
     gentoo:

data/lib/autoproj/gitorious.rb

@@ -53,7 +53,6 @@ module Autoproj
         if Autobuild::Importer.respond_to?(:fallback) && options[:fallback_to_http]
             Autobuild::Importer.fallback do |package, importer|
                 root_rx = /^(?:http:\/\/git\.|git:\/\/|git@)#{Regexp.quote(base_url)}:?/
-
                 if importer.kind_of?(Autobuild::Git) && importer.repository =~ root_rx && importer.repository !~ /^http/
                     Autoproj.warn "import from #{importer.repository} failed, falling back to using http for all packages on #{base_url}"
 

data/lib/autoproj/manifest.rb

@@ -1057,6 +1057,7 @@ module Autoproj
             @moved_packages = Hash.new
             @osdeps_overrides = Hash.new
             @metapackages = Hash.new
+            @ignored_os_dependencies = Set.new
 
             @constant_definitions = Hash.new
             if Autoproj.has_config_key?('manifest_source')
@@ -1595,6 +1596,117 @@ module Autoproj
             set
         end
 
+        # Exception raised when a caller requires to use an excluded package
+        class ExcludedPackage < ConfigError
+            attr_reader :name
+            def initialize(name)
+                @name = name
+            end
+        end
+
+        # Resolves the given +name+, where +name+ can either be the name of a
+        # source or the name of a package.
+        #
+        # The returned value is a list of pairs:
+        #
+        #   [type, package_name]
+        #
+        # where +type+ can either be :package or :osdeps (as symbols)
+        #
+        # The returned array can be empty if +name+ is an ignored package
+        def resolve_package_name(name)
+            if pkg_set = find_metapackage(name)
+                if !pkg_set
+                    raise ConfigError.new, "#{name} is neither a package nor a package set name. Packages in autoproj must be declared in an autobuild file."
+                end
+                pkg_names = pkg_set.each_package.map(&:name)
+            else
+                pkg_names = [name]
+            end
+
+            result = []
+            pkg_names.each do |pkg|
+                result.concat(resolve_single_package_name(pkg))
+            end
+            result
+        end
+
+        # Resolves a package name, where +name+ cannot be resolved as a
+        # metapackage
+        #
+        # This is a helper method for #resolve_package_name. Do not use
+        # directly
+        def resolve_single_package_name(name) # :nodoc:
+            if ignored?(name)
+                return []
+            end
+
+            explicit_selection  = explicitly_selected_package?(name)
+	    osdeps_availability = Autoproj.osdeps.availability_of(name)
+            available_as_source = Autobuild::Package[name]
+
+            osdeps_overrides = Autoproj.manifest.osdeps_overrides[name]
+            if osdeps_overrides
+                source_packages    = osdeps_overrides[:packages].dup
+                force_source_usage = osdeps_overrides[:force]
+                begin
+                    source_packages = source_packages.inject([]) do |result, src_pkg_name|
+                        result.concat(resolve_package_name(src_pkg_name))
+                    end.uniq
+                    available_as_source = true
+                rescue ExcludedPackage
+                    force_source_usage = false
+                    available_as_source = false
+                end
+
+                if source_packages.empty?
+                    source_packages << [:package, name]
+                end
+            end
+
+            if force_source_usage
+                return source_packages
+            elsif !explicit_selection 
+                if osdeps_availability == Autoproj::OSDependencies::AVAILABLE
+                    return [[:osdeps, name]]
+                elsif osdeps_availability == Autoproj::OSDependencies::IGNORE
+                    return []
+                end
+
+                if osdeps_availability == Autoproj::OSDependencies::UNKNOWN_OS
+                    # If we can't handle that OS, but other OSes have a
+                    # definition for it, we assume that it can be installed as
+                    # an external package. However, if it is also available as a
+                    # source package, prompt the user
+                    if !available_as_source || explicit_osdeps_selection(name)
+                        return [[:osdeps, name]]
+                    end
+                end
+
+                # No source, no osdeps. Call osdeps again, but this time to get
+                # a proper error message.
+                if !available_as_source
+                    begin
+                        osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set, name => [self.name])
+                        Autoproj.osdeps.resolve_os_dependencies(osdeps)
+                    rescue Autoproj::ConfigError => e
+                        if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.installs_os_packages?
+                            Autoproj.warn "in #{File.join(srcdir, 'manifest.xml')}: #{e.message}"
+                            Autoproj.warn "this osdeps dependency is simply ignored as you asked autoproj to not install osdeps packages"
+                            @ignored_os_dependencies << name
+                            # We are not asked to install OS packages, just ignore
+                            return []
+                        end
+                        raise
+                    end
+                    # Should never reach further than that
+                end
+            elsif !available_as_source
+                raise ConfigError, "cannot resolve #{name}: it is not a package, not a metapackage and not an osdeps"
+            end
+            return [[:package, name]]
+        end
+
         # +name+ can either be the name of a source or the name of a package. In
         # the first case, we return all packages defined by that source. In the
         # latter case, we return the singleton array [name]
@@ -1933,16 +2045,16 @@ module Autoproj
             # First, remove packages that are directly referenced by name or by
             # package set names
             selection.each do |sel|
-                sel = Regexp.new(Regexp.quote(sel))
+                match_pkg_name = Regexp.new(Regexp.quote(sel))
 
                 packages = all_layout_packages.
-                    find_all { |pkg_name| pkg_name =~ sel }.
+                    find_all { |pkg_name| pkg_name =~ match_pkg_name }.
                     to_set
                 matches[sel] = packages
                 expanded_packages |= packages
 
                 each_metapackage do |pkg|
-                    if pkg.name =~ sel
+                    if pkg.name =~ match_pkg_name
                         packages = resolve_package_set(pkg.name).to_set
                         packages = (packages & all_layout_packages)
                         matches[sel] |= packages

data/lib/autoproj/osdeps.rb

@@ -17,8 +17,10 @@ module Autoproj
             attr_reader :aliases
             attr_accessor :force_osdeps
             attr_accessor :gem_with_prerelease
+            attr_accessor :gem_doc
         end
         @aliases = Hash.new
+        @gem_doc = false
 
         attr_writer :silent
         def silent?; @silent end
@@ -375,12 +377,30 @@ fi
 
 	    # If data is a hash, it means we have to check the OS version as well
             if data.kind_of?(Hash)
-                version_entry = data.find do |version_list, _|
-                    version_list.to_s.split(',').
-                        map(&:downcase).
-                        any? do |v|
-                            os_versions.any? { |osv| Regexp.new(v) =~ osv }
+                # Look in +data+ for specific version. We look, in order, in the
+                # os_versions field (detected OS versions), and return the first
+                # matching entry
+                version_entry = nil
+                # First, look for an exact match
+                found = os_versions.find do |os_ver|
+                    version_entry = data.find do |version_list, _|
+                        version_list.to_s.split(',').
+                            map(&:downcase).
+                            any? { |v| v == os_ver }
+                    end
+                end
+                if !found
+                    # Then relax the matching ...
+                    found = os_versions.find do |os_ver|
+                        version_entry = data.find do |version_list, _|
+                            version_list.to_s.split(',').
+                                map(&:downcase).
+                                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}"
                 end
 
                 if !version_entry
@@ -400,7 +420,7 @@ fi
 		# Single package
                 return [PACKAGES, [data.to_str]]
             else
-                raise ConfigError.new, "invalid package specificiation #{data} in #{source_of(name)}"
+                raise ConfigError.new, "invalid package specification #{data} in #{source_of(name)}"
             end
         end
 
@@ -927,6 +947,10 @@ So, what do you want ? (all, ruby, os or none)
                 guess_gem_program
 
                 base_cmdline = [Autobuild.tool('gem'), 'install']
+                if !OSDependencies.gem_doc
+                    base_cmdline << '--no-rdoc' << '--no-ri'
+                end
+
                 if Autoproj::OSDependencies.gem_with_prerelease
                     base_cmdline << "--prerelease"
                 end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.14.rc2"
+    VERSION = "1.7.14.rc4"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 15424049
+  hash: 15424061
   prerelease: 7
   segments: 
   - 1
   - 7
   - 14
   - rc
-  - 2
-  version: 1.7.14.rc2
+  - 4
+  version: 1.7.14.rc4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 Z
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild