autoproj 2.12.1 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 214fd95f143468744f972355eefe4d626db36b1b9682c47998fc33373f1e5af5
-  data.tar.gz: 7fc8e361877c7ae1a66da15c00661e858cde213e6cf152c83799a7af71d910bf
+  metadata.gz: d0594abdc1c9523788d70185cef7fee0094e70aa0aad5a7c06432e78fd3f2324
+  data.tar.gz: 7fbde174feb043143cf9d64a23517858982216bd15e33c659954085f5168af64
 SHA512:
-  metadata.gz: 75a492d69d8b5902468f0a21c20bf1b4cbfe19c86d438f879094d3684c31da6a14fa184aa839fe1607dad086bf3210fe43a572d488f99e1ecb85c56be04f9489
-  data.tar.gz: d65b0bbbce89c696c913cddb23241b40a8d3acad47aabe7b93e9283701d3e7c1a82fde6544924d7b3f209a855aa9d065218303701c809b7a15e4fba3837193f6
+  metadata.gz: 82529e41b820b90048063019025470390718393f7479dfbf9714d4898abdc6d8a327306f1b672191f48e925b1af8c2e05e94583a4f9dde8a418f6aac11a99523
+  data.tar.gz: 9eeec00ec5b9aaaa565e85a65b2a07a22ba0701044657434d2a99c837174e0d87551a389f73d3ee55eff0f05ee2221b61c7f35e2b057c2fe5bbfbbe568015723

data/.travis.yml

@@ -1,9 +1,11 @@
 sudo: true
 language: ruby
 rvm:
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - "2.3"
+  - "2.4"
+  - "2.5"
+  - "2.6"
+  - "2.7"
   - jruby-9.1.15.0
 matrix:
     allow_failures:

data/autoproj.gemspec

@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
     s.add_runtime_dependency "bundler"
-    s.add_runtime_dependency "autobuild", ">= 1.19.0"
+    s.add_runtime_dependency "autobuild", ">= 1.21.0"
     s.add_runtime_dependency "backports", '~> 3.0'
     s.add_runtime_dependency "utilrb", '~> 3.0.0', ">= 3.0.0"
-    s.add_runtime_dependency "thor", '~> 0.20.0'
-    s.add_runtime_dependency 'concurrent-ruby', '~> 1.0.0', '>= 1.0.0'
-    s.add_runtime_dependency 'tty-color', '~> 0.4.0', '>= 0.4.0'
-    s.add_runtime_dependency 'tty-prompt', '~> 0.15.0'
-    s.add_runtime_dependency 'tty-spinner', '~> 0.8.0'
+    s.add_runtime_dependency "thor", '~> 1.0'
+    s.add_runtime_dependency 'concurrent-ruby', '~> 1.1'
+    s.add_runtime_dependency 'tty-color', '~> 0.5.0'
+    s.add_runtime_dependency 'tty-prompt', '~> 0.21.0'
+    s.add_runtime_dependency 'tty-spinner', '~> 0.9.0'
     s.add_runtime_dependency 'rb-inotify' if RbConfig::CONFIG['target_os'] =~ /linux/
     s.add_runtime_dependency 'xdg', '= 2.2.5'
     s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"

data/bin/alog

@@ -23,6 +23,7 @@ Autoproj.report(silent: true) do
 
     if log_files.size == 1
         logfile = log_files.first
+        puts File.read(logfile)
     elsif log_files.size > 1
         begin
             logfile = cli.select_log_file(log_files)

data/bin/autoproj_bootstrap

@@ -264,7 +264,7 @@ module Autoproj
             end
 
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path)))
+                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
             end
 
             # Parse the provided command line options and returns the non-options

data/bin/autoproj_install

@@ -264,7 +264,7 @@ module Autoproj
             end
 
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path)))
+                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
             end
 
             # Parse the provided command line options and returns the non-options

data/lib/autoproj.rb

@@ -9,6 +9,8 @@
 require 'backports/2.4.0/nil_class/dup'
 require 'backports/2.4.0/false_class/dup'
 require 'backports/2.4.0/true_class/dup'
+require 'backports/2.4.0/hash/transform_values'
+require 'backports/2.5.0/hash/transform_keys'
 
 require 'autobuild'
 require 'autoproj/autobuild'

data/lib/autoproj/autobuild_extensions/dsl.rb

@@ -421,9 +421,9 @@ def source_package(options, workspace: Autoproj.workspace)
 end
 
 # @deprecated use Autoproj.config.declare instead
-def configuration_option(*opts, &block)
+def configuration_option(*opts, **kw, &block)
     Autoproj.warn_deprecated __method__, "use Autoproj.config.declare instead"
-    Autoproj.config.declare(*opts, &block)
+    Autoproj.config.declare(*opts, **kw, &block)
 end
 
 # @deprecated use Autoproj.config.get instead

data/lib/autoproj/cli/main.rb

@@ -134,8 +134,9 @@ def run_autoproj_cli(filename, classname, report_options, *args, tool_failure_mo
                         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 @@ def status(*packages)
                 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]

data/lib/autoproj/cli/status.rb

@@ -73,7 +73,7 @@ def snapshot_overrides_vcs?(importer, vcs, snapshot)
                 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 @@ def report_exception(package_status, msg, e)
                 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 @@ def status_of_package(package_description, only_local: false, snapshot: false)
                 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 @@ def status_of_package(package_description, only_local: false, snapshot: false)
                             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 @@ def status_of_package(package_description, only_local: false, snapshot: false)
                     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 @@ def each_package_status(packages, parallel: ws.config.parallel_import_level, sna
                 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 @@ def each_package_status(packages, parallel: ws.config.parallel_import_level, sna
                         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 @@ def display_status(packages, parallel: ws.config.parallel_import_level, snapshot
                         sync_packages = ""
                     end
 
-                    STDERR.print 
+                    STDERR.print
 
                     if status.msg.size == 1
                         Autoproj.message "#{pkg_name}: #{status.msg.first}"

data/lib/autoproj/cli/update.rb

@@ -1,5 +1,6 @@
 require 'autoproj/cli'
 require 'autoproj/cli/base'
+require 'autoproj/cli/status'
 require 'autoproj/ops/import'
 
 module Autoproj
@@ -66,17 +67,20 @@ def validate_options(selection, options)
                 return selection, options
             end
 
-            def run(selected_packages, run_hook: false, report: true, **options)
+            def run(selected_packages, run_hook: false, report: true, ask: false, **options)
                 ws.manifest.accept_unavailable_osdeps = !options[:osdeps]
                 ws.setup
                 ws.autodetect_operating_system(force: true)
-                if options[:bundler]
-                    ws.update_bundler
-                end
-                if options[:autoproj]
-                    ws.update_autoproj
+
+                if ask
+                    prompt = TTY::Prompt.new
+                    options[:bundler] &&= prompt.yes?("Update bundler ?")
+                    options[:autoproj] &&= prompt.yes?("Update autoproj ?")
                 end
 
+                ws.update_bundler if options[:bundler]
+                ws.update_autoproj if options[:autoproj]
+
                 begin
                     ws.load_package_sets(
                         mainline: options[:mainline],
@@ -84,7 +88,8 @@ def run(selected_packages, run_hook: false, report: true, **options)
                         checkout_only: !options[:config] || options[:checkout_only],
                         reset: options[:reset],
                         keep_going: options[:keep_going],
-                        retry_count: options[:retry_count])
+                        retry_count: options[:retry_count]
+                    )
                 rescue ImportFailed => configuration_import_failure
                     if !options[:keep_going]
                         raise
@@ -122,6 +127,7 @@ def run(selected_packages, run_hook: false, report: true, **options)
                         parallel: options[:parallel] || ws.config.parallel_import_level,
                         retry_count: options[:retry_count],
                         auto_exclude: options[:auto_exclude],
+                        ask: ask,
                         report: report)
 
                 ws.finalize_setup
@@ -193,14 +199,63 @@ def normalize_osdeps_options(
                 osdeps_options
             end
 
+            class AskUpdateFilter
+                def initialize(prompt, parallel: 1, only_local: false)
+                    @prompt = prompt
+                    @only_local = only_local
+                    @executor = Concurrent::FixedThreadPool.new(parallel, max_length: 0)
+
+                    @parallel = parallel
+                    @futures = {}
+                    @lookahead_queue = []
+                end
+
+                def call(pkg)
+                    unless (status = @futures.delete(pkg).value)
+                        raise v.reason
+                    end
+
+                    clean = !status.unexpected &&
+                            (status.sync || (status.local && !status.remote))
+                    if clean
+                        msg = Autobuild.color('already up-to-date', :green)
+                        pkg.autobuild.message "#{msg} %s"
+                        return false
+                    end
+
+                    Autobuild.progress_display_synchronize do
+                        status.msg.each { |m| puts m }
+                        @prompt.yes?("Update #{pkg.name} ?")
+                    end
+                end
+
+                def lookahead(pkg)
+                    @futures[pkg] = Concurrent::Future.execute(executor: @executor) do
+                        Status.status_of_package(
+                            pkg, snapshot: false, only_local: @only_local
+                        )
+                    end
+                end
+            end
+
             def update_packages(selected_packages,
                 from: nil, checkout_only: false, only_local: false, reset: false,
                 deps: true, keep_going: false, parallel: 1,
                 retry_count: 0, osdeps: true, auto_exclude: false, osdeps_options: Hash.new,
-                report: true)
+                report: true, ask: false)
 
                 setup_update_from(from) if from
 
+                filter =
+                    if ask
+                        prompt = TTY::Prompt.new
+                        filter = AskUpdateFilter.new(
+                            prompt, parallel: parallel, only_local: only_local
+                        )
+                    else
+                        ->(pkg) { true }
+                    end
+
                 ops = Autoproj::Ops::Import.new(
                     ws, report_path: (ws.import_report_path if report))
                 source_packages, osdep_packages =
@@ -213,7 +268,8 @@ def update_packages(selected_packages,
                                         parallel: parallel,
                                         retry_count: retry_count,
                                         install_vcs_packages: (osdeps_options if osdeps),
-                                        auto_exclude: auto_exclude)
+                                        auto_exclude: auto_exclude,
+                                        filter: filter)
                 [source_packages, osdep_packages, nil]
             rescue ExcludedSelection => e
                 raise CLIInvalidSelection, e.message, e.backtrace

data/lib/autoproj/cli/utility.rb

@@ -70,7 +70,7 @@ def list(user_selection, options = {})
                 out_format = "%-#{w}s %-7s %-9s"
                 puts format(out_format, 'Package Name', 'Enabled', 'Available')
                 lines.each do |name, enabled, available|
-                    puts(format(out_format, name, (!!enabled).to_s, (!!available).to_s))
+                    puts(format(out_format, name, (!!enabled).to_s, (!!available).to_s)) # rubocop:disable Style/DoubleNegation
                 end
             end
 
@@ -113,12 +113,12 @@ def apply_to_packages(packages, parallel: ws.config.parallel_build_level)
                 ) do |pkg, phase|
                     reporting&.report_incremental(pkg) if phase == utility_name
                 end
-
             ensure
                 reporting&.create_report(packages.map(&:autobuild))
             end
 
             def package_metadata(autobuild_package)
+                # rubocop:disable Style/DoubleNegation
                 u = autobuild_package.utility(@utility_name)
                 {
                     'source_dir' => u.source_dir,
@@ -127,8 +127,9 @@ def package_metadata(autobuild_package)
                     'enabled' => !!u.enabled?,
                     'invoked' => !!u.invoked?,
                     'success' => !!u.success?,
-                    'installed' => !!u.installed?,
+                    'installed' => !!u.installed?
                 }
+                # rubocop:enable Style/DoubleNegation
             end
         end
     end

data/lib/autoproj/configuration.rb

@@ -244,10 +244,10 @@ def save(path = self.path, force: false)
             @modified = false
         end
 
-        def each_reused_autoproj_installation
+        def each_reused_autoproj_installation(&block)
             if has_value_for?('reused_autoproj_installations')
-                get('reused_autoproj_installations').each(&proc)
-            else [].each(&proc)
+                get('reused_autoproj_installations').each(&block)
+            else [].each(&block)
             end
         end
 

data/lib/autoproj/default.osdeps

@@ -92,6 +92,12 @@ ruby24:
 ruby25:
   default: ignore # we assume that if the user has a ruby 2.5 runtime, it is usable
 
+ruby26:
+  default: ignore # we assume that if the user has a ruby 2.5 runtime, it is usable
+
+ruby27:
+  default: ignore # we assume that if the user has a ruby 2.5 runtime, it is usable
+
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
@@ -132,15 +138,19 @@ archive:
   debian,ubuntu:
   - tar
   - unzip
+  - ca-certificates
   gentoo:
   - app-arch/tar
   - app-arch/unzip
+  - app-misc/ca-certificates
   arch:
   - tar
   - unzip
+  - ca-certificates
   fedora:
   - tar
   - unzip
+  - ca-certificates
   macos-port:
   - gnutar
   - unzip
@@ -149,6 +159,7 @@ archive:
   opensuse:
   - tar
   - unzip
+  - ca-certificates
   default: ignore
 
 cvs:

data/lib/autoproj/manifest.rb

@@ -1237,7 +1237,7 @@ def self.config
         workspace.config
     end
 
-    def self.add_osdeps_overrides(*args, &block)
-        manifest.add_osdeps_overrides(*args, &block)
+    def self.add_osdeps_overrides(*args, **kw, &block)
+        manifest.add_osdeps_overrides(*args, **kw, &block)
     end
 end

data/lib/autoproj/ops/import.rb

@@ -199,6 +199,7 @@ def import_selected_packages(selection,
                                          install_vcs_packages: Hash.new,
                                          non_imported_packages: :checkout,
                                          auto_exclude: auto_exclude?,
+                                         filter: ->(package) { true },
                                          **import_options)
 
                 unless %i[checkout ignore return].include?(non_imported_packages)
@@ -235,6 +236,11 @@ def import_selected_packages(selection,
                 missing_vcs = Array.new
                 installed_vcs_packages = Set['none', 'local']
                 while failures.empty? || keep_going
+                    # Allow 'filter' to parallelize as well
+                    if filter.respond_to?(:lookahead)
+                        package_queue.each { |pkg| filter.lookahead(pkg) }
+                    end
+
                     # Queue work for all packages in the queue
                     package_queue.each do |pkg|
                         # Remove packages that have already been processed
@@ -255,6 +261,11 @@ def import_selected_packages(selection,
                         end
                         all_processed_packages << pkg
 
+                        unless filter.call(pkg)
+                            completion_queue << [pkg, Time.now]
+                            next
+                        end
+
                         importer = pkg.autobuild.importer
                         if !pre_package_import(selection, manifest, pkg.autobuild,
                                                reverse_dependencies)
@@ -272,8 +283,8 @@ def import_selected_packages(selection,
                             next
                         end
 
-                        pending_packages << pkg
                         begin
+                            pending_packages << pkg
                             queue_import_work(
                                 executor, completion_queue, pkg,
                                 retry_count: retry_count,
@@ -432,6 +443,7 @@ def import_packages(selection,
                                 keep_going: false,
                                 install_vcs_packages: Hash.new,
                                 auto_exclude: auto_exclude?,
+                                filter: ->(pkg) { true },
                                 **import_options)
 
                 manifest = ws.manifest
@@ -443,6 +455,7 @@ def import_packages(selection,
                     recursive: recursive,
                     install_vcs_packages: install_vcs_packages,
                     auto_exclude: auto_exclude,
+                    filter: filter,
                     **import_options)
 
                 raise failures.first if !keep_going && !failures.empty?

data/lib/autoproj/ops/install.rb

@@ -254,7 +254,7 @@ def default_gemfile_contents(autoproj_version = ">= 2.0.0")
             end
 
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path)))
+                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
             end
 
             # Parse the provided command line options and returns the non-options

data/lib/autoproj/ops/tools.rb

@@ -24,8 +24,8 @@ def initialize(text_name, srcdir, importer = nil)
                 @@packages.delete(text_name)
             end
 
-            def import(options = Hash.new)
-                importer.import(self, options)
+            def import(**options)
+                importer.import(self, **options)
             end
 
             def add_stat(*args)

data/lib/autoproj/package_definition.rb

@@ -90,7 +90,7 @@ def apply_dependencies_from_manifest
                         autobuild.depends_on name
                     end
                 rescue ConfigError => e
-                    raise ConfigError.new(manifest.path),
+                    raise PackageNotFound.new(manifest.path),
                           "manifest #{manifest.path} of #{self.name} from "\
                           "#{package_set.name} lists '#{name}' as dependency, "\
                           'but it is neither a normal package nor an osdeps '\

data/lib/autoproj/package_set.rb

@@ -168,7 +168,7 @@ def initialize(
             @version_control = Array.new
             @overrides = Array.new
             @raw_local_dir = raw_local_dir
-            @default_importer = VCSDefinition.from_raw(type: 'none')
+            @default_importer = VCSDefinition.from_raw({ type: 'none' })
 
             @imports  = Set.new
             @imports_vcs  = Array.new
@@ -239,7 +239,7 @@ def snapshot(target_dir, options = Hash.new)
             else
                 package = create_autobuild_package
                 if package.importer.respond_to?(:snapshot)
-                    package.importer.snapshot(package, target_dir, options)
+                    package.importer.snapshot(package, target_dir, **options)
                 end
             end
         end

data/lib/autoproj/test.rb

@@ -333,8 +333,9 @@ def ws_clear_layout
             ws.manifest.clear_layout
         end
 
-        def ws_define_package_set(name, vcs = VCSDefinition.from_raw(type: 'none'),
-                                  **options)
+        def ws_define_package_set(
+            name, vcs = VCSDefinition.from_raw({ type: 'none' }), **options
+        )
             package_set = PackageSet.new(ws, vcs, name: name, **options)
             ws.manifest.register_package_set(package_set)
             package_set
@@ -351,8 +352,9 @@ def ws_create_local_package_set(name, path, source_data: Hash.new, **options)
             package_set
         end
 
-        def ws_add_package_set_to_layout(name, vcs = VCSDefinition.from_raw(type: 'none'),
-                                         **options)
+        def ws_add_package_set_to_layout(
+            name, vcs = VCSDefinition.from_raw({ type: 'none' }), **options
+        )
             package_set = ws_define_package_set(name, vcs, **options)
             ws.manifest.add_package_set_to_layout(package_set)
             package_set

data/lib/autoproj/variable_expansion.rb

@@ -80,7 +80,9 @@ def self.expand(value, definitions = Hash.new)
     end
 
     # True if the given string contains expansions
-    def self.contains_expansion?(string); string =~ /\$/ end
+    def self.contains_expansion?(string)
+        string.respond_to?(:to_str) && string.to_str =~ /\$/
+    end
 
     def self.resolve_one_constant(name, value, result, definitions)
         result[name] ||= single_expansion(value, result) do |missing_name|

data/lib/autoproj/vcs_definition.rb

@@ -33,7 +33,7 @@ class VCSDefinition
         HistoryEntry  = Struct.new :package_set, :vcs
         RawEntry      = Struct.new :package_set, :file, :vcs
 
-        def initialize(type, url, vcs_options, from: nil, raw: Array.new, history: Array.new)
+        def initialize(type, url, vcs_options, from: nil, raw: [], history: [])
             if !raw.respond_to?(:to_ary)
                 raise ArgumentError, "wrong format for the raw field (#{raw.inspect})"
             end
@@ -49,7 +49,7 @@ def initialize(type, url, vcs_options, from: nil, raw: Array.new, history: Array
 
         # Create a null VCS object
         def self.none
-            from_raw(type: 'none')
+            from_raw({ type: 'none' })
         end
 
         # Whether there is actually a version control definition
@@ -151,10 +151,14 @@ def self.normalize_vcs_hash(spec, base_dir: nil)
                         elsif base_dir
                             File.expand_path(short_url, base_dir)
                         else
-                            raise ArgumentError, "VCS path '#{short_url}' is relative and no base_dir was given"
+                            raise ArgumentError,
+                                  "VCS path '#{short_url}' is relative and no "\
+                                  "base_dir was given"
                         end
                     if !File.directory?(source_dir)
-                        raise ArgumentError, "'#{short_url}' is neither a remote source specification, nor an existing local directory"
+                        raise ArgumentError,
+                              "'#{short_url}' is neither a remote source "\
+                              'specification, nor an existing local directory'
                     end
                     spec.merge!(type: 'local', url: source_dir)
                 end
@@ -195,17 +199,26 @@ def self.raw_spec_to_s(spec)
         # @return [VCSDefinition]
         # @raise ArgumentError if the raw specification does not match an
         #   expected format
-        def self.from_raw(spec, from: nil, raw: Array.new, history: Array.new)
+        def self.from_raw(spec, from: nil, raw: [], history: [])
             normalized_spec = normalize_vcs_hash(spec)
             if !(type = normalized_spec.delete(:type))
-                raise ArgumentError, "the source specification #{raw_spec_to_s(spec)} normalizes into #{raw_spec_to_s(normalized_spec)}, which does not have a VCS type"
-            elsif !(url  = normalized_spec.delete(:url))
-                if type != 'none'
-                    raise ArgumentError, "the source specification #{raw_spec_to_s(spec)} normalizes into #{raw_spec_to_s(normalized_spec)}, which does not have a URL. Only VCS of type 'none' do not require one"
-                end
+                raise ArgumentError,
+                      "the source specification #{raw_spec_to_s(spec)} normalizes "\
+                      "into #{raw_spec_to_s(normalized_spec)}, "\
+                      'which does not have a VCS type'
+            end
+
+            if !(url  = normalized_spec.delete(:url)) && type != 'none'
+                raise ArgumentError,
+                      "the source specification #{raw_spec_to_s(spec)} normalizes "\
+                      "into #{raw_spec_to_s(normalized_spec)}, "\
+                      'which does not have a URL. '\
+                      'Only VCS of type \'none\' do not require one'
             end
 
-            VCSDefinition.new(type, url, normalized_spec, from: from, history: history, raw: raw)
+            VCSDefinition.new(
+                type, url, normalized_spec, from: from, history: history, raw: raw
+            )
         end
 
         def ==(other_vcs)
@@ -307,7 +320,7 @@ def self.call_source_handler(vcs, url, options)
         if !handler
             raise ArgumentError, "there is no source handler for #{vcs}"
         else
-            return handler.call(url, options)
+            handler.call(url, **options)
         end
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.12.1"
+    VERSION = "2.13.0"
 end

data/lib/autoproj/workspace.rb

@@ -282,7 +282,8 @@ def load_config(reconfigure = false)
                     if (raw_vcs = config.get('manifest_source', nil))
                         VCSDefinition.from_raw(raw_vcs)
                     else
-                        VCSDefinition.from_raw(type: 'local', url: config_dir)
+                        local_vcs = { type: 'local', url: config_dir }
+                        VCSDefinition.from_raw(local_vcs)
                     end
 
                 if config.source_dir && Pathname.new(config.source_dir).absolute?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -78,82 +78,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: tty-color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -466,8 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages