autoproj 2.17.0 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a2de5ee91090c29e14337e48e9adbf9673a719e79e2d6610bb037ea4bb0d02
-  data.tar.gz: fb693ef03ade583a5bf4d1e0d8c3cb24a0b909e66a640d471d2b2ec14c414ebb
+  metadata.gz: f4c228e4f98b8c247f2d74a03df462fcea6692ff2b4d5a27bf066675bb6cfe20
+  data.tar.gz: ee3eaf3c0fcdb93b748f3e3a0885fd728284a097a2004e58acef278b2af167dd
 SHA512:
-  metadata.gz: 35e62e7f4719c7ee187b492b1042e520595167ca2f7183380f505460e40ea878dcb1549b36d85fef60a319789f267dc090e88eb12bd32a06023d60644ab61a72
-  data.tar.gz: 3e8c66e8e46236041fd11a808f2249357c88f65d98daf863b4edf92a718d3e949d89dc3372e0149182c045683dc6f5f0432c25efa47c6d2b801768fc05a67d45
+  metadata.gz: 79ab87db2b465d8e128bceef8d00da1286f68dd13978207bf812a1aa1e599b81b456abdf80f2d2deed5e627475a955c55e12ea5e6a5358d1183ae8184c4500cd
+  data.tar.gz: 544195c982e911442c4475e07a7ebc7edc533e866ea386fd141d80d29b1a5ae6a092e79992be22f2e10f70c89027f787ec14c24e88cbdc267ed08ba199a33680

data/.github/workflows/lint.yml

@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["2.7", "2.6", "2.5"]
-
+        ruby-version: ["3.2", "3.1", "2.7"]
+    continue-on-error: true
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby ${{ matrix.ruby-version }}

data/.github/workflows/test.yml

@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["2.7", "2.6", "2.5"]
-
+        ruby-version: ["3.2", "3.1", "2.7"]
+    continue-on-error: true
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby ${{ matrix.ruby-version }}

data/.gitignore

@@ -9,3 +9,5 @@ pkg/
 /.yardoc/
 test/gem_home
 tmp/
+
+Gemfile.lock

data/Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 gem "autobuild", git: "https://github.com/rock-core/autobuild", branch: "master"
+gem "rubygems-server" unless RUBY_VERSION < "3"
 
 group :dev do
     gem "rubocop", "~> 1.28.0"
@@ -14,4 +15,5 @@ group :vscode do
     gem "ruby-debug-ide", ">= 0.6.0"
     gem "solargraph"
 end
+
 gemspec

data/README.md

@@ -245,12 +245,9 @@ work with it on an existing workspace.
 Run
 
 ~~~
-bundle install --path=vendor
+bundle install
 ~~~
 
-Note that Autoproj's own test suite assumes that Bundler is setup with
-`--path=vendor`. Keep it that way
-
 To run the test suite,
 
 ~~~

data/autoproj.gemspec

@@ -36,10 +36,10 @@ Gem::Specification.new do |s|
     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 "utilrb", "~> 3.0.0", ">= 3.0.0"
+    s.add_runtime_dependency "utilrb", "~> 3.0", ">= 3.0"
     s.add_runtime_dependency "xdg", "= 2.2.5"
     s.add_development_dependency "aruba", "~> 2.1.0"
-    s.add_development_dependency "flexmock", "~> 2.0", ">= 2.0.0"
+    s.add_development_dependency "flexmock"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
     s.add_development_dependency "simplecov"
     s.add_development_dependency "timecop"

data/bin/autoproj_bootstrap

@@ -85,7 +85,9 @@ module Autoproj
                 env["RUBYLIB"] = []
                 env["PATH"] = self.class.sanitize_env(ENV["PATH"] || "")
                 env["BUNDLE_GEMFILE"] = []
-
+                env["BUNDLER_VERSION"] = []
+                env["BUNDLER_SETUP"] = []
+                env["BUNDLE_BIN_PATH"] = []
                 load_config
 
                 if config["ruby_executable"] != Gem.ruby
@@ -264,14 +266,22 @@ module Autoproj
             # @param [String] autoproj_version a constraint on the autoproj version
             #   that should be used
             # @return [String]
-            def default_gemfile_contents(autoproj_version = ">= 2.16.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.18.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options
@@ -436,25 +446,46 @@ module Autoproj
                 end
             end
 
+            def write_bundle_shim(bundle_shim_path)
+                contents = <<~BUNDLERSHIM
+                    #!#{Gem.ruby}
+                    ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+                    ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
+                    ENV['GEM_HOME'] = '#{gems_gem_home}'
+                    ENV.delete('GEM_PATH')
+                    Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
+                    exec "#{File.join(gems_gem_home, 'bin', 'bundle')}", *ARGV
+                BUNDLERSHIM
+
+                File.write(bundle_shim_path, contents)
+                FileUtils.chmod 0755, bundle_shim_path
+            end
+
             def install_autoproj(bundler, bundler_version: self.bundler_version)
                 # Force bundler to update. If the user does not want this, let
                 # him specify a Gemfile with tighter version constraints
                 lockfile = File.join(dot_autoproj, "Gemfile.lock")
+                shims_path = File.join(dot_autoproj, "bin")
                 FileUtils.rm lockfile if File.exist?(lockfile)
 
                 run_bundler(bundler, "config", "set", "--local", "path", gems_install_path,
                             bundler_version: bundler_version)
                 run_bundler(bundler, "config", "set", "--local", "shebang", Gem.ruby,
                             bundler_version: bundler_version)
+                run_bundler(bundler, "config", "set", "--local", "bin", shims_path,
+                            bundler_version: bundler_version)
 
                 install_args = ["--gemfile=#{autoproj_gemfile_path}"]
                 install_args << "--local" if local?
                 run_bundler(bundler, "install", *install_args,
                             bundler_version: bundler_version)
 
-                shims_path = File.join(dot_autoproj, "bin")
-                run_bundler(bundler, "binstubs", "--all", "--force", "--path", shims_path,
+                run_bundler(bundler, "binstubs", "--all", "--force",
                             bundler_version: bundler_version)
+
+                bundle_shim_path = File.join(shims_path, "bundle")
+                write_bundle_shim(bundle_shim_path) unless File.exist?(bundle_shim_path)
+
                 self.class.rewrite_shims(
                     shims_path, ruby_executable, root_dir,
                     autoproj_gemfile_path, gems_gem_home
@@ -543,6 +574,7 @@ module Autoproj
 # Autoproj generated preamble
 #{WITHOUT_BUNDLER}
 ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -555,6 +587,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 
 #{WITHOUT_BUNDLER}
 ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -580,6 +613,7 @@ load Gem.bin_path('bundler', 'bundler')"
 # Autoproj generated preamble, v1
 #{RUBYLIB_REINIT}
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] = '#{autoproj_gemfile_path}.lock'
 ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
                 AUTOPROJ_PREAMBLE
@@ -592,6 +626,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 
 #{RUBYLIB_REINIT}
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] = '#{autoproj_gemfile_path}.lock'
 ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 require 'rubygems'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']

data/bin/autoproj_install

@@ -85,7 +85,9 @@ module Autoproj
                 env["RUBYLIB"] = []
                 env["PATH"] = self.class.sanitize_env(ENV["PATH"] || "")
                 env["BUNDLE_GEMFILE"] = []
-
+                env["BUNDLER_VERSION"] = []
+                env["BUNDLER_SETUP"] = []
+                env["BUNDLE_BIN_PATH"] = []
                 load_config
 
                 if config["ruby_executable"] != Gem.ruby
@@ -264,14 +266,22 @@ module Autoproj
             # @param [String] autoproj_version a constraint on the autoproj version
             #   that should be used
             # @return [String]
-            def default_gemfile_contents(autoproj_version = ">= 2.16.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.18.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options
@@ -436,25 +446,46 @@ module Autoproj
                 end
             end
 
+            def write_bundle_shim(bundle_shim_path)
+                contents = <<~BUNDLERSHIM
+                    #!#{Gem.ruby}
+                    ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+                    ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
+                    ENV['GEM_HOME'] = '#{gems_gem_home}'
+                    ENV.delete('GEM_PATH')
+                    Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
+                    exec "#{File.join(gems_gem_home, 'bin', 'bundle')}", *ARGV
+                BUNDLERSHIM
+
+                File.write(bundle_shim_path, contents)
+                FileUtils.chmod 0755, bundle_shim_path
+            end
+
             def install_autoproj(bundler, bundler_version: self.bundler_version)
                 # Force bundler to update. If the user does not want this, let
                 # him specify a Gemfile with tighter version constraints
                 lockfile = File.join(dot_autoproj, "Gemfile.lock")
+                shims_path = File.join(dot_autoproj, "bin")
                 FileUtils.rm lockfile if File.exist?(lockfile)
 
                 run_bundler(bundler, "config", "set", "--local", "path", gems_install_path,
                             bundler_version: bundler_version)
                 run_bundler(bundler, "config", "set", "--local", "shebang", Gem.ruby,
                             bundler_version: bundler_version)
+                run_bundler(bundler, "config", "set", "--local", "bin", shims_path,
+                            bundler_version: bundler_version)
 
                 install_args = ["--gemfile=#{autoproj_gemfile_path}"]
                 install_args << "--local" if local?
                 run_bundler(bundler, "install", *install_args,
                             bundler_version: bundler_version)
 
-                shims_path = File.join(dot_autoproj, "bin")
-                run_bundler(bundler, "binstubs", "--all", "--force", "--path", shims_path,
+                run_bundler(bundler, "binstubs", "--all", "--force",
                             bundler_version: bundler_version)
+
+                bundle_shim_path = File.join(shims_path, "bundle")
+                write_bundle_shim(bundle_shim_path) unless File.exist?(bundle_shim_path)
+
                 self.class.rewrite_shims(
                     shims_path, ruby_executable, root_dir,
                     autoproj_gemfile_path, gems_gem_home
@@ -543,6 +574,7 @@ module Autoproj
 # Autoproj generated preamble
 #{WITHOUT_BUNDLER}
 ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -555,6 +587,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 
 #{WITHOUT_BUNDLER}
 ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -580,6 +613,7 @@ load Gem.bin_path('bundler', 'bundler')"
 # Autoproj generated preamble, v1
 #{RUBYLIB_REINIT}
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] = '#{autoproj_gemfile_path}.lock'
 ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
                 AUTOPROJ_PREAMBLE
@@ -592,6 +626,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 
 #{RUBYLIB_REINIT}
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] = '#{autoproj_gemfile_path}.lock'
 ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 require 'rubygems'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']

data/lib/autoproj/cli/main_doc.rb

@@ -28,10 +28,11 @@ module Autoproj
                           desc: "controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)"
             def enable(*packages)
                 require "autoproj/cli/doc"
+                options = self.options.merge(parent_options)
                 report(silent: true) do
                     cli = Doc.new
-                    args = cli.validate_options(packages, options)
-                    cli.enable(*args)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.enable(*args, **options)
                 end
             end
 
@@ -40,10 +41,11 @@ module Autoproj
                           desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def disable(*packages)
                 require "autoproj/cli/doc"
+                options = self.options.merge(parent_options)
                 report(silent: true) do
                     cli = Doc.new
-                    args = cli.validate_options(packages, options)
-                    cli.disable(*args)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.disable(*args, **options)
                 end
             end
 
@@ -52,10 +54,11 @@ module Autoproj
                           desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def list(*packages)
                 require "autoproj/cli/doc"
+                options = self.options.merge(parent_options)
                 report(silent: true) do
                     cli = Doc.new
-                    args = cli.validate_options(packages, options)
-                    cli.list(*args)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.list(*args, **options)
                 end
             end
 
@@ -78,8 +81,8 @@ module Autoproj
                 report do |extra_options|
                     cli = Doc.new
                     options.delete(:tool)
-                    args = cli.validate_options(packages, options.merge(extra_options))
-                    cli.run(*args)
+                    *args, options = cli.validate_options(packages, options.merge(extra_options))
+                    cli.run(*args, **options)
                 end
             end
         end

data/lib/autoproj/cli/main_test.rb

@@ -45,8 +45,9 @@ module Autoproj
                 require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
-                    args = cli.validate_options(packages, options)
-                    cli.enable(*args)
+                    options = self.options.merge(parent_options)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.enable(*args, **options)
                 end
             end
 
@@ -57,8 +58,9 @@ module Autoproj
                 require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
-                    args = cli.validate_options(packages, options)
-                    cli.disable(*args)
+                    options = self.options.merge(parent_options)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.disable(*args, **options)
                 end
             end
 
@@ -69,8 +71,9 @@ module Autoproj
                 require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
-                    args = cli.validate_options(packages, options)
-                    cli.list(*args)
+                    options = self.options.merge(parent_options)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.list(*args, **options)
                 end
             end
 
@@ -101,8 +104,8 @@ module Autoproj
                     Autobuild.ignore_errors = options.delete(:keep_going)
                     Autobuild::TestUtility.coverage_enabled = options.delete(:coverage)
                     options.delete(:tool)
-                    args = cli.validate_options(packages, options.merge(extra_options))
-                    cli.run(*args)
+                    *args, options = cli.validate_options(packages, options.merge(extra_options))
+                    cli.run(*args, **options)
                 end
             end
         end

data/lib/autoproj/cli/utility.rb

@@ -17,7 +17,7 @@ module Autoproj
                 ws.config.save
             end
 
-            def enable(user_selection, options = {})
+            def enable(user_selection, **options)
                 if user_selection.empty?
                     ws.load_config
                     ws.config.utility_enable_all(utility_name)
@@ -33,7 +33,7 @@ module Autoproj
                 ws.config.save
             end
 
-            def disable(user_selection, options = {})
+            def disable(user_selection, **options)
                 if user_selection.empty?
                     ws.load_config
                     ws.config.utility_disable_all(utility_name)
@@ -49,7 +49,7 @@ module Autoproj
                 ws.config.save
             end
 
-            def list(user_selection, options = {})
+            def list(user_selection, **options)
                 initialize_and_load
                 resolved_selection, = finalize_setup(
                     user_selection,
@@ -75,7 +75,7 @@ module Autoproj
                 end
             end
 
-            def run(user_selection, options = {})
+            def run(user_selection, **options)
                 options[:parallel] ||= ws.config.parallel_build_level
                 initialize_and_load
 

data/lib/autoproj/configuration.rb

@@ -436,6 +436,22 @@ module Autoproj
             set("separate_prefixes", flag, true)
         end
 
+        # Returns true if Ruby shims should be installed in a separate prefix
+        #
+        # The default is false (disabled)
+        #
+        # @return [Boolean]
+        def isolate_ruby_shims?
+            get("isolate_ruby_shims", false)
+        end
+
+        # Controls whether Ruby shims should be in a separate prefix
+        #
+        # @see isolate_shims?
+        def isolate_ruby_shims=(flag)
+            set("isolate_ruby_shims", flag, true)
+        end
+
         # Returns true if packages and prefixes should be auto-generated, based
         # on the SHA of the package names. This is meant to be used for build
         # services that want to check that dependencies are properly set

data/lib/autoproj/default.osdeps

@@ -101,6 +101,10 @@ ruby27:
 ruby30:
   default: ignore # we assume that if the user has a ruby 3.0 runtime, it is usable
 
+ruby32:
+  default: ignore # we assume that if the user has a ruby 3.0 runtime, it is usable
+
+
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore

data/lib/autoproj/git_server_configuration.rb

@@ -73,7 +73,8 @@ module Autoproj
         disabled_methods: [],
         config: Autoproj.config,
         fallback_to_http: nil,
-        lazy: false)
+        lazy: false,
+        add_suffix: true)
 
         disabled_methods = Array(disabled_methods)
 
@@ -100,7 +101,7 @@ module Autoproj
         end
 
         Autoproj.add_source_handler name.downcase do |url, private: false, **vcs_options|
-            url += ".git" if url !~ /\.git$/
+            url += ".git" if add_suffix && url !~ /\.git$/
             url = "/#{url}" if url !~ /^\//
 
             unless GIT_SERVER_CONFIG_VARS.all? { |v| config.has_value_for?("#{name}#{v}") }

data/lib/autoproj/installation_manifest.rb

@@ -2,9 +2,21 @@ module Autoproj
     # Manifest of installed packages imported from another autoproj installation
     class InstallationManifest
         Package = Struct.new :name, :type, :vcs, :srcdir, :importdir,
-                             :prefix, :builddir, :logdir, :dependencies
+                             :prefix, :builddir, :logdir, :dependencies, :manifest
         PackageSet = Struct.new :name, :vcs, :raw_local_dir, :user_local_dir
 
+        Manifest = Struct.new(
+            :description, :brief_description, :url, :license, :version,
+            :authors, :maintainers, :rock_maintainers, :dependencies, :tags,
+            keyword_init: true
+        )
+
+        # Copied from PackageManifest, must keep the same interface
+        ContactInfo = Struct.new :name, :email, keyword_init: true
+
+        # Copied from PackageManifest, must keep the same interface
+        Dependency  = Struct.new :name, :optional, :modes, keyword_init: true
+
         attr_reader :path
         attr_reader :packages
         attr_reader :package_sets
@@ -27,18 +39,27 @@ module Autoproj
                 case pkg
                 when PackageDefinition
                     v = pkg.autobuild
+                    manifest = convert_manifest(v.description)
                     Package.new(
                         v.name, v.class.name, pkg.vcs.to_hash, v.srcdir,
                         (v.importdir if v.respond_to?(:importdir)),
                         v.prefix,
                         (v.builddir if v.respond_to?(:builddir)),
-                        v.logdir, v.dependencies
+                        v.logdir, v.dependencies,
+                        manifest
                     )
                 else
                     pkg
                 end
         end
 
+        def convert_manifest(manifest)
+            fields = Manifest.members.each_with_object({}) do |k, h|
+                h[k] = manifest.send(k)
+            end
+            Manifest.new(**fields)
+        end
+
         # Add a {Autoproj::PackageSet} to this manifest
         #
         # @return [PackageSet] the package set in the installation manifest format
@@ -95,9 +116,11 @@ module Autoproj
                         )
                         package_sets[pkg_set.name] = pkg_set
                     else
+                        manifest = load_manifest(entry["manifest"])
                         pkg = Package.new(
                             entry["name"], entry["type"], entry["vcs"], entry["srcdir"], entry["importdir"],
-                            entry["prefix"], entry["builddir"], entry["logdir"], entry["dependencies"]
+                            entry["prefix"], entry["builddir"], entry["logdir"], entry["dependencies"],
+                            manifest
                         )
                         packages[pkg.name] = pkg
                     end
@@ -105,21 +128,62 @@ module Autoproj
             end
         end
 
+        def load_manifest(entry)
+            entry = entry.dup
+            %w[authors maintainers rock_maintainers].each do |field|
+                entry[field] = load_contact_list(entry[field])
+            end
+            entry["dependencies"] = load_manifest_dependencies(entry["dependencies"])
+
+            Manifest.new(**entry.transform_keys(&:to_sym))
+        end
+
+        def load_contact_list(list)
+            list.map { |fields| ContactInfo.new(**fields.transform_keys(&:to_sym)) }
+        end
+
+        def load_manifest_dependencies(list)
+            list.map { |fields| Dependency.new(**fields.transform_keys(&:to_sym)) }
+        end
+
         # Save the installation manifest
         def save(path = @path)
             Ops.atomic_write(path) do |io|
                 marshalled_package_sets = each_package_set.map do |pkg_set|
-                    set = pkg_set.to_h.transform_keys(&:to_s)
+                    set = struct_to_yaml(pkg_set)
                     set["package_set"] = set["name"]
                     set
                 end
                 marshalled_packages = each_package.map do |pkg|
-                    pkg.to_h.transform_keys(&:to_s)
+                    struct_to_yaml(pkg)
                 end
                 io.write YAML.dump(marshalled_package_sets + marshalled_packages)
             end
         end
 
+        def object_to_yaml(obj)
+            case obj
+            when Struct
+                struct_to_yaml(obj)
+            when Array
+                obj.map { |el| object_to_yaml(el) }
+            when Hash
+                hash_to_yaml(obj)
+            else
+                obj
+            end
+        end
+
+        def struct_to_yaml(obj)
+            obj.to_h
+               .transform_keys(&:to_s)
+               .transform_values { |el| object_to_yaml(el) }
+        end
+
+        def hash_to_yaml(obj)
+            obj.transform_values { |el| object_to_yaml(el) }
+        end
+
         # Returns the default Autoproj installation manifest path for a given
         # autoproj workspace root
         #
@@ -133,7 +197,9 @@ module Autoproj
             path = path_for_workspace_root(root_dir)
             manifest = InstallationManifest.new(path)
             unless manifest.exist?
-                raise ConfigError.new, "no #{path} file found. You should probably rerun autoproj envsh in that folder first"
+                raise ConfigError.new,
+                      "no #{path} file found. You should probably rerun " \
+                      "autoproj envsh in that folder first"
             end
 
             manifest.load

data/lib/autoproj/manifest.rb

@@ -1088,7 +1088,7 @@ module Autoproj
 
         # Remove any OSDeps override that has previously been added with
         # #add_osdeps_overrides
-        def remove_osdeps_overrides(osdep_name)
+        def remove_osdeps_overrides(osdeps_name)
             @osdeps_overrides.delete(osdeps_name.to_s)
         end
 

data/lib/autoproj/ops/cache.rb

@@ -164,8 +164,10 @@ module Autoproj
 
                 platform_suffix = "-#{Gem::Platform.local}.gem"
                 failed = []
-                compile.each do |gem_name, artifacts: []|
+                compile.each do |gem_name, options = {}|
+                    artifacts = options[:artifacts] || []
                     Dir.glob(File.join(cache_dir, "#{gem_name}*.gem")) do |gem|
+                        next unless /^#{gem_name}-\d/.match?(File.basename(gem))
                         next if gem.end_with?(platform_suffix)
 
                         gem_basename = File.basename(gem, ".gem")

