autoproj 2.0.0.rc42 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa089f772cf7682ac2d74d05851effa2c21e7ffd
-  data.tar.gz: 0ad031e321b6ee31932488de6c399990f34ea0c2
+  metadata.gz: 76bc72f60bd12fb8626be1bd3b750deea75f4613
+  data.tar.gz: e69bc9fc35160b4e1c57ead90e4f18424a0ba456
 SHA512:
-  metadata.gz: 5a7f64e6988bb2105ede4c7907f98a12cd309442d44cef7a688ecaae1b446c596eea8f7e22b6b5c0ee54c3af2758fd1a7cd338c1457e4487436ff12af9d0daf7
-  data.tar.gz: 498d3119d750f2714c8c6572e9ae56a21f8b9ef5c15cb2e7ba452bf12491a727ac7cc2d09bd8422ab1ed1d9560c8c9656858866ee74b9e1d3ae1153a5795f484
+  metadata.gz: 2db69c1d9d67720fcf69b916b023678ba1c50a8484925f1e0722e982d5d71de7f03a8520556779afa86bb5793059f994fc46a0de358698d4f156707e00ae3d96
+  data.tar.gz: 0fe40287446c20df8759ca1d1675ad1e451505d9d5ffbf0d796e43b7b13964287e76331a241667bd23b23be7aa639151c1a26117fc37229bce80ffd6e8dd61ad

data/lib/autoproj/cli/status.rb

@@ -68,17 +68,17 @@ def status_of_package(package_description, only_local: false, snapshot: false)
                     package_status.msg << Autoproj.color("  is not imported yet", :magenta)
                 else
                     if importer.respond_to?(:snapshot)
-                        snapshot =
+                        snapshot_version =
                             begin importer.snapshot(pkg, nil, exact_state: false, only_local: only_local)
                             rescue Autobuild::PackageException
                                 Hash.new
                             end
-                        if snapshot_overrides_vcs?(importer, package_description.vcs, snapshot)
-                            non_nil_values = snapshot.delete_if { |k, v| !v }
+                        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("  consider adding this to your overrides, or use autoproj versions to do it for you", :bright_green)
                             if snapshot
-                                importer.relocate(importer.repository, snapshot)
+                                importer.relocate(importer.repository, snapshot_version)
                             end
                         end
                     end

data/lib/autoproj/os_package_resolver.rb

@@ -193,35 +193,10 @@ def invalidate_resolve_package_cache
         # Merges the osdeps information of +info+ into +self+. If packages are
         # defined in both OSPackageResolver objects, the information in +info+
         # takes precedence
-        def merge(info)
+        def merge(info, suffixes: [])
             @definitions = definitions.merge(info.definitions) do |h, v1, v2|
                 if v1 != v2
-                    old = source_of(h)
-                    new = info.source_of(h)
-
-                    # Warn if the new osdep definition resolves to a different
-                    # set of packages than the old one
-                    old_resolved = resolve_package(h, resolve_recursive: false).inject(Hash.new) do |osdep_h, (handler, status, list)|
-                        osdep_h[handler] = [status, list.dup]
-                        osdep_h
-                    end
-                    new_resolved = info.resolve_package(h, resolve_recursive: false).inject(Hash.new) do |osdep_h, (handler, status, list)|
-                        osdep_h[handler] = [status, list.dup]
-                        osdep_h
-                    end
-                    if old_resolved != new_resolved
-                        Autoproj.warn "osdeps definition for #{h}, previously defined in #{old} overridden by #{new}:"
-                        first = true
-                        old_resolved.each do |handler, (_, packages)|
-                            Autoproj.warn "  #{first ? 'resp. ' : '      '}#{handler}: #{packages.map(&:to_s).join(", ")}"
-                            first = false
-                        end
-                        first = true
-                        new_resolved.each do |handler, (_, packages)|
-                            Autoproj.warn "  #{first ? 'and   ' : '      '}#{handler}: #{packages.map(&:to_s).join(", ")}"
-                            first = false
-                        end
-                    end
+                    warn_about_merge_collisions(info, suffixes, h, v1, v2)
                 end
                 v2
             end
@@ -240,6 +215,42 @@ def merge(info)
             end
         end
 
+        # @api private
+        #
+        # Warn about a collision (override) detected during #merge
+        def warn_about_merge_collisions(merged_info, suffixes, key, old_value, new_value)
+            old = source_of(key)
+            new = merged_info.source_of(key)
+
+            if suffixes.any? { |s| "#{old}#{s}" == new }
+                return
+            end
+
+            # Warn if the new osdep definition resolves to a different
+            # set of packages than the old one
+            old_resolved = resolve_package(key, resolve_recursive: false).inject(Hash.new) do |osdep_h, (handler, status, list)|
+                osdep_h[handler] = [status, list.dup]
+                osdep_h
+            end
+            new_resolved = merged_info.resolve_package(key, resolve_recursive: false).inject(Hash.new) do |osdep_h, (handler, status, list)|
+                osdep_h[handler] = [status, list.dup]
+                osdep_h
+            end
+            if old_resolved != new_resolved
+                Autoproj.warn "osdeps definition for #{key}, previously defined in #{old} overridden by #{new}:"
+                first = true
+                old_resolved.each do |handler, (_, packages)|
+                    Autoproj.warn "  #{first ? 'resp. ' : '      '}#{handler}: #{packages.map(&:to_s).join(", ")}"
+                    first = false
+                end
+                first = true
+                new_resolved.each do |handler, (_, packages)|
+                    Autoproj.warn "  #{first ? 'and   ' : '      '}#{handler}: #{packages.map(&:to_s).join(", ")}"
+                    first = false
+                end
+            end
+        end
+
         # Perform some sanity checks on the given osdeps definitions
         def self.verify_definitions(hash, path = [])
             hash.each do |key, value|

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc42"
+    VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc42
+  version: 2.0.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -327,9 +327,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1