Autocorrect PDK validation warnings

This commit is contained in:
2019-05-09 23:41:09 +01:00
parent 998f1716f3
commit 939f795d37
26 changed files with 537 additions and 584 deletions

View File

@@ -1,16 +1,15 @@
Facter.add('entropy_repos') do
confine :operatingsystem => :Sabayon
confine operatingsystem: :Sabayon
setcode do
# Use the types/providers to do the heavy lifting here
repos = {}
Puppet::Type.type(:entropy_repo).provider(:file).instances().each do |repo|
Puppet::Type.type(:entropy_repo).provider(:file).instances.each do |repo|
Facter.debug(repo.enabled)
r = {
:repo_type => repo.repo_type,
:enabled => repo.enabled,
repo_type: repo.repo_type,
enabled: repo.enabled,
}
repos[repo.name] = r
@@ -18,5 +17,4 @@ Facter.add('entropy_repos') do
repos
end
end

View File

@@ -1,7 +1,6 @@
Facter.add(:locale) do
confine :osfamily => :gentoo
setcode do
Facter::Core::Execution.exec('eselect --colour=no --brief locale show').strip
end
confine osfamily: :gentoo
setcode do
Facter::Core::Execution.exec('eselect --colour=no --brief locale show').strip
end
end

View File

@@ -1,54 +1,51 @@
Puppet::Type.type(:enman_repo).provide(:enman) do
desc "Enman provider for Enman Repositories"
defaultfor :operatingsystem => :sabayon
desc 'Enman provider for Enman Repositories'
commands({:enman => "enman"})
defaultfor operatingsystem: :sabayon
commands(enman: 'enman')
mk_resource_methods
def create
enman("add", resource[:name])
@property_hash[:ensure] = :present
enman('add', resource[:name])
@property_hash[:ensure] = :present
end
def destroy
enman("remove", resource[:name])
@property_hash[:ensure] = :absent
enman('remove', resource[:name])
@property_hash[:ensure] = :absent
end
def exists?
@property_hash[:ensure] == :present
end
def self.instances
all_installed = enman("list", "--quiet", "--installed").chomp.split
all_available = enman("list", "--quiet", "--available").chomp.split
all_installed = enman('list', '--quiet', '--installed').chomp.split
all_available = enman('list', '--quiet', '--available').chomp.split
all_available.collect do |available_repo|
all_available.map do |available_repo|
repo = {
:name => available_repo,
:ensure => all_installed.include?(available_repo) ? :present : :absent,
:provider => :enman_repo,
name: available_repo,
ensure: all_installed.include?(available_repo) ? :present : :absent,
provider: :enman_repo,
}
Puppet.debug(repo)
new(repo)
end
end
def self.prefetch(resources)
available_repos = self.instances()
available_repos = instances
resources.each do |name, resource|
resources.each do |name, _resource|
if provider = available_repos.find { |r| r.name == name }
resources[name].provider = provider
end
end
end
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,41 +1,38 @@
require 'puppet/provider/parsedfile'
file = "/etc/entropy/packages/package.keywords"
file = '/etc/entropy/packages/package.keywords'
Puppet::Type.type(:entropy_keywords).provide(:parsed,
:parent => Puppet::Provider::ParsedFile,
:default_target => file,
:filetype => :flat
) do
parent: Puppet::Provider::ParsedFile,
default_target: file,
filetype: :flat) do
desc "Override keywords for entropy packages"
desc 'Override keywords for entropy packages'
defaultfor :operatingsystem => :sabayon
defaultfor operatingsystem: :sabayon
text_line :blank,
:match => /^\s*$/
match: %r{^\s*$}
text_line :comment,
:match => /^\s*#/
match: %r{^\s*#}
text_line :unmanaged,
:match => %r{^(\S+)\s+([<>]?=)?(?:((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?)?(?:\s*repo=([a-zA-Z0-9\._-]+))?\s*$}
match: %r{^(\S+)\s+([<>]?=)?(?:((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?)?(?:\s*repo=([a-zA-Z0-9\._-]+))?\s*$}
record_line :parsed,
:fields => %w{keyword operator package version repo name},
:match => %r{^(\S+)\s+([<>]?=)?(?:((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?)?(?:\s*repo=([a-zA-Z0-9\._-]+))?\s+## Puppet Name: (.*)\s*$},
:to_line => proc { |record|
line = record[:keyword] + " "
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version]
line += " " if record[:package] && record[:repo]
line += "repo=" + record[:repo] if record[:repo]
line += " ## Puppet Name: " + record[:name]
line
}
fields: ['keyword', 'operator', 'package', 'version', 'repo', 'name'],
match: %r{^(\S+)\s+([<>]?=)?(?:((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?)?(?:\s*repo=([a-zA-Z0-9\._-]+))?\s+## Puppet Name: (.*)\s*$},
to_line: proc { |record|
line = record[:keyword] + ' '
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += '-' + record[:version] if record[:version]
line += ' ' if record[:package] && record[:repo]
line += 'repo=' + record[:repo] if record[:repo]
line += ' ## Puppet Name: ' + record[:name]
line
}
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,43 +1,40 @@
require 'puppet/provider/parsedfile'
masks = "/etc/entropy/packages/package.mask"
masks = '/etc/entropy/packages/package.mask'
Puppet::Type.type(:entropy_mask).provide(:parsed,
:parent => Puppet::Provider::ParsedFile,
:default_target => masks,
:filetype => :flat
) do
parent: Puppet::Provider::ParsedFile,
default_target: masks,
filetype: :flat) do
desc "File mask provider for entropy packages"
desc 'File mask provider for entropy packages'
defaultfor :operatingsystem => :sabayon
defaultfor operatingsystem: :sabayon
text_line :blank,
:match => /^\s*$/
match: %r{^\s*$}
text_line :comment,
:match => /^\s*#/
match: %r{^\s*#}
text_line :unmanaged,
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s*$}
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s*$}
record_line :parsed,
:fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s+#+ Puppet Name: (.*)\s*$},
:to_line => proc { |record|
line = ""
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use]
line += "#" + record[:tag] if record[:tag]
line += "::" + record[:repo] if record[:repo]
line += " ## Puppet Name: " + record[:name]
line
}
fields: ['operator', 'package', 'version', 'slot', 'use', 'tag', 'repo', 'name'],
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s+#+ Puppet Name: (.*)\s*$},
to_line: proc { |record|
line = ''
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += '-' + record[:version] if record[:version]
line += ':' + record[:slot] if record[:slot]
line += '[' + record[:use] + ']' if record[:use]
line += '#' + record[:tag] if record[:tag]
line += '::' + record[:repo] if record[:repo]
line += ' ## Puppet Name: ' + record[:name]
line
}
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,7 +1,7 @@
Puppet::Type.type(:entropy_repo).provide(:file) do
desc "File provider for Entropy Repositories"
defaultfor :operatingsystem => :sabayon
desc 'File provider for Entropy Repositories'
defaultfor operatingsystem: :sabayon
mk_resource_methods
@@ -18,57 +18,55 @@ Puppet::Type.type(:entropy_repo).provide(:file) do
disabled_filename = "/etc/entropy/repositories.conf.d/_entropy_#{type_prefix}#{@property_hash[:name]}"
if value == 'true' || value == :true
if File.exists?(disabled_filename)
if File.exist?(disabled_filename)
File.rename(disabled_filename, enabled_filename)
end
else
if File.exists?(enabled_filename)
if File.exist?(enabled_filename)
File.rename(enabled_filename, disabled_filename)
end
end
@property_hash[:enabled] = value
end
def self.instances
repos = Dir.entries('/etc/entropy/repositories.conf.d/')
repos.collect do |r|
repos.map { |r|
if r == '.' || r == '..'
nil
elsif r =~ /\.example$/
elsif r =~ %r{\.example$}
nil
elsif r !~ /^_?entropy_/
elsif r !~ %r{^_?entropy_}
nil
else
matches = /^(_)?entropy_(enman_)?(.*)$/.match(r)
matches = %r{^(_)?entropy_(enman_)?(.*)$}.match(r)
enabled = matches[1].nil? ? 'true' : 'false'
type = matches[2] == 'enman_' ? 'enman' : 'entropy'
type = (matches[2] == 'enman_') ? 'enman' : 'entropy'
name = matches[3]
repo = {
:name => name,
:repo_type => type,
:enabled => enabled,
:provider => :entropy_repo,
name: name,
repo_type: type,
enabled: enabled,
provider: :entropy_repo,
}
new(repo)
end
end.compact
}.compact
end
def self.prefetch(resources)
repos = self.instances()
repos = instances
resources.each do |name, resource|
resources.each do |name, _resource|
if provider = repos.find { |r| r.name == name }
resources[name].provider = provider
end
end
end
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,43 +1,40 @@
require 'puppet/provider/parsedfile'
file = "/etc/entropy/packages/package.splitdebug"
file = '/etc/entropy/packages/package.splitdebug'
Puppet::Type.type(:entropy_splitdebug).provide(:parsed,
:parent => Puppet::Provider::ParsedFile,
:default_target => file,
:filetype => :flat
) do
parent: Puppet::Provider::ParsedFile,
default_target: file,
filetype: :flat) do
desc "File splitdebug provider for entropy packages"
desc 'File splitdebug provider for entropy packages'
defaultfor :operatingsystem => :sabayon
defaultfor operatingsystem: :sabayon
text_line :blank,
:match => /^\s*$/
match: %r{^\s*$}
text_line :comment,
:match => /^\s*#/
match: %r{^\s*#}
text_line :unmanaged,
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9\._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9\._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s*$}
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9\._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9\._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s*$}
record_line :parsed,
:fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9\._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9\._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s+#+ Puppet Name: (.*)\s*$},
:to_line => proc { |record|
line = ""
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use]
line += "#" + record[:tag] if record[:tag]
line += "::" + record[:repo] if record[:repo]
line += " ## Puppet Name: " + record[:name]
fields: ['operator', 'package', 'version', 'slot', 'use', 'tag', 'repo', 'name'],
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9\._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9\._-]+))?(?:::([a-zA-Z0-9\._-]+))?\s+#+ Puppet Name: (.*)\s*$},
to_line: proc { |record|
line = ''
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += '-' + record[:version] if record[:version]
line += ':' + record[:slot] if record[:slot]
line += '[' + record[:use] + ']' if record[:use]
line += '#' + record[:tag] if record[:tag]
line += '::' + record[:repo] if record[:repo]
line += ' ## Puppet Name: ' + record[:name]
line
}
line
}
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,43 +1,40 @@
require 'puppet/provider/parsedfile'
file = "/etc/entropy/packages/package.splitdebug.mask"
file = '/etc/entropy/packages/package.splitdebug.mask'
Puppet::Type.type(:entropy_splitdebug_mask).provide(:parsed,
:parent => Puppet::Provider::ParsedFile,
:default_target => file,
:filetype => :flat
) do
parent: Puppet::Provider::ParsedFile,
default_target: file,
filetype: :flat) do
desc "File splitdebug mask provider for entropy packages"
desc 'File splitdebug mask provider for entropy packages'
defaultfor :operatingsystem => :sabayon
defaultfor operatingsystem: :sabayon
text_line :blank,
:match => /^\s*$/
match: %r{^\s*$}
text_line :comment,
:match => /^\s*#/
match: %r{^\s*#}
text_line :unmanaged,
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9\._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s*$}
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9\._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s*$}
record_line :parsed,
:fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s+#+ Puppet Name: (.*)\s*$},
:to_line => proc { |record|
line = ""
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use]
line += "#" + record[:tag] if record[:tag]
line += "::" + record[:repo] if record[:repo]
line += " ## Puppet Name: " + record[:name]
fields: ['operator', 'package', 'version', 'slot', 'use', 'tag', 'repo', 'name'],
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s+#+ Puppet Name: (.*)\s*$},
to_line: proc { |record|
line = ''
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += '-' + record[:version] if record[:version]
line += ':' + record[:slot] if record[:slot]
line += '[' + record[:use] + ']' if record[:use]
line += '#' + record[:tag] if record[:tag]
line += '::' + record[:repo] if record[:repo]
line += ' ## Puppet Name: ' + record[:name]
line
}
line
}
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,43 +1,40 @@
require 'puppet/provider/parsedfile'
unmasks = "/etc/entropy/packages/package.unmask"
unmasks = '/etc/entropy/packages/package.unmask'
Puppet::Type.type(:entropy_unmask).provide(:parsed,
:parent => Puppet::Provider::ParsedFile,
:default_target => unmasks,
:filetype => :flat
) do
parent: Puppet::Provider::ParsedFile,
default_target: unmasks,
filetype: :flat) do
desc "File unmask provider for entropy packages"
desc 'File unmask provider for entropy packages'
defaultfor :operatingsystem => :sabayon
defaultfor operatingsystem: :sabayon
text_line :blank,
:match => /^\s*$/
match: %r{^\s*$}
text_line :comment,
:match => /^\s*#/
match: %r{^\s*#}
text_line :unmanaged,
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s*$}
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s*$}
record_line :parsed,
:fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s+#+ Puppet Name: (.*)\s*$},
:to_line => proc { |record|
line = ""
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use]
line += "#" + record[:tag] if record[:tag]
line += "::" + record[:repo] if record[:repo]
line += " ## Puppet Name: " + record[:name]
fields: ['operator', 'package', 'version', 'slot', 'use', 'tag', 'repo', 'name'],
match: %r{^([<>]?=)?((?:[A-Za-z0-9+_.-]+/)?[a-zA-Z0-9+_-]+)?(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?::([a-zA-Z0-9._-]+))?(?:\[([^\]]*)\])?(?:#([a-zA-Z0-9._-]+))?(?:::([a-zA-Z0-9._-]+))?\s+#+ Puppet Name: (.*)\s*$},
to_line: proc { |record|
line = ''
line += record[:operator] if record[:operator]
line += record[:package] if record[:package]
line += '-' + record[:version] if record[:version]
line += ':' + record[:slot] if record[:slot]
line += '[' + record[:use] + ']' if record[:use]
line += '#' + record[:tag] if record[:tag]
line += '::' + record[:repo] if record[:repo]
line += ' ## Puppet Name: ' + record[:name]
line
}
line
}
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,7 +1,7 @@
require 'puppet/provider/package'
require 'fileutils'
Puppet::Type.type(:package).provide(:entropy, :parent => Puppet::Provider::Package) do
Puppet::Type.type(:package).provide(:entropy, parent: Puppet::Provider::Package) do
desc "Provides packaging support for Sabayon's entropy system."
has_feature :versionable
@@ -9,60 +9,57 @@ Puppet::Type.type(:package).provide(:entropy, :parent => Puppet::Provider::Packa
has_feature :uninstallable
has_feature :upgradeable
has_command(:equo, "equo") do
has_command(:equo, 'equo') do
locale = Facter.value(:locale)
environment({
:LANG => locale,
:LC_ALL => locale,
:LANGUAHE => locale,
})
environment(LANG: locale,
LC_ALL: locale,
LANGUAHE: locale)
end
# Require the locale fact exist
confine :false => Facter.value(:locale).nil?
confine :osfamily => :Gentoo
defaultfor :operatingsystem => :Sabayon
confine false: Facter.value(:locale).nil?
confine osfamily: :Gentoo
defaultfor operatingsystem: :Sabayon
def self.instances
result_format = /^(\S+)\/(\S+)-([\.\d]+(?:_?(?:a(?:lpha)?|b(?:eta)?|pre|pre_pre|rc|p)\d*)?(?:-r\d+)?)(?:#(\S+))?$/
result_fields = [:category, :name, :ensure]
begin
search_output = equo("query", "list", "installed", "--quiet", "--verbose").chomp
search_output = equo('query', 'list', 'installed', '--quiet', '--verbose').chomp
packages = []
search_output.each_line do |search_result|
match = result_format.match(search_result)
if match
package = {}
result_fields.zip(match.captures) do |field, value|
package[field] = value unless !value or value.empty?
end
package[:provider] = :entropy
packages << new(package)
next unless match
package = {}
result_fields.zip(match.captures) do |field, value|
package[field] = value unless !value || value.empty?
end
package[:provider] = :entropy
packages << new(package)
end
return packages
rescue Puppet::ExecutionFailure => detail
raise Puppet::Error.new(detail.message)
raise Puppet::Error, detail.message
end
end
def install
should = @resource.should(:ensure)
name = package_name
unless should == :present or should == :latest
unless should == :present || should == :latest
# We must install a specific version
name = "=#{name}-#{should}"
end
begin
equo "install", name
equo 'install', name
rescue Puppet::ExecutionFailure => detail
raise Puppet::Error.new(detail.message)
raise Puppet::Error, detail.message
end
end
@@ -76,15 +73,13 @@ Puppet::Type.type(:package).provide(:entropy, :parent => Puppet::Provider::Packa
end
def uninstall
begin
equo "remove", package_name
rescue Puppet::ExecutionFailure => detail
raise Puppet::Error.new(detail.message)
end
equo 'remove', package_name
rescue Puppet::ExecutionFailure => detail
raise Puppet::Error, detail.message
end
def update
self.install
install
end
def query
@@ -93,16 +88,15 @@ Puppet::Type.type(:package).provide(:entropy, :parent => Puppet::Provider::Packa
begin
# Look for an installed package from a known repository
search_output = equo("match", "--quiet", "--verbose", package_name).chomp
search_output = equo('match', '--quiet', '--verbose', package_name).chomp
search_match = search_output.match(result_format)
if search_match
package = {}
result_fields.zip(search_match.captures).each do |field, value|
package[field] = value unless !value or value.empty?
package[field] = value unless !value || value.empty?
end
begin
installed_output = equo('match', '--quiet', '--verbose', '--installed', package_name).chomp
installed_match = installed_output.match(result_format)
@@ -122,38 +116,34 @@ Puppet::Type.type(:package).provide(:entropy, :parent => Puppet::Provider::Packa
else
# List all installed packages and try and find if it's installed from outside a repository
# If so, assume the installed version is the latest available
all_installed = equo("query", "list", "installed", "--quiet", "--verbose").chomp
all_installed = equo('query', 'list', 'installed', '--quiet', '--verbose').chomp
all_installed.split("\n").each do |installed_package|
search_match = installed_package.match(result_format)
if search_match
search_captures = search_match.captures
if (search_captures[0] == @resource[:category] and search_captures[1] == @resource[:name]) or "#{search_captures[0]}/#{search_captures[1]}" == package_name
next unless search_match
search_captures = search_match.captures
package = {
:ensure => search_captures[2]
}
next unless (search_captures[0] == (@resource[:category]) && search_captures[1] == (@resource[:name])) || package_name == "#{search_captures[0]}/#{search_captures[1]}"
result_fields.zip(search_captures).each do |field, value|
package[field] = value unless !value or value.empty?
end
package = {
ensure: search_captures[2],
}
return package
end
result_fields.zip(search_captures).each do |field, value|
package[field] = value unless !value || value.empty?
end
return package
end
raise Puppet::Error.new("No package found with the specified name [#{package_name}]")
raise Puppet::Error, "No package found with the specified name [#{package_name}]"
end
rescue Puppet::ExecutionFailure => detail
raise Puppet::Error.new(detail.message)
raise Puppet::Error, detail.message
end
end
def latest
self.query[:version_available]
query[:version_available]
end
end

View File

@@ -1,8 +1,7 @@
# Manage systemd services using /bin/systemctl
Puppet::Type.type(:service).provide :sabayon, :parent => :systemd do
desc "Manages `systemd` services using `systemctl`."
defaultfor :operatingsystem => :sabayon
Puppet::Type.type(:service).provide :sabayon, parent: :systemd do
desc 'Manages `systemd` services using `systemctl`.'
defaultfor operatingsystem: :sabayon
end

View File

@@ -1,18 +1,16 @@
Puppet::Type.newtype(:enman_repo) do
@desc = "Manages Sabayon Community Repositories"
@desc = 'Manages Sabayon Community Repositories'
ensurable
newparam(:name) do
desc "Name of the Enman Repository"
desc 'Name of the Enman Repository'
isnamevar
end
autorequire(:package) do
['enman']
end
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,23 +1,23 @@
Puppet::Type.newtype(:entropy_keywords) do
@desc = "Override keywords for Entropy packages"
@desc = 'Override keywords for Entropy packages'
ensurable
newparam(:name) do
desc "Unique name for this keyword entry"
desc 'Unique name for this keyword entry'
end
newproperty(:keyword) do
desc "Keyword to be applied to matching packages"
desc 'Keyword to be applied to matching packages'
defaultto {
defaultto do
os = Facter.value(:os)
if os.key?('architecture')
os['architecture']
else
'**'
end
}
end
end
newproperty(:operator) do
@@ -25,35 +25,35 @@ Puppet::Type.newtype(:entropy_keywords) do
end
newproperty(:package) do
desc "Name of the package being keyworded"
desc 'Name of the package being keyworded'
newvalues(%r{^(?:[A-Za-z0-9+_.-]+\/)?[a-zA-Z0-9+_-]+$})
end
newproperty(:version) do
desc "Version of the package"
desc 'Version of the package'
newvalues(%r{^(\d*(?:\.\d+[a-zA-Z]*)*)(?:_((?:alpha|beta|pre|rc)\d*))?(-r\d+)?$})
end
newproperty(:repo) do
desc "Repo for the package"
desc 'Repo for the package'
end
newproperty(:target) do
desc "Location of the package.keywords file being managed"
desc 'Location of the package.keywords file being managed'
defaultto {
defaultto do
if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
@resource.class.defaultprovider.default_target
else
nil
end
}
end
end
validate do
raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, 'Package is required when a version is specified') if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil?
raise(ArgumentError, 'Version is required when an operator is specified') if self[:version].nil? && !self[:operator].nil?
end
autobefore(:package) do
@@ -62,4 +62,3 @@ Puppet::Type.newtype(:entropy_keywords) do
end
# vim: set ts=2 sw=2 expandtab:

View File

@@ -1,10 +1,10 @@
Puppet::Type.newtype(:entropy_mask) do
@desc = "Mask packages in Entropy"
@desc = 'Mask packages in Entropy'
ensurable
newparam(:name) do
desc "Unique name for this mask"
desc 'Unique name for this mask'
end
newproperty(:operator) do
@@ -12,47 +12,47 @@ Puppet::Type.newtype(:entropy_mask) do
end
newproperty(:package) do
desc "Name of the package being masked"
desc 'Name of the package being masked'
newvalues(%r{^(?:[A-Za-z0-9+_.-]+\/)?[a-zA-Z0-9+_-]+$})
end
newproperty(:version) do
desc "Version of the package"
desc 'Version of the package'
newvalues(%r{^(\d*(?:\.\d+[a-zA-Z]*)*)(?:_((?:alpha|beta|pre|rc)\d*))?(-r\d+)?$})
end
newproperty(:slot) do
desc "Slot the package is in"
desc 'Slot the package is in'
end
newproperty(:use) do
desc "Useflags for the package"
desc 'Useflags for the package'
end
newproperty(:tag) do
desc "Tag for the package"
desc 'Tag for the package'
end
newproperty(:repo) do
desc "Repo for the package"
desc 'Repo for the package'
end
newproperty(:target) do
desc "Location of the package.mask file being managed"
desc 'Location of the package.mask file being managed'
defaultto {
defaultto do
if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
@resource.class.defaultprovider.default_target
else
nil
end
}
end
end
validate do
raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, 'Package is required when a version is specified') if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil?
raise(ArgumentError, 'Version is required when an operator is specified') if self[:version].nil? && !self[:operator].nil?
end
autobefore(:package) do
@@ -61,4 +61,3 @@ Puppet::Type.newtype(:entropy_mask) do
end
# vim: set ts=2 sw=2 expandtab:

View File

@@ -1,22 +1,20 @@
require 'puppet/property/boolean'
Puppet::Type.newtype(:entropy_repo) do
@desc = "Manages Entropy Repositories"
@desc = 'Manages Entropy Repositories'
newparam(:name) do
desc "Name of the Entropy Repository"
desc 'Name of the Entropy Repository'
end
newproperty(:repo_type, :readonly => true) do
desc "What type of repository this is (enman or entropy)"
newproperty(:repo_type, readonly: true) do
desc 'What type of repository this is (enman or entropy)'
end
newproperty(:enabled) do
desc "Whether the repository is enabled or not"
desc 'Whether the repository is enabled or not'
newvalues('true', 'false')
end
end
# vim: set ts=2 shiftwidth=2 expandtab :

View File

@@ -1,10 +1,10 @@
Puppet::Type.newtype(:entropy_splitdebug) do
@desc = "Manages splitdebug for packages in Entropy"
@desc = 'Manages splitdebug for packages in Entropy'
ensurable
newparam(:name) do
desc "Unique name for this splitdebug specification"
desc 'Unique name for this splitdebug specification'
end
newproperty(:operator) do
@@ -12,47 +12,47 @@ Puppet::Type.newtype(:entropy_splitdebug) do
end
newproperty(:package) do
desc "Name of the package with splitdebug"
desc 'Name of the package with splitdebug'
newvalues(%r{^(?:[A-Za-z0-9+_.-]+\/)?[a-zA-Z0-9+_-]+$})
end
newproperty(:version) do
desc "Version of the package"
desc 'Version of the package'
newvalues(%r{^(\d*(?:\.\d+[a-zA-Z]*)*)(?:_((?:alpha|beta|pre|rc)\d*))?(-r\d+)?$})
end
newproperty(:slot) do
desc "Slot the package is in"
desc 'Slot the package is in'
end
newproperty(:use) do
desc "Useflags for the package"
desc 'Useflags for the package'
end
newproperty(:tag) do
desc "Tag for the package"
desc 'Tag for the package'
end
newproperty(:repo) do
desc "Repo for the package"
desc 'Repo for the package'
end
newproperty(:target) do
desc "Location of the package.splitdebug file being managed"
desc 'Location of the package.splitdebug file being managed'
defaultto {
defaultto do
if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
@resource.class.defaultprovider.default_target
else
nil
end
}
end
end
validate do
raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, 'Package is required when a version is specified') if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil?
raise(ArgumentError, 'Version is required when an operator is specified') if self[:version].nil? && !self[:operator].nil?
end
autobefore(:package) do
@@ -61,4 +61,3 @@ Puppet::Type.newtype(:entropy_splitdebug) do
end
# vim: set ts=2 sw=2 expandtab:

View File

@@ -1,10 +1,10 @@
Puppet::Type.newtype(:entropy_splitdebug_mask) do
@desc = "Manages splitdebug masks for packages in Entropy"
@desc = 'Manages splitdebug masks for packages in Entropy'
ensurable
newparam(:name) do
desc "Unique name for this splitdebug mask specification"
desc 'Unique name for this splitdebug mask specification'
end
newproperty(:operator) do
@@ -12,47 +12,47 @@ Puppet::Type.newtype(:entropy_splitdebug_mask) do
end
newproperty(:package) do
desc "Name of the package with splitdebug mask"
desc 'Name of the package with splitdebug mask'
newvalues(%r{^(?:[A-Za-z0-9+_.-]+\/)?[a-zA-Z0-9+_-]+$})
end
newproperty(:version) do
desc "Version of the package"
desc 'Version of the package'
newvalues(%r{^(\d*(?:\.\d+[a-zA-Z]*)*)(?:_((?:alpha|beta|pre|rc)\d*))?(-r\d+)?$})
end
newproperty(:slot) do
desc "Slot the package is in"
desc 'Slot the package is in'
end
newproperty(:use) do
desc "Useflags for the package"
desc 'Useflags for the package'
end
newproperty(:tag) do
desc "Tag for the package"
desc 'Tag for the package'
end
newproperty(:repo) do
desc "Repo for the package"
desc 'Repo for the package'
end
newproperty(:target) do
desc "Location of the package.splitdebug.mask file being managed"
desc 'Location of the package.splitdebug.mask file being managed'
defaultto {
defaultto do
if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
@resource.class.defaultprovider.default_target
else
nil
end
}
end
end
validate do
raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, 'Package is required when a version is specified') if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil?
raise(ArgumentError, 'Version is required when an operator is specified') if self[:version].nil? && !self[:operator].nil?
end
autobefore(:package) do
@@ -61,4 +61,3 @@ Puppet::Type.newtype(:entropy_splitdebug_mask) do
end
# vim: set ts=2 sw=2 expandtab:

View File

@@ -1,10 +1,10 @@
Puppet::Type.newtype(:entropy_unmask) do
@desc = "Unmask packages in Entropy"
@desc = 'Unmask packages in Entropy'
ensurable
newparam(:name) do
desc "Unique name for this unmask"
desc 'Unique name for this unmask'
end
newproperty(:operator) do
@@ -12,47 +12,47 @@ Puppet::Type.newtype(:entropy_unmask) do
end
newproperty(:package) do
desc "Name of the package being masked"
desc 'Name of the package being masked'
newvalues(%r{^(?:[A-Za-z0-9+_.-]+\/)?[a-zA-Z0-9+_-]+$})
end
newproperty(:version) do
desc "Version of the package"
desc 'Version of the package'
newvalues(%r{^(\d*(?:\.\d+[a-zA-Z]*)*)(?:_((?:alpha|beta|pre|rc)\d*))?(-r\d+)?$})
end
newproperty(:slot) do
desc "Slot the package is in"
desc 'Slot the package is in'
end
newproperty(:use) do
desc "Useflags for the package"
desc 'Useflags for the package'
end
newproperty(:tag) do
desc "Tag for the package"
desc 'Tag for the package'
end
newproperty(:repo) do
desc "Repo for the package"
desc 'Repo for the package'
end
newproperty(:target) do
desc "Location of the package.unmask file being managed"
desc 'Location of the package.unmask file being managed'
defaultto {
defaultto do
if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
@resource.class.defaultprovider.default_target
else
nil
end
}
end
end
validate do
raise(ArgumentError, "Package is required when a version is specified") if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, 'Package is required when a version is specified') if self[:package].nil? && !self[:version].nil?
raise(ArgumentError, "Version is required when an operator is specified") if self[:version].nil? && !self[:operator].nil?
raise(ArgumentError, 'Version is required when an operator is specified') if self[:version].nil? && !self[:operator].nil?
end
autobefore(:package) do
@@ -61,4 +61,3 @@ Puppet::Type.newtype(:entropy_unmask) do
end
# vim: set ts=2 sw=2 expandtab: