Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/vanagon/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class Project
attr_accessor :components
attr_accessor :conflicts
attr_accessor :requires
attr_accessor :suggests
attr_accessor :replaces
attr_accessor :provides

Expand Down Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions lib/vanagon/project/dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions resources/rpm/project.spec.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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") -%>
Expand Down
9 changes: 9 additions & 0 deletions spec/lib/vanagon/project/dsl_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading