autoproj 2.14.0 → 2.15.0

data/lib/autoproj/cli/main_doc.rb

@@ -1,15 +1,16 @@
 module Autoproj
     module CLI
         class MainDoc < Thor
-            namespace 'doc'
+            namespace "doc"
 
-            default_command 'exec'
+            default_command "exec"
 
             no_commands do
                 def report(report_options = Hash.new)
                     options = self.options.merge(parent_options)
                     extra_options = Hash.new
-                    if Autobuild::Subprocess.transparent_mode = options[:tool]
+                    if options[:tool]
+                        Autobuild::Subprocess.transparent_mode = true
                         Autobuild.silent = true
                         Autobuild.color = false
                         report_options[:silent] = true
@@ -22,11 +23,11 @@ module Autoproj
                 end
             end
 
-            desc 'enable [PACKAGES]', 'enable docs for the given packages (or for all packages if none are given)'
+            desc "enable [PACKAGES]", "enable docs for the given packages (or for all packages if none are given)"
             option :deps, type: :boolean, default: false,
-                desc: 'controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)'
+                          desc: "controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)"
             def enable(*packages)
-                require 'autoproj/cli/doc'
+                require "autoproj/cli/doc"
                 report(silent: true) do
                     cli = Doc.new
                     args = cli.validate_options(packages, options)
@@ -34,11 +35,11 @@ module Autoproj
                 end
             end
 
-            desc 'disable [PACKAGES]', 'disable docs for the given packages (or for all packages if none are given)'
+            desc "disable [PACKAGES]", "disable docs for the given packages (or for all packages if none are given)"
             option :deps, type: :boolean, default: false,
-                desc: 'controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)'
+                          desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def disable(*packages)
-                require 'autoproj/cli/doc'
+                require "autoproj/cli/doc"
                 report(silent: true) do
                     cli = Doc.new
                     args = cli.validate_options(packages, options)
@@ -46,11 +47,11 @@ module Autoproj
                 end
             end
 
-            desc 'list [PACKAGES]', 'show doc enable/disable status for the given packages (or all packages if none are given)'
+            desc "list [PACKAGES]", "show doc enable/disable status for the given packages (or all packages if none are given)"
             option :deps, type: :boolean, default: true,
-                desc: 'controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)'
+                          desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def list(*packages)
-                require 'autoproj/cli/doc'
+                require "autoproj/cli/doc"
                 report(silent: true) do
                     cli = Doc.new
                     args = cli.validate_options(packages, options)
@@ -58,21 +59,21 @@ module Autoproj
                 end
             end
 
-            desc 'exec [PACKAGES]', 'generate documentation for the given packages, or all if no packages are given on the command line'
+            desc "exec [PACKAGES]", "generate documentation for the given packages, or all if no packages are given on the command line"
             option :deps, type: :boolean, default: false,
-                desc: 'controls whether to generate documentation of the dependencies of the packages given on the command line (the default is not)'
-            option :no_deps_shortcut, hide: true, aliases: '-n', type: :boolean,
-                desc: 'provide -n for --no-deps'
+                          desc: "controls whether to generate documentation of the dependencies of the packages given on the command line (the default is not)"
+            option :no_deps_shortcut, hide: true, aliases: "-n", type: :boolean,
+                                      desc: "provide -n for --no-deps"
             option :parallel, aliases: :p, type: :numeric,
-                desc: 'maximum number of parallel jobs'
+                              desc: "maximum number of parallel jobs"
             option :tool, type: :boolean, default: false,
-                desc: "run in tool mode, which do not redirect the subcommand's outputs"
+                          desc: "run in tool mode, which do not redirect the subcommand's outputs"
             option :color, type: :boolean, default: TTY::Color.color?,
-                desc: 'enables or disables colored display (enabled by default if the terminal supports it)'
+                           desc: "enables or disables colored display (enabled by default if the terminal supports it)"
             option :progress, type: :boolean, default: TTY::Color.color?,
-                desc: 'enables or disables progress display (enabled by default if the terminal supports it)'
+                              desc: "enables or disables progress display (enabled by default if the terminal supports it)"
             def exec(*packages)
-                require 'autoproj/cli/doc'
+                require "autoproj/cli/doc"
                 options = self.options.merge(parent_options)
                 report do |extra_options|
                     cli = Doc.new

data/lib/autoproj/cli/main_global.rb

@@ -1,38 +1,63 @@
 module Autoproj
     module CLI
         class MainGlobal < Thor
-            namespace 'global'
+            namespace "global"
 
-            desc 'register', 'register the current workspace'
+            WorkspaceDir = Struct.new :name, :path, :present
+
+            no_commands do
+                def gather_workspaces_dirs(ws)
+                    ws.each_with_object({}) do |w, h|
+                        w_dirs = %w[root_dir prefix_dir build_dir].map do |name|
+                            dir = w.public_send(name)
+                            if dir.start_with?("/")
+                                WorkspaceDir.new(name, dir, File.directory?(dir))
+                            end
+                        end.compact
+
+                        h[w] = w_dirs
+                    end
+                end
+
+                def filter_removed_workspaces(dirs)
+                    dirs.delete_if { |w, w_dirs| w_dirs.none?(&:present) }
+                end
+            end
+
+            desc "register", "register the current workspace"
             def register
-                require 'autoproj'
+                require "autoproj"
                 ws = Workspace.default
                 ws.load_config
                 ws.register_workspace
             end
 
-            desc 'status', 'display information about the known workspaces'
+            desc "status", "display information about the known workspaces"
             def status
-                require 'autoproj'
+                require "autoproj"
                 ws = Workspace.registered_workspaces
                 fields = Workspace::RegisteredWorkspace.members.map(&:to_s)
+
+                dirs = gather_workspaces_dirs(ws)
+                filter_removed_workspaces(dirs)
+                Workspace.save_registered_workspaces(dirs.keys)
+
                 format_w = fields.map(&:length).max + 1
                 format = "%-#{format_w}s %s (%s)"
-                blocks = ws.map do |w|
-                    %w[root_dir prefix_dir build_dir].map do |name|
-                        dir = w.public_send(name)
-                        if dir.start_with?('/')
-                            status = if File.directory?(dir)
-                                         Autobuild.color('present', :green)
-                                     else
-                                         Autobuild.color('absent', :yellow)
-                                     end
-
-                            format(format, "#{name}:", dir, status)
-                        end
-                    end.compact.join("\n")
+                blocks = dirs.map do |w, w_dirs|
+                    lines = w_dirs.map do |d|
+                        status =
+                            if d.present
+                                Autobuild.color("present", :green)
+                            else
+                                Autobuild.color("absent", :yellow)
+                            end
+
+                        format(format, "#{d.name}:", d.path, status)
+                    end
+                    lines.join("\n")
                 end
-                puts blocks.join("---\n")
+                puts blocks.join("\n---\n")
             end
         end
     end

data/lib/autoproj/cli/main_plugin.rb

@@ -1,7 +1,7 @@
 module Autoproj
     module CLI
         class MainPlugin < Thor
-            namespace 'plugin'
+            namespace "plugin"
 
             no_commands do
                 def ws
@@ -15,27 +15,27 @@ module Autoproj
 
                 def read_plugin_list
                     ws.load_config
-                    ws.config.get('plugins', Hash.new)
+                    ws.config.get("plugins", Hash.new)
                 end
 
                 def write_plugin_list(plugins)
                     ws.load_config
-                    ws.config.set('plugins', plugins)
+                    ws.config.set("plugins", plugins)
                     ws.save_config
                 end
             end
 
-            desc 'install NAME', 'install or upgrade an autoproj plugin'
-            option :version, desc: 'a gem version constraint',
-                type: 'string', default: '>= 0'
-            option :git, desc: 'checkout a git repository instead of downloading the gem',
-                type: 'string'
-            option :branch, desc: 'choose the branch that should be checked out with --git',
-                type: 'string', default: 'master'
-            option :path, desc: 'use the plugin that is already present on this path',
-                type: 'string'
+            desc "install NAME", "install or upgrade an autoproj plugin"
+            option :version, desc: "a gem version constraint",
+                             type: "string", default: ">= 0"
+            option :git, desc: "checkout a git repository instead of downloading the gem",
+                         type: "string"
+            option :branch, desc: "choose the branch that should be checked out with --git",
+                            type: "string", default: "master"
+            option :path, desc: "use the plugin that is already present on this path",
+                          type: "string"
             def install(name)
-                require 'autoproj'
+                require "autoproj"
 
                 gem_options = Hash.new
                 if options[:git] && options[:path]
@@ -59,18 +59,18 @@ module Autoproj
                 end
             end
 
-            desc 'list', 'list installed plugins'
+            desc "list", "list installed plugins"
             def list
-                require 'autoproj'
+                require "autoproj"
                 read_plugin_list.sort_by(&:first).each do |name, (version, options)|
                     args = [version, *options.map { |k, v| "#{k}: \"#{v}\"" }]
-                    puts "#{name}: #{args.join(", ")}"
+                    puts "#{name}: #{args.join(', ')}"
                 end
             end
 
-            desc 'remove NAME', 'uninstall a plugin'
+            desc "remove NAME", "uninstall a plugin"
             def remove(name)
-                require 'autoproj'
+                require "autoproj"
                 plugins = read_plugin_list
                 updated_plugins = plugins.dup
                 updated_plugins.delete(name)

data/lib/autoproj/cli/main_test.rb

@@ -1,15 +1,16 @@
 module Autoproj
     module CLI
         class MainTest < Thor
-            namespace 'test'
+            namespace "test"
 
-            default_command 'exec'
+            default_command "exec"
 
             no_commands do
                 def report(report_options = Hash.new)
                     options = self.options.merge(parent_options)
                     extra_options = Hash.new
-                    if Autobuild::Subprocess.transparent_mode = options[:tool]
+                    if options[:tool]
+                        Autobuild::Subprocess.transparent_mode = true
                         Autobuild.silent = true
                         Autobuild.color = false
                         report_options[:silent] = true
@@ -22,26 +23,26 @@ module Autoproj
                 end
             end
 
-            desc 'default [on|off]', 'set whether tests are enabled or disabled by default, without touching existing settings'
+            desc "default [on|off]", "set whether tests are enabled or disabled by default, without touching existing settings"
             def default(on_or_off)
-                require 'autoproj/cli/test'
+                require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
                     args = cli.validate_options([], options)
                     enabled = case on_or_off
-                              when 'on' then true
-                              when 'off' then false
+                              when "on" then true
+                              when "off" then false
                               else raise ArgumentError, "expected 'on' or 'off'"
                               end
                     cli.default(enabled)
                 end
             end
 
-            desc 'enable [PACKAGES]', 'enable tests for the given packages (or for all packages if none are given)'
+            desc "enable [PACKAGES]", "enable tests for the given packages (or for all packages if none are given)"
             option :deps, type: :boolean, default: false,
-                desc: 'controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)'
+                          desc: "controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)"
             def enable(*packages)
-                require 'autoproj/cli/test'
+                require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
                     args = cli.validate_options(packages, options)
@@ -49,11 +50,11 @@ module Autoproj
                 end
             end
 
-            desc 'disable [PACKAGES]', 'disable tests for the given packages (or for all packages if none are given)'
+            desc "disable [PACKAGES]", "disable tests for the given packages (or for all packages if none are given)"
             option :deps, type: :boolean, default: false,
-                desc: 'controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)'
+                          desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def disable(*packages)
-                require 'autoproj/cli/test'
+                require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
                     args = cli.validate_options(packages, options)
@@ -61,11 +62,11 @@ module Autoproj
                 end
             end
 
-            desc 'list [PACKAGES]', 'show test enable/disable status for the given packages (or all packages if none are given)'
+            desc "list [PACKAGES]", "show test enable/disable status for the given packages (or all packages if none are given)"
             option :deps, type: :boolean, default: true,
-                desc: 'controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)'
+                          desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def list(*packages)
-                require 'autoproj/cli/test'
+                require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
                     args = cli.validate_options(packages, options)
@@ -73,26 +74,26 @@ module Autoproj
                 end
             end
 
-            desc 'exec [PACKAGES]', 'execute the tests for the given packages, or all if no packages are given on the command line'
+            desc "exec [PACKAGES]", "execute the tests for the given packages, or all if no packages are given on the command line"
             option :keep_going, aliases: :k, type: :boolean,
-                banner: '',
-                desc: 'do not stop on build or checkout errors'
+                                banner: "",
+                                desc: "do not stop on build or checkout errors"
             option :deps, type: :boolean, default: false,
-                desc: 'controls whether to execute the tests of the dependencies of the packages given on the command line (the default is not)'
+                          desc: "controls whether to execute the tests of the dependencies of the packages given on the command line (the default is not)"
             option :parallel, aliases: :p, type: :numeric,
-                desc: 'maximum number of parallel jobs'
+                              desc: "maximum number of parallel jobs"
             option :fail, type: :boolean, default: true,
-                desc: 'return with a nonzero exit code if the test does not pass'
+                          desc: "return with a nonzero exit code if the test does not pass"
             option :coverage, type: :boolean, default: false,
-                desc: 'whether code coverage should be generated if possible'
+                              desc: "whether code coverage should be generated if possible"
             option :tool, type: :boolean, default: false,
-                desc: "build in tool mode, which do not redirect the subcommand's outputs"
+                          desc: "build in tool mode, which do not redirect the subcommand's outputs"
             option :color, type: :boolean, default: TTY::Color.color?,
-                desc: 'enables or disables colored display (enabled by default if the terminal supports it)'
+                           desc: "enables or disables colored display (enabled by default if the terminal supports it)"
             option :progress, type: :boolean, default: TTY::Color.color?,
-                desc: 'enables or disables progress display (enabled by default if the terminal supports it)'
+                              desc: "enables or disables progress display (enabled by default if the terminal supports it)"
             def exec(*packages)
-                require 'autoproj/cli/test'
+                require "autoproj/cli/test"
                 options = self.options.merge(parent_options)
                 report do |extra_options|
                     cli = Test.new

data/lib/autoproj/cli/manifest.rb

@@ -1,10 +1,10 @@
-require 'autoproj'
-require 'autoproj/cli/base'
+require "autoproj"
+require "autoproj/cli/base"
 module Autoproj
     module CLI
         class Manifest < Base
             def validate_options(args, options)
-                return args, options
+                [args, options]
             end
 
             def run(name, options = Hash.new)
@@ -21,11 +21,12 @@ module Autoproj
                         full_path = File.join(ws.config_dir, name)
                     end
 
-                    if !File.file?(full_path)
+                    unless File.file?(full_path)
                         alternative_full_path = File.join(ws.config_dir, "manifest.#{name}")
-                        if !File.file?(alternative_full_path)
+                        unless File.file?(alternative_full_path)
                             raise CLIInvalidArguments, "neither #{full_path} nor #{alternative_full_path} exist"
                         end
+
                         full_path = alternative_full_path
                     end
                     begin
@@ -34,7 +35,7 @@ module Autoproj
                         Autoproj.error "failed to load #{full_path}"
                         raise
                     end
-                    ws.config.set 'manifest_name', File.basename(full_path)
+                    ws.config.set "manifest_name", File.basename(full_path)
                     ws.save_config
                     Autoproj.message "set manifest to #{full_path}"
                 else
@@ -47,4 +48,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/osdeps.rb

@@ -1,4 +1,4 @@
-require 'autoproj/cli/inspection_tool'
+require "autoproj/cli/inspection_tool"
 
 module Autoproj
     module CLI
@@ -8,18 +8,18 @@ module Autoproj
                 if options[:system_info]
                     os_names, os_versions = ws.os_package_resolver.operating_system
                     os_package_manager_names = OSPackageResolver::OS_PACKAGE_MANAGERS.values
-                    os_indep_managers = ws.os_package_installer.package_managers.
-                        each_key.find_all do |name, manager|
-                            !os_package_manager_names.include?(name)
-                        end
-                    puts "OS Names:    #{(os_names - ['default']).join(", ")}"
-                    puts "OS Versions: #{(os_versions - ['default']).join(", ")}"
+                    os_indep_managers = ws.os_package_installer.package_managers
+                                          .each_key.find_all do |name, manager|
+                        !os_package_manager_names.include?(name)
+                    end
+                    puts "OS Names:    #{(os_names - ['default']).join(', ')}"
+                    puts "OS Versions: #{(os_versions - ['default']).join(', ')}"
                     puts "OS Package Manager: #{ws.os_package_resolver.os_package_manager}"
-                    puts "Available Package Managers: #{os_indep_managers.sort.join(", ")}"
+                    puts "Available Package Managers: #{os_indep_managers.sort.join(', ')}"
                     return
                 end
 
-                _, osdep_packages, resolved_selection, _ =
+                _, osdep_packages, resolved_selection, =
                     finalize_setup(user_selection)
 
                 shell_helpers = options.fetch(:shell_helpers, ws.config.shell_helpers?)
@@ -28,10 +28,11 @@ module Autoproj
                 ws.install_os_packages(
                     osdep_packages,
                     run_package_managers_without_packages: true,
-                    install_only: !update)
+                    install_only: !update
+                )
                 export_env_sh(shell_helpers: shell_helpers)
                 Main.run_post_command_hook(:update, ws, source_packages: [],
-                    osdep_packages: osdep_packages)
+                                                        osdep_packages: osdep_packages)
             end
         end
     end

data/lib/autoproj/cli/patcher.rb

@@ -1,11 +1,11 @@
-require 'autoproj/cli/inspection_tool'
+require "autoproj/cli/inspection_tool"
 module Autoproj
     module CLI
         # Interface to patch/unpatch a package
         class Patcher < InspectionTool
             def run(packages, patch: true)
                 initialize_and_load
-                packages, _ = finalize_setup(packages, recursive: false, non_imported_packages: :ignore)
+                packages, = finalize_setup(packages, recursive: false, non_imported_packages: :ignore)
                 packages.each do |package_name|
                     pkg = ws.manifest.package_definition_by_name(package_name)
                     if patch
@@ -18,4 +18,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/query.rb

@@ -1,5 +1,5 @@
-require 'autoproj'
-require 'autoproj/cli/inspection_tool'
+require "autoproj"
+require "autoproj/cli/inspection_tool"
 
 module Autoproj
     module CLI
@@ -10,14 +10,14 @@ module Autoproj
 
             def find_all_matches(query, packages)
                 matches = packages.map do |pkg|
-                    if priority = query.match(pkg)
+                    if (priority = query.match(pkg))
                         [priority, pkg]
                     end
                 end.compact
                 matches.sort_by { |priority, pkg| [priority, pkg.name] }
             end
 
-            def run(query_string, format: '$NAME', search_all: false, only_present: false, osdeps: false)
+            def run(query_string, format: "$NAME", search_all: false, only_present: false, osdeps: false)
                 initialize_and_load
                 all_selected_packages, all_selected_osdeps_packages, * =
                     finalize_setup([], non_imported_packages: :return)
@@ -29,7 +29,7 @@ module Autoproj
                 end
             end
 
-            def query_os_packages(query_string, selected_packages, format: '$NAME', search_all: false)
+            def query_os_packages(query_string, selected_packages, format: "$NAME", search_all: false)
                 if query_string.empty?
                     query = OSPackageQuery.all
                 else
@@ -67,14 +67,14 @@ module Autoproj
 
             def format_osdep_package(format, priority, name, handler, real_package_name)
                 fields = Hash.new
-                fields['NAME']     = name
-                fields['PRIORITY'] = priority
-                fields['HANDLER']  = handler
-                fields['REAL_PACKAGE']  = real_package_name
+                fields["NAME"]     = name
+                fields["PRIORITY"] = priority
+                fields["HANDLER"]  = handler
+                fields["REAL_PACKAGE"] = real_package_name
                 Autoproj.expand(format, fields)
             end
 
-            def query_source_packages(query_string, selected_packages, format: '$NAME', search_all: false, only_present: false)
+            def query_source_packages(query_string, selected_packages, format: "$NAME", search_all: false, only_present: false)
                 if query_string.empty?
                     query = SourcePackageQuery.all
                 else
@@ -105,18 +105,17 @@ module Autoproj
             def format_source_package(format, priority, package)
                 autobuild_package = package.autobuild
                 fields = Hash.new
-                fields['SRCDIR']   = autobuild_package.srcdir
-                fields['BUILDDIR'] = if autobuild_package.respond_to?(:builddir)
+                fields["SRCDIR"]   = autobuild_package.srcdir
+                fields["BUILDDIR"] = if autobuild_package.respond_to?(:builddir)
                                          autobuild_package.builddir
                                      end
-                fields['PREFIX']   = autobuild_package.prefix
-                fields['NAME']     = package.name
-                fields['PRIORITY'] = priority
-                fields['URL']      = (package.vcs.url if !package.vcs.none?)
-                fields['PRESENT']  = File.directory?(autobuild_package.srcdir)
+                fields["PREFIX"]   = autobuild_package.prefix
+                fields["NAME"]     = package.name
+                fields["PRIORITY"] = priority
+                fields["URL"]      = (package.vcs.url unless package.vcs.none?)
+                fields["PRESENT"]  = File.directory?(autobuild_package.srcdir)
                 Autoproj.expand(format, fields)
             end
         end
     end
 end
-

data/lib/autoproj/cli/reconfigure.rb

@@ -1,4 +1,4 @@
-require 'autoproj/cli/base'
+require "autoproj/cli/base"
 module Autoproj
     module CLI
         class Reconfigure < Base
@@ -16,4 +16,3 @@ module Autoproj
         end
     end
 end
-

data/lib/autoproj/cli/reset.rb

@@ -1,7 +1,7 @@
-require 'autoproj/cli'
-require 'autoproj/cli/inspection_tool'
-require 'autoproj/cli/update'
-require 'autoproj/cli/versions'
+require "autoproj/cli"
+require "autoproj/cli/inspection_tool"
+require "autoproj/cli/update"
+require "autoproj/cli/versions"
 
 module Autoproj
     module CLI
@@ -24,7 +24,8 @@ module Autoproj
                 # Checkout the version file
                 versions_file = File.join(
                     Workspace::OVERRIDES_DIR,
-                    Versions::DEFAULT_VERSIONS_FILE_BASENAME)
+                    Versions::DEFAULT_VERSIONS_FILE_BASENAME
+                )
                 begin
                     file_data = importer.show(pkg, ref_name, versions_file)
                     versions_path = File.join(ws.config_dir, versions_file)
@@ -34,23 +35,19 @@ module Autoproj
                         FileUtils.cp versions_path, old_versions_path
                     end
                     FileUtils.mkdir_p File.join(ws.config_dir, Workspace::OVERRIDES_DIR)
-                    File.open(versions_path, 'w') do |io|
+                    File.open(versions_path, "w") do |io|
                         io.write file_data
                     end
 
                     update = CLI::Update.new
                     run_args = update.run([], reset: true)
-
                 ensure
-                    if !options[:freeze]
+                    unless options[:freeze]
                         FileUtils.rm_f versions_path
-                        if old_versions_path
-                            FileUtils.mv old_versions_path, versions_path
-                        end
+                        FileUtils.mv old_versions_path, versions_path if old_versions_path
                     end
                 end
             end
         end
     end
 end
-