summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2014-05-15 13:31:23 -0400
committerAshley Penney <ashley.penney@puppetlabs.com>2014-05-15 13:31:23 -0400
commit8499ebdb7f892f2623295058649c67a5553d4732 (patch)
tree436a27d393345adb11b3d13a349257648b6f0813
parent08b00d9229961d7b3c3cba997bfb35c8d47e4c4b (diff)
parent6eaa592cd8d5af097a4624b3d1cead74408aabf2 (diff)
Merge pull request #256 from stbenjam/2571-before
(PUP-2571) add 'before' functionality to file_line
-rw-r--r--lib/puppet/provider/file_line/ruby.rb16
-rw-r--r--lib/puppet/type/file_line.rb4
-rwxr-xr-xspec/unit/puppet/provider/file_line/ruby_spec.rb59
-rwxr-xr-xspec/unit/puppet/type/file_line_spec.rb8
4 files changed, 80 insertions, 7 deletions
diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index 94e7fac..2cbd172 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -9,7 +9,9 @@ Puppet::Type.type(:file_line).provide(:ruby) do
if resource[:match]
handle_create_with_match
elsif resource[:after]
- handle_create_with_after
+ handle_create_with_position :after
+ elsif resource[:before]
+ handle_create_with_position :before
else
append_line
end
@@ -49,29 +51,29 @@ Puppet::Type.type(:file_line).provide(:ruby) do
end
end
- def handle_create_with_after
- regex = Regexp.new(resource[:after])
+ def handle_create_with_position(position)
+ regex = resource[position] ? Regexp.new(resource[position]) : nil
count = lines.count {|l| l.match(regex)}
case count
- when 1 # find the line to put our line after
+ when 1 # find the line to put our line before/after
File.open(resource[:path], 'w') do |fh|
lines.each do |l|
- fh.puts(l)
+ fh.puts(l) if position == :after
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[:after]}' in file '#{resource[:path]}'. One or no line must match the pattern."
+ raise Puppet::Error, "#{count} lines match pattern '#{resource[position]}' 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 323fc4c..bc6745f 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -46,6 +46,10 @@ 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
diff --git a/spec/unit/puppet/provider/file_line/ruby_spec.rb b/spec/unit/puppet/provider/file_line/ruby_spec.rb
index a016b68..d004af4 100755
--- a/spec/unit/puppet/provider/file_line/ruby_spec.rb
+++ b/spec/unit/puppet/provider/file_line/ruby_spec.rb
@@ -183,6 +183,65 @@ describe provider_class do
end
end
end
+
+ describe 'using before' do
+ let :resource do
+ Puppet::Type::File_line.new(
+ {
+ :name => 'foo',
+ :path => @tmpfile,
+ :line => 'inserted = line',
+ :before => '^foo1',
+ }
+ )
+ end
+
+ let :provider do
+ provider_class.new(resource)
+ end
+
+ context 'with one line matching the before expression' do
+ before :each do
+ File.open(@tmpfile, 'w') do |fh|
+ fh.write("foo1\nfoo = blah\nfoo2\nfoo = baz")
+ end
+ end
+
+ it 'inserts the specified line before the line matching the "before" expression' do
+ provider.create
+ File.read(@tmpfile).chomp.should eql("inserted = line\nfoo1\nfoo = blah\nfoo2\nfoo = baz")
+ end
+ end
+
+ context 'with two lines matching the before expression' do
+ before :each do
+ File.open(@tmpfile, 'w') do |fh|
+ fh.write("foo1\nfoo = blah\nfoo2\nfoo1\nfoo = baz")
+ end
+ end
+
+ it 'errors out stating "One or no line must match the pattern"' do
+ expect { provider.create }.to raise_error(Puppet::Error, /One or no line must match the pattern/)
+ end
+ end
+
+ context 'with no lines matching the after expression' do
+ let :content do
+ "foo3\nfoo = blah\nfoo2\nfoo = baz\n"
+ end
+
+ before :each do
+ File.open(@tmpfile, 'w') do |fh|
+ fh.write(content)
+ end
+ end
+
+ it 'appends the specified line to the file' do
+ provider.create
+ File.read(@tmpfile).should eq(content << resource[:line] << "\n")
+ end
+ end
+ end
end
context "when removing" do
diff --git a/spec/unit/puppet/type/file_line_spec.rb b/spec/unit/puppet/type/file_line_spec.rb
index ab5b81b..b85b9f4 100755
--- a/spec/unit/puppet/type/file_line_spec.rb
+++ b/spec/unit/puppet/type/file_line_spec.rb
@@ -15,6 +15,14 @@ describe Puppet::Type.type(:file_line) do
file_line[:match] = '^foo.*$'
file_line[:match].should == '^foo.*$'
end
+ it 'should accept an after regex' do
+ file_line[:after] = '^foo.*$'
+ file_line[:after].should == '^foo.*$'
+ end
+ it 'should accept a before regex' do
+ file_line[:before] = '^foo.*$'
+ file_line[:before].should == '^foo.*$'
+ end
it 'should not accept a match regex that does not match the specified line' do
expect {
Puppet::Type.type(:file_line).new(