autoproj 1.11.0.rc15 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f532e864fc2e5926742f48b077550a790c3baacf
-  data.tar.gz: 63a70a19b2f5aa23508031293ed199439a1c2dde
+  metadata.gz: dc64d6f9ced9d44cb201ab31f5dbf2a84bdef777
+  data.tar.gz: ea6d4f3c3d2db15a084c9d3348780dddd893d975
 SHA512:
-  metadata.gz: 7a47dd280accc2939eea99009665d4ad575366e7e8b673a1072c661bfe2088433e19e2b58a83b7d9df875e1471d2dd8761356b58cc5cf57b211a552a8726e71c
-  data.tar.gz: f28e24343f5ed84060f2c769ad48c36ceeef17334336645c8c8a0bb116d6ac600f252fd1f8d79deef6bee21891fad8cdd227d69be70ac60776d7bf26b169268f
+  metadata.gz: b3b99d765575bc4526854ec74f3571b41181d30267f2b223a3e7e6e3a7f1194680fd0a9d99d86ab7489e20f7030a8373b7984e0dd23178e722dd7a4f2b21b52a
+  data.tar.gz: 03740b0613ed3fcbd37b585c86d4c47decf8a8792d7f2898ccea2f79b8e0fcd765b83b2ad0d5669e9bf05339b07fa2da74697172d7b25e1f61fe964059b0940a

data/bin/autoproj_bootstrap

@@ -1055,13 +1055,34 @@ fi
                 end
             end
 
-            def reinstall
-                Autoproj.message "  reinstalling all RubyGems"
+            def build_gem_cmdlines(gems)
+                with_version, without_version = gems.partition { |name, v| v }
+
+                cmdlines = []
+                if !without_version.empty?
+                    cmdlines << without_version.flatten
+                end
+                with_version.each do |name, v|
+                    cmdlines << [name, "-v", v]
+                end
+                cmdlines
+            end
+
+            def pristine(gems)
+                guess_gem_program
                 base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem')]
-                Autobuild::Subprocess.run 'osdeps', 'reinstall', *base_cmdline,
-                    'clean'
-                Autobuild::Subprocess.run 'osdeps', 'reinstall', *base_cmdline,
-                    'pristine', '--all', '--extensions'
+                cmdlines = [
+                    [*base_cmdline, 'clean'],
+                ]
+                cmdlines += build_gem_cmdlines(gems).map do |line|
+                    base_cmdline + ["pristine", "--extensions"] + line
+                end
+                if gems_interaction(gems, cmdlines)
+                    Autoproj.message "  restoring RubyGems: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+                    cmdlines.each do |c|
+                        Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
+                    end
+                end
             end
 
             def install(gems)
@@ -1075,16 +1096,10 @@ fi
                 if GemManager.with_prerelease
                     base_cmdline << "--prerelease"
                 end
-                with_version, without_version = gems.partition { |name, v| v }
 
-                cmdlines = []
-                if !without_version.empty?
-                    cmdlines << (base_cmdline + without_version.flatten)
-                end
-                with_version.each do |name, v|
-                    cmdlines << base_cmdline + [name, "-v", v]
+                cmdlines = build_gem_cmdlines(gems).map do |line|
+                    base_cmdline + line
                 end
-
                 if gems_interaction(gems, cmdlines)
                     Autoproj.message "  installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
 
@@ -1373,6 +1388,10 @@ fi
             OSDependencies.load(file)
         end
 
+        def load_default
+            merge(self.class.load_default)
+        end
+
         PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager,
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
@@ -1465,6 +1484,14 @@ fi
             @filter_uptodate_packages = true
         end
 
+        # Returns the name of all known OS packages
+        #
+        # It includes even the packages for which there are no definitions on
+        # this OS
+        def all_package_names
+            all_definitions.keys
+        end
+
         # Returns the full path to the osdeps file from which the package
         # definition for +package_name+ has been taken
         def source_of(package_name)
@@ -2298,6 +2325,24 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             enabled_handlers
         end
 
+        # Requests that packages that are handled within the autoproj project
+        # (i.e. gems) are restored to pristine condition
+        #
+        # This is usually called as a rebuild step to make sure that all these
+        # packages are updated to whatever required the rebuild
+        def pristine(packages, options = Hash.new)
+            setup_package_handlers(options)
+            packages = resolve_os_dependencies(packages)
+
+            _, other_packages =
+                packages.partition { |handler, list| handler == os_package_handler }
+            other_packages.each do |handler, list|
+                if handler.respond_to?(:pristine)
+                    handler.pristine(list)
+                end
+            end
+        end
+
         # Requests the installation of the given set of packages
         def install(packages, options = Hash.new)
             # Remove the set of packages that have already been installed 

data/lib/autoproj/cmdline.rb

@@ -133,11 +133,11 @@ module Autoproj
 
             # Initialize the Autoproj.osdeps object by loading the default. The
             # rest is loaded later
-            Autoproj.osdeps = Autoproj::OSDependencies.load_default
-            Autoproj.osdeps.silent = !osdeps?
-            Autoproj.osdeps.filter_uptodate_packages = osdeps_filter_uptodate?
+            manifest.osdeps.load_default
+            manifest.osdeps.silent = !osdeps?
+            manifest.osdeps.filter_uptodate_packages = osdeps_filter_uptodate?
             if osdeps_forced_mode
-                Autoproj.osdeps.osdeps_mode = osdeps_forced_mode
+                manifest.osdeps.osdeps_mode = osdeps_forced_mode
             end
 
             # Define the option NOW, as update_os_dependencies? needs to know in
@@ -146,7 +146,7 @@ module Autoproj
             # It might lead to having multiple operating system detections, but
             # that's the best I can do for now.
 	    Autoproj::OSDependencies.define_osdeps_mode_option
-            Autoproj.osdeps.osdeps_mode
+            manifest.osdeps.osdeps_mode
 
             # Do that AFTER we have properly setup Autoproj.osdeps as to avoid
             # unnecessarily redetecting the operating system

data/lib/autoproj/manifest.rb

@@ -108,12 +108,16 @@ module Autoproj
         # The VCS object for the main configuration itself
         attr_reader :vcs
 
+        # The definition of all OS packages available on this installation
+        attr_reader :osdeps
+
 	def initialize
             @file = nil
 	    @data = Hash.new
             @packages = Hash.new
             @package_manifests = Hash.new
             @package_sets = []
+            @osdeps = OSDependencies.new
 
             @automatic_exclusions = Hash.new
             @constants_definitions = Hash.new
@@ -558,7 +562,7 @@ module Autoproj
             options = Kernel.validate_options options, :filter => true
 
             explicit_selection  = explicitly_selected_package?(name)
-	    osdeps_availability = Autoproj.osdeps.availability_of(name)
+	    osdeps_availability = osdeps.availability_of(name)
             available_as_source = Autobuild::Package[name]
 
             osdeps_overrides = Autoproj.manifest.osdeps_overrides[name]
@@ -609,9 +613,9 @@ module Autoproj
                         return []
                     end
                     begin
-                        Autoproj.osdeps.resolve_os_dependencies([name].to_set)
+                        osdeps.resolve_os_dependencies([name].to_set)
                     rescue Autoproj::ConfigError => e
-                        if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.os_package_handler.enabled?
+                        if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !osdeps.os_package_handler.enabled?
                             if !@ignored_os_dependencies.include?(name)
                                 Autoproj.warn "some package depends on the #{name} osdep: #{e.message}"
                                 Autoproj.warn "this osdeps dependency is simply ignored as you asked autoproj to not install osdeps packages"
@@ -647,7 +651,7 @@ module Autoproj
                 end
                 pkg_set.each_package.
                     map(&:name).
-                    find_all { |pkg_name| !Autoproj.osdeps || !Autoproj.osdeps.has?(pkg_name) }
+                    find_all { |pkg_name| !osdeps || !osdeps.has?(pkg_name) }
             end
         end
 
@@ -747,7 +751,7 @@ module Autoproj
                 result |= metapackage(pkg_set.name).packages.map(&:name).to_set
             end
             result.to_a.
-                find_all { |pkg_name| !Autoproj.osdeps || !Autoproj.osdeps.has?(pkg_name) }
+                find_all { |pkg_name| !osdeps.has?(pkg_name) }
         end
 
         # Returns true if +name+ is a valid package and is included in the build
@@ -758,7 +762,7 @@ module Autoproj
         # If it is false, the method will simply return false on non-defined
         # packages 
         def package_enabled?(name, validate = true)
-            if !Autobuild::Package[name] && !Autoproj.osdeps.has?(name)
+            if !Autobuild::Package[name] && !osdeps.has?(name)
                 if validate
                     raise ArgumentError, "package #{name} does not exist"
                 end
@@ -928,10 +932,8 @@ module Autoproj
             return required_os_packages, package_os_deps
         end
 
-        # Installs the OS dependencies that are required by the given packages
-        def install_os_dependencies(packages)
-            required_os_packages, package_os_deps = list_os_dependencies(packages)
-            required_os_packages.delete_if do |pkg|
+        def filter_os_dependencies(required_os_packages, package_os_deps)
+            required_os_packages.find_all do |pkg|
                 if excluded?(pkg)
                     raise ConfigError.new, "the osdeps package #{pkg} is excluded from the build in #{file}. It is required by #{package_os_deps[pkg].join(", ")}"
                 end
@@ -939,10 +941,30 @@ module Autoproj
                     if Autoproj.verbose
                         Autoproj.message "ignoring osdeps package #{pkg}"
                     end
-                    true
+                    false
+                else true
                 end
             end
-            Autoproj.osdeps.install(required_os_packages)
+        end
+
+        # Restores the OS dependencies required by the given packages to
+        # pristine conditions
+        #
+        # This is usually called as a rebuild step to make sure that all these
+        # packages are updated to whatever required the rebuild
+        def pristine_os_dependencies(packages)
+            required_os_packages, package_os_deps = list_os_dependencies(packages)
+            required_os_packages =
+                filter_os_dependencies(required_os_packages, package_os_deps)
+            osdeps.pristine(required_os_packages)
+        end
+
+        # Installs the OS dependencies that are required by the given packages
+        def install_os_dependencies(packages)
+            required_os_packages, package_os_deps = list_os_dependencies(packages)
+            required_os_packages =
+                filter_os_dependencies(required_os_packages, package_os_deps)
+            osdeps.install(required_os_packages)
         end
 
         # The set of overrides added with #add_osdeps_overrides
@@ -993,10 +1015,10 @@ module Autoproj
         #
         # This method converts the first two directories into the third one
         def expand_package_selection(selection, options = Hash.new)
-            options = Kernel.validate_options options, :filter => true
-            base_dir = Autoproj.root_dir
+            options = Kernel.validate_options options, filter: true
 
             result = PackageSelection.new
+
             # All the packages that are available on this installation
             all_layout_packages = self.all_selected_packages
 
@@ -1025,25 +1047,36 @@ module Autoproj
 
             # Finally, check for package source directories
             all_packages = self.all_package_names
+            all_osdeps_packages = osdeps.all_package_names
+
             selection.each do |sel|
                 match_pkg_name = Regexp.new(Regexp.quote(sel))
-                all_packages.each do |pkg_name|
+                matching_packages = all_packages.map do |pkg_name|
                     pkg = Autobuild::Package[pkg_name]
-                    if pkg_name =~ match_pkg_name || "#{sel}/" =~ Regexp.new("^#{Regexp.quote(pkg.srcdir)}/") || pkg.srcdir =~ Regexp.new("^#{Regexp.quote(sel)}")
-                        # Check-out packages that are not in the manifest only
-                        # if they are explicitely selected. However, we do store
-                        # them as "possible resolutions" for the user selection,
-                        # and add them if -- at the end of the method -- nothing
-                        # has been found for this particular selection
-                        if !all_layout_packages.include?(pkg.name)
-                            if pkg_name != sel && pkg.srcdir != sel
-                                pending_selections[sel] = pkg_name
-                                next
-                            end
-                        end
-
-                        result.select(sel, pkg_name)
+                    if pkg_name =~ match_pkg_name ||
+                        "#{sel}/" =~ Regexp.new("^#{Regexp.quote(pkg.srcdir)}/") ||
+                        pkg.srcdir =~ Regexp.new("^#{Regexp.quote(sel)}")
+                        [pkg_name, (pkg_name == sel || pkg.srcdir == sel)]
                     end
+                end.compact
+                matching_osdeps_packages = all_osdeps_packages.find_all do |pkg_name|
+                    if pkg_name =~ match_pkg_name
+                        [pkg_name, pkg_name == sel]
+                    end
+                end.compact
+
+                (matching_packages + matching_osdeps_packages).to_set.each do |pkg_name, exact_match|
+                    # Check-out packages that are not in the manifest only
+                    # if they are explicitely selected. However, we do store
+                    # them as "possible resolutions" for the user selection,
+                    # and add them if -- at the end of the method -- nothing
+                    # has been found for this particular selection
+                    if !all_layout_packages.include?(pkg_name) && !exact_match
+                        pending_selections[sel] = pkg_name
+                        next
+                    end
+
+                    result.select(sel, pkg_name)
                 end
             end
 
@@ -1137,7 +1170,13 @@ module Autoproj
         #
         # @return [OSDependencies]
         # @see load_osdeps_from_package_sets
-        attr_accessor :osdeps
+        def osdeps
+            manifest.osdeps
+        end
+
+        def osdeps=(osdeps)
+            raise ArgumentError, "cannot set the osdeps object explicitely anymore. Use osdeps.clear and osdeps.merge"
+        end
 
         # The configuration file
         # @return [Configuration]

data/lib/autoproj/ops/build.rb

@@ -38,6 +38,7 @@ module Autoproj
                 end
 
                 packages = manifest.all_layout_packages
+                manifest.pristine_os_dependencies(packages)
                 rebuild_packages(packages, packages)
             end
 

data/lib/autoproj/osdeps.rb

@@ -592,13 +592,34 @@ fi
                 end
             end
 
-            def reinstall
-                Autoproj.message "  reinstalling all RubyGems"
+            def build_gem_cmdlines(gems)
+                with_version, without_version = gems.partition { |name, v| v }
+
+                cmdlines = []
+                if !without_version.empty?
+                    cmdlines << without_version.flatten
+                end
+                with_version.each do |name, v|
+                    cmdlines << [name, "-v", v]
+                end
+                cmdlines
+            end
+
+            def pristine(gems)
+                guess_gem_program
                 base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem')]
-                Autobuild::Subprocess.run 'osdeps', 'reinstall', *base_cmdline,
-                    'clean'
-                Autobuild::Subprocess.run 'osdeps', 'reinstall', *base_cmdline,
-                    'pristine', '--all', '--extensions'
+                cmdlines = [
+                    [*base_cmdline, 'clean'],
+                ]
+                cmdlines += build_gem_cmdlines(gems).map do |line|
+                    base_cmdline + ["pristine", "--extensions"] + line
+                end
+                if gems_interaction(gems, cmdlines)
+                    Autoproj.message "  restoring RubyGems: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+                    cmdlines.each do |c|
+                        Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
+                    end
+                end
             end
 
             def install(gems)
@@ -612,16 +633,10 @@ fi
                 if GemManager.with_prerelease
                     base_cmdline << "--prerelease"
                 end
-                with_version, without_version = gems.partition { |name, v| v }
 
-                cmdlines = []
-                if !without_version.empty?
-                    cmdlines << (base_cmdline + without_version.flatten)
-                end
-                with_version.each do |name, v|
-                    cmdlines << base_cmdline + [name, "-v", v]
+                cmdlines = build_gem_cmdlines(gems).map do |line|
+                    base_cmdline + line
                 end
-
                 if gems_interaction(gems, cmdlines)
                     Autoproj.message "  installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
 
@@ -910,6 +925,10 @@ fi
             OSDependencies.load(file)
         end
 
+        def load_default
+            merge(self.class.load_default)
+        end
+
         PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager,
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
@@ -1002,6 +1021,14 @@ fi
             @filter_uptodate_packages = true
         end
 
+        # Returns the name of all known OS packages
+        #
+        # It includes even the packages for which there are no definitions on
+        # this OS
+        def all_package_names
+            all_definitions.keys
+        end
+
         # Returns the full path to the osdeps file from which the package
         # definition for +package_name+ has been taken
         def source_of(package_name)
@@ -1835,6 +1862,24 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             enabled_handlers
         end
 
+        # Requests that packages that are handled within the autoproj project
+        # (i.e. gems) are restored to pristine condition
+        #
+        # This is usually called as a rebuild step to make sure that all these
+        # packages are updated to whatever required the rebuild
+        def pristine(packages, options = Hash.new)
+            setup_package_handlers(options)
+            packages = resolve_os_dependencies(packages)
+
+            _, other_packages =
+                packages.partition { |handler, list| handler == os_package_handler }
+            other_packages.each do |handler, list|
+                if handler.respond_to?(:pristine)
+                    handler.pristine(list)
+                end
+            end
+        end
+
         # Requests the installation of the given set of packages
         def install(packages, options = Hash.new)
             # Remove the set of packages that have already been installed 

data/lib/autoproj/package_selection.rb

@@ -23,13 +23,6 @@ module Autoproj
             # set of user-provided strings that caused that package to be
             # selected
             attr_reader :selection
-            # The set of osdeps matches, i.e. a mapping from a user-provided string to
-            # the set of packages it selected
-            attr_reader :osdeps_matches
-            # The set of selected osdeps packages, as a hash of the package name
-            # to the set of user-provided strings that caused that package to be
-            # selected
-            attr_reader :osdeps_selection
             # A flag that tells #filter_excluded_and_ignored_packages whether
             # the a given package selection is weak or not.
             #
@@ -48,8 +41,6 @@ module Autoproj
             def initialize
                 @selection = Hash.new { |h, k| h[k] = Set.new }
                 @matches = Hash.new { |h, k| h[k] = Set.new }
-                @osdeps_matches = Hash.new { |h, k| h[k] = Set.new }
-                @osdeps_selection = Hash.new { |h, k| h[k] = Set.new }
                 @weak_dependencies = Hash.new
                 @ignores = Hash.new { |h, k| h[k] = Set.new }
                 @exclusions = Hash.new { |h, k| h[k] = Set.new }
@@ -60,13 +51,8 @@ module Autoproj
                 selection.keys
             end
 
-            # The set of packages that have been selected
-            def osdeps_packages
-                osdeps_selection.keys
-            end
-
             def include?(pkg_name)
-                selection.has_key?(pkg_name) || osdeps_selection.has_key?(pkg_name)
+                selection.has_key?(pkg_name)
             end
 
             def empty?

data/lib/autoproj/package_set.rb

@@ -331,7 +331,12 @@ module Autoproj
         def parse_source_definition
             @name = source_definition['name']
             @provides = (source_definition['provides'] || Set.new).to_set
-            @imports_vcs  = (source_definition['imports'] || Array.new).map do |set_def|
+            @imports_vcs  = Array(source_definition['imports'] || Array.new).map do |set_def|
+                if !set_def.kind_of?(Hash)
+                    raise ConfigError.new(source_file),
+                        "in #{source_file}: wrong format for 'imports' section. Expected an array of maps (e.g. - github: my/url)."
+                end
+
                 Autoproj.in_file(source_file) do
                     PackageSet.resolve_definition(manifest, set_def)
                 end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc15"
+    VERSION = "1.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc15
+  version: 1.12.0
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -216,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2