From ca8e036bacd4f33a0fd135c941c5c40f9a681499 Mon Sep 17 00:00:00 2001
From: Neil Prockter <prockter@lse.ac.uk>
Date: Sat, 2 Aug 2014 00:18:16 +0100
Subject: [PATCH] ensure concat file fragments are always replaced

---
 manifests/fragment.pp                         |   1 +
 .../fragments_are_always_replaced_spec.rb     | 119 ++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 spec/acceptance/fragments_are_always_replaced_spec.rb

diff --git a/manifests/fragment.pp b/manifests/fragment.pp
index 28f8251..0af7edf 100644
--- a/manifests/fragment.pp
+++ b/manifests/fragment.pp
@@ -117,6 +117,7 @@ define concat::fragment(
     source  => $source,
     content => $content,
     backup  => false,
+    replace => true,
     alias   => "concat_fragment_${name}",
     notify  => Exec["concat_${target}"]
   }
diff --git a/spec/acceptance/fragments_are_always_replaced_spec.rb b/spec/acceptance/fragments_are_always_replaced_spec.rb
new file mode 100644
index 0000000..a207b05
--- /dev/null
+++ b/spec/acceptance/fragments_are_always_replaced_spec.rb
@@ -0,0 +1,119 @@
+require 'spec_helper_acceptance'
+
+describe 'concat::fragment replace' do
+  context 'should create fragment files' do
+    before(:all) do
+      shell('rm -rf /tmp/concat /var/lib/puppet/concat')
+      shell('mkdir /tmp/concat')
+    end
+
+    pp1 = <<-EOS
+      concat { '/tmp/concat/foo': }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/foo',
+        content => 'caller has replace unset run 1',
+      }
+    EOS
+    pp2 = <<-EOS
+      concat { '/tmp/concat/foo': }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/foo',
+        content => 'caller has replace unset run 2',
+      }
+    EOS
+
+    it 'applies the manifest twice with no stderr' do
+      expect(apply_manifest(pp1, :catch_failures => true).stderr).to eq("")
+      expect(apply_manifest(pp1, :catch_changes => true).stderr).to eq("")
+      expect(apply_manifest(pp2, :catch_failures => true).stderr).to eq("")
+      expect(apply_manifest(pp2, :catch_changes => true).stderr).to eq("")
+    end
+
+    describe file('/tmp/concat/foo') do
+      it { should be_file }
+      it { should_not contain 'caller has replace unset run 1' }
+      it { should contain 'caller has replace unset run 2' }
+    end
+  end # should create fragment files
+
+  context 'should replace its own fragment files when caller has File { replace=>true } set' do
+    before(:all) do
+      shell('rm -rf /tmp/concat /var/lib/puppet/concat')
+      shell('mkdir /tmp/concat')
+    end
+
+    pp1 = <<-EOS
+      File { replace=>true }
+      concat { '/tmp/concat/foo': }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/foo',
+        content => 'caller has replace true set run 1',
+      }
+    EOS
+    pp2 = <<-EOS
+      File { replace=>true }
+      concat { '/tmp/concat/foo': }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/foo',
+        content => 'caller has replace true set run 2',
+      }
+    EOS
+
+    it 'applies the manifest twice with no stderr' do
+      expect(apply_manifest(pp1, :catch_failures => true).stderr).to eq("")
+      expect(apply_manifest(pp1, :catch_changes => true).stderr).to eq("")
+      expect(apply_manifest(pp2, :catch_failures => true).stderr).to eq("")
+      expect(apply_manifest(pp2, :catch_changes => true).stderr).to eq("")
+    end
+
+    describe file('/tmp/concat/foo') do
+      it { should be_file }
+      it { should_not contain 'caller has replace true set run 1' }
+      it { should contain 'caller has replace true set run 2' }
+    end
+  end # should replace its own fragment files when caller has File(replace=>true) set
+
+  context 'should replace its own fragment files even when caller has File { replace=>false } set' do
+    before(:all) do
+      shell('rm -rf /tmp/concat /var/lib/puppet/concat')
+      shell('mkdir /tmp/concat')
+    end
+
+    pp1 = <<-EOS
+      File { replace=>false }
+      concat { '/tmp/concat/foo': }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/foo',
+        content => 'caller has replace false set run 1',
+      }
+    EOS
+    pp2 = <<-EOS
+      File { replace=>false }
+      concat { '/tmp/concat/foo': }
+
+      concat::fragment { '1':
+        target  => '/tmp/concat/foo',
+        content => 'caller has replace false set run 2',
+      }
+    EOS
+
+    it 'applies the manifest twice with no stderr' do
+      expect(apply_manifest(pp1, :catch_failures => true).stderr).to eq("")
+      expect(apply_manifest(pp1, :catch_changes => true).stderr).to eq("")
+      expect(apply_manifest(pp2, :catch_failures => true).stderr).to eq("")
+      expect(apply_manifest(pp2, :catch_changes => true).stderr).to eq("")
+    end
+
+    describe file('/tmp/concat/foo') do
+      it { should be_file }
+      it { should_not contain 'caller has replace false set run 1' }
+      it { should contain 'caller has replace false set run 2' }
+    end
+  end # should replace its own fragment files even when caller has File(replace=>false) set
+
+end