autoproj 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dca8e55a7c64c7312807af77109ad2c9cd0595a9a9a1d71380feaf94adfedc8
-  data.tar.gz: 82839629e2b0d4f88fd164b9ebb918d43e59b14d6405914a7d0a125f2d704d8a
+  metadata.gz: 9816c7630ddb1758579428da56d50fcfd6e655ff69d9daddbe860c4f8d8c9501
+  data.tar.gz: ec2228ff0857f8a4d78fc7ee512a6ec50c2b02dec8bc15af725a43b8a97ddf31
 SHA512:
-  metadata.gz: 3df68134467944f00613b7618a4ef0549ae1e96b8c0da30aa0c4e6303cd8f6fa8a5ada7718a6e1521ca2385b951c803cd475b0c9dd298eae5f012057e8f57cc3
-  data.tar.gz: cc986e111da204e047f11e4d1e9fcdf13de55220b5bfc164e9494c1ad1facd5094796e3cb9e325ba6dd97d1034cfda749fc5fc56e9b284b42e819ca4c01ebb47
+  metadata.gz: 362c3cc73ce68418dc18fa0f018523de0a0b0ea27f6f72fc56d7cf8c820dae1d1eacdf759bae614ad5bf547973a44f6e7cadbe1863df1d75fc2673cec124c855
+  data.tar.gz: 877354416b6ab05061f99c630ea535aeb6cbabd529682a0b85d051567687a58430e49b4b4c2c61f857edcc193d6220c202972f0deadd2ba59d0bd42ada907ff6

data/lib/autoproj/package_set.rb

@@ -535,7 +535,9 @@ def parse_source_definition(source_definition)
 
                 Autoproj.in_file(source_file) do
                     default_vcs_spec, raw = version_control_field(
-                        'default', version_control, file: source_file)
+                        'default', version_control,
+                        file: source_file, section: 'version_control'
+                    )
                     if default_vcs_spec
                         @default_importer = VCSDefinition.from_raw(default_vcs_spec,
                             raw: raw, from: self)
@@ -653,28 +655,30 @@ def normalize_vcs_list(section_name, file, list)
         #   package in the form (PackageSet,Hash), where PackageSet is self.
         #   The Hash part is nil if there are no matching entries. Hash keys are
         #   normalized to symbols
-        def version_control_field(package_name, entry_list, validate: true, file: source_file)
+        def version_control_field(package_name, entry_list, validate: true,
+                                  file: source_file, section: nil)
             raw = []
-            vcs_spec = Hash.new
+            vcs_spec = entry_list.inject({}) do |resolved_spec, (name_match, spec)|
+                next(resolved_spec) unless name_match === package_name
 
-            entry_list.each do |name_match, spec|
-                if name_match === package_name
-                    raw << VCSDefinition::RawEntry.new(self, file, spec)
-                    vcs_spec =
-                        begin
-                            VCSDefinition.update_raw_vcs_spec(vcs_spec, spec)
-                        rescue ConfigError => e
-                            raise ConfigError.new, "invalid VCS definition in the #{section_name} section for '#{name}': #{e.message}", e.backtrace
-                        end
+                raw << VCSDefinition::RawEntry.new(self, file, spec)
+                begin
+                    VCSDefinition.update_raw_vcs_spec(resolved_spec, spec)
+                rescue ArgumentError => e
+                    raise ConfigError.new,
+                          'invalid VCS definition while resolving package '\
+                          "'#{package_name}', entry '#{name_match}' of "\
+                          "#{section ? "section '#{section}'" : ''}: "\
+                          "#{e.message}", e.backtrace
                 end
             end
 
-            if vcs_spec.empty?
-                return nil, []
-            end
+            return nil, [] if vcs_spec.empty?
 
-            expansions = Hash["PACKAGE" => package_name,
-                "PACKAGE_BASENAME" => File.basename(package_name)]
+            expansions = {
+                'PACKAGE' => package_name,
+                'PACKAGE_BASENAME' => File.basename(package_name)
+            }
 
             vcs_spec = expand(vcs_spec, expansions)
             vcs_spec.dup.each do |name, value|
@@ -682,7 +686,7 @@ def version_control_field(package_name, entry_list, validate: true, file: source
             end
 
             # Resolve relative paths w.r.t. the workspace root dir
-            if url = (vcs_spec.delete('url') || vcs_spec.delete(:url))
+            if (url = (vcs_spec.delete('url') || vcs_spec.delete(:url)))
                 vcs_spec[:url] = VCSDefinition.to_absolute_url(url, ws.root_dir)
             end
 
@@ -691,11 +695,14 @@ def version_control_field(package_name, entry_list, validate: true, file: source
             if validate
                 begin
                     VCSDefinition.from_raw(vcs_spec)
-                rescue ConfigError => e
-                    raise ConfigError.new, "invalid resulting VCS definition for package #{package_name}: #{e.message}", e.backtrace
+                rescue ArgumentError => e
+                    raise ConfigError.new,
+                          'invalid resulting VCS definition for package '\
+                          "'#{package_name}': #{e.message}",
+                          e.backtrace
                 end
             end
-            return vcs_spec, raw
+            [vcs_spec, raw]
         end
 
         # @api private
@@ -706,15 +713,20 @@ def invalidate_importer_definitions_cache
         end
 
         # Returns the VCS definition for +package_name+ as defined in this
-        # source, or nil if the source does not have any.
+        # package set, or nil if the source does not have any.
         #
         # @param [PackageDefinition] package
         # @return [VCSDefinition] the importer definition, or nil if none
         #   could be found
         def importer_definition_for(package, default: default_importer, require_existing: true)
-            package_name = manifest.validate_package_name_argument(package, require_existing: require_existing)
+            package_name = manifest.validate_package_name_argument(
+                package, require_existing: require_existing
+            )
             importer_definitions_cache[package_name] ||= Autoproj.in_file source_file do
-                vcs_spec, raw = version_control_field(package_name, version_control, file: source_file)
+                vcs_spec, raw = version_control_field(
+                    package_name, version_control,
+                    file: source_file, section: 'version_control'
+                )
                 if vcs_spec
                     VCSDefinition.from_raw(vcs_spec, raw: raw, from: self)
                 else
@@ -729,7 +741,9 @@ def importer_definition_for(package, default: default_importer, require_existing
         # @param [VCSDefinition] the vcs to be updated
         # @return [VCSDefinition] the new, updated vcs object
         def overrides_for(package, vcs, require_existing: true)
-            package_name = manifest.validate_package_name_argument(package, require_existing: require_existing)
+            package_name = manifest.validate_package_name_argument(
+                package, require_existing: require_existing
+            )
             resolve_overrides(package_name, vcs)
         end
 
@@ -742,7 +756,10 @@ def resolve_overrides(key, vcs)
             overrides.each do |file, file_overrides|
                 new_spec, new_raw_entry =
                     Autoproj.in_file file do
-                        version_control_field(key, file_overrides, validate: false, file: file)
+                        version_control_field(
+                            key, file_overrides,
+                            validate: false, file: file, section: 'overrides'
+                        )
                     end
 
                 if new_spec
@@ -750,7 +767,9 @@ def resolve_overrides(key, vcs)
                         begin
                             vcs = vcs.update(new_spec, raw: new_raw_entry, from: self)
                         rescue ConfigError => e
-                            raise ConfigError.new, "invalid resulting VCS specification in the overrides section for #{key}: #{e.message}"
+                            raise ConfigError.new, "invalid resulting VCS specification "\
+                                                   "in the overrides section for "\
+                                                   "#{key}: #{e.message}"
                         end
                     end
                 end

data/lib/autoproj/repository_managers/apt.rb

@@ -143,7 +143,6 @@ def key_exist?(key)
                 Open3.popen3({'LANG' => 'C'}, 'apt-key', 'export', key) do |_, _, stderr, wait_thr|
                     success = wait_thr.value.success?
                     stderr = stderr.read
-                    puts stderr.inspect
                     has_error = stderr.match(/WARNING: nothing exported/)
                     exist = success && !has_error
                 end

data/lib/autoproj/vcs_definition.rb

@@ -113,6 +113,8 @@ def self.update_raw_vcs_spec(old, new)
         #
         #   - package_name
         #     branch: value
+        #
+        # @raise ArgumentError if the given spec cannot be normalized
         def self.normalize_vcs_hash(spec, base_dir: nil)
             plain = Array.new
             filtered_spec = Hash.new
@@ -130,7 +132,7 @@ def self.normalize_vcs_hash(spec, base_dir: nil)
             end
 
             if plain.size > 1
-                raise ConfigError.new, "invalid syntax"
+                raise ArgumentError, "invalid syntax"
             elsif plain.size == 1
                 short_url = plain.first
                 vcs, *url = short_url.split(':')
@@ -274,7 +276,7 @@ def create_autobuild_importer
         end
 
         # Returns a pretty representation of this VCS definition
-        def to_s 
+        def to_s
             if type == "none"
                 "none"
             else
@@ -326,7 +328,7 @@ def self.call_source_handler(vcs, url, options)
     #       - tools/orocos.rb:
     #         github: rock-core/base-types
     #         branch: test
-    # 
+    #
     # @yieldparam [String] url the url given to the handler
     # @yieldparam [Hash] the rest of the VCS hash
     # @return [Hash] a VCS hash with the information expanded

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.10.1"
+    VERSION = "2.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler