Merge pull request #788 from tphoney/MODULES-5003

(MODULES-5003) file_line fix all broken lines

2 files changed, 36 insertions, 12 deletions

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index 42f287a..1d27424 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -1,16 +1,21 @@
 Puppet::Type.type(:file_line).provide(:ruby) do
   def exists?
+    found = true
     if resource[:replace].to_s != 'true' and count_matches(match_regex) > 0
-      true
+      found = true
     else
       lines.find do |line|
         if resource[:ensure].to_s == 'absent' and resource[:match_for_absence].to_s == 'true'
-          line.chomp =~ Regexp.new(resource[:match])
+          found = line.chomp =~ Regexp.new(resource[:match])
         else
-          line.chomp == resource[:line].chomp
+          found = line.chomp == resource[:line].chomp
+        end
+        if found == false then
+          break
         end
       end
     end
+    found
   end
 
   def create
diff --git a/spec/unit/puppet/provider/file_line/ruby_spec.rb b/spec/unit/puppet/provider/file_line/ruby_spec.rb
index 3d28687..dcf8509 100755
--- a/spec/unit/puppet/provider/file_line/ruby_spec.rb
+++ b/spec/unit/puppet/provider/file_line/ruby_spec.rb
@@ -30,7 +30,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
       File.open(tmpfile, 'w') do |fh|
         fh.write('foo1')
       end
-      expect(provider.exists?).to be_nil
+      expect(provider.exists?).to eql (false)
     end
     it 'should append to an existing file when creating' do
       provider.create
@@ -70,7 +70,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
       File.open(@tmpfile, 'w') do |fh|
         fh.write("foo1\nfoo2")
       end
-      expect(@provider.exists?).to be_nil
+      expect(@provider.exists?).to eql (false)
       @provider.create
       expect(File.read(@tmpfile).chomp).to eql("foo1\nfoo2\nfoo = bar")
     end
@@ -113,7 +113,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
         File.open(@tmpfile, 'w') do |fh|
           fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz")
         end
-        expect(@provider.exists?).to be_nil
+        expect(@provider.exists?).to eql(false)
         expect { @provider.create }.to raise_error(Puppet::Error, /More than one line.*matches/)
         expect(File.read(@tmpfile)).to eql("foo1\nfoo=blah\nfoo2\nfoo=baz")
       end
@@ -132,11 +132,30 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
         File.open(@tmpfile, 'w') do |fh|
           fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz")
         end
-        expect(@provider.exists?).to be_nil
+        expect(@provider.exists?).to eql(false)
         @provider.create
         expect(File.read(@tmpfile).chomp).to eql("foo1\nfoo = bar\nfoo2\nfoo = bar")
       end
 
+      it 'should replace all lines that match, even when some lines are correct' do
+        @resource = Puppet::Type::File_line.new(
+          {
+            :name     => 'neil',
+            :path     => @tmpfile,
+            :line     => "\thard\tcore\t0\n",
+            :match    => '^[ \t]hard[ \t]+core[ \t]+.*',
+            :multiple => true,
+          }
+        )
+        @provider = provider_class.new(@resource)
+        File.open(@tmpfile, 'w') do |fh|
+          fh.write("\thard\tcore\t90\n\thard\tcore\t0\n")
+        end
+        expect(@provider.exists?).to eql(false)
+        @provider.create
+        expect(File.read(@tmpfile).chomp).to eql("\thard\tcore\t0\n\thard\tcore\t0")
+      end
+
       it 'should raise an error with invalid values' do
         expect {
           @resource = Puppet::Type::File_line.new(
@@ -155,7 +174,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
         File.open(@tmpfile, 'w') do |fh|
           fh.write("foo1\nfoo=blah\nfoo2")
         end
-        expect(@provider.exists?).to be_nil
+        expect(@provider.exists?).to eql(false)
         @provider.create
         expect(File.read(@tmpfile).chomp).to eql("foo1\nfoo = bar\nfoo2")
       end
@@ -163,7 +182,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
         File.open(@tmpfile, 'w') do |fh|
           fh.write("foo1\nfoo2")
         end
-        expect(@provider.exists?).to be_nil
+        expect(@provider.exists?).to eql(false)
         @provider.create
         expect(File.read(@tmpfile)).to eql("foo1\nfoo2\nfoo = bar\n")
       end
@@ -171,7 +190,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
         File.open(@tmpfile, 'w') do |fh|
           fh.write("foo1\nfoo = bar\nfoo2")
         end
-        expect(@provider.exists?).to be_truthy
+        expect(@provider.exists?).to eql(false)
         @provider.create
         expect(File.read(@tmpfile).chomp).to eql("foo1\nfoo = bar\nfoo2")
       end
@@ -275,7 +294,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
             }
           )
           @provider = provider_class.new(@resource)
-          expect(@provider.exists?).to be_nil
+          expect(@provider.exists?).to eql (false) 
           @provider.create
           expect(File.read(@tmpfile).chomp).to eql("foo1\ninserted = line\nfoo = blah\nfoo2\nfoo1\ninserted = line\nfoo = baz")
         end
@@ -368,7 +387,7 @@ describe provider_class, :unless => Puppet::Util::Platform.windows? do
       File.open(@tmpfile, 'w') do |fh|
         fh.write("foo1\nfoo\nfoo2")
       end
-      expect(@provider.exists?).to be_truthy
+      expect(@provider.exists?).to be_nil
     end
 
     it 'should remove one line if it matches' do