summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/provider/file_line/ruby.rb16
-rw-r--r--lib/puppet/type/file_line.rb4
2 files changed, 7 insertions, 13 deletions
diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index 2cbd172..94e7fac 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -9,9 +9,7 @@ Puppet::Type.type(:file_line).provide(:ruby) do
if resource[:match]
handle_create_with_match
elsif resource[:after]
- handle_create_with_position :after
- elsif resource[:before]
- handle_create_with_position :before
+ handle_create_with_after
else
append_line
end
@@ -51,29 +49,29 @@ Puppet::Type.type(:file_line).provide(:ruby) do
end
end
- def handle_create_with_position(position)
- regex = resource[position] ? Regexp.new(resource[position]) : nil
+ def handle_create_with_after
+ regex = Regexp.new(resource[:after])
count = lines.count {|l| l.match(regex)}
case count
- when 1 # find the line to put our line before/after
+ when 1 # find the line to put our line after
File.open(resource[:path], 'w') do |fh|
lines.each do |l|
- fh.puts(l) if position == :after
+ fh.puts(l)
if regex.match(l) then
fh.puts(resource[:line])
end
- fh.puts(l) if position == :before
end
end
when 0 # append the line to the end of the file
append_line
else
- raise Puppet::Error, "#{count} lines match pattern '#{resource[position]}' in file '#{resource[:path]}'. One or no line must match the pattern."
+ raise Puppet::Error, "#{count} lines match pattern '#{resource[:after]}' in file '#{resource[:path]}'. One or no line must match the pattern."
end
end
+ ##
# append the line to the file.
#
# @api private
diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index bc6745f..323fc4c 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -46,10 +46,6 @@ Puppet::Type.newtype(:file_line) do
desc 'An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)'
end
- newparam(:before) do
- desc 'An optional value used to specify the line before which we will add any new lines. (Existing lines are added in place)'
- end
-
newparam(:line) do
desc 'The line to be appended to the file located by the path parameter.'
end