data/lib/autoproj/ops/configuration.rb

@@ -585,7 +585,7 @@ module Autoproj
                     when OSPackageResolver::UNKNOWN_OS
                         manifest.exclude_package(osdep_name, "the current operating system is unknown to autoproj")
                     when OSPackageResolver::WRONG_OS
-                        manifest.exclude_package(osdep_name, "#{osdep_name} is defined, but not for this operating system")
+                        manifest.exclude_package(osdep_name, "#{osdep_name} is defined in #{os_package_resolver.source_of(osdep_name)}, but not for this operating system")
                     when OSPackageResolver::NONEXISTENT
                         manifest.exclude_package(osdep_name, "#{osdep_name} is marked as unavailable for this operating system")
                     end

data/lib/autoproj/ops/install.rb

@@ -75,7 +75,9 @@ module Autoproj
                 env["RUBYLIB"] = []
                 env["PATH"] = self.class.sanitize_env(ENV["PATH"] || "")
                 env["BUNDLE_GEMFILE"] = []
-
+                env["BUNDLER_VERSION"] = []
+                env["BUNDLER_SETUP"] = []
+                env["BUNDLE_BIN_PATH"] = []
                 load_config
 
                 if config["ruby_executable"] != Gem.ruby
@@ -260,8 +262,16 @@ module Autoproj
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options
@@ -426,25 +436,46 @@ module Autoproj
                 end
             end
 
+            def write_bundle_shim(bundle_shim_path)
+                contents = <<~BUNDLERSHIM
+                    #!#{Gem.ruby}
+                    ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+                    ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
+                    ENV['GEM_HOME'] = '#{gems_gem_home}'
+                    ENV.delete('GEM_PATH')
+                    Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
+                    exec "#{File.join(gems_gem_home, 'bin', 'bundle')}", *ARGV
+                BUNDLERSHIM
+
+                File.write(bundle_shim_path, contents)
+                FileUtils.chmod 0755, bundle_shim_path
+            end
+
             def install_autoproj(bundler, bundler_version: self.bundler_version)
                 # Force bundler to update. If the user does not want this, let
                 # him specify a Gemfile with tighter version constraints
                 lockfile = File.join(dot_autoproj, "Gemfile.lock")
+                shims_path = File.join(dot_autoproj, "bin")
                 FileUtils.rm lockfile if File.exist?(lockfile)
 
                 run_bundler(bundler, "config", "set", "--local", "path", gems_install_path,
                             bundler_version: bundler_version)
                 run_bundler(bundler, "config", "set", "--local", "shebang", Gem.ruby,
                             bundler_version: bundler_version)
+                run_bundler(bundler, "config", "set", "--local", "bin", shims_path,
+                            bundler_version: bundler_version)
 
                 install_args = ["--gemfile=#{autoproj_gemfile_path}"]
                 install_args << "--local" if local?
                 run_bundler(bundler, "install", *install_args,
                             bundler_version: bundler_version)
 
-                shims_path = File.join(dot_autoproj, "bin")
-                run_bundler(bundler, "binstubs", "--all", "--force", "--path", shims_path,
+                run_bundler(bundler, "binstubs", "--all", "--force",
                             bundler_version: bundler_version)
+
+                bundle_shim_path = File.join(shims_path, "bundle")
+                write_bundle_shim(bundle_shim_path) unless File.exist?(bundle_shim_path)
+
                 self.class.rewrite_shims(
                     shims_path, ruby_executable, root_dir,
                     autoproj_gemfile_path, gems_gem_home
@@ -533,6 +564,7 @@ module Autoproj
 # Autoproj generated preamble
 #{WITHOUT_BUNDLER}
 ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -545,6 +577,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 
 #{WITHOUT_BUNDLER}
 ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] ||= '#{autoproj_gemfile_path}.lock'
 ENV['GEM_HOME'] = '#{gems_gem_home}'
 ENV.delete('GEM_PATH')
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
@@ -570,6 +603,7 @@ load Gem.bin_path('bundler', 'bundler')"
 # Autoproj generated preamble, v1
 #{RUBYLIB_REINIT}
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] = '#{autoproj_gemfile_path}.lock'
 ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
                 AUTOPROJ_PREAMBLE
@@ -582,6 +616,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 
 #{RUBYLIB_REINIT}
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_LOCKFILE'] = '#{autoproj_gemfile_path}.lock'
 ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 require 'rubygems'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']

data/lib/autoproj/ops/main_config_switcher.rb

@@ -156,8 +156,8 @@ module Autoproj
             # @api private
             def do_switch_config(delete_current, type, url, *options)
                 vcs_def = Hash.new
-                vcs_def[:type] = type
-                vcs_def[:url]  = VCSDefinition.to_absolute_url(url, ws.root_dir)
+                vcs_def["type"] = type
+                vcs_def["url"]  = VCSDefinition.to_absolute_url(url, ws.root_dir)
                 options.each do |opt|
                     name, value = opt.split("=")
                     value = Integer(value) if value =~ /^\d+$/

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -60,7 +60,10 @@ module Autoproj
                 end
 
                 gemfile_path = File.join(ws.prefix_dir, "gems", "Gemfile")
-                env.set("BUNDLE_GEMFILE", gemfile_path) if File.file?(gemfile_path)
+                if File.file?(gemfile_path)
+                    env.set("BUNDLE_GEMFILE", gemfile_path)
+                    env.set("BUNDLE_LOCKFILE", "#{gemfile_path}.lock")
+                end
 
                 if cache_dir && File.exist?(cache_dir)
                     vendor_dir = File.join(File.dirname(gemfile_path), "vendor")
@@ -303,9 +306,14 @@ module Autoproj
             )
                 FileUtils.rm "#{gemfile}.lock" if update && File.file?("#{gemfile}.lock")
 
-                options << "--path" << gem_path
-                options << "--shebang" << Gem.ruby
-                options << "--binstubs" << binstubs if binstubs
+                run_bundler(ws, "config", "set", "--local", "path", gem_path,
+                            bundler_version: bundler_version)
+                run_bundler(ws, "config", "set", "--local", "shebang", Gem.ruby,
+                            bundler_version: bundler_version)
+                if binstubs
+                    run_bundler(ws, "config", "set", "--local", "bin", binstubs,
+                                bundler_version: bundler_version)
+                end
 
                 apply_build_config(ws)
 
@@ -324,6 +332,12 @@ module Autoproj
                         end
                     end
                 end
+
+                if binstubs
+                    run_bundler(ws, "binstubs", "--all",
+                                bundler_version: bundler_version,
+                                gem_home: gem_home, gemfile: gemfile)
+                end
             end
 
             def self.bundle_gem_path(ws, gem_name,
@@ -358,7 +372,7 @@ module Autoproj
                     target_env = Hash[
                         "GEM_HOME" => gem_home,
                         "GEM_PATH" => nil,
-                        "BUNDLE_GEMFILE" => gemfile,
+                        "BUNDLE_GEMFILE" => gemfile, "BUNDLE_LOCKFILE" => "#{gemfile}.lock",
                         "RUBYOPT" => nil,
                         "RUBYLIB" => rubylib_for_bundler,
                     ].merge(bundler_version_env)
@@ -390,7 +404,7 @@ module Autoproj
                                               .gsub(/#  from.*/, "")
                             raise ConfigError, cleaned_message
                         end
-                    gems_remotes |= bundler_def.send(:sources).rubygems_remotes.to_set
+                    gems_remotes |= bundler_def.send(:sources).rubygems_sources.flat_map(&:remotes).to_set
                     bundler_def.dependencies.each do |d|
                         d.groups.each do |group_name|
                             if d.platforms.empty?
@@ -630,8 +644,8 @@ module Autoproj
                 Tempfile.open "autoproj-rubylib" do |io|
                     result = Autoproj.bundler_unbundled_system(
                         Hash["GEM_HOME" => env["GEM_HOME"], "GEM_PATH" => env["GEM_PATH"],
-                             "BUNDLE_GEMFILE" => gemfile, "RUBYOPT" => nil,
-                             "RUBYLIB" => self.class.rubylib_for_bundler],
+                             "BUNDLE_GEMFILE" => gemfile, "BUNDLE_LOCKFILE" => "#{gemfile}.lock",
+                             "RUBYOPT" => nil, "RUBYLIB" => self.class.rubylib_for_bundler],
                         Autobuild.tool("ruby"), "-rbundler/setup",
                         "-e", "puts $LOAD_PATH",
                         out: io, **silent_redirect

data/lib/autoproj/package_manifest.rb

@@ -217,7 +217,7 @@ module Autoproj
                     return "true"
                 end
 
-                config.get(var)
+                config.get(var).to_s
             end
 
             def initialize(path, manifest, condition_context: Configuration.new)

data/lib/autoproj/python.rb

@@ -69,13 +69,12 @@ module Autoproj
             version: ws.config.get("python_version", nil))
             finders = [
                 -> { Autobuild.programs["python"] },
-                -> { `which python3`.strip },
-                -> { `which python`.strip }
+                -> { Autobuild.find_in_path("python3") },
+                -> { Autobuild.find_in_path("python") }
             ]
 
             finders.each do |finder|
-                python_bin = finder.call
-                if python_bin && !python_bin.empty?
+                if (python_bin = finder.call)
                     python_version, valid = validate_python_version(python_bin, version)
                     return python_bin, python_version if valid
                 end

data/lib/autoproj/test.rb

@@ -247,7 +247,12 @@ module Autoproj
                       "call stop_gem_server before calling start_gem_server again"
             end
             @gem_server_pid = spawn(
-                Hash["RUBYOPT" => nil],
+                Hash[
+                    "RUBYOPT" => nil,
+                    "GEM_HOME" => path,
+                    "BUNDLE_GEMFILE" => nil,
+                    "BUNDLER_SETUP" => nil
+                ],
                 Gem.ruby, Ops::Install.guess_gem_program, "server",
                 "--quiet", "--dir", path, out: :close, err: :close
             )
@@ -342,6 +347,8 @@ module Autoproj
 
             # Make a valid (albeit empty) Gemfile
             File.open(File.join(ws.dot_autoproj_dir, "Gemfile"), "w").close
+            # Create the shims folder
+            FileUtils.mkdir File.join(ws.dot_autoproj_dir, "bin")
             ws
         end
 

data/lib/autoproj/vcs_definition.rb

@@ -201,7 +201,8 @@ module Autoproj
         # @return [VCSDefinition]
         # @raise ArgumentError if the raw specification does not match an
         #   expected format
-        def self.from_raw(spec, from: nil, raw: [], history: [])
+        def self.from_raw(spec_str = nil, from: nil, raw: [], history: [], **spec_hash)
+            spec = spec_str || spec_hash
             normalized_spec = normalize_vcs_hash(spec)
             unless (type = normalized_spec.delete(:type))
                 raise ArgumentError,

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.17.0"
+    VERSION = "2.18.1"
 end

data/lib/autoproj/workspace.rb

@@ -405,7 +405,14 @@ module Autoproj
                 install_suffix = match[1]
             end
 
-            bindir = File.join(prefix_dir, "bin")
+            prefixdir =
+                if config.isolate_ruby_shims?
+                    File.join(prefix_dir, "autoproj")
+                else
+                    prefix_dir
+                end
+
+            bindir = File.join(prefixdir, "bin")
             FileUtils.mkdir_p bindir
             env.add "PATH", bindir
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.1
 platform: ruby
 authors:
 - Sylvain Joyeux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -170,20 +170,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: xdg
   requirement: !ruby/object:Gem::Requirement
@@ -216,22 +216,16 @@ dependencies:
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -473,7 +467,7 @@ homepage: http://rock-robotics.org
 licenses:
 - BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -488,8 +482,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []