autoproj 2.12.0 → 2.15.0

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
-
-

data/lib/autoproj/cli/inspection_tool.rb

@@ -1,18 +1,16 @@
-require 'autoproj/cli/base'
+require "autoproj/cli/base"
 
 module Autoproj
     module CLI
         # Base class for CLI tools that do not change the state of the installed
         # system
         class InspectionTool < Base
-            def initialize_and_load(mainline: nil)
+            def initialize_and_load(mainline: nil, read_only: false)
                 Autoproj.silent do
-                    ws.setup
-                    if mainline == 'mainline' || mainline == 'true'
-                        mainline = true
-                    end
+                    ws.setup(read_only: read_only)
+                    mainline = true if %w[mainline true].include?(mainline)
                     ws.load_package_sets(mainline: mainline)
-                    ws.config.save
+                    ws.config.save unless read_only
                     ws.setup_all_package_directories
                 end
             end
@@ -22,7 +20,7 @@ module Autoproj
             # @param [Array<String>] packages the list of package names
             # @param [Symbol] non_imported_packages whether packages that are
             #   not yet imported should be ignored (:ignore) or returned
-            #   (:return). 
+            #   (:return).
             # @option options recursive (true) whether the package resolution
             #   should return the package(s) and their dependencies
             #
@@ -30,18 +28,25 @@ module Autoproj
             #   selected packages, the PackageSelection representing the
             #   selection resolution itself, and a flag telling whether some of
             #   the arguments were pointing within the configuration area
-            def finalize_setup(packages = [], non_imported_packages: :ignore, recursive: true, auto_exclude: false)
+            def finalize_setup(
+                packages = [],
+                non_imported_packages: :ignore,
+                recursive: true,
+                auto_exclude: false,
+                read_only: false
+            )
                 Autoproj.silent do
-                    packages, config_selected = normalize_command_line_package_selection(packages)
+                    packages, config_selected =
+                        normalize_command_line_package_selection(packages)
                     # Call resolve_user_selection once to auto-add packages, so
                     # that they're available to e.g. overrides.rb
                     resolve_user_selection(packages)
                     ws.finalize_package_setup
                     source_packages, osdep_packages, resolved_selection =
                         resolve_selection(packages, recursive: recursive, non_imported_packages: non_imported_packages, auto_exclude: auto_exclude)
-                    ws.finalize_setup
-                    ws.export_installation_manifest
-                    return source_packages, osdep_packages, resolved_selection, config_selected
+                    ws.finalize_setup(read_only: read_only)
+                    ws.export_installation_manifest unless read_only
+                    [source_packages, osdep_packages, resolved_selection, config_selected]
                 end
             end
         end

data/lib/autoproj/cli/locate.rb

@@ -1,4 +1,4 @@
-require 'autoproj/cli/inspection_tool'
+require "autoproj/cli/inspection_tool"
 
 module Autoproj
     module CLI
@@ -11,8 +11,9 @@ module Autoproj
         class Locate < InspectionTool
             attr_reader :packages
             attr_reader :package_sets
-            
+
             class NotFound < CLIException; end
+
             class NoSuchDir < CLIException; end
 
             # Create the locate CLI interface
@@ -69,14 +70,14 @@ module Autoproj
                         candidates << pkg
                     end
                 end
-                return candidates
+                candidates
             end
 
             def find_packages_with_directory_shortnames(selection)
-                *directories, basename = *selection.split('/')
-                dirname_rx = directories.
-                    map { |d| "#{Regexp.quote(d)}\\w*" }.
-                    join("/")
+                *directories, basename = *selection.split("/")
+                dirname_rx = directories
+                             .map { |d| "#{Regexp.quote(d)}\\w*" }
+                             .join("/")
 
                 rx        = Regexp.new("#{dirname_rx}/#{Regexp.quote(basename)}")
                 rx_strict = Regexp.new("#{dirname_rx}/#{Regexp.quote(basename)}$")
@@ -85,12 +86,8 @@ module Autoproj
                 candidates_strict = []
                 packages.each do |pkg|
                     name = pkg.name
-                    if name =~ rx
-                        candidates << pkg
-                    end
-                    if name =~ rx_strict
-                        candidates_strict << pkg
-                    end
+                    candidates << pkg if name =~ rx
+                    candidates_strict << pkg if name =~ rx_strict
                 end
 
                 if candidates.size > 1 && candidates_strict.size == 1
@@ -114,22 +111,18 @@ module Autoproj
                            :build_dir
                        elsif options.delete(:prefix)
                            :prefix_dir
-                       elsif log_type = options[:log]
-                           if log_type == 'log'
-                               options.delete(:log)
-                           end
+                       elsif (log_type = options[:log])
+                           options.delete(:log) if log_type == "log"
                            :log
                        else
                            :source_dir
                        end
                 options[:mode] ||= mode
-                if selections.empty?
-                    selections << ws.root_dir
-                end
-                return selections, options
+                selections << ws.root_dir if selections.empty?
+                [selections, options]
             end
 
-            RESOLUTION_MODES = [:source_dir, :build_dir, :prefix_dir, :log]
+            RESOLUTION_MODES = %i[source_dir build_dir prefix_dir log]
 
             def run(selections, cache: !!packages, mode: :source_dir, log: nil)
                 if !RESOLUTION_MODES.include?(mode)
@@ -139,9 +132,7 @@ module Autoproj
                 end
 
                 selections.each do |string|
-                    if File.directory?(string)
-                        string = "#{File.expand_path(string)}/"
-                    end
+                    string = "#{File.expand_path(string)}/" if File.directory?(string)
                     if mode == :source_dir
                         puts source_dir_of(string)
                     elsif mode == :build_dir
@@ -149,7 +140,7 @@ module Autoproj
                     elsif mode == :prefix_dir
                         puts prefix_dir_of(string)
                     elsif mode == :log
-                        if all_logs = (log == 'all')
+                        if (all_logs = (log == "all"))
                             log = nil
                         end
                         result = logs_of(string, log: log)
@@ -179,17 +170,15 @@ module Autoproj
                     # If there is more than one candidate, check if there are some that are not
                     # present on disk
                     present = matching_packages.find_all { |pkg| File.directory?(pkg.srcdir) }
-                    if present.size == 1
-                        matching_packages = present
-                    end
+                    matching_packages = present if present.size == 1
                 end
 
                 if matching_packages.empty?
                     raise CLIInvalidArguments, "cannot find '#{selection}' in the current autoproj installation"
                 elsif matching_packages.size > 1
-                    raise CLIAmbiguousArguments, "multiple packages match '#{selection}' in the current autoproj installation: #{matching_packages.map(&:name).sort.join(", ")}"
+                    raise CLIAmbiguousArguments, "multiple packages match '#{selection}' in the current autoproj installation: #{matching_packages.map(&:name).sort.join(', ')}"
                 else
-                    return matching_packages.first
+                    matching_packages.first
                 end
             end
 
@@ -203,7 +192,7 @@ module Autoproj
             def source_dir_of(selection)
                 if workspace_dir?(selection)
                     ws.root_dir
-                elsif pkg_set = find_package_set(selection)
+                elsif (pkg_set = find_package_set(selection))
                     pkg_set.user_local_dir
                 else
                     resolve_package(selection).srcdir
@@ -246,20 +235,21 @@ module Autoproj
             #
             # The workspace is resolved as the main configuration
             #
-            # If 'log' is nil and multiple logs are available, 
+            # If 'log' is nil and multiple logs are available,
             def logs_of(selection, log: nil)
                 if workspace_dir?(selection) || (pkg_set = find_package_set(selection))
-                    if log && log != 'import'
-                        return []
-                    end
+                    return [] if log && log != "import"
+
                     name = if pkg_set then pkg_set.name
-                           else "autoproj main configuration"
+                           else
+                               "autoproj main configuration"
                            end
 
                     import_log = File.join(ws.log_dir, "#{name}-import.log")
                     if File.file?(import_log)
-                        return [import_log]
-                    else return []
+                        [import_log]
+                    else
+                        []
                     end
                 else
                     pkg = resolve_package(selection)
@@ -269,7 +259,7 @@ module Autoproj
 
             # Interactively select a log file among a list
             def select_log_file(log_files)
-                require 'tty/prompt'
+                require "tty/prompt"
 
                 log_files = log_files.map do |path|
                     [path, File.stat(path).mtime]
@@ -294,4 +284,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/log.rb

@@ -1,4 +1,4 @@
-require 'autoproj/cli/base'
+require "autoproj/cli/base"
 
 module Autoproj
     module CLI
@@ -15,15 +15,15 @@ module Autoproj
                 end
 
                 common_args = [Autobuild.tool(:git), "--git-dir=#{ws.config_dir}/.git"]
-                if since = options[:since]
-                    exec(*common_args, 'diff', parse_log_entry(since), 'autoproj@{0}')
+                if (since = options[:since])
+                    exec(*common_args, "diff", parse_log_entry(since), "autoproj@{0}")
                 elsif args.empty?
-                    exec(*common_args, 'reflog',
-                        Ops::Snapshot.import_state_log_ref, '--format=%Cgreen%gd %Cblue%cr %Creset%gs')
+                    exec(*common_args, "reflog",
+                         Ops::Snapshot.import_state_log_ref, "--format=%Cgreen%gd %Cblue%cr %Creset%gs")
                 elsif options[:diff]
-                    exec(*common_args, 'diff', *args.map { |entry| parse_log_entry(entry) })
+                    exec(*common_args, "diff", *args.map { |entry| parse_log_entry(entry) })
                 else
-                    exec(*common_args, 'show', *args.map { |entry| parse_log_entry(entry) })
+                    exec(*common_args, "show", *args.map { |entry| parse_log_entry(entry) })
                 end
             end