autoproj 2.11.0 → 2.14.0

data/lib/autoproj/base.rb

@@ -56,4 +56,22 @@ module Autoproj
             end
         end
     end
+
+    # Shim for a smooth upgrade path to bundler 2.1+
+    def self.bundler_unbundled_system(*args, **options)
+        if Bundler.respond_to?(:unbundled_system)
+            Bundler.unbundled_system(*args, **options)
+        else
+            Bundler.clean_system(*args, **options)
+        end
+    end
+
+    # Shim for a smooth upgrade path to bundler 2.1+
+    def self.bundler_with_unbundled_env(&block)
+        if Bundler.respond_to?(:with_unbundled_env)
+            Bundler.with_unbundled_env(&block)
+        else
+            Bundler.with_clean_env(&block)
+        end
+    end
 end

data/lib/autoproj/cli/base.rb

@@ -151,7 +151,7 @@ module Autoproj
                     non_imported_packages: non_imported_packages,
                     auto_exclude: auto_exclude)
 
-                return source_packages, osdep_packages, resolved_selection
+                [source_packages, osdep_packages, resolved_selection]
             rescue ExcludedSelection => e
                 raise CLIInvalidSelection, e.message, e.backtrace
             end

data/lib/autoproj/cli/build.rb

@@ -18,12 +18,14 @@ module Autoproj
             end
 
             def run(selected_packages, **options)
-                build_options, options = filter_options options,
+                build_options, options = filter_options(
+                    options,
                     force: false,
                     rebuild: false,
                     parallel: nil,
                     confirm: true,
                     not: Array.new
+                )
 
                 command_line_selection, source_packages, _osdep_packages =
                     super(selected_packages,
@@ -41,6 +43,7 @@ module Autoproj
                 # Disable all packages that are not selected
                 ws.manifest.each_autobuild_package do |pkg|
                     next if active_packages.include?(pkg.name)
+
                     pkg.disable
                 end
 
@@ -61,11 +64,13 @@ module Autoproj
                                     else 'force-build'
                                     end
                         if build_options[:confirm] != false
-                            opt = BuildOption.new("", "boolean",
+                            opt = BuildOption.new(
+                                "", "boolean",
                                 {
                                     doc: "this is going to trigger a #{mode_name} "\
                                         "of all packages. Is that really what you want ?"
-                                }, nil)
+                                }, nil
+                            )
                             raise Interrupt unless opt.ask(false)
                         end
 

data/lib/autoproj/cli/cache.rb

@@ -1,32 +1,104 @@
+# frozen_string_literal: true
+
 require 'autoproj/cli/inspection_tool'
 require 'autoproj/ops/cache'
 
 module Autoproj
     module CLI
         class Cache < InspectionTool
+            def parse_gem_compile(string)
+                scanner = StringScanner.new(string)
+                name = scanner.scan(/[^\[]+/)
+
+                level = 0
+                artifacts = []
+                artifact_include = nil
+                artifact_name = ''.dup
+                until scanner.eos?
+                    c = scanner.getch
+                    if level == 0
+                        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 == ']'
+                            raise ArgumentError, "empty [] found in '#{string}'"
+                        else
+                            raise ArgumentError,
+                                  "expected '+' or '-' but got '#{c}' in '#{string}'"
+                        end
+                        next
+                    end
+
+                    if c == ']'
+                        level -= 1
+                        if level == 0
+                            artifacts << [artifact_include, artifact_name]
+                            artifact_name = ''.dup
+                            next
+                        end
+                    end
+
+                    artifact_name << c
+                end
+
+                raise ArgumentError, "missing closing ']' in #{string}" if level != 0
+
+                [name, artifacts: artifacts]
+            end
+
             def validate_options(argv, options = Hash.new)
                 argv, options = super
 
                 if argv.empty?
                     default_cache_dirs = Autobuild::Importer.default_cache_dirs
                     if !default_cache_dirs || default_cache_dirs.empty?
-                        raise CLIInvalidArguments, "no cache directory defined with e.g. the AUTOBUILD_CACHE_DIR environment variable, expected one cache directory as argument"
+                        raise CLIInvalidArguments,
+                              "no cache directory defined with e.g. the "\
+                              "AUTOBUILD_CACHE_DIR environment variable, "\
+                              "expected one cache directory as argument"
                     end
-                    Autoproj.warn "using cache directory #{default_cache_dirs.first} from the autoproj configuration"
+                    Autoproj.warn "using cache directory #{default_cache_dirs.first} "\
+                                  "from the autoproj configuration"
                     argv << default_cache_dirs.first
                 end
 
-                return File.expand_path(argv.first, ws.root_dir), *argv[1..-1], options
+                if (compile = options[:gems_compile])
+                    options[:gems_compile] = compile.map do |name|
+                        parse_gem_compile(name)
+                    end
+                end
+
+                [File.expand_path(argv.first, ws.root_dir), *argv[1..-1], options]
             end
 
-            def run(cache_dir, *package_names, all: true, keep_going: false, checkout_only: false)
+            def run(cache_dir, *package_names,
+                    keep_going: false,
+                    packages: true, all: true, checkout_only: false,
+                    gems: false, gems_compile: [], gems_compile_force: false)
                 initialize_and_load
                 finalize_setup
 
-                cache_op = Autoproj::Ops::Cache.new(cache_dir, ws.manifest)
-                cache_op.create_or_update(*package_names, all: all, keep_going: keep_going, checkout_only: checkout_only)
+                cache_op = Autoproj::Ops::Cache.new(cache_dir, ws)
+                if packages
+                    cache_op.create_or_update(
+                        *package_names,
+                        all: all, keep_going: keep_going,
+                        checkout_only: checkout_only
+                    )
+                end
+
+                if gems
+                    Autoproj.message "caching gems in #{cache_op.gems_cache_dir}"
+                    cache_op.create_or_update_gems(
+                        keep_going: keep_going,
+                        compile: gems_compile,
+                        compile_force: gems_compile_force
+                    )
+                end
             end
         end
     end
 end
-

data/lib/autoproj/cli/inspection_tool.rb

@@ -8,9 +8,7 @@ module Autoproj
             def initialize_and_load(mainline: nil)
                 Autoproj.silent do
                     ws.setup
-                    if mainline == 'mainline' || mainline == 'true'
-                        mainline = true
-                    end
+                    mainline = true if %w[mainline true].include?(mainline)
                     ws.load_package_sets(mainline: mainline)
                     ws.config.save
                     ws.setup_all_package_directories
@@ -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
             #
@@ -32,7 +30,8 @@ module Autoproj
             #   the arguments were pointing within the configuration area
             def finalize_setup(packages = [], non_imported_packages: :ignore, recursive: true, auto_exclude: 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)
@@ -41,7 +40,7 @@ module Autoproj
                         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
+                    [source_packages, osdep_packages, resolved_selection, config_selected]
                 end
             end
         end

data/lib/autoproj/cli/main.rb

@@ -134,8 +134,9 @@ module Autoproj
                         end
                         cli = CLI.const_get(classname).new
                         begin
-                            run_args = cli.validate_options(args, options.merge(extra_options))
-                            cli.run(*run_args)
+                            *run_args, kw = cli.validate_options(args, options.merge(extra_options))
+                            kw = (kw || {}).transform_keys(&:to_sym)
+                            cli.run(*run_args, **kw)
                         ensure
                             cli.notify_env_sh_updated if cli.respond_to?(:notify_env_sh_updated)
                         end
@@ -228,6 +229,8 @@ module Autoproj
                 desc: "compare to the given baseline. if 'true', the comparison will ignore any override, otherwise it will take into account overrides only up to the given package set"
             option :auto_exclude, type: :boolean,
                 desc: 'if true, packages that fail to import will be excluded from the build'
+            option :ask, type: :boolean, default: false,
+                desc: 'ask whether each package should or should not be updated'
             def update(*packages)
                 report_options = Hash[silent: false, on_package_failures: default_report_on_package_failures]
                 if options[:auto_exclude]
@@ -300,13 +303,34 @@ In this case, the default is false
                 end
             end
 
-            desc 'cache CACHE_DIR', 'create or update a cache directory that can be given to AUTOBUILD_CACHE_DIR'
-            option :keep_going, aliases: :k,
-                desc: 'do not stop on errors'
-            option :checkout_only, aliases: :c, type: :boolean, default: false,
-                desc: "only checkout packages, do not update already-cached ones"
-            option :all, type: :boolean, default: true,
-                desc: "cache all defined packages (the default) or only the selected ones"
+            desc 'cache CACHE_DIR', 'create or update a cache directory that '\
+                                    'can be given to AUTOBUILD_CACHE_DIR'
+            option :keep_going,
+                   aliases: :k,
+                   desc: 'do not stop on errors'
+            option :checkout_only,
+                   aliases: :c, type: :boolean, default: false,
+                   desc: 'only checkout packages, do not update already-cached ones'
+            option :all,
+                   type: :boolean, default: true,
+                   desc: 'cache all defined packages (the default), '\
+                         ' or only the selected ones'
+            option :packages,
+                   type: :boolean, default: true,
+                   desc: 'update the package cache'
+            option :gems,
+                   type: :boolean, default: false,
+                   desc: 'update the gems cache'
+            option :gems_compile_force,
+                   type: :boolean, default: false,
+                   desc: 'with --gems-compile, recompile existing gems as well'
+            option :gems_compile,
+                   type: :array,
+                   desc: 'pre-compile the following gems. This requires gem-compiler '\
+                         'to be available in the workspace. Use GEM_NAME+ARTIFACT'\
+                         '[+ARTIFACT] to add files or directories to the precompiled '\
+                         'gems beyond what gem-compiler auto-adds (which is mostly '\
+                         'dynamic libraries)'
             def cache(*args)
                 run_autoproj_cli(:cache, :Cache, Hash[], *args)
             end

data/lib/autoproj/cli/show.rb

@@ -17,7 +17,8 @@ module Autoproj
                     source_packages, osdep_packages, * =
                         finalize_setup(user_selection, recursive: recursive, non_imported_packages: :return)
                 else
-                    source_packages, osdep_packages = Array.new, Array.new
+                    source_packages = []
+                    osdep_packages = []
                 end
 
                 all_matching_osdeps = osdep_packages.map { |pkg| [pkg, true] }
@@ -232,7 +233,7 @@ module Autoproj
                     end
                 end
 
-                if !selections.empty?
+                unless selections.empty?
                     puts "  selected by way of"
                     selections.each do |root_pkg|
                         paths = find_selection_path(root_pkg, pkg_name)
@@ -248,9 +249,7 @@ module Autoproj
             end
 
             def find_selection_path(from, to)
-                if from == to
-                    return [[from]]
-                end
+                return [[from]] if from == to
 
                 all_paths = Array.new
                 ws.manifest.resolve_package_name(from).each do |pkg_type, pkg_name|
@@ -262,19 +261,17 @@ module Autoproj
 
                     pkg = ws.manifest.find_autobuild_package(pkg_name)
                     pkg.dependencies.each do |dep_pkg_name|
-                        if result = find_selection_path(dep_pkg_name, to)
+                        if (result = find_selection_path(dep_pkg_name, to))
                             all_paths.concat(result.map { |p| path + p })
                         end
                     end
-                    if pkg.os_packages.include?(to)
-                        all_paths << (path + [to])
-                    end
+                    all_paths << (path + [to]) if pkg.os_packages.include?(to)
                 end
 
                 # Now filter common trailing subpaths
                 all_paths = all_paths.sort_by(&:size)
                 filtered_paths = Array.new
-                while !all_paths.empty?
+                until all_paths.empty?
                     path = all_paths.shift
                     filtered_paths << path
                     size = path.size
@@ -290,19 +287,15 @@ module Autoproj
                     options = vcs.dup
                     type = options.delete('type')
                     url  = options.delete('url')
-                else 
+                else
                     options = vcs.options
                     type = vcs.type
                     url = vcs.url
                 end
 
                 fields = []
-                if type
-                    fields << ['type', type]
-                end
-                if url
-                    fields << ['url', url]
-                end
+                fields << ['type', type] if type
+                fields << ['url', url] if url
                 fields = fields.concat(options.to_a.sort_by { |k, _| k.to_s })
                 fields.map do |key, value|
                     if value.respond_to?(:to_str) && File.file?(value) && value =~ /^\//
@@ -315,9 +308,10 @@ module Autoproj
             def compute_all_revdeps(pkg_revdeps, revdeps)
                 pkg_revdeps = pkg_revdeps.dup
                 all_revdeps = Array.new
-                while !pkg_revdeps.empty?
+                until pkg_revdeps.empty?
                     parent_name = pkg_revdeps.shift
                     next if all_revdeps.include?(parent_name)
+
                     all_revdeps << parent_name
                     pkg_revdeps.concat(revdeps[parent_name].to_a)
                 end

data/lib/autoproj/cli/status.rb

@@ -73,7 +73,7 @@ module Autoproj
                 end
             end
 
-            def report_exception(package_status, msg, e)
+            def self.report_exception(package_status, msg, e)
                 package_status.msg << Autoproj.color("  #{msg} (#{e})", :red)
                 if Autobuild.debug
                     package_status.msg.concat(e.backtrace.map do |line|
@@ -82,8 +82,8 @@ module Autoproj
                 end
             end
 
-            PackageStatus = Struct.new :msg, :sync, :uncommitted, :local, :remote
-            def status_of_package(package_description, only_local: false, snapshot: false)
+            PackageStatus = Struct.new :msg, :sync, :unexpected, :uncommitted, :local, :remote
+            def self.status_of_package(package_description, only_local: false, snapshot: false)
                 pkg = package_description.autobuild
                 importer = pkg.importer
                 package_status = PackageStatus.new(Array.new, false, false, false, false)
@@ -96,7 +96,7 @@ module Autoproj
                 else
                     begin status = importer.status(pkg, only_local: only_local)
                     rescue StandardError => e
-                        report_exception(package_status, "failed to fetch status information", e)
+                        self.report_exception(package_status, "failed to fetch status information", e)
                         return package_status
                     end
 
@@ -108,7 +108,7 @@ module Autoproj
                             rescue Autobuild::PackageException
                                 Hash.new
                             rescue StandardError => e
-                                report_exception(package_status, "failed to fetch snapshotting information", e)
+                                self.report_exception(package_status, "failed to fetch snapshotting information", e)
                                 return package_status
                             end
                         if snapshot_overrides_vcs?(importer, package_description.vcs, snapshot_version)
@@ -122,6 +122,7 @@ module Autoproj
                     end
 
                     status.unexpected_working_copy_state.each do |msg|
+                        package_status.unexpected = true
                         package_status.msg << Autoproj.color("  #{msg}", :red, :bold)
                     end
 
@@ -173,13 +174,15 @@ module Autoproj
                 end
                 noninteractive = noninteractive.map do |pkg|
                     future = Concurrent::Future.execute(executor: executor) do
-                        status_of_package(pkg, snapshot: snapshot, only_local: only_local)
+                        Status.status_of_package(
+                            pkg, snapshot: snapshot, only_local: only_local
+                        )
                     end
                     [pkg, future]
                 end
 
                 (noninteractive + interactive).each do |pkg, future|
-                    if future 
+                    if future
                         if progress
                             wait_timeout = 1
                             while true
@@ -196,7 +199,10 @@ module Autoproj
                         if !(status = future.value)
                             raise future.reason
                         end
-                    else status = status_of_package(pkg, snapshot: snapshot, only_local: only_local)
+                    else
+                        status = Status.status_of_package(
+                            pkg, snapshot: snapshot, only_local: only_local
+                        )
                     end
 
                     result.uncommitted ||= status.uncommitted
@@ -263,7 +269,7 @@ module Autoproj
                         sync_packages = ""
                     end
 
-                    STDERR.print 
+                    STDERR.print
 
                     if status.msg.size == 1
                         Autoproj.message "#{pkg_name}: #{status.msg.first}"