autoproj 2.14.0 → 2.15.0

data/lib/autoproj/build_option.rb

@@ -8,24 +8,28 @@ module Autoproj
 
         attr_reader :validator
 
-        TRUE_STRINGS = %w{on yes y true}
-        FALSE_STRINGS = %w{off no n false}
+        TRUE_STRINGS = %w[on yes y true]
+        FALSE_STRINGS = %w[off no n false]
         def initialize(name, type, options, validator)
-            @name, @type, @options = name.to_str, type.to_str, options.to_hash
+            @name = name.to_str
+            @type = type.to_str
+            @options = options.to_hash
             @validator = validator.to_proc if validator
-            if !BuildOption.respond_to?("validate_#{type}")
+            unless BuildOption.respond_to?("validate_#{type}")
                 raise ConfigError.new, "invalid option type #{type}"
             end
         end
 
         def short_doc
-            if short_doc = options[:short_doc]
+            if (short_doc = options[:short_doc])
                 short_doc
-            elsif doc = options[:doc]
+            elsif (doc = options[:doc])
                 if doc.respond_to?(:to_ary) then doc.first
-                else doc
+                else
+                    doc
                 end
-            else "#{name} (no documentation for this option)"
+            else
+                "#{name} (no documentation for this option)"
             end
         end
 
@@ -38,7 +42,7 @@ module Autoproj
                     first_line
                 else
                     remaining = remaining.join("\n").split("\n").join("\n    ")
-                    Autoproj.color(first_line, :bold) + "\n    " + remaining
+                    "#{Autoproj.color(first_line, :bold)}\n#{remaining}"
                 end
             else
                 doc
@@ -52,11 +56,11 @@ module Autoproj
         # default value
         def ensure_value(current_value)
             if !current_value.nil?
-                return current_value.to_s, false
+                [current_value.to_s, false]
             elsif options[:default]
-                return options[:default].to_str, true
+                [options[:default].to_str, true]
             else
-                return '', true
+                ["", true]
             end
         end
 
@@ -67,16 +71,13 @@ module Autoproj
         # @param [String] current_value the option's current value
         # @param [String] doc a string to override the default option banner
         def ask(current_value, doc = nil)
-            value,_ = ensure_value(current_value)
+            value, = ensure_value(current_value)
 
             STDOUT.print "  #{doc || self.doc} [#{value}] "
             STDOUT.flush
             answer = STDIN.readline.chomp
-            if answer == ''
-                answer = value
-            end
+            answer = value if answer == ""
             validate(answer)
-
         rescue InputError => e
             Autoproj.message("invalid value: #{e.message}", :red)
             retry
@@ -84,9 +85,7 @@ module Autoproj
 
         def validate(value)
             value = BuildOption.send("validate_#{type}", value, options)
-            if validator
-                value = validator[value]
-            end
+            value = validator[value] if validator
             value
         end
 
@@ -96,19 +95,19 @@ module Autoproj
             elsif FALSE_STRINGS.include?(value.downcase)
                 false
             else
-                raise InputError, "invalid boolean value '#{value}', accepted values are '#{TRUE_STRINGS.join(", ")}' for true, and '#{FALSE_STRINGS.join(", ")} for false"
+                raise InputError, "invalid boolean value '#{value}', accepted values are '#{TRUE_STRINGS.join(', ')}' for true, and '#{FALSE_STRINGS.join(', ')} for false"
             end
         end
 
         def self.validate_string(value, options)
-            if possible_values = options[:possible_values]
+            if (possible_values = options[:possible_values])
                 if options[:lowercase]
                     value = value.downcase
                 elsif options[:uppercase]
                     value = value.upcase
                 end
 
-                if !possible_values.include?(value)
+                unless possible_values.include?(value)
                     raise InputError, "invalid value '#{value}', accepted values are '#{possible_values.join("', '")}' (without the quotes)"
                 end
             end
@@ -116,4 +115,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/base.rb

@@ -1,7 +1,7 @@
-require 'tty/color'
-require 'autoproj'
-require 'autoproj/autobuild'
-require 'autoproj/cli'
+require "tty/color"
+require "autoproj"
+require "autoproj/autobuild"
+require "autoproj/cli"
 
 module Autoproj
     module CLI
@@ -30,7 +30,7 @@ module Autoproj
             def normalize_command_line_package_selection(selection)
                 selection = selection.map do |name|
                     if File.directory?(name)
-                        File.expand_path(name) + "/"
+                        "#{File.expand_path(name)}/"
                     else
                         name
                     end
@@ -39,7 +39,7 @@ module Autoproj
                 config_selected = false
                 selection.delete_if do |name|
                     if name =~ /^#{Regexp.quote(ws.config_dir)}(?:#{File::SEPARATOR}|$)/ ||
-                        name =~ /^#{Regexp.quote(ws.remotes_dir)}(?:#{File::SEPARATOR}|$)/
+                       name =~ /^#{Regexp.quote(ws.remotes_dir)}(?:#{File::SEPARATOR}|$)/
                         config_selected = true
                     elsif (ws.config_dir + File::SEPARATOR) =~ /^#{Regexp.quote(name)}/
                         config_selected = true
@@ -47,7 +47,7 @@ module Autoproj
                     end
                 end
 
-                return selection, config_selected
+                [selection, config_selected]
             end
 
             # Resolve a user-provided selection
@@ -64,7 +64,7 @@ module Autoproj
                             raise CLIInvalidSelection, e.message, e.backtrace
                         end
                     if Autoproj.verbose
-                        Autoproj.message "selected packages: #{selection.each_package_name.to_a.sort.join(", ")}"
+                        Autoproj.message "selected packages: #{selection.each_package_name.to_a.sort.join(', ')}"
                     end
                     return selection, []
                 end
@@ -79,8 +79,9 @@ module Autoproj
                 # Try to auto-add stuff if nonresolved
                 nonresolved.delete_if do |sel|
                     sel = File.expand_path(sel)
-                    next if !File.directory?(sel)
-                    while sel != '/'
+                    next unless File.directory?(sel)
+
+                    while sel != "/"
                         handler, srcdir = Autoproj.package_handler_for(sel)
                         if handler
                             Autoproj.message "  auto-adding #{srcdir} using the #{handler.gsub(/_package/, '')} package handler"
@@ -99,9 +100,9 @@ module Autoproj
                 end
 
                 if Autoproj.verbose
-                    Autoproj.message "selected packages: #{selected_packages.each_package_name.to_a.sort.join(", ")}"
+                    Autoproj.message "selected packages: #{selected_packages.each_package_name.to_a.sort.join(', ')}"
                 end
-                return selected_packages, nonresolved
+                [selected_packages, nonresolved]
             end
 
             # Resolves the user-provided selection into the set of packages that
@@ -139,7 +140,7 @@ module Autoproj
             #
             # @see resolve_user_selection
             def resolve_selection(user_selection, checkout_only: true, only_local: false, recursive: true, non_imported_packages: :ignore, auto_exclude: false)
-                resolved_selection, _ = resolve_user_selection(user_selection, filter: false)
+                resolved_selection, = resolve_user_selection(user_selection, filter: false)
 
                 ops = Ops::Import.new(ws)
                 source_packages, osdep_packages = ops.import_packages(
@@ -149,7 +150,8 @@ module Autoproj
                     recursive: recursive,
                     warn_about_ignored_packages: false,
                     non_imported_packages: non_imported_packages,
-                    auto_exclude: auto_exclude)
+                    auto_exclude: auto_exclude
+                )
 
                 [source_packages, osdep_packages, resolved_selection]
             rescue ExcludedSelection => e
@@ -169,8 +171,8 @@ module Autoproj
                         !(resolved_selection.ignored?(pkg_name) ||
                           resolved_selection.excluded?(pkg_name))
                 end
-                if !not_matched.empty?
-                    raise CLIInvalidArguments, "autoproj: wrong package selection on command line, cannot find a match for #{not_matched.to_a.sort.join(", ")}"
+                unless not_matched.empty?
+                    raise CLIInvalidArguments, "autoproj: wrong package selection on command line, cannot find a match for #{not_matched.to_a.sort.join(', ')}"
                 end
             end
 
@@ -182,12 +184,12 @@ module Autoproj
 
             def self.validate_options(args, options)
                 options, remaining = filter_options options,
-                    silent: false,
-                    verbose: false,
-                    debug: false,
-                    color: TTY::Color.color?,
-                    progress: TTY::Color.color?,
-                    parallel: nil
+                                                    silent: false,
+                                                    verbose: false,
+                                                    debug: false,
+                                                    color: TTY::Color.color?,
+                                                    progress: TTY::Color.color?,
+                                                    parallel: nil
 
                 Autoproj.silent = options[:silent]
                 Autobuild.color = options[:color]
@@ -207,13 +209,12 @@ module Autoproj
                     Autobuild.debug = true
                 end
 
-
-                if level = options[:parallel]
+                if (level = options[:parallel])
                     Autobuild.parallel_build_level = Integer(level)
                     remaining[:parallel] = Integer(level)
                 end
 
-                return args, remaining.to_sym_keys
+                [args, remaining.to_sym_keys]
             end
 
             def export_env_sh(shell_helpers: ws.config.shell_helpers?)
@@ -239,4 +240,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/bootstrap.rb

@@ -1,7 +1,7 @@
-require 'autoproj'
-require 'autoproj/cli/base'
-require 'autoproj/ops/tools'
-require 'autoproj/ops/main_config_switcher'
+require "autoproj"
+require "autoproj/cli/base"
+require "autoproj/ops/tools"
+require "autoproj/ops/main_config_switcher"
 
 module Autoproj
     module CLI
@@ -11,26 +11,26 @@ module Autoproj
             attr_reader :root_dir
 
             def initialize(root_dir = Dir.pwd)
-                if File.exist?(File.join(root_dir, 'autoproj', "manifest"))
+                if File.exist?(File.join(root_dir, "autoproj", "manifest"))
                     raise CLIException, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
                 end
+
                 @root_dir = root_dir
             end
 
             def validate_options(args, options)
                 args, options = Base.validate_options(args, options)
-                if path = options[:reuse]
-                    if path == 'reuse'
-                        path = ENV['AUTOPROJ_CURRENT_ROOT']
-                    end
+                if (path = options[:reuse])
+                    path = ENV["AUTOPROJ_CURRENT_ROOT"] if path == "reuse"
 
                     path = File.expand_path(path)
-                    if !File.directory?(path) || !File.directory?(File.join(path, 'autoproj'))
+                    if !File.directory?(path) || !File.directory?(File.join(path, "autoproj"))
                         raise CLIInvalidArguments, "#{path} does not look like an autoproj installation"
                     end
+
                     options[:reuse] = [path]
                 end
-                return args, options
+                [args, options]
             end
 
             def run(buildconf_info, interactive: nil, **options)
@@ -46,10 +46,10 @@ module Autoproj
 
                 begin
                     switcher.bootstrap(buildconf_info,
-                        check_root_dir_empty: check_root_dir_empty,
-                        **options)
+                                       check_root_dir_empty: check_root_dir_empty,
+                                       **options)
                     if seed_config
-                        FileUtils.cp seed_config, File.join(ws.config_dir, 'config.yml')
+                        FileUtils.cp seed_config, File.join(ws.config_dir, "config.yml")
                     end
 
                     STDOUT.puts <<-EOTEXT
@@ -73,7 +73,6 @@ The resulting software is installed in
 #{ws.prefix_dir}
 
                     EOTEXT
-
                 rescue RuntimeError
                     STDERR.puts <<-EOTEXT
 #{Autoproj.color('autoproj bootstrap failed', :red, :bold)}
@@ -92,4 +91,3 @@ autoproj bootstrap '#{ARGV.join("'")}'
         end
     end
 end
-

data/lib/autoproj/cli/build.rb

@@ -1,5 +1,5 @@
-require 'autoproj/cli/update'
-require 'autoproj/ops/build'
+require "autoproj/cli/update"
+require "autoproj/ops/build"
 
 module Autoproj
     module CLI
@@ -7,7 +7,8 @@ module Autoproj
             def validate_options(selected_packages, options)
                 selected_packages, options =
                     super(selected_packages, options.merge(
-                        checkout_only: true, aup: options[:amake]))
+                        checkout_only: true, aup: options[:amake]
+                    ))
 
                 options[:deps] = false if options[:no_deps_shortcut]
                 if options[:deps].nil?
@@ -54,21 +55,23 @@ module Autoproj
                     packages_to_rebuild =
                         if options[:deps] || command_line_selection.empty?
                             source_packages
-                        else command_line_selection
+                        else
+                            command_line_selection
                         end
 
                     if command_line_selection.empty?
                         # If we don't have an explicit package selection, we want to
                         # make sure that the user really wants this
-                        mode_name = if build_options[:rebuild] then 'rebuild'
-                                    else 'force-build'
+                        mode_name = if build_options[:rebuild] then "rebuild"
+                                    else
+                                        "force-build"
                                     end
                         if build_options[:confirm] != false
                             opt = BuildOption.new(
                                 "", "boolean",
                                 {
                                     doc: "this is going to trigger a #{mode_name} "\
-                                        "of all packages. Is that really what you want ?"
+                                         "of all packages. Is that really what you want ?"
                                 }, nil
                             )
                             raise Interrupt unless opt.ask(false)

data/lib/autoproj/cli/cache.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'autoproj/cli/inspection_tool'
-require 'autoproj/ops/cache'
+require "autoproj/cli/inspection_tool"
+require "autoproj/ops/cache"
 
 module Autoproj
     module CLI
@@ -13,17 +13,17 @@ module Autoproj
                 level = 0
                 artifacts = []
                 artifact_include = nil
-                artifact_name = ''.dup
+                artifact_name = "".dup
                 until scanner.eos?
                     c = scanner.getch
                     if level == 0
-                        raise ArgumentError, "expected '[' but got '#{c}'" unless c == '['
+                        raise ArgumentError, "expected '[' but got '#{c}'" unless c == "["
 
                         level = 1
                         include_c = scanner.getch
                         if %w[+ -].include?(include_c)
-                            artifact_include = (include_c == '+')
-                        elsif include_c == ']'
+                            artifact_include = (include_c == "+")
+                        elsif include_c == "]"
                             raise ArgumentError, "empty [] found in '#{string}'"
                         else
                             raise ArgumentError,
@@ -32,11 +32,11 @@ module Autoproj
                         next
                     end
 
-                    if c == ']'
+                    if c == "]"
                         level -= 1
                         if level == 0
                             artifacts << [artifact_include, artifact_name]
-                            artifact_name = ''.dup
+                            artifact_name = "".dup
                             next
                         end
                     end
@@ -75,9 +75,9 @@ module Autoproj
             end
 
             def run(cache_dir, *package_names,
-                    keep_going: false,
-                    packages: true, all: true, checkout_only: false,
-                    gems: false, gems_compile: [], gems_compile_force: false)
+                keep_going: false,
+                packages: true, all: true, checkout_only: false,
+                gems: false, gems_compile: [], gems_compile_force: false)
                 initialize_and_load
                 finalize_setup
 

data/lib/autoproj/cli/clean.rb

@@ -1,5 +1,5 @@
-require 'autoproj/cli/inspection_tool'
-require 'tty/prompt'
+require "autoproj/cli/inspection_tool"
+require "tty/prompt"
 
 module Autoproj
     module CLI
@@ -8,16 +8,16 @@ module Autoproj
                 packages, options = super
                 if packages.empty? && !options[:all]
                     prompt = TTY::Prompt.new
-                    if !prompt.yes?("this is going to clean all packages. Is that really what you want ?")
+                    unless prompt.yes?("this is going to clean all packages. Is that really what you want ?")
                         raise Interrupt
                     end
                 end
-                return packages, options
+                [packages, options]
             end
 
             def run(selection, options = Hash.new)
                 initialize_and_load
-                packages, _ = normalize_command_line_package_selection(selection)
+                packages, = normalize_command_line_package_selection(selection)
 
                 deps = if options.has_key?(:deps)
                            options[:deps]
@@ -27,17 +27,17 @@ module Autoproj
 
                 source_packages, * = resolve_selection(
                     packages,
-                    recursive: deps)
+                    recursive: deps
+                )
                 if source_packages.empty?
-                    raise CLIInvalidArguments, "no packages or OS packages match #{selection.join(" ")}"
+                    raise CLIInvalidArguments, "no packages or OS packages match #{selection.join(' ')}"
                 end
 
                 source_packages.each do |pkg_name|
-                    ws.manifest.find_autobuild_package(pkg_name).
-                        prepare_for_rebuild
+                    ws.manifest.find_autobuild_package(pkg_name)
+                      .prepare_for_rebuild
                 end
             end
         end
     end
 end
-

data/lib/autoproj/cli/commit.rb

@@ -1,6 +1,6 @@
-require 'autoproj/cli/inspection_tool'
-require 'autoproj/cli/versions'
-require 'autoproj/ops/snapshot'
+require "autoproj/cli/inspection_tool"
+require "autoproj/cli/versions"
+require "autoproj/ops/snapshot"
 
 module Autoproj
     module CLI
@@ -9,7 +9,7 @@ module Autoproj
                 if tag_name
                     "autoproj created tag #{tag_name}"
                 else
-                    'autoproj created version commit'
+                    "autoproj created version commit"
                 end
             end
 
@@ -43,13 +43,12 @@ module Autoproj
                              keep_going: options[:keep_going],
                              deps: options[:deps])
 
-                importer.run_git(pkg, 'add', versions_file)
+                importer.run_git(pkg, "add", versions_file)
                 message = options[:message] || default_message(tag_name)
 
-                importer.run_git(pkg, 'commit', '-m', message)
-                importer.run_git(pkg, 'tag', tag_name) unless tag_name.nil?
+                importer.run_git(pkg, "commit", "-m", message)
+                importer.run_git(pkg, "tag", tag_name) unless tag_name.nil?
             end
         end
     end
 end
-

data/lib/autoproj/cli/doc.rb

@@ -1,9 +1,9 @@
-require 'autoproj/cli/utility'
+require "autoproj/cli/utility"
 
 module Autoproj
     module CLI
         class Doc < Utility
-            def initialize(ws = Workspace.default, name: 'doc')
+            def initialize(ws = Workspace.default, name: "doc")
                 super
             end
         end

data/lib/autoproj/cli/envsh.rb

@@ -1,4 +1,4 @@
-require 'autoproj/cli/inspection_tool'
+require "autoproj/cli/inspection_tool"
 module Autoproj
     module CLI
         class Envsh < InspectionTool
@@ -16,4 +16,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/exec.rb

@@ -1,7 +1,7 @@
-require 'autoproj/find_workspace'
-require 'autoproj/ops/cached_env'
-require 'autoproj/ops/which'
-require 'autoproj/ops/watch'
+require "autoproj/find_workspace"
+require "autoproj/ops/cached_env"
+require "autoproj/ops/which"
+require "autoproj/ops/watch"
 
 module Autoproj
     module CLI
@@ -9,7 +9,7 @@ module Autoproj
             def initialize
                 @root_dir = Autoproj.find_workspace_dir
                 unless @root_dir
-                    require 'autoproj/workspace'
+                    require "autoproj/workspace"
                     # Will do all sorts of error reporting,
                     # or may be able to resolve
                     @root_dir = Workspace.default.root_dir
@@ -20,40 +20,80 @@ module Autoproj
                 env = Ops.load_cached_env(@root_dir)
                 return unless env
 
-                Autobuild::Environment.
-                    environment_from_export(env, ENV)
+                Autobuild::Environment
+                    .environment_from_export(env, ENV)
             end
 
-            def run(cmd, *args, use_cached_env: Ops.watch_running?(@root_dir))
+            def try_loading_installation_manifest
+                Autoproj::InstallationManifest.from_workspace_root(@root_dir)
+            rescue
+            end
+
+            PACKAGE_ROOT_PATH_RX = /^(srcdir|builddir|prefix):(.*)$/
+
+            def resolve_package_root_path(package, manifest)
+                if (m = PACKAGE_ROOT_PATH_RX.match(package))
+                    kind = m[1]
+                    name = m[2]
+                else
+                    kind = "srcdir"
+                    name = package
+                end
+
+                unless (pkg = manifest.find_package_by_name(name))
+                    raise ArgumentError, "no package #{name} in this workspace"
+                end
+
+                unless (dir = pkg.send(kind))
+                    raise CLIInvalidArguments, "package #{pkg.name} has no #{kind}"
+                end
+
+                dir
+            end
+
+            def run(
+                cmd, *args,
+                use_cached_env: Ops.watch_running?(@root_dir),
+                interactive: nil,
+                package: nil, chdir: nil
+            )
                 env = load_cached_env if use_cached_env
+                manifest = try_loading_installation_manifest if use_cached_env
 
-                unless env
-                    require 'autoproj'
-                    require 'autoproj/cli/inspection_tool'
+                if !env || (package && !manifest)
+                    require "autoproj"
+                    require "autoproj/cli/inspection_tool"
                     ws = Workspace.from_dir(@root_dir)
+                    ws.config.interactive = interactive unless interactive.nil?
                     loader = InspectionTool.new(ws)
-                    loader.initialize_and_load
-                    loader.finalize_setup(Array.new)
+                    loader.initialize_and_load(read_only: true)
+                    loader.finalize_setup(read_only: true)
                     env = ws.full_env.resolved_env
+                    manifest = ws.installation_manifest if package
                 end
 
-                path = env['PATH'].split(File::PATH_SEPARATOR)
+                root_path = resolve_package_root_path(package, manifest) if package
+                chdir ||= root_path
+                if chdir
+                    chdir = File.expand_path(chdir, root_path)
+                    chdir_kw = { chdir: chdir }
+                end
+
+                path = env["PATH"].split(File::PATH_SEPARATOR)
                 program =
-                    begin Ops.which(cmd, path_entries: path)
+                    begin Ops.which(cmd, path_entries: [chdir, *path].compact)
                     rescue ::Exception => e
-                        require 'autoproj'
+                        require "autoproj"
                         raise CLIInvalidArguments, e.message, e.backtrace
                     end
 
                 begin
-                    ::Process.exec(env, program, *args)
+                    ::Process.exec(env, program, *args, **(chdir_kw || {}))
                 rescue ::Exception => e
-                    require 'autoproj'
+                    require "autoproj"
                     raise CLIInvalidArguments, e.message, e.backtrace
                 end
             end
         end
     end
 end
-
-