autoproj 2.9.0 → 2.10.0

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.9.0"
+    VERSION = "2.10.0"
 end

data/lib/autoproj/workspace.rb

@@ -54,11 +54,12 @@ class Workspace < Ops::Loader
         def initialize(root_dir,
                        os_package_resolver: OSPackageResolver.new,
                        package_managers: OSPackageInstaller::PACKAGE_MANAGERS,
-                       os_repository_resolver: OSRepositoryResolver.new(operating_system: os_package_resolver.operating_system),
+                       os_repository_resolver: OSRepositoryResolver.new(
+                            operating_system: os_package_resolver.operating_system),
                        os_repository_installer: OSRepositoryInstaller.new(self))
             @root_dir = root_dir
             @root_path = Pathname.new(root_dir)
-            @ruby_version_keyword = "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
+            @ruby_version_keyword = "ruby#{RUBY_VERSION.split('.')[0, 2].join('')}"
             @osdep_suffixes = Array.new
 
             @loader = loader
@@ -82,10 +83,8 @@ def initialize(root_dir,
         # @return [String,nil] the root path, or nil if one did not yet source
         #   the workspace's env.sh
         def self.autoproj_current_root
-            if env = ENV['AUTOPROJ_CURRENT_ROOT']
-                if !env.empty?
-                    env
-                end
+            if (env = ENV['AUTOPROJ_CURRENT_ROOT'])
+                env unless env.empty?
             end
         end
 
@@ -104,31 +103,35 @@ def self.from_pwd(**workspace_options)
         #   and the one from +dir+ mismatch
         # @raise [NotWorkspace] if dir is not within an autoproj workspace
         def self.from_dir(dir, **workspace_options)
-            if path = Autoproj.find_workspace_dir(dir)
+            if (path = Autoproj.find_workspace_dir(dir))
                 Workspace.new(path, **workspace_options)
             elsif Autoproj.find_v1_workspace_dir(dir)
-                raise OutdatedWorkspace, "#{dir} looks like a v1 workspace, run autoproj upgrade before continuing"
+                raise OutdatedWorkspace, "#{dir} looks like a v1 workspace, "\
+                    "run autoproj upgrade before continuing"
             else
                 raise NotWorkspace, "not in a Autoproj installation"
             end
         end
 
         def self.from_environment(**workspace_options)
-            if path = Autoproj.find_workspace_dir
+            if (path = Autoproj.find_workspace_dir)
                 from_dir(path, **workspace_options)
             elsif Autoproj.find_v1_workspace_dir(dir = Autoproj.default_find_base_dir)
-                raise OutdatedWorkspace, "#{dir} looks like a v1 workspace, run autoproj upgrade before continuing"
-            elsif envvar = ENV['AUTOPROJ_CURRENT_ROOT']
-                raise NotWorkspace, "AUTOPROJ_CURRENT_ROOT is currently set to #{envvar}, but that is not an Autoproj workspace"
+                raise OutdatedWorkspace, "#{dir} looks like a v1 workspace, "\
+                    "run autoproj upgrade before continuing"
+            elsif (envvar = ENV['AUTOPROJ_CURRENT_ROOT'])
+                raise NotWorkspace, "AUTOPROJ_CURRENT_ROOT is currently set "\
+                    "to #{envvar}, but that is not an Autoproj workspace"
             else
-                raise NotWorkspace, "not in an Autoproj installation, and no env.sh has been loaded so far"
+                raise NotWorkspace, "not in an Autoproj installation, "\
+                    "and no env.sh has been loaded so far"
             end
         end
 
         # Tests whether the given path is under a directory tree managed by
         # autoproj
         def self.in_autoproj_project?(path)
-            !!Autoproj.find_workspace_dir(path)
+            Autoproj.find_workspace_dir(path)
         end
 
         # Returns the default workspace
@@ -141,15 +144,19 @@ def self.in_autoproj_project?(path)
         # directory
         def self.default(**workspace_options)
             ws = from_environment(**workspace_options)
-            if (from_pwd = Autoproj.find_workspace_dir(Dir.pwd)) && (from_pwd != ws.root_dir)
-                raise MismatchingWorkspace, "the current environment points to #{ws.root_dir}, but you are in #{from_pwd}, make sure you are loading the right #{ENV_FILENAME} script !"
+            from_pwd = Autoproj.find_workspace_dir(Dir.pwd)
+            if from_pwd && (from_pwd != ws.root_dir)
+                raise MismatchingWorkspace, "the current environment points to "\
+                    "#{ws.root_dir}, but you are in #{from_pwd}, make sure you "\
+                    "are loading the right #{ENV_FILENAME} script !"
             end
             ws
         end
 
         def load(*args)
             set_as_main_workspace
-            flag, Autoproj.warn_deprecated_level = Autoproj.warn_deprecated_level, 1
+            flag = Autoproj.warn_deprecated_level
+            Autoproj.warn_deprecated_level = 1
             super
         ensure
             Autoproj.warn_deprecated_level = flag
@@ -227,7 +234,7 @@ def log_dir
             File.join(prefix_dir, 'log')
         end
 
-        OVERRIDES_DIR = "overrides.d"
+        OVERRIDES_DIR = "overrides.d".freeze
 
         # Returns the directory containing overrides files
         #
@@ -236,24 +243,42 @@ def overrides_dir
             File.join(config_dir, OVERRIDES_DIR)
         end
 
+        BUILD_REPORT_BASENAME = "build_report.json"
+
+        # The full path to the build report
+        #
+        # @return [String]
+        def build_report_path
+            File.join(log_dir, BUILD_REPORT_BASENAME)
+        end
+
+        # Load the configuration for this workspace from
+        # config_file_path
+        #
+        # @param [Boolean] reset Set to true to replace the configuration object,
+        #   set to false to load into the existing
+        # @return [Configuration] configuration object
         def load_config(reconfigure = false)
-            @config = Configuration.new(config_file_path)
             if File.file?(config_file_path)
-                config.load(reconfigure: reconfigure)
-                if raw_vcs = config.get('manifest_source', nil)
-                    manifest.vcs = VCSDefinition.from_raw(raw_vcs)
-                else
-                    manifest.vcs = VCSDefinition.from_raw(
-                        type: 'local', url: config_dir)
-                end
+                config.reset
+                config.load(path: config_file_path, reconfigure: reconfigure)
+                manifest.vcs =
+                    if (raw_vcs = config.get('manifest_source', nil))
+                        VCSDefinition.from_raw(raw_vcs)
+                    else
+                        VCSDefinition.from_raw(type: 'local', url: config_dir)
+                    end
 
                 if config.source_dir && Pathname.new(config.source_dir).absolute?
                     raise ConfigError, 'source dir path configuration must be relative'
                 end
 
-                os_package_resolver.prefer_indep_over_os_packages = config.prefer_indep_over_os_packages?
-                os_package_resolver.operating_system ||= config.get('operating_system', nil)
-                os_repository_resolver.operating_system ||= config.get('operating_system', nil)
+                os_package_resolver.prefer_indep_over_os_packages =
+                    config.prefer_indep_over_os_packages?
+                os_package_resolver.operating_system ||=
+                    config.get('operating_system', nil)
+                os_repository_resolver.operating_system ||=
+                    config.get('operating_system', nil)
             end
             @config
         end
@@ -271,7 +296,8 @@ def autodetect_operating_system(force: false)
                     os_package_resolver.operating_system = [names, versions]
                     os_repository_resolver.operating_system = [names, versions]
                     Autobuild.progress :operating_system_autodetection,
-                        "operating system: #{(names - ['default']).join(",")} - #{(versions - ['default']).join(",")}"
+                        "operating system: #{(names - ['default']).join(',')} -"\
+                        " #{(versions - ['default']).join(',')}"
                 ensure
                     Autobuild.progress_done :operating_system_autodetection
                 end
@@ -289,9 +315,7 @@ def supported_operating_system?
 
         def setup_os_package_installer
             autodetect_operating_system
-            os_package_installer.each_manager do |pkg_mng|
-                pkg_mng.initialize_environment
-            end
+            os_package_installer.each_manager(&:initialize_environment)
             os_package_resolver.load_default
             os_package_installer.define_osdeps_mode_option
             os_package_installer.osdeps_mode
@@ -318,9 +342,7 @@ def setup
             config.each_reused_autoproj_installation do |p|
                 manifest.reuse(p)
             end
-            if File.exist?(manifest_file_path)
-                manifest.load(manifest_file_path)
-            end
+            manifest.load(manifest_file_path) if File.exist?(manifest_file_path)
 
             Autobuild.prefix = prefix_dir
             FileUtils.mkdir_p File.join(prefix_dir, '.autoproj')
@@ -330,7 +352,7 @@ def setup
 
             Autobuild.srcdir = source_dir
             Autobuild.logdir = log_dir
-            if cache_dir = config.importer_cache_dir
+            if (cache_dir = config.importer_cache_dir)
                 Autobuild::Importer.default_cache_dirs = cache_dir
             end
             setup_os_package_installer
@@ -339,7 +361,7 @@ def setup
 
         def install_ruby_shims
             install_suffix = ""
-            if match = /ruby(.*)$/.match(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
+            if (match = /ruby(.*)$/.match(RbConfig::CONFIG['RUBY_INSTALL_NAME']))
                 install_suffix = match[1]
             end
 
@@ -351,9 +373,9 @@ def install_ruby_shims
                 io.puts "#! /bin/sh"
                 io.puts "exec #{config.ruby_executable} \"$@\""
             end
-            FileUtils.chmod 0755, File.join(bindir, 'ruby')
+            FileUtils.chmod 0o755, File.join(bindir, 'ruby')
 
-            ['gem', 'irb', 'testrb'].each do |name|
+            %w[gem irb testrb].each do |name|
                 # Look for the corresponding gem program
                 prg_name = "#{name}#{install_suffix}"
                 if File.file?(prg_path = File.join(RbConfig::CONFIG['bindir'], prg_name))
@@ -361,7 +383,7 @@ def install_ruby_shims
                         io.puts "#! #{config.ruby_executable}"
                         io.puts "exec \"#{prg_path}\", *ARGV"
                     end
-                    FileUtils.chmod 0755, File.join(bindir, name)
+                    FileUtils.chmod 0o755, File.join(bindir, name)
                 end
             end
         end
@@ -386,9 +408,7 @@ def update_autoproj(restart_on_update: true)
 
             # This is a guard to avoid infinite recursion in case the user is
             # running autoproj osdeps --force
-            if ENV['AUTOPROJ_RESTARTING'] == '1'
-                return
-            end
+            return if ENV['AUTOPROJ_RESTARTING'] == '1'
 
             gemfile  = File.join(dot_autoproj_dir, 'Gemfile')
             binstubs = File.join(dot_autoproj_dir, 'bin')
@@ -420,15 +440,16 @@ def update_autoproj(restart_on_update: true)
                 config.save
                 ENV['AUTOPROJ_RESTARTING'] = '1'
                 require 'rbconfig'
-                exec(config.ruby_executable, $0, *ARGV)
+                exec(config.ruby_executable, $PROGRAM_NAME, *ARGV)
             end
         end
 
         def run(*args, &block)
-            if args.last.kind_of?(Hash)
-                options = args.pop
-            else options = Hash.new
-            end
+            options =
+                if args.last.kind_of?(Hash)
+                    args.pop
+                else Hash.new
+                end
             options_env = options.fetch(:env, Hash.new)
             options[:env] = env.resolved_env.merge(options_env)
             Autobuild::Subprocess.run(*args, options, &block)
@@ -438,7 +459,8 @@ def migrate_bundler_and_autoproj_gem_layout
             if !File.directory?(File.join(dot_autoproj_dir, 'autoproj'))
                 return
             else
-                config = YAML.load(File.read(File.join(dot_autoproj_dir, 'config.yml')))
+                config_path = File.join(dot_autoproj_dir, 'config.yml')
+                config = YAML.safe_load(File.read(config_path))
                 return if config['gems_install_path']
             end
 
@@ -519,7 +541,7 @@ def self.find_user_cache_path(xdg_path, home_path = xdg_path)
         def self.registered_workspaces
             path = find_user_data_path('workspaces.yml')
             if File.file?(path)
-                yaml = (YAML.load(File.read(path)) || [])
+                yaml = (YAML.safe_load(File.read(path)) || [])
                 fields = RegisteredWorkspace.members.map(&:to_s)
                 yaml.map do |h|
                     values = h.values_at(*fields)
@@ -572,9 +594,7 @@ def load_package_sets(only_local: false,
                               mainline: nil,
                               reset: false,
                               retry_count: nil)
-            if !File.file?(manifest_file_path) # empty install, just return
-                return
-            end
+            return unless File.file?(manifest_file_path) # empty install, just return
 
             Ops::Configuration.new(self).
                 load_package_sets(only_local: only_local,
@@ -585,7 +605,7 @@ def load_package_sets(only_local: false,
                                   mainline: mainline)
         end
 
-        def load_packages(selection = manifest.default_packages(false), options = Hash.new)
+        def load_packages(selection = manifest.default_packages(false), options = {})
             options = Hash[warn_about_ignored_packages: true, checkout_only: true].
                 merge(options)
             ops = Ops::Import.new(self)
@@ -602,7 +622,7 @@ def setup_all_package_directories
             manifest.reused_installations.each do |imported_manifest|
                 imported_manifest.each do |imported_pkg|
                     imported_packages << imported_pkg.name
-                    if pkg = manifest.find_package_definition(imported_pkg.name)
+                    if (pkg = manifest.find_package_definition(imported_pkg.name))
                         pkg.autobuild.srcdir = imported_pkg.srcdir
                         pkg.autobuild.prefix = imported_pkg.prefix
                     end
@@ -612,6 +632,7 @@ def setup_all_package_directories
             manifest.each_package_definition do |pkg_def|
                 pkg = pkg_def.autobuild
                 next if imported_packages.include?(pkg_def.name)
+
                 setup_package_directories(pkg)
             end
         end
@@ -626,7 +647,7 @@ def setup_package_directories(pkg)
                 end
 
             srcdir =
-                if target = manifest.moved_packages[pkg_name]
+                if (target = manifest.moved_packages[pkg_name])
                     File.join(layout, target)
                 else
                     File.join(layout, pkg_name)
@@ -641,9 +662,7 @@ def setup_package_directories(pkg)
 
             pkg = manifest.find_autobuild_package(pkg_name)
             pkg.srcdir = File.join(source_dir, srcdir)
-            if pkg.respond_to?(:builddir)
-                pkg.builddir = compute_builddir(pkg)
-            end
+            pkg.builddir = compute_builddir(pkg) if pkg.respond_to?(:builddir)
 
             pkg.prefix = File.join(prefix_dir, prefixdir)
             pkg.doc_target_dir = File.join(prefix_dir, 'doc', pkg_name)
@@ -682,7 +701,7 @@ def finalize_package_setup
             end
 
             main_package_set = manifest.main_package_set
-            Dir.glob(File.join( overrides_dir, "*.rb" ) ).sort.each do |file|
+            Dir.glob(File.join(overrides_dir, "*.rb")).sort.each do |file|
                 load main_package_set, file
             end
         end
@@ -693,9 +712,7 @@ def finalize_package_setup
         # have been properly set up (a.k.a. after package import)
         def finalize_setup
             # Finally, disable all ignored packages on the autobuild side
-            manifest.each_ignored_package do |pkg|
-                pkg.disable
-            end
+            manifest.each_ignored_package(&:disable)
 
             # We now have processed the process setup blocks. All configuration
             # should be done and we can save the configuration data.
@@ -719,6 +736,7 @@ def export_installation_manifest
             # Update the new entries
             manifest.each_package_set do |pkg_set|
                 next if pkg_set.main?
+
                 install_manifest.add_package_set(pkg_set)
             end
             selected_packages.each do |pkg_name|
@@ -741,14 +759,14 @@ def full_env
         # Export the workspace's env.sh file
         #
         # @return [Boolean] true if the environment has been changed, false otherwise
-        def export_env_sh(package_names = nil, shell_helpers: true)
+        def export_env_sh(_package_names = nil, shell_helpers: true)
             full_env = self.full_env
             changed = save_cached_env(full_env)
             full_env.export_env_sh(shell_helpers: shell_helpers)
             changed
         end
 
-        def save_cached_env(env = self.full_env)
+        def save_cached_env(env = full_env)
             Ops.save_cached_env(root_dir, env)
         end
 
@@ -801,7 +819,8 @@ def install_os_repositories
         # @param [Proc,nil] block a setup block that should be called to
         #   configure the package
         # @return [PackageDefinition]
-        def define_package(package_type, package_name, block = nil, package_set = manifest.main_package_set, file = nil)
+        def define_package(package_type, package_name, block = nil,
+                           package_set = manifest.main_package_set, file = nil)
             autobuild_package = Autobuild.send(package_type, package_name)
             register_package(autobuild_package, block, package_set, file)
         end
@@ -816,7 +835,8 @@ def define_package(package_type, package_name, block = nil, package_set = manife
         # @param [Proc,nil] block a setup block that should be called to
         #   configure the package
         # @return [PackageDefinition]
-        def register_package(package, block = nil, package_set = manifest.main_package_set, file = nil)
+        def register_package(package, block = nil,
+                             package_set = manifest.main_package_set, file = nil)
             pkg = manifest.register_package(package, block, package_set, file)
             pkg.autobuild.ws = self
             pkg
@@ -834,7 +854,7 @@ def register_package(package, block = nil, package_set = manifest.main_package_s
         # @return [String] the resolved program
         # @raise [ExecutableNotFound] if an executable file named `cmd` cannot
         #   be found
-        def which(cmd, path_entries: nil)
+        def which(cmd, _path_entries: nil)
             Ops.which(cmd, path_entries: -> { full_env.value('PATH') || Array.new })
         end
     end
@@ -845,9 +865,7 @@ def self.workspace
 
     def self.workspace=(ws)
         @workspace = ws
-        if ws
-            self.root_dir = ws.root_dir
-        end
+        self.root_dir = ws&.root_dir
     end
 
     def self.env

data/shell/completion/amake_bash

@@ -61,6 +61,7 @@ __amake() {
         --no-tool
         --confirm
         --no-confirm
+        --not
     "
 
     case "$cur" in

data/shell/completion/amake_zsh

@@ -20,6 +20,7 @@ __amake() {
     {--auto-exclude,--no-auto-exclude}'[if true, packages that fail to import will be excluded from the build]' \
     {--tool,--no-tool}'[act as a build tool, transparently passing the subcommand''s outputs to STDOUT]' \
     {--confirm,--no-confirm}'[--force and --rebuild will ask confirmation if applied to the whole workspace. Use --no-confirm to disable this confirmation]' \
+    --not'[do not build the packages listed]' \
     '*:arg:_autoproj_installed_packages'
 }
 

data/shell/completion/autoproj_bash

@@ -666,6 +666,7 @@ __autoproj_build() {
         --no-tool
         --confirm
         --no-confirm
+        --not
     "
 
     case "$cur" in
@@ -1061,6 +1062,7 @@ __autoproj_versions() {
         --local
         --no-local
         --save
+        --fingerprint
     "
 
     case "$cur" in

data/shell/completion/autoproj_zsh

@@ -471,6 +471,7 @@ __autoproj_build() {
     {--auto-exclude,--no-auto-exclude}'[if true, packages that fail to import will be excluded from the build]' \
     {--tool,--no-tool}'[act as a build tool, transparently passing the subcommand''s outputs to STDOUT]' \
     {--confirm,--no-confirm}'[--force and --rebuild will ask confirmation if applied to the whole workspace. Use --no-confirm to disable this confirmation]' \
+    --not'[do not build the packages listed]' \
     '*:arg:_autoproj_installed_packages'
 }
 
@@ -697,6 +698,7 @@ __autoproj_versions() {
     {--deps,--no-deps}'[whether both packages and their dependencies should be versioned, or only the selected packages (the latter is the default)]' \
     {--local,--no-local}'[whether we should access the remote server to verify that the snapshotted state is present]' \
     --save'[save to the given file instead of displaying it on the standard output]' \
+    --fingerprint'[calculate unique fingerprint for each package]' \
     '*:arg:_autoproj_installed_packages'
 }