ben/puppet-sabayon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use native to_line methods which is more easily testable

Browse Source
This commit is contained in:
Ben Roberts
2016-10-12 23:11:11 +01:00
parent 60329c3dec
commit 61b3262b7a
5 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/puppet/provider/entropy_keywords/parsed.rb
View File

@@ -23,9 +23,7 @@ Puppet::Type.type(:entropy_keywords).provide(:parsed,
record_line :parsed, record_line :parsed,
:fields => %w{keyword operator package version repo name}, :fields => %w{keyword operator package version repo name},
:match => %r{^(\S+)\s+([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?:\s+repo=([a-zA-Z0-9\._-]+))?\s+## Puppet Name: (.*)\s*$}, :match => %r{^(\S+)\s+([<>]?=)?([a-zA-Z+\/-]*)(?:-(\d+(?:\.\d+)*[a-z]*(?:_(?:alpha|beta|pre|p|rc)\d*)?(?:-r\d+)?))?(?:\s+repo=([a-zA-Z0-9\._-]+))?\s+## Puppet Name: (.*)\s*$},
:block_eval => :instance do :to_line => proc { |record|
def to_line(record)
line = record[:keyword] + " " line = record[:keyword] + " "
line += record[:operator] if record[:operator] line += record[:operator] if record[:operator]
line += record[:package] if record[:package] line += record[:package] if record[:package]
@@ -34,10 +32,8 @@ Puppet::Type.type(:entropy_keywords).provide(:parsed,
line += " ## Puppet Name: " + record[:name] line += " ## Puppet Name: " + record[:name]
line line
end }
end
end end
# vim: set ts=2 shiftwidth=2 expandtab : # vim: set ts=2 shiftwidth=2 expandtab :

10
lib/puppet/provider/entropy_mask/parsed.rb
View File

@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_mask).provide(:parsed,
record_line :parsed, record_line :parsed,
:fields => %w{operator package version slot use tag repo name}, :fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$}, :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$},
:block_eval => :instance do :to_line => proc { |record|
def to_line(record)
line = "" line = ""
line += record[:operator] if record[:operator] line += record[:operator] if record[:operator]
line += record[:package] line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version] line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot] line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use] line += "[" + record[:use] + "]" if record[:use]
@@ -37,10 +35,8 @@ Puppet::Type.type(:entropy_mask).provide(:parsed,
line += " ## Puppet Name: " + record[:name] line += " ## Puppet Name: " + record[:name]
line line
end }
end
end end
# vim: set ts=2 shiftwidth=2 expandtab : # vim: set ts=2 shiftwidth=2 expandtab :

10
lib/puppet/provider/entropy_splitdebug/parsed.rb
View File

@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed,
record_line :parsed, record_line :parsed,
:fields => %w{operator package version slot use tag repo name}, :fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$}, :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$},
:block_eval => :instance do :to_line => proc { |record|
def to_line(record)
line = "" line = ""
line += record[:operator] if record[:operator] line += record[:operator] if record[:operator]
line += record[:package] line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version] line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot] line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use] line += "[" + record[:use] + "]" if record[:use]
@@ -37,9 +35,7 @@ Puppet::Type.type(:entropy_splitdebug).provide(:parsed,
line += " ## Puppet Name: " + record[:name] line += " ## Puppet Name: " + record[:name]
line line
end }
end
end end

10
lib/puppet/provider/entropy_splitdebug_mask/parsed.rb
View File

@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_splitdebug_mask).provide(:parsed,
record_line :parsed, record_line :parsed,
:fields => %w{operator package version slot use tag repo name}, :fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$}, :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$},
:block_eval => :instance do :to_line => proc { |record|
def to_line(record)
line = "" line = ""
line += record[:operator] if record[:operator] line += record[:operator] if record[:operator]
line += record[:package] line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version] line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot] line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use] line += "[" + record[:use] + "]" if record[:use]
@@ -37,9 +35,7 @@ Puppet::Type.type(:entropy_splitdebug_mask).provide(:parsed,
line += " ## Puppet Name: " + record[:name] line += " ## Puppet Name: " + record[:name]
line line
end }
end
end end

10
lib/puppet/provider/entropy_unmask/parsed.rb
View File

@@ -23,12 +23,10 @@ Puppet::Type.type(:entropy_unmask).provide(:parsed,
record_line :parsed, record_line :parsed,
:fields => %w{operator package version slot use tag repo name}, :fields => %w{operator package version slot use tag repo name},
:match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$}, :match => %r{^([<>]?=)?([a-zA-Z+\/-]*)(?:-(\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*$},
:block_eval => :instance do :to_line => proc { |record|
def to_line(record)
line = "" line = ""
line += record[:operator] if record[:operator] line += record[:operator] if record[:operator]
line += record[:package] line += record[:package] if record[:package]
line += "-" + record[:version] if record[:version] line += "-" + record[:version] if record[:version]
line += ":" + record[:slot] if record[:slot] line += ":" + record[:slot] if record[:slot]
line += "[" + record[:use] + "]" if record[:use] line += "[" + record[:use] + "]" if record[:use]
@@ -37,9 +35,7 @@ Puppet::Type.type(:entropy_unmask).provide(:parsed,
line += " ## Puppet Name: " + record[:name] line += " ## Puppet Name: " + record[:name]
line line
end }
end
end end