autoproj 2.12.1 → 2.15.1

data/lib/autoproj/cli/show.rb

@@ -1,5 +1,5 @@
-require 'autoproj'
-require 'autoproj/cli/inspection_tool'
+require "autoproj"
+require "autoproj/cli/inspection_tool"
 
 module Autoproj
     module CLI
@@ -29,7 +29,7 @@ module Autoproj
                 end
 
                 if package_set_names.empty? && source_packages.empty? && all_matching_osdeps.empty?
-                    Autoproj.error "no package set, packages or OS packages match #{user_selection.join(" ")}"
+                    Autoproj.error "no package set, packages or OS packages match #{user_selection.join(' ')}"
                     return
                 elsif !source_packages.empty? || !all_matching_osdeps.empty?
                     ws.load_all_available_package_manifests
@@ -48,7 +48,7 @@ module Autoproj
                         puts "pkg     #{name}"
                     end
                     all_matching_osdeps.each do |name, sel|
-                        puts "osdep   #{name} (#{sel ? "not selected" : "selected"})"
+                        puts "osdep   #{name} (#{sel ? 'not selected' : 'selected'})"
                     end
                 else
                     package_set_names.each do |pkg_set_name|
@@ -66,17 +66,17 @@ module Autoproj
             def display_package_set(name, package_per_line: 8)
                 puts Autoproj.color("package set #{name}", :bold)
                 pkg_set = ws.manifest.find_package_set(name)
-                if !File.directory?(pkg_set.raw_local_dir)
+                unless File.directory?(pkg_set.raw_local_dir)
                     puts Autobuild.color("  this package set is not checked out", :magenta)
                 end
-                if overrides_key = pkg_set.vcs.overrides_key
+                if (overrides_key = pkg_set.vcs.overrides_key)
                     puts "  overrides key: pkg_set:#{overrides_key}"
                 end
-                if pkg_set.raw_local_dir != pkg_set.user_local_dir
+                if pkg_set.raw_local_dir == pkg_set.user_local_dir
+                    puts "  path: #{pkg_set.raw_local_dir}"
+                else
                     puts "  checkout dir: #{pkg_set.raw_local_dir}"
                     puts "  symlinked to: #{pkg_set.user_local_dir}"
-                else
-                    puts "  path: #{pkg_set.raw_local_dir}"
                 end
 
                 puts "  version control information:"
@@ -87,20 +87,20 @@ module Autoproj
                 if size == 0
                     puts "  does not have any packages"
                 else
-                    puts "  refers to #{metapackage.size} package#{'s' if metapackage.size > 1}"
+                    plural = metapackage.size > 1 ? "s" : ""
+                    puts "  refers to #{metapackage.size} package#{plural}"
                 end
                 names = metapackage.each_package.map(&:name).sort
                 package_lines = names.each_slice(package_per_line).map do |*line_names|
                     line_names.join(", ")
                 end
-                puts "    " + package_lines.join(",\n    ")
-
+                puts "    #{package_lines.join(",\n    ")}"
             end
 
             def display_source_package(pkg_name, default_packages, revdeps, options = Hash.new)
                 puts Autoproj.color("source package #{pkg_name}", :bold)
                 pkg = ws.manifest.find_autobuild_package(pkg_name)
-                if !File.directory?(pkg.srcdir)
+                unless File.directory?(pkg.srcdir)
                     puts Autobuild.color("  this package is not checked out yet, the dependency information will probably be incomplete", :magenta)
                 end
                 puts "  source definition"
@@ -110,9 +110,9 @@ module Autoproj
                 display_vcs(vcs)
                 display_common_information(pkg_name, default_packages, revdeps)
 
-                puts "  directly depends on: #{pkg.dependencies.sort.join(", ")}"
-                puts "  optionally depends on: #{pkg.optional_dependencies.sort.join(", ")}"
-                puts "  dependencies on OS packages: #{pkg.os_packages.sort.join(", ")}"
+                puts "  directly depends on: #{pkg.dependencies.sort.join(', ')}"
+                puts "  optionally depends on: #{pkg.optional_dependencies.sort.join(', ')}"
+                puts "  dependencies on OS packages: #{pkg.os_packages.sort.join(', ')}"
                 if options[:env]
                     puts "  environment"
                     pkg.resolved_env.sort_by(&:first).each do |name, v|
@@ -141,14 +141,15 @@ module Autoproj
                             if entry.package_set && entry.file
                                 "#{entry.package_set.name} (#{entry.file})"
                             elsif entry.package_set
-                                "#{entry.package_set.name}"
+                                entry.package_set.name.to_s
                             elsif entry.file
-                                "#{entry.file}"
+                                entry.file.to_s
                             end
 
                         title = if first
                                     "first match: in #{entry_name}"
-                                else "overriden in #{entry_name}"
+                                else
+                                    "overriden in #{entry_name}"
                                 end
                         first = false
                         fragments << [title, vcs_to_array(entry.vcs)]
@@ -172,26 +173,25 @@ module Autoproj
                 puts Autoproj.color("the osdep '#{pkg_name}'", :bold)
                 begin
                     ws.os_package_resolver.resolve_os_packages([pkg_name]).each do |manager_name, packages|
-                        puts "  #{manager_name}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
+                        puts "  #{manager_name}: #{packages.map { |*subnames| subnames.join(' ') }.join(', ')}"
                     end
                 rescue MissingOSDep => e
                     puts "  #{e.message}"
                 end
 
-                if !selected
+                unless selected
                     puts "  is present, but won't be used by autoproj for '#{pkg_name}'"
                 end
 
                 entries = ws.os_package_resolver.all_definitions[pkg_name]
                 puts "  #{entries.inject(0) { |c, (files, _)| c + files.size }} matching entries:"
                 entries.each do |files, entry|
-                    puts "    in #{files.join(", ")}:"
+                    puts "    in #{files.join(', ')}:"
                     lines = YAML.dump(entry).split("\n")
-                    lines[0] = lines[0].gsub(/---\s*/, '')
-                    if lines[0].empty?
-                        lines.shift
-                    end
-                    puts "        " + lines.join("\n      ")
+                    lines[0] = lines[0].gsub(/---\s*/, "")
+                    lines.shift if lines[0].empty?
+
+                    puts "        #{lines.join("\n      ")}"
                 end
                 display_common_information(pkg_name, default_packages, revdeps)
             end
@@ -204,14 +204,12 @@ module Autoproj
                     else
                         layout_selection = layout_selection.dup
                         layout_selection.delete(pkg_name)
-                        puts "  is directly selected by the manifest via #{layout_selection.to_a.join(", ")}"
+                        puts "  is directly selected by the manifest via #{layout_selection.to_a.join(', ')}"
                     end
                 else
                     puts "  is not directly selected by the manifest"
                 end
-                if ws.manifest.ignored?(pkg_name)
-                    puts "  is ignored"
-                end
+                puts "  is ignored" if ws.manifest.ignored?(pkg_name)
                 if ws.manifest.excluded?(pkg_name)
                     puts "  is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
                 end
@@ -221,8 +219,8 @@ module Autoproj
                 if pkg_revdeps.empty?
                     puts "  no reverse dependencies"
                 else
-                    puts "  direct reverse dependencies: #{pkg_revdeps.sort.join(", ")}"
-                    puts "  recursive reverse dependencies: #{all_revdeps.sort.join(", ")}"
+                    puts "  direct reverse dependencies: #{pkg_revdeps.sort.join(', ')}"
+                    puts "  recursive reverse dependencies: #{all_revdeps.sort.join(', ')}"
                 end
 
                 selections = Set.new
@@ -241,7 +239,7 @@ module Autoproj
                             puts "    FAILED"
                         else
                             paths.sort.uniq.each do |p|
-                                puts "    #{p.join(">")}"
+                                puts "    #{p.join('>')}"
                             end
                         end
                     end
@@ -256,7 +254,8 @@ module Autoproj
                     next if pkg_type != :package
 
                     path = if pkg_name == from then []
-                           else [pkg_name]
+                           else
+                               [pkg_name]
                            end
 
                     pkg = ws.manifest.find_autobuild_package(pkg_name)
@@ -285,8 +284,8 @@ module Autoproj
             def vcs_to_array(vcs)
                 if vcs.kind_of?(Hash)
                     options = vcs.dup
-                    type = options.delete('type')
-                    url  = options.delete('url')
+                    type = options.delete("type")
+                    url  = options.delete("url")
                 else
                     options = vcs.options
                     type = vcs.type
@@ -294,8 +293,8 @@ module Autoproj
                 end
 
                 fields = []
-                fields << ['type', type] if type
-                fields << ['url', url] if url
+                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 =~ /^\//

data/lib/autoproj/cli/status.rb

@@ -1,5 +1,5 @@
-require 'autoproj/cli/inspection_tool'
-require 'tty-spinner'
+require "autoproj/cli/inspection_tool"
+require "tty-spinner"
 
 module Autoproj
     module CLI
@@ -7,27 +7,24 @@ module Autoproj
             def validate_options(packages, options)
                 packages, options = super
                 options[:progress] = Autobuild.progress_display_enabled?
-                if options[:no_deps_shortcut]
-                    options[:deps] = false
-                end
-                if options[:deps].nil? && packages.empty?
-                    options[:deps] = true
-                end
-                return packages, options
+                options[:deps] = false if options[:no_deps_shortcut]
+                options[:deps] = true if options[:deps].nil? && packages.empty?
+                [packages, options]
             end
 
             def run(user_selection, options = Hash.new)
                 initialize_and_load(mainline: options[:mainline])
                 packages, *, config_selected = finalize_setup(
                     user_selection,
-                    recursive: options[:deps])
+                    recursive: options[:deps]
+                )
 
                 if options[:config].nil?
                     options[:config] = user_selection.empty? || config_selected
                 end
 
                 if packages.empty?
-                    Autoproj.error "no packages or OS packages match #{user_selection.join(" ")}"
+                    Autoproj.error "no packages or OS packages match #{user_selection.join(' ')}"
                     return
                 end
 
@@ -39,14 +36,15 @@ module Autoproj
 
                 if options[:config]
                     pkg_sets = ws.manifest.each_package_set.to_a
-                    if !pkg_sets.empty?
+                    unless pkg_sets.empty?
                         Autoproj.message("autoproj: displaying status of configuration", :bold)
                         display_status(
                             pkg_sets,
                             parallel: options[:parallel],
                             snapshot: options[:snapshot],
                             only_local: options[:only_local],
-                            progress: options[:progress])
+                            progress: options[:progress]
+                        )
 
                         STDERR.puts
                     end
@@ -61,7 +59,8 @@ module Autoproj
                     parallel: options[:parallel],
                     snapshot: options[:snapshot],
                     only_local: options[:only_local],
-                    progress: options[:progress])
+                    progress: options[:progress]
+                )
             end
 
             def snapshot_overrides_vcs?(importer, vcs, snapshot)
@@ -73,7 +72,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 +81,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)
@@ -100,8 +99,8 @@ module Autoproj
                         return package_status
                     end
 
-                    snapshot_useful = [Autobuild::Importer::Status::ADVANCED, Autobuild::Importer::Status::NEEDS_MERGE].
-                        include?(status.status)
+                    snapshot_useful = [Autobuild::Importer::Status::ADVANCED, Autobuild::Importer::Status::NEEDS_MERGE]
+                                      .include?(status.status)
                     if snapshot && snapshot_useful && importer.respond_to?(:snapshot)
                         snapshot_version =
                             begin importer.snapshot(pkg, nil, exact_state: false, only_local: only_local)
@@ -113,7 +112,7 @@ module Autoproj
                             end
                         if snapshot_overrides_vcs?(importer, package_description.vcs, snapshot_version)
                             non_nil_values = snapshot_version.delete_if { |k, v| !v }
-                            package_status.msg << Autoproj.color("  found configuration that contains all local changes: #{non_nil_values.sort_by(&:first).map { |k, v| "#{k}: #{v}" }.join(", ")}", :bright_green)
+                            package_status.msg << Autoproj.color("  found configuration that contains all local changes: #{non_nil_values.sort_by(&:first).map { |k, v| "#{k}: #{v}" }.join(', ')}", :bright_green)
                             package_status.msg << Autoproj.color("  consider adding this to your overrides, or use autoproj versions to do it for you", :bright_green)
                             if snapshot
                                 importer.relocate(importer.repository, snapshot_version)
@@ -122,6 +121,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
 
@@ -162,29 +162,40 @@ module Autoproj
                 package_status
             end
 
-            def each_package_status(packages, parallel: ws.config.parallel_import_level, snapshot: false, only_local: false, progress: nil)
-                return enum_for(__method__) if !block_given?
+            def each_package_status(
+                packages,
+                parallel: ws.config.parallel_import_level,
+                snapshot: false, only_local: false, progress: nil
+            )
+                unless block_given?
+                    return enum_for(
+                        __method__, packages,
+                        parallel: parallel, snapshot: snapshot, only_local: only_local,
+                        progress: progress
+                    )
+                end
 
                 result = StatusResult.new
 
                 executor = Concurrent::FixedThreadPool.new(parallel, max_length: 0)
-                interactive, noninteractive = packages.partition do |pkg|
-                    pkg.autobuild.importer && pkg.autobuild.importer.interactive?
-                end
+                interactive, noninteractive =
+                    packages.partition { |pkg| pkg.autobuild.importer&.interactive? }
                 noninteractive = noninteractive.map do |pkg|
-                    future = Concurrent::Future.execute(executor: executor) do
-                        status_of_package(pkg, snapshot: snapshot, only_local: only_local)
+                    future = Concurrent::Promises.future_on(executor) do
+                        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
-                                future.wait(wait_timeout)
-                                if future.complete?
+                            loop do
+                                future.wait!(wait_timeout)
+                                if future.resolved?
                                     break
                                 else
                                     wait_timeout = 0.2
@@ -193,10 +204,13 @@ module Autoproj
                             end
                         end
 
-                        if !(status = future.value)
+                        unless (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
@@ -205,7 +219,6 @@ module Autoproj
                     yield(pkg, status)
                 end
                 result
-
             rescue Interrupt
                 Autoproj.warn "Interrupted, waiting for pending jobs to finish"
                 raise
@@ -224,9 +237,9 @@ module Autoproj
 
                 if progress
                     progress = lambda do |pkg|
-                        if !spinner
-                            if !sync_packages.empty?
-                                Autoproj.message("#{sync_packages}: #{Autoproj.color("local and remote are in sync", :green)}")
+                        unless spinner
+                            unless sync_packages.empty?
+                                Autoproj.message("#{sync_packages}: #{Autoproj.color('local and remote are in sync', :green)}")
                                 sync_packages = ""
                             end
 
@@ -258,12 +271,12 @@ module Autoproj
                         next
                     end
 
-                    if !sync_packages.empty?
-                        Autoproj.message("#{sync_packages}: #{Autoproj.color("local and remote are in sync", :green)}")
+                    unless sync_packages.empty?
+                        Autoproj.message("#{sync_packages}: #{Autoproj.color('local and remote are in sync', :green)}")
                         sync_packages = ""
                     end
 
-                    STDERR.print 
+                    STDERR.print
 
                     if status.msg.size == 1
                         Autoproj.message "#{pkg_name}: #{status.msg.first}"
@@ -274,12 +287,11 @@ module Autoproj
                         end
                     end
                 end
-                if !sync_packages.empty?
-                    Autoproj.message("#{sync_packages}: #{Autoproj.color("local and remote are in sync", :green)}")
+                unless sync_packages.empty?
+                    Autoproj.message("#{sync_packages}: #{Autoproj.color('local and remote are in sync', :green)}")
                 end
-                return result
+                result
             end
         end
     end
 end
-

data/lib/autoproj/cli/switch_config.rb

@@ -1,8 +1,8 @@
-require 'autoproj'
-require 'autoproj/cli/base'
-require 'autoproj/cli/update'
-require 'autoproj/ops/main_config_switcher'
-require 'autoproj/ops/configuration'
+require "autoproj"
+require "autoproj/cli/base"
+require "autoproj/cli/update"
+require "autoproj/ops/main_config_switcher"
+require "autoproj/ops/configuration"
 
 module Autoproj
     module CLI
@@ -29,4 +29,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/tag.rb

@@ -1,7 +1,7 @@
-require 'autoproj'
-require 'autoproj/cli/versions'
-require 'autoproj/ops/snapshot'
-require 'autoproj/cli/base'
+require "autoproj"
+require "autoproj/cli/versions"
+require "autoproj/ops/snapshot"
+require "autoproj/cli/base"
 
 module Autoproj
     module CLI
@@ -19,21 +19,23 @@ module Autoproj
 
                 versions_file = File.join(
                     Workspace::OVERRIDES_DIR,
-                    Versions::DEFAULT_VERSIONS_FILE_BASENAME)
+                    Versions::DEFAULT_VERSIONS_FILE_BASENAME
+                )
 
                 if tag_name.nil?
                     importer = pkg.importer
-                    all_tags = importer.run_git_bare(pkg, 'tag')
+                    all_tags = importer.run_git_bare(pkg, "tag")
                     all_tags.sort.each do |tag|
                         next if tag =~ /\^/
+
                         begin importer.show(pkg, "refs/tags/#{tag}", versions_file)
-                            puts tag
+                              puts tag
                         rescue Autobuild::PackageException
                         end
                     end
                     return
                 end
-                
+
                 # Check if the tag already exists
                 begin
                     importer.rev_parse(pkg, "refs/tags/#{tag_name}")
@@ -42,7 +44,7 @@ module Autoproj
                 end
 
                 message = options[:message] ||
-                    "autoproj created tag #{tag_name}"
+                          "autoproj created tag #{tag_name}"
                 commit_id = Ops::Snapshot.create_commit(pkg, versions_file, message) do |io|
                     versions = CLI::Versions.new(ws)
                     Autoproj.message "creating versions file, this may take a while"
@@ -53,9 +55,8 @@ module Autoproj
                                  keep_going: options[:keep_going])
                 end
 
-                importer.run_git_bare(pkg, 'tag', tag_name, commit_id)
+                importer.run_git_bare(pkg, "tag", tag_name, commit_id)
             end
         end
     end
 end
-

data/lib/autoproj/cli/test.rb

@@ -1,21 +1,21 @@
-require 'autoproj/cli/utility'
+require "autoproj/cli/utility"
 
 module Autoproj
     module CLI
         class Test < Utility
             def initialize(ws = Workspace.default,
-                           name: 'test',
-                           report_path: ws.utility_report_path('test'))
+                name: "test",
+                report_path: ws.utility_report_path("test"))
                 super
             end
 
             def package_metadata(package)
                 u = package.test_utility
                 super.merge(
-                    'coverage_available' => !!u.coverage_available?,
-                    'coverage_enabled' => !!u.coverage_enabled?,
-                    'coverage_source_dir' => u.coverage_source_dir,
-                    'coverage_target_dir' => u.coverage_target_dir
+                    "coverage_available" => !!u.coverage_available?,
+                    "coverage_enabled" => !!u.coverage_enabled?,
+                    "coverage_source_dir" => u.coverage_source_dir,
+                    "coverage_target_dir" => u.coverage_target_dir
                 )
             end
         end