From 02c41047c95cebb657c638a0f84c4f06664ac934 Mon Sep 17 00:00:00 2001 From: nmburgan <13688219+nmburgan@users.noreply.github.com> Date: Tue, 6 Oct 2026 23:31:59 +0000 Subject: [PATCH] Add a suggests DSL method for the rpm Suggests tag A project can now name packages to suggest. They render as Suggests tags in the rpm spec and nowhere else, which is how the preferred alternative of an "or" dependency is marked for the rpm solvers. Signed-off-by: nmburgan <13688219+nmburgan@users.noreply.github.com> Assisted-by: Claude Fable 5.1 --- lib/vanagon/project.rb | 2 ++ lib/vanagon/project/dsl.rb | 9 +++++++++ resources/rpm/project.spec.erb | 3 +++ spec/lib/vanagon/project/dsl_spec.rb | 9 +++++++++ 4 files changed, 23 insertions(+) diff --git a/lib/vanagon/project.rb b/lib/vanagon/project.rb index 5c50e462..e06350a9 100644 --- a/lib/vanagon/project.rb +++ b/lib/vanagon/project.rb @@ -27,6 +27,7 @@ class Project attr_accessor :components attr_accessor :conflicts attr_accessor :requires + attr_accessor :suggests attr_accessor :replaces attr_accessor :provides @@ -150,6 +151,7 @@ def initialize(name, platform) # rubocop:disable Metrics/AbcSize @name = name @components = [] @requires = [] + @suggests = [] @directories = [] @settings = platform.settings # Environments are like Hashes but with specific constraints diff --git a/lib/vanagon/project/dsl.rb b/lib/vanagon/project/dsl.rb index 9d473e56..99de0f85 100644 --- a/lib/vanagon/project/dsl.rb +++ b/lib/vanagon/project/dsl.rb @@ -113,6 +113,15 @@ def requires(requirement, version = nil) @project.requires << OpenStruct.new(:requirement => requirement, :version => version) end + # Names a package the project suggests at run time. Only rpm packages + # carry the tag, which is how a preferred alternative of an or + # requirement is marked for the rpm solvers. + # + # @param suggestion [String] the package to suggest + def suggests(suggestion) + @project.suggests << suggestion + end + # Indicates that this component replaces a system level package. Replaces can be collected and used by the project and package. # # @param replacement [String] a package that is replaced with this component diff --git a/resources/rpm/project.spec.erb b/resources/rpm/project.spec.erb index 8fb97b02..942926bc 100644 --- a/resources/rpm/project.spec.erb +++ b/resources/rpm/project.spec.erb @@ -75,6 +75,9 @@ Autoreq: 0 <%- get_requires.each do |requires| -%> Requires: <%= requires.requirement %><%= requires.version ? " #{requires.version}" : "" %> <%- end -%> +<%- suggests.each do |suggestion| -%> +Suggests: <%= suggestion %> +<%- end -%> <%- if has_services? -%> <%- if @platform.get_service_types.include?("systemd") -%> diff --git a/spec/lib/vanagon/project/dsl_spec.rb b/spec/lib/vanagon/project/dsl_spec.rb index 859fcf86..a43b6414 100644 --- a/spec/lib/vanagon/project/dsl_spec.rb +++ b/spec/lib/vanagon/project/dsl_spec.rb @@ -183,6 +183,15 @@ end end + describe '#suggests' do + it 'adds a package to the list of suggested packages' do + proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform) + proj.instance_eval(project_block) + proj.suggests('jre-25-headless') + expect(proj._project.suggests).to eq(['jre-25-headless']) + end + end + describe '#generate_source_artifacts' do it 'defaults to false' do proj = Vanagon::Project::DSL.new('test-fixture', configdir, platform)