autoproj 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446bfd7b052bedbb573c7eecf69fee6db6fa9331
-  data.tar.gz: 6bf58cc533bcb37ecee2c1d95fe54ae0e73f1cc9
+  metadata.gz: 60531973b1e5068ee8e84846d5314fd6ffe01abf
+  data.tar.gz: b58a9052db03178e6e52dafdb2f776eb314f14c5
 SHA512:
-  metadata.gz: 1d87bc69018b5bfe2f6cdb737966ec0b0b862888c493cba9437ec85e03b4a2ba875d3811d80c4d552cd2c3381bf1255524125c5a63b8ca3189b71af13c85ded7
-  data.tar.gz: bd41f335d883331c1950c7da1181d5427c59d7bba2c09577aaaac9fe71a43920af5973e6281035b41390db0dbd12ace9f251cdbf9b142f5f97bfde1d92dbf712
+  metadata.gz: f914b0ad12e9dd0d8e3c56f975f97f30e6eb86ede4a5061d3d342e79a20b0c96db609f5a8b131fffc69a8f0ca8ace53a2b2d11b236db61166a6071c5a28e95f1
+  data.tar.gz: 2416f891515b54a88bc702f69e3f097904618b0bfd29c42fef9b20a36b8a8059dadc36de7775b298c03132e9d99e2c2abff462d92645eb425f9be6f5ff3867c7

data/lib/autoproj/cli/main.rb

@@ -128,6 +128,8 @@ def doc(*packages)
                 desc: 'maximum number of parallel jobs'
             option :mainline, type: :string,
                 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'
             def update(*packages)
                 run_autoproj_cli(:update, :Update, Hash[silent: false], *packages)
             end
@@ -157,7 +159,8 @@ def update(*packages)
                 desc: 'provide -n for --no-deps'
             option :parallel, aliases: :p, type: :numeric,
                 desc: 'maximum number of parallel jobs'
-
+            option :auto_exclude, type: :boolean,
+                desc: 'if true, packages that fail to import will be excluded from the build'
             def build(*packages)
                 run_autoproj_cli(:build, :Build, Hash[silent: false], *packages)
             end

data/lib/autoproj/cli/update.rb

@@ -117,7 +117,8 @@ def run(selected_packages, options)
                         deps: options[:deps],
                         keep_going: options[:keep_going],
                         parallel: options[:parallel] || ws.config.parallel_import_level,
-                        retry_count: options[:retry_count])
+                        retry_count: options[:retry_count],
+                        auto_exclude: options[:auto_exclude])
 
                 ws.finalize_setup
                 ws.export_installation_manifest
@@ -176,7 +177,7 @@ def normalize_osdeps_options(
             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, osdeps_options: Hash.new)
+                retry_count: 0, osdeps: true, auto_exclude: false, osdeps_options: Hash.new)
 
                 if from
                     setup_update_from(from)
@@ -192,7 +193,8 @@ def update_packages(selected_packages,
                                         keep_going: keep_going,
                                         parallel: parallel,
                                         retry_count: retry_count,
-                                        install_vcs_packages: (osdeps_options if osdeps))
+                                        install_vcs_packages: (osdeps_options if osdeps),
+                                        auto_exclude: auto_exclude)
                 return source_packages, osdep_packages, nil
             rescue PackageImportFailed => import_failure
                 if !keep_going

data/lib/autoproj/ops/import.rb

@@ -2,8 +2,19 @@ module Autoproj
     module Ops
         class Import
             attr_reader :ws
+
+            # Whether packages are added to exclusions if they error during the
+            # import process
+            #
+            # This is mostly meant for CI operations
+            def auto_exclude?
+                @auto_exclude
+            end
+            attr_writer :auto_exclude
+
             def initialize(ws)
                 @ws = ws
+                @auto_exclude = false
             end
 
             def mark_exclusion_along_revdeps(pkg_name, revdeps, chain = [], reason = nil)
@@ -80,10 +91,15 @@ def pre_package_import(selection, manifest, pkg, reverse_dependencies)
                 end
             end
 
-            def post_package_import(selection, manifest, pkg, reverse_dependencies)
+            def post_package_import(selection, manifest, pkg, reverse_dependencies, auto_exclude: auto_exclude?)
                 Rake::Task["#{pkg.name}-import"].instance_variable_set(:@already_invoked, true)
                 if pkg.checked_out?
-                    manifest.load_package_manifest(pkg.name)
+                    begin
+                        manifest.load_package_manifest(pkg.name)
+                    rescue Exception => e
+                        raise if !auto_exclude
+                        manifest.add_exclusion(pkg.name, "#{pkg.name} failed to import with #{e} and auto_exclude was true")
+                    end
                 end
 
                 # The package setup mechanisms might have added an exclusion
@@ -158,6 +174,7 @@ def import_selected_packages(selection,
                                          keep_going: false,
                                          install_vcs_packages: Hash.new,
                                          non_imported_packages: :checkout,
+                                         auto_exclude: auto_exclude?,
                                          **import_options)
 
                 if ![:checkout, :ignore, :return].include?(non_imported_packages)
@@ -275,6 +292,9 @@ def import_selected_packages(selection,
                     if reason
                         if reason.kind_of?(Autobuild::InteractionRequired)
                             main_thread_imports << pkg
+                        elsif auto_exclude
+                            manifest.add_exclusion(pkg.name, "#{pkg.name} failed to import with #{reason} and auto_exclude was true")
+                            selection.filter_excluded_and_ignored_packages(manifest)
                         else
                             # One importer failed... terminate
                             Autoproj.error "import of #{pkg.name} failed"
@@ -284,7 +304,9 @@ def import_selected_packages(selection,
                             failures << reason
                         end
                     else
-                        if new_packages = post_package_import(selection, manifest, pkg.autobuild, reverse_dependencies)
+                        if new_packages = post_package_import(
+                                selection, manifest, pkg.autobuild, reverse_dependencies,
+                                auto_exclude: auto_exclude)
                             # Excluded dependencies might have caused the package to be
                             # excluded as well ... do not add any dependency to the
                             # processing queue if it is the case
@@ -363,6 +385,7 @@ def import_packages(selection,
                                 recursive: true,
                                 keep_going: false,
                                 install_vcs_packages: Hash.new,
+                                auto_exclude: auto_exclude?,
                                 **import_options)
 
                 manifest = ws.manifest
@@ -373,6 +396,7 @@ def import_packages(selection,
                     keep_going: keep_going,
                     recursive: recursive,
                     install_vcs_packages: install_vcs_packages,
+                    auto_exclude: auto_exclude,
                     **import_options)
 
                 if !keep_going && !failures.empty?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.1.2"
+    VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -365,3 +365,4 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
+has_rdoc: