autoproj 2.16.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb77cb6d5c3c156ae3d665933ec7380f5b0ae491767b87c6e6f25c9c96966885
-  data.tar.gz: 1474ca4f6e00f46dc70631f25c70e0cf0340d85f62101053117faf79ed65bd21
+  metadata.gz: e19c3ca78afb4d42f58b65effbed3ff1aed2fe83210e6fa2ee0d46ed12793430
+  data.tar.gz: 2b1a0802811156df47ac64a869f9ccf1de2ba5734d6d0316d2f857a5b18fa638
 SHA512:
-  metadata.gz: e1fb865f1ecdfa9d290c9dbb6048e601ca99f8e691643a36ada2528137c47819a30172e7abf9bd3d5cd91c44148fa0b8a8793b4a6783fb9bee52661cad960777
-  data.tar.gz: 6c9b821c1158e70bdb9a98536998dafe6270f4bb778646171d4691cc82fe0ce9828e263fda268ebaeced020cc7dcdfd30a33b9e5ea5593774f1ffe39eb0326c7
+  metadata.gz: b46ab523d1b83ef75128c8707d65899b8eb770706b391252bb1826578acc6505ad67169964ef9e9c1c7653962d8ed50ff5e20a6b48d765a2298afbcdf5c973c1
+  data.tar.gz: 21cc35037beb50b30ee0879c680b9c68ef401c07c394270b8d1e81ae678f8e9c931b53b35bc205b877224b440e745674cd48e49cf566aef575332324a309516c

data/.github/workflows/lint.yml

@@ -19,7 +19,9 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
+    - name: Configure bundler without 'vscode'
+      run: bundle config set --local without vscode
     - name: Install dependencies
       run: bundle install
     - name: Run rubocop
-      run: bundle exec rubocop
+      run: bundle exec rubocop

data/.github/workflows/test.yml

@@ -19,6 +19,8 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
+    - name: Configure bundler without 'vscode'
+      run: bundle config set --local without vscode
     - name: Install dependencies
       run: bundle install
     - name: Run tests

data/Gemfile

@@ -2,12 +2,15 @@ source "https://rubygems.org"
 
 gem "autobuild", git: "https://github.com/rock-core/autobuild", branch: "master"
 
+group :dev do
+    gem "rubocop", "~> 1.28.0"
+    gem "rubocop-rock"
+end
+
 group :vscode do
     gem "debase", ">= 0.2.2.beta10"
     gem "pry"
     gem "pry-byebug"
-    gem "rubocop", ">= 0.6.0"
-    gem "rubocop-rock"
     gem "ruby-debug-ide", ">= 0.6.0"
     gem "solargraph"
 end

data/Rakefile

@@ -20,6 +20,7 @@ task "bootstrap" do
     %w[bootstrap install].each do |install_script|
         bootstrap_code = File.read(File.join(Dir.pwd, "bin", "autoproj_#{install_script}.in"))
                              .gsub("require 'autoproj/ops/install'", autoproj_ops_install)
+                             .gsub('#{Autoproj::VERSION}', Autoproj::VERSION) # rubocop:disable Lint/InterpolationCheck
         File.open(File.join(Dir.pwd, "bin", "autoproj_#{install_script}"), "w") do |io|
             io.write bootstrap_code
         end

data/autoproj.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency "tty-spinner", "~> 0.9.0"
     s.add_runtime_dependency "utilrb", "~> 3.0.0", ">= 3.0.0"
     s.add_runtime_dependency "xdg", "= 2.2.5"
-    s.add_development_dependency "aruba"
+    s.add_development_dependency "aruba", "~> 2.1.0"
     s.add_development_dependency "flexmock", "~> 2.0", ">= 2.0.0"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
     s.add_development_dependency "simplecov"

data/bin/autoproj_bootstrap

@@ -97,7 +97,9 @@ module Autoproj
                 @ruby_executable = config["ruby_executable"]
                 @local = false
 
-                install_gems_in_gem_user_dir unless @gems_install_path
+                @gems_install_path ||= default_gems_install_path
+                @gems_install_path = File.expand_path(@gems_install_path)
+
                 env["GEM_HOME"] = [gems_gem_home]
                 env["GEM_PATH"] = [gems_gem_home]
             end
@@ -171,24 +173,17 @@ module Autoproj
             # (see #local?)
             attr_writer :local
 
-            # The user-wide place where RubyGems installs gems
-            def self.dot_gem_dir
-                if Gem.respond_to?(:data_home) # Debian 11+
-                    File.join(Gem.data_home, "gem")
-                else
-                    File.join(Gem.user_home, ".gem")
-                end
-            end
-
-            # The version and platform-specific suffix under {#dot_gem_dir}
+            # The version and platform-specific suffix
             #
             # This is also the suffix used by bundler to install gems
             def self.gems_path_suffix
-                @gems_path_suffix ||=
-                    Pathname
-                    .new(Gem.user_dir)
-                    .relative_path_from(Pathname.new(dot_gem_dir))
-                    .to_s
+                return @gems_path_suffix if @gem_path_suffix
+
+                parts = [Gem.ruby_engine]
+                unless RbConfig::CONFIG["ruby_version"].empty?
+                    parts << RbConfig::CONFIG["ruby_version"]
+                end
+                @gems_path_suffix = File.join parts
             end
 
             # The path into which the workspace's gems should be installed
@@ -219,21 +214,21 @@ module Autoproj
                 end
             end
 
-            # Install autoproj in Gem's default user dir
-            def install_gems_in_gem_user_dir
+            # Get autoproj's default path for installing gems
+            def default_gems_install_path
                 xdg_default_gem_path = xdg_var("XDG_DATA_HOME",
                                                File.join(Dir.home, ".local", "share", "autoproj", "gems"))
                 default_gem_path = File.join(
                     Dir.home, ".autoproj", "gems"
                 )
-                @gems_install_path =
-                    if File.directory?(xdg_default_gem_path)
-                        xdg_default_gem_path
-                    elsif File.directory?(default_gem_path)
-                        default_gem_path
-                    else
-                        xdg_default_gem_path
-                    end
+
+                if File.directory?(xdg_default_gem_path)
+                    xdg_default_gem_path
+                elsif File.directory?(default_gem_path)
+                    default_gem_path
+                else
+                    xdg_default_gem_path
+                end
             end
 
             # Whether autoproj should prefer OS-independent packages over their
@@ -269,15 +264,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.0.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.17.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
-                 "gem \"autoproj\", \"#{autoproj_version}\"",
-                 "gem \"utilrb\", \">= 3.0.1\""].join("\n")
+                 "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
@@ -297,11 +299,12 @@ module Autoproj
                         @gem_source = url
                     end
                     opt.on "--gems-path=PATH", "install gems under this path instead "\
-                                               "of ~/.autoproj/gems" do |path|
-                        self.gems_install_path = path
+                                               "of #{default_gems_install_path} (do not use with --public-gems)" do |path|
+                        @gems_install_path = path
                     end
-                    opt.on "--public-gems", "install gems in the default gem location" do
-                        install_gems_in_gem_user_dir
+                    opt.on "--public-gems", "install gems in the default gem location: #{default_gems_install_path}"\
+                                            " (do not use with --gems-path)" do
+                        @gems_install_path = default_gems_install_path
                     end
                     opt.on "--bundler-version=VERSION_CONSTRAINT", String, "use the provided "\
                                                                            "string as a version constraint for bundler" do |version|
@@ -323,6 +326,7 @@ module Autoproj
                            "when reinstalling an existing autoproj workspace, do not "\
                            "use the config in .autoproj/ as seed" do
                         @config.clear
+                        @config["bundler_version"] = Install.default_bundler_version
                     end
                     opt.on "--seed-config=PATH", String, "path to a seed file that "\
                                                          "should be used to initialize the configuration" do |path|
@@ -756,11 +760,21 @@ require 'bundler/setup'
                 end
 
                 @config = config
+                @config["bundler_version"] ||= self.class.default_bundler_version
+
                 %w[gems_install_path prefer_indep_over_os_packages].each do |flag|
                     instance_variable_set "@#{flag}", config.fetch(flag, false)
                 end
             end
 
+            def self.default_bundler_version
+                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                    "2.3.6"
+                elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+                    "2.4.22"
+                end
+            end
+
             def save_config
                 config["gems_install_path"] = gems_install_path
                 config["prefer_indep_over_os_packages"] = prefer_indep_over_os_packages?

data/bin/autoproj_install

@@ -97,7 +97,9 @@ module Autoproj
                 @ruby_executable = config["ruby_executable"]
                 @local = false
 
-                install_gems_in_gem_user_dir unless @gems_install_path
+                @gems_install_path ||= default_gems_install_path
+                @gems_install_path = File.expand_path(@gems_install_path)
+
                 env["GEM_HOME"] = [gems_gem_home]
                 env["GEM_PATH"] = [gems_gem_home]
             end
@@ -171,24 +173,17 @@ module Autoproj
             # (see #local?)
             attr_writer :local
 
-            # The user-wide place where RubyGems installs gems
-            def self.dot_gem_dir
-                if Gem.respond_to?(:data_home) # Debian 11+
-                    File.join(Gem.data_home, "gem")
-                else
-                    File.join(Gem.user_home, ".gem")
-                end
-            end
-
-            # The version and platform-specific suffix under {#dot_gem_dir}
+            # The version and platform-specific suffix
             #
             # This is also the suffix used by bundler to install gems
             def self.gems_path_suffix
-                @gems_path_suffix ||=
-                    Pathname
-                    .new(Gem.user_dir)
-                    .relative_path_from(Pathname.new(dot_gem_dir))
-                    .to_s
+                return @gems_path_suffix if @gem_path_suffix
+
+                parts = [Gem.ruby_engine]
+                unless RbConfig::CONFIG["ruby_version"].empty?
+                    parts << RbConfig::CONFIG["ruby_version"]
+                end
+                @gems_path_suffix = File.join parts
             end
 
             # The path into which the workspace's gems should be installed
@@ -219,21 +214,21 @@ module Autoproj
                 end
             end
 
-            # Install autoproj in Gem's default user dir
-            def install_gems_in_gem_user_dir
+            # Get autoproj's default path for installing gems
+            def default_gems_install_path
                 xdg_default_gem_path = xdg_var("XDG_DATA_HOME",
                                                File.join(Dir.home, ".local", "share", "autoproj", "gems"))
                 default_gem_path = File.join(
                     Dir.home, ".autoproj", "gems"
                 )
-                @gems_install_path =
-                    if File.directory?(xdg_default_gem_path)
-                        xdg_default_gem_path
-                    elsif File.directory?(default_gem_path)
-                        default_gem_path
-                    else
-                        xdg_default_gem_path
-                    end
+
+                if File.directory?(xdg_default_gem_path)
+                    xdg_default_gem_path
+                elsif File.directory?(default_gem_path)
+                    default_gem_path
+                else
+                    xdg_default_gem_path
+                end
             end
 
             # Whether autoproj should prefer OS-independent packages over their
@@ -269,15 +264,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.0.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.17.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
-                 "gem \"autoproj\", \"#{autoproj_version}\"",
-                 "gem \"utilrb\", \">= 3.0.1\""].join("\n")
+                 "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
@@ -297,11 +299,12 @@ module Autoproj
                         @gem_source = url
                     end
                     opt.on "--gems-path=PATH", "install gems under this path instead "\
-                                               "of ~/.autoproj/gems" do |path|
-                        self.gems_install_path = path
+                                               "of #{default_gems_install_path} (do not use with --public-gems)" do |path|
+                        @gems_install_path = path
                     end
-                    opt.on "--public-gems", "install gems in the default gem location" do
-                        install_gems_in_gem_user_dir
+                    opt.on "--public-gems", "install gems in the default gem location: #{default_gems_install_path}"\
+                                            " (do not use with --gems-path)" do
+                        @gems_install_path = default_gems_install_path
                     end
                     opt.on "--bundler-version=VERSION_CONSTRAINT", String, "use the provided "\
                                                                            "string as a version constraint for bundler" do |version|
@@ -323,6 +326,7 @@ module Autoproj
                            "when reinstalling an existing autoproj workspace, do not "\
                            "use the config in .autoproj/ as seed" do
                         @config.clear
+                        @config["bundler_version"] = Install.default_bundler_version
                     end
                     opt.on "--seed-config=PATH", String, "path to a seed file that "\
                                                          "should be used to initialize the configuration" do |path|
@@ -756,11 +760,21 @@ require 'bundler/setup'
                 end
 
                 @config = config
+                @config["bundler_version"] ||= self.class.default_bundler_version
+
                 %w[gems_install_path prefer_indep_over_os_packages].each do |flag|
                     instance_variable_set "@#{flag}", config.fetch(flag, false)
                 end
             end
 
+            def self.default_bundler_version
+                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                    "2.3.6"
+                elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+                    "2.4.22"
+                end
+            end
+
             def save_config
                 config["gems_install_path"] = gems_install_path
                 config["prefer_indep_over_os_packages"] = prefer_indep_over_os_packages?

data/lib/autoproj/autobuild_extensions/package.rb

@@ -107,6 +107,8 @@ module Autoproj
 
                 pkg_autobuild, pkg_os = partition_package(name)
                 pkg_autobuild.each do |pkg|
+                    next if ws.manifest.ignored?(pkg)
+
                     super(pkg)
                 end
                 @os_packages.merge(pkg_os.to_set)

data/lib/autoproj/configuration.rb

@@ -268,11 +268,6 @@ module Autoproj
             set("parallel_import_level", level)
         end
 
-        # The user-wide place where RubyGems installs gems
-        def self.dot_gem_dir
-            Ops::Install.dot_gem_dir
-        end
-
         # The Ruby platform and version-specific subdirectory used by bundler and rubygem
         def self.gems_path_suffix
             Ops::Install.gems_path_suffix

data/lib/autoproj/default.osdeps

@@ -93,10 +93,17 @@ ruby25:
   default: ignore # we assume that if the user has a ruby 2.5 runtime, it is usable
 
 ruby26:
-  default: ignore # we assume that if the user has a ruby 2.5 runtime, it is usable
+  default: ignore # we assume that if the user has a ruby 2.6 runtime, it is usable
 
 ruby27:
-  default: ignore # we assume that if the user has a ruby 2.5 runtime, it is usable
+  default: ignore # we assume that if the user has a ruby 2.7 runtime, it is usable
+
+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

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/manifest.rb

@@ -1015,7 +1015,8 @@ module Autoproj
                                                         "no package.xml file" unless File.file?(manifest_path)
 
                 manifest = PackageManifest.load(package, manifest_path,
-                                                ros_manifest: true)
+                                                ros_manifest: true,
+                                                condition_context: @ws.env)
             else
                 manifest_paths = [File.join(package.srcdir, "manifest.xml")]
                 if package_set.local_dir
@@ -1028,7 +1029,8 @@ module Autoproj
                 end
                 if manifest_path
                     manifest = PackageManifest.load(package, manifest_path,
-                                                    ros_manifest: false)
+                                                    ros_manifest: false,
+                                                    condition_context: @ws.config)
                 end
             end
 
@@ -1086,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/atomic_write.rb

@@ -1,37 +1,74 @@
+# frozen_string_literal: true
+
+require "tempfile"
+require "fileutils"
+
 module Autoproj
     module Ops
+        # Write to a file atomically. Useful for situations where you don't
+        # want other processes or threads to see half-written files.
+        #
+        #   File.atomic_write('important.file') do |file|
+        #     file.write('hello')
+        #   end
+        #
+        # This method needs to create a temporary file. By default it will create it
+        # in the same directory as the destination file. If you don't like this
+        # behavior you can provide a different directory but it must be on the
+        # same physical filesystem as the file you're trying to write.
+        #
+        #   File.atomic_write('/data/something.important', '/data/tmp') do |file|
+        #     file.write('hello')
+        #   end
+        #
         # Shamelessly stolen from ActiveSupport
-        def self.atomic_write(file_name, temp_dir = Dir.tmpdir)
-            require "tempfile" unless defined?(Tempfile)
-            require "fileutils" unless defined?(FileUtils)
+        def self.atomic_write(file_name, temp_dir = File.dirname(file_name))
+            Tempfile.open(".#{File.basename(file_name)}", temp_dir) do |temp_file|
+                temp_file.binmode
+                yield temp_file
+                temp_file.close
 
-            temp_file = Tempfile.new(File.basename(file_name), temp_dir)
-            yield temp_file
-            temp_file.flush
-            begin temp_file.fsync
-            rescue NotImplementedError
-            end
-            temp_file.close
+                old_stat = begin
+                    # Get original file permissions
+                    File.stat(file_name)
+                rescue Errno::ENOENT
+                    # If not possible, probe which are the default permissions in the
+                    # destination directory.
+                    probe_stat_in(File.dirname(file_name))
+                end
 
-            begin
-                # Get original file permissions
-                old_stat = File.stat(file_name)
-            rescue Errno::ENOENT
-                # No old permissions, write a temp file to determine the defaults
-                check_name = File.join(
-                    File.dirname(file_name), ".permissions_check.#{Thread.current.object_id}.#{Process.pid}.#{rand(1000000)}"
-                )
-                File.open(check_name, "w") {}
-                old_stat = File.stat(check_name)
-                File.unlink(check_name)
+                if old_stat
+                    # Set correct permissions on new file
+                    begin
+                        File.chown(old_stat.uid, old_stat.gid, temp_file.path)
+                        # This operation will affect filesystem ACL's
+                        File.chmod(old_stat.mode, temp_file.path)
+                    rescue Errno::EPERM, Errno::EACCES
+                        # Changing file ownership failed, moving on.
+                    end
+                end
+
+                # Overwrite original file with temp file
+                File.rename(temp_file.path, file_name)
             end
+        end
 
-            # Overwrite original file with temp file
-            FileUtils.mv(temp_file.path, file_name)
+        # Private utility method.
+        def self.probe_stat_in(dir) # :nodoc:
+            basename = [
+                ".permissions_check",
+                Thread.current.object_id,
+                Process.pid,
+                rand(1000000)
+            ].join(".")
 
-            # Set correct permissions on new file
-            File.chown(old_stat.uid, old_stat.gid, file_name)
-            File.chmod(old_stat.mode, file_name)
+            file_name = File.join(dir, basename)
+            FileUtils.touch(file_name)
+            File.stat(file_name)
+        rescue Errno::ENOENT
+            file_name = nil
+        ensure
+            FileUtils.rm_f(file_name) if file_name
         end
     end
 end

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

@@ -87,7 +87,9 @@ module Autoproj
                 @ruby_executable = config["ruby_executable"]
                 @local = false
 
-                install_gems_in_gem_user_dir unless @gems_install_path
+                @gems_install_path ||= default_gems_install_path
+                @gems_install_path = File.expand_path(@gems_install_path)
+
                 env["GEM_HOME"] = [gems_gem_home]
                 env["GEM_PATH"] = [gems_gem_home]
             end
@@ -161,24 +163,17 @@ module Autoproj
             # (see #local?)
             attr_writer :local
 
-            # The user-wide place where RubyGems installs gems
-            def self.dot_gem_dir
-                if Gem.respond_to?(:data_home) # Debian 11+
-                    File.join(Gem.data_home, "gem")
-                else
-                    File.join(Gem.user_home, ".gem")
-                end
-            end
-
-            # The version and platform-specific suffix under {#dot_gem_dir}
+            # The version and platform-specific suffix
             #
             # This is also the suffix used by bundler to install gems
             def self.gems_path_suffix
-                @gems_path_suffix ||=
-                    Pathname
-                    .new(Gem.user_dir)
-                    .relative_path_from(Pathname.new(dot_gem_dir))
-                    .to_s
+                return @gems_path_suffix if @gem_path_suffix
+
+                parts = [Gem.ruby_engine]
+                unless RbConfig::CONFIG["ruby_version"].empty?
+                    parts << RbConfig::CONFIG["ruby_version"]
+                end
+                @gems_path_suffix = File.join parts
             end
 
             # The path into which the workspace's gems should be installed
@@ -209,21 +204,21 @@ module Autoproj
                 end
             end
 
-            # Install autoproj in Gem's default user dir
-            def install_gems_in_gem_user_dir
+            # Get autoproj's default path for installing gems
+            def default_gems_install_path
                 xdg_default_gem_path = xdg_var("XDG_DATA_HOME",
                                                File.join(Dir.home, ".local", "share", "autoproj", "gems"))
                 default_gem_path = File.join(
                     Dir.home, ".autoproj", "gems"
                 )
-                @gems_install_path =
-                    if File.directory?(xdg_default_gem_path)
-                        xdg_default_gem_path
-                    elsif File.directory?(default_gem_path)
-                        default_gem_path
-                    else
-                        xdg_default_gem_path
-                    end
+
+                if File.directory?(xdg_default_gem_path)
+                    xdg_default_gem_path
+                elsif File.directory?(default_gem_path)
+                    default_gem_path
+                else
+                    xdg_default_gem_path
+                end
             end
 
             # Whether autoproj should prefer OS-independent packages over their
@@ -259,15 +254,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.0.0")
+            def default_gemfile_contents(autoproj_version = ">= #{Autoproj::VERSION}")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
-                 "gem \"autoproj\", \"#{autoproj_version}\"",
-                 "gem \"utilrb\", \">= 3.0.1\""].join("\n")
+                 "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
@@ -287,11 +289,12 @@ module Autoproj
                         @gem_source = url
                     end
                     opt.on "--gems-path=PATH", "install gems under this path instead "\
-                                               "of ~/.autoproj/gems" do |path|
-                        self.gems_install_path = path
+                                               "of #{default_gems_install_path} (do not use with --public-gems)" do |path|
+                        @gems_install_path = path
                     end
-                    opt.on "--public-gems", "install gems in the default gem location" do
-                        install_gems_in_gem_user_dir
+                    opt.on "--public-gems", "install gems in the default gem location: #{default_gems_install_path}"\
+                                            " (do not use with --gems-path)" do
+                        @gems_install_path = default_gems_install_path
                     end
                     opt.on "--bundler-version=VERSION_CONSTRAINT", String, "use the provided "\
                                                                            "string as a version constraint for bundler" do |version|
@@ -313,6 +316,7 @@ module Autoproj
                            "when reinstalling an existing autoproj workspace, do not "\
                            "use the config in .autoproj/ as seed" do
                         @config.clear
+                        @config["bundler_version"] = Install.default_bundler_version
                     end
                     opt.on "--seed-config=PATH", String, "path to a seed file that "\
                                                          "should be used to initialize the configuration" do |path|
@@ -746,11 +750,21 @@ require 'bundler/setup'
                 end
 
                 @config = config
+                @config["bundler_version"] ||= self.class.default_bundler_version
+
                 %w[gems_install_path prefer_indep_over_os_packages].each do |flag|
                     instance_variable_set "@#{flag}", config.fetch(flag, false)
                 end
             end
 
+            def self.default_bundler_version
+                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                    "2.3.6"
+                elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+                    "2.4.22"
+                end
+            end
+
             def save_config
                 config["gems_install_path"] = gems_install_path
                 config["prefer_indep_over_os_packages"] = prefer_indep_over_os_packages?

data/lib/autoproj/os_package_installer.rb

@@ -185,7 +185,8 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
                 when "gem"  then modes << "gem"
                 when "pip"  then modes << "pip"
                 when "os"   then modes << "os"
-                when "none" then # rubocop:disable Lint/EmptyWhen
+                when "none" then
+                    # noop
                 else
                     if package_managers.key?(str)
                         modes << str

data/lib/autoproj/package_manifest.rb

@@ -16,9 +16,10 @@ module Autoproj
         # @param [Boolean] ros_manifest whether the file follows the ROS format
         # @return [PackageManifest]
         # @see parse
-        def self.load(package, file, ros_manifest: false)
+        def self.load(package, file, ros_manifest: false, condition_context: nil)
             loader_class = ros_manifest ? RosPackageManifest::Loader : Loader
-            parse(package, File.read(file), path: file, loader_class: loader_class)
+            parse(package, File.read(file), path: file, loader_class: loader_class,
+                                            condition_context: condition_context)
         end
 
         # Create a PackageManifest object from the XML content provided as a
@@ -30,15 +31,22 @@ module Autoproj
         # @param [Boolean] ros_manifest whether the file follows the ROS format
         # @return [PackageManifest]
         # @see load
-        def self.parse(package, contents,
-            path: "<loaded from string>", loader_class: Loader)
+        def self.parse(
+            package, contents,
+            path: "<loaded from string>", loader_class: Loader,
+            condition_context: nil
+        )
             manifest = loader_class::MANIFEST_CLASS.new(package, path)
-            loader = loader_class.new(path, manifest)
+            loader = loader_class.new(path, manifest,
+                                      condition_context: condition_context)
             begin
                 REXML::Document.parse_stream(contents, loader)
             rescue REXML::ParseException => e
                 raise Autobuild::PackageException.new(package.name, "prepare"),
-                      "invalid #{file}: #{e.message}"
+                      "invalid #{path}: #{e.message}"
+            rescue Autoproj::ConfigError => e
+                raise Autobuild::PackageException.new(package.name, "prepare"),
+                      "invalid #{path}: #{e.message}"
             end
             manifest
         end
@@ -181,10 +189,50 @@ module Autoproj
 
             MANIFEST_CLASS = PackageManifest
 
-            def initialize(path, manifest)
+            def self.expand_configuration_variable(var, config)
+                prefix = var[0, 1]
+                var = var[1..-1] if prefix == "$"
+
+                if var.start_with?("operating_system_name_")
+                    os = config.get("operating_system", nil)
+                    return "" if os.nil?
+
+                    os_names, = os
+                    return "" unless os_names.any? do |name|
+                        var == "operating_system_name_#{name}"
+                    end
+
+                    return "true"
+                end
+
+                if var.start_with?("operating_system_version_")
+                    os = config.get("operating_system", nil)
+                    return "" if os.nil?
+
+                    _, os_versions = os
+                    return "" unless os_versions.any? do |ver|
+                        var == "operating_system_version_#{ver.gsub(/[.,+-]/, '_')}"
+                    end
+
+                    return "true"
+                end
+
+                config.get(var)
+            end
+
+            def initialize(path, manifest, condition_context: Configuration.new)
                 super()
                 @path = path
                 @manifest = manifest
+                @condition_parser = RosConditionParser.new do |var|
+                    Loader.expand_configuration_variable(var, condition_context)
+                end
+            end
+
+            def handle_condition(expr)
+                return true unless expr && !expr.empty?
+
+                @condition_parser.evaluate(expr)
             end
 
             def parse_depend_tag(tag_name, attributes, modes: [], optional: false)
@@ -195,6 +243,8 @@ module Autoproj
                           "without a 'package' attribute"
                 end
 
+                return unless handle_condition(attributes["condition"])
+
                 if (tag_modes = attributes["modes"])
                     modes += tag_modes.split(",")
                 end

data/lib/autoproj/ros_condition_parser.rb

@@ -8,15 +8,13 @@ module Autoproj
     # Parses a conditional expression
     # Syntax and rules as defined in https://www.ros.org/reps/rep-0149.html#id20
     class RosConditionParser < Parslet::Parser
-        def initialize(context)
-            @context = context
+        def initialize(&expander)
+            @expander = expander
             super()
         end
 
         def expand(var)
-            Autoproj.expand(var, @context)
-        rescue StandardError
-            ""
+            @expander.call(var)
         end
 
         # Evaluates the Abstract Syntax Tree generated by the parser

data/lib/autoproj/ros_package_manifest.rb

@@ -23,10 +23,13 @@ module Autoproj
                              buildtool_depend buildtool_export_depend
                              exec_depend test_depend run_depend doc_depend].to_set.freeze
 
-            def initialize(path, manifest)
+            def initialize(path, manifest, condition_context: {})
                 super
-                @env = manifest.package.ws.env
-                @condition_parser = RosConditionParser.new(@env)
+                @condition_parser = RosConditionParser.new do |var|
+                    Autoproj.expand(var, condition_context)
+                rescue StandardError
+                    ""
+                end
             end
 
             def tag_start(name, attributes)

data/lib/autoproj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -202,16 +202,16 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement