autoproj 2.15.1 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79dfca26614ef3c2b0491b7c91979986dd94e3c74ae0a15bc4a3b6729c0d0bd4
-  data.tar.gz: 425261fdab1ec54880133f874a357a1b4adb0a247d08c421da02dde615e4c1b4
+  metadata.gz: bb77cb6d5c3c156ae3d665933ec7380f5b0ae491767b87c6e6f25c9c96966885
+  data.tar.gz: 1474ca4f6e00f46dc70631f25c70e0cf0340d85f62101053117faf79ed65bd21
 SHA512:
-  metadata.gz: 2e46b35e75abf68b4cf1643ffe96b915179b3a2e59862c95248ed64ae8eb1d54ae892ea7dd006db87f7722a065f24512e26435e0f848458d23e67f12a41f7165
-  data.tar.gz: 371003014229e5023749734b108bf4484059ad3fd0e73f9b7dfcf6cabe426d709b8d2aca75415b10687354eae17eebf9c6b6835006c505f40a1093983217084d
+  metadata.gz: e1fb865f1ecdfa9d290c9dbb6048e601ca99f8e691643a36ada2528137c47819a30172e7abf9bd3d5cd91c44148fa0b8a8793b4a6783fb9bee52661cad960777
+  data.tar.gz: 6c9b821c1158e70bdb9a98536998dafe6270f4bb778646171d4691cc82fe0ce9828e263fda268ebaeced020cc7dcdfd30a33b9e5ea5593774f1ffe39eb0326c7

data/lib/autoproj/configuration.rb

@@ -606,5 +606,39 @@ module Autoproj
             end
             result
         end
+
+        # Allows to load a seed-config.yml file (also from a buildconf repository)
+        # rather than providing it before checkout using the --seed-config paramater
+        # of the autoproj_bootstrap script
+        # this allows to bootstrap with --no-interactive and still apply a custom config e.g. in CI/CD
+        # The call to this function has to be in the init.rb of the buildconf BEFORE any other
+        # config option, e.g. the git server configuration settings
+        # The filename parameter is the name of the config seed yml file in the repository
+        def load_config_once(filename, config_dir: Autoproj.workspace.config_dir)
+            seed_config = File.expand_path(filename, config_dir)
+
+            return if get("default_config_applied_#{seed_config}", false)
+
+            Autoproj.message "loading seed config #{seed_config}"
+            load path: seed_config
+            set "default_config_applied_#{seed_config}", true, true
+        end
+
+        # Similar to load_config_once but asks the user if the default config should be applied
+        def load_config_once_with_permission(filename, default: "yes", config_dir: Autoproj.workspace.config_dir)
+            seed_config = File.expand_path(filename, config_dir)
+            # only run this code if config has not beed applied already (don't run when reconfiguring)
+            return if has_value_for?("use_default_config_#{seed_config}")
+
+            declare "use_default_config_#{seed_config}",
+                    "boolean",
+                    default: default,
+                    doc: ["Should the default workspace config be used?",
+                          "This buildconf denines a default configuration in the buildconf (#{seed_config})",
+                          "Should it be applied?"]
+            if get("use_default_config_#{seed_config}")
+                load_config_once(filename, config_dir: config_dir)
+            end
+        end
     end
 end

data/lib/autoproj/ops/configuration.rb

@@ -32,10 +32,24 @@ module Autoproj
                         @dag.add_edge p, root_pkg_set
                     end
                 end
+            end
 
-                unless @dag.acyclic?
-                    raise "The package set hierarchy contains cycles: #{@dag.cycles}"
+            def verify_acyclic
+                return if @dag.acyclic?
+
+                Autoproj.fatal "The package sets form (a) cycle(s)"
+                @dag.cycles.each_with_index do |cycle, index|
+                    Autoproj.fatal "== Cycle #{index}"
+                    (cycle + cycle[0, 1]).each_cons(2) do |a, b|
+                        if b.imports.include?(a)
+                            Autoproj.fatal "  #{b.name} depends on #{a.name} in its source.yml"
+                        else
+                            Autoproj.fatal "  #{b.name} is after #{a.name} in the package_sets section of the manifest"
+                        end
+                    end
                 end
+
+                raise ConfigError.new "cycles in package set dependencies"
             end
 
             # Flatten the hierarchy, a establish a sorting
@@ -363,6 +377,7 @@ module Autoproj
             # the local package set (by main configuration) last
             def sort_package_sets_by_import_order(package_sets, root_pkg_set)
                 c = PackageSetHierarchy.new(package_sets, root_pkg_set)
+                c.verify_acyclic
                 sorted_pkg_sets = c.flatten
 
                 if sorted_pkg_sets.last != root_pkg_set
@@ -626,12 +641,18 @@ module Autoproj
                 root_pkg_set.imports.each do |pkg_set|
                     pkg_set.explicit = true
                 end
+
+                # sort packages, main package is the last
                 package_sets = sort_package_sets_by_import_order(package_sets, root_pkg_set)
                 ws.manifest.reset_package_sets
                 package_sets.each do |pkg_set|
-                    ws.load_if_present(pkg_set, pkg_set.local_dir, "init.rb")
                     ws.manifest.register_package_set(pkg_set)
                 end
+
+                ws.manifest.each_package_set do |pkg_set|
+                    ws.load_if_present(pkg_set, pkg_set.local_dir, "init.rb")
+                end
+
                 failures
             end
         end

data/lib/autoproj/package_set.rb

@@ -793,23 +793,6 @@ module Autoproj
             vcs
         end
 
-        # Recursively resolve imports for a given package set
-        def self.resolve_imports(pkg_set, parents = Set.new)
-            return Set.new if pkg_set.imports.empty?
-
-            updated_parents = parents | [pkg_set]
-
-            imports = pkg_set.imports.dup
-            pkg_set.imports.each do |p|
-                if parents.include?(p)
-                    raise "Cycling dependency between package sets encountered:" \
-                          "#{p.name} <--> #{pkg_set.name}"
-                end
-                imports.merge(resolve_imports(p, updated_parents))
-            end
-            imports
-        end
-
         # Enumerates the Autobuild::Package instances that are defined in this
         # source
         def each_package

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.15.1"
+    VERSION = "2.16.0"
 end

data/lib/autoproj.rb

@@ -63,7 +63,7 @@ require "utilrb/logger"
 
 module Autoproj
     class << self
-        attr_reader :logger
+        attr_accessor :logger
     end
     @logger = Logger.new(STDOUT)
     logger.level = Logger::WARN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.16.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild