autoproj 2.12.0 → 2.15.0

data/lib/autoproj/os_repository_installer.rb

@@ -1,6 +1,6 @@
-require 'autoproj/repository_managers/manager'
-require 'autoproj/repository_managers/unknown_os_manager'
-require 'autoproj/repository_managers/apt'
+require "autoproj/repository_managers/manager"
+require "autoproj/repository_managers/unknown_os_manager"
+require "autoproj/repository_managers/apt"
 
 module Autoproj
     class OSRepositoryInstaller
@@ -11,7 +11,7 @@ module Autoproj
         attr_reader :repository_managers
 
         OS_REPOSITORY_MANAGERS = {
-            'debian' => RepositoryManagers::APT
+            "debian" => RepositoryManagers::APT
         }.freeze
 
         def initialize(ws)

data/lib/autoproj/os_repository_resolver.rb

@@ -1,5 +1,5 @@
-require 'tempfile'
-require 'json'
+require "tempfile"
+require "json"
 
 module Autoproj
     # Manager for OS repository provided by package sets
@@ -11,7 +11,9 @@ module Autoproj
         attr_accessor :operating_system
 
         def self.load(file)
-            raise ArgumentError, "no such file or directory: #{file}" unless File.file?(file)
+            unless File.file?(file)
+                raise ArgumentError, "no such file or directory: #{file}"
+            end
 
             error_t = if defined? Psych::SyntaxError
                           [ArgumentError, Psych::SyntaxError]
@@ -62,12 +64,12 @@ module Autoproj
         end
 
         def entry_matches?(entry, identifiers)
-            !(entry.keys.first.split(',').map(&:strip) & identifiers).empty?
+            !(entry.keys.first.split(",").map(&:strip) & identifiers).empty?
         end
 
         def resolved_entries
             os_name, os_version = operating_system
-            os_version << 'default' unless os_version.include?('default')
+            os_version << "default" unless os_version.include?("default")
 
             distribution_filtered = definitions.select do |entry|
                 entry_matches?(entry, os_name)
@@ -131,7 +133,7 @@ module Autoproj
             return if obj.is_a?(type)
 
             raise ArgumentError, "invalid osrepos definition in #{path.join('/')}: "\
-                "expected a #{type}, found a #{obj.class}"
+                                 "expected a #{type}, found a #{obj.class}"
         end
     end
 end

data/lib/autoproj/package_definition.rb

@@ -15,6 +15,7 @@ module Autoproj
         # @return [String] path to the file that contains this package's
         #   definition
         attr_reader :file
+
         # Whether this package is completely setup
         #
         # If the package is set up, its importer as well as all target
@@ -48,7 +49,7 @@ module Autoproj
         # @return [Array<String>]
         def modes
             @modes + autobuild.utilities
-                     .values.find_all(&:enabled?).map(&:name)
+                              .values.find_all(&:enabled?).map(&:name)
         end
 
         # The package name
@@ -83,19 +84,17 @@ module Autoproj
         def apply_dependencies_from_manifest
             manifest = autobuild.description
             manifest.each_dependency(modes) do |name, is_optional|
-                begin
-                    if is_optional
-                        autobuild.optional_dependency name
-                    else
-                        autobuild.depends_on name
-                    end
-                rescue ConfigError => e
-                    raise ConfigError.new(manifest.path),
-                          "manifest #{manifest.path} of #{self.name} from "\
-                          "#{package_set.name} lists '#{name}' as dependency, "\
-                          'but it is neither a normal package nor an osdeps '\
-                          "package. osdeps reports: #{e.message}", e.backtrace
+                if is_optional
+                    autobuild.optional_dependency name
+                else
+                    autobuild.depends_on name
                 end
+            rescue ConfigError => e
+                raise PackageNotFound.new(manifest.path),
+                      "manifest #{manifest.path} of #{self.name} from "\
+                      "#{package_set.name} lists '#{name}' as dependency, "\
+                      "but it is neither a normal package nor an osdeps "\
+                      "package. osdeps reports: #{e.message}", e.backtrace
             end
         end
     end

data/lib/autoproj/package_managers/apt_dpkg_manager.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'autoproj/package_managers/debian_version'
+require "autoproj/package_managers/debian_version"
 
 module Autoproj
     module PackageManagers
@@ -14,24 +14,26 @@ module Autoproj
                 @installed_packages = nil
                 @installed_versions = nil
                 super(ws, true,
-                      %w{apt-get install},
-                      %w{DEBIAN_FRONTEND=noninteractive apt-get install -y})
+                      %w[apt-get install],
+                      %w[DEBIAN_FRONTEND=noninteractive apt-get install -y])
             end
 
             def configure_manager
                 super
-                ws.config.declare 'apt_dpkg_update', 'boolean',
-                    default: 'yes',
-                    doc: ['Would you like autoproj to keep apt packages up-to-date?']
+                ws.config.declare(
+                    "apt_dpkg_update", "boolean",
+                    default: "yes",
+                    doc: ["Would you like autoproj to keep apt packages up-to-date?"]
+                )
                 keep_uptodate?
             end
 
             def keep_uptodate?
-                ws.config.get('apt_dpkg_update')
+                ws.config.get("apt_dpkg_update")
             end
 
             def keep_uptodate=(flag)
-                ws.config.set('apt_dpkg_update', flag, true)
+                ws.config.set("apt_dpkg_update", flag, true)
             end
 
             def self.parse_package_status(
@@ -46,7 +48,7 @@ module Autoproj
                         end
                     end
                     if virtual && paragraph =~ /^Provides: (.*)$/
-                        installed_packages.merge($1.split(',').map(&:strip))
+                        installed_packages.merge($1.split(",").map(&:strip))
                     end
                 end
             end
@@ -58,11 +60,12 @@ module Autoproj
                 dpkg_status << "\n"
 
                 dpkg_status = StringScanner.new(dpkg_status)
-                if !dpkg_status.scan(/Package: /)
-                    raise ArgumentError, "expected #{status_file} to have Package: lines but found none"
+                unless dpkg_status.scan(/Package: /)
+                    raise ArgumentError, "expected #{status_file} to have Package: "\
+                                         "lines but found none"
                 end
 
-                while paragraph_end = dpkg_status.scan_until(/Package: /)
+                while (paragraph_end = dpkg_status.scan_until(/Package: /))
                     paragraph = "Package: #{paragraph_end[0..-10]}"
                     parse_package_status(installed_packages, installed_versions,
                                          paragraph, virtual: virtual)
@@ -73,37 +76,37 @@ module Autoproj
             end
 
             def self.parse_apt_cache_paragraph(paragraph)
-                version = '0'
-                if paragraph =~ /^Package: (.*)$/
-                    package_name = $1
-                    if paragraph =~ /^Version: (.*)$/
-                        version = $1
-                    end
+                version = "0"
+                if (paragraph_m = /^Package: (.*)$/.match(paragraph))
+                    package_name = paragraph_m[1]
+                    version_m = /^Version: (.*)$/.match(paragraph)
+                    version = version_m[1] if version_m
                 end
                 [package_name, version]
             end
 
             def self.parse_packages_versions(packages)
                 packages_versions = {}
-                apt_cache_show = `apt-cache show --no-all-versions #{packages.join(' ')}`
+                apt_cache_show = `apt-cache show --no-all-versions #{packages.join(" ")}`
                 apt_cache_show = StringScanner.new(apt_cache_show)
-                if !apt_cache_show.scan(/Package: /)
-                    return packages_versions
-                end
+                return packages_versions unless apt_cache_show.scan(/Package: /)
 
-                while paragraph_end = apt_cache_show.scan_until(/Package: /)
+                while (paragraph_end = apt_cache_show.scan_until(/Package: /))
                     paragraph = "Package: #{paragraph_end[0..-10]}"
                     package_name, version = parse_apt_cache_paragraph(paragraph)
                     packages_versions[package_name] = DebianVersion.new(version)
                 end
-                package_name, version = parse_apt_cache_paragraph("Package: #{apt_cache_show.rest}")
+                package_name, version = parse_apt_cache_paragraph(
+                    "Package: #{apt_cache_show.rest}"
+                )
                 packages_versions[package_name] = DebianVersion.new(version)
                 packages_versions
             end
 
             def updated?(package, available_version)
-                # Consider up-to-date if the package is provided by another package (purely virtual)
-                # Ideally, we should check the version of the package that provides it
+                # Consider up-to-date if the package is provided by another
+                # package (purely virtual) Ideally, we should check the version
+                # of the package that provides it
                 return true unless available_version && @installed_versions[package]
 
                 (available_version <= @installed_versions[package])
@@ -111,8 +114,13 @@ module Autoproj
 
             # On a dpkg-enabled system, checks if the provided package is installed
             # and returns true if it is the case
-            def installed?(package_name, filter_uptodate_packages: false, install_only: false)
-                @installed_packages, @installed_versions = self.class.parse_dpkg_status(status_file) unless @installed_packages && @installed_versions
+            def installed?(package_name, filter_uptodate_packages: false,
+                install_only: false)
+                unless @installed_packages && @installed_versions
+                    @installed_packages, @installed_versions =
+                        self.class.parse_dpkg_status(status_file)
+                end
+
                 if package_name =~ /^(\w[a-z0-9+-.]+)/
                     @installed_packages.include?($1)
                 else
@@ -122,11 +130,18 @@ module Autoproj
             end
 
             def install(packages, filter_uptodate_packages: false, install_only: false)
-                packages_versions = self.class.parse_packages_versions(packages)
                 if filter_uptodate_packages || install_only
-                    packages = packages.find_all do |package_name|
-                        !installed?(package_name) || (keep_uptodate? && !updated?(package_name, packages_versions[package_name]))
+                    already_installed, missing = packages.partition do |package_name|
+                        installed?(package_name)
+                    end
+
+                    if keep_uptodate? && !install_only
+                        packages_versions = self.class.parse_packages_versions(already_installed)
+                        need_update = already_installed.find_all do |package_name|
+                            !updated?(package_name, packages_versions[package_name])
+                        end
                     end
+                    packages = missing + (need_update || [])
                 end
 
                 if super(packages)