Add newline at the end of each config block

Author: Simon Peeters

manifests/config.pp

@@ -73,6 +73,12 @@
     puppet::config::main { $key: value => $value }
   }
 
+  concat::fragment { 'puppet.conf_comment':
+    target  => "${puppet_dir}/puppet.conf",
+    content => '# file managed by puppet',
+    order   => '0_comment',
+  }
+
   file { $puppet_dir:
     ensure => directory,
     owner  => $puppet::dir_owner,

manifests/config/entry.pp

@@ -30,9 +30,14 @@
   # they make sure that '1_main ' is ordered before '1_main_*'
   ensure_resource('concat::fragment', "puppet.conf_${section}", {
       target  => "${puppet::dir}/puppet.conf",
-      content => "\n\n[${section}]",
+      content => "\n[${section}]",
       order   => "${sectionorder}_${section} ",
   })
+  ensure_resource('concat::fragment', "puppet.conf_${section}_end", {
+      target  => "${puppet::dir}/puppet.conf",
+      content => "\n",
+      order   => "${sectionorder}_${section}~end",
+  })
 
   # this adds the '$key =' for the first value,
   # otherwise it just appends it with the joiner to separate it from the previous value.

spec/defines/puppet_config_entry_spec.rb

@@ -20,9 +20,13 @@
           }
         end
         it 'should contain the section header' do
-          should contain_concat__fragment('puppet.conf_main').with_content("\n\n[main]")
+          should contain_concat__fragment('puppet.conf_main').with_content("\n[main]")
           should contain_concat__fragment('puppet.conf_main').with_order("1_main ")
         end
+        it 'should contain the section end' do
+          should contain_concat__fragment('puppet.conf_main_end').with_content("\n")
+          should contain_concat__fragment('puppet.conf_main_end').with_order("1_main~end")
+        end
         it 'should contain the keyvalue pair' do
           should contain_concat__fragment('puppet.conf_main_foo').with_content(/^\s+foo = bar$/)
           should contain_concat__fragment('puppet.conf_main_foo').with_order("1_main_foo ")
@@ -41,9 +45,13 @@
           }
         end
         it 'should contain the section header' do
-          should contain_concat__fragment('puppet.conf_main').with_content("\n\n[main]")
+          should contain_concat__fragment('puppet.conf_main').with_content("\n[main]")
           should contain_concat__fragment('puppet.conf_main').with_order("1_main ")
         end
+        it 'should contain the section end' do
+          should contain_concat__fragment('puppet.conf_main_end').with_content("\n")
+          should contain_concat__fragment('puppet.conf_main_end').with_order("1_main~end")
+        end
         it 'should contain the keyvalue pair' do
           should contain_concat__fragment('puppet.conf_main_foo').with_content(/^\s+foo = bar,baz$/)
           should contain_concat__fragment('puppet.conf_main_foo').with_order("1_main_foo ")
@@ -63,9 +71,13 @@
           }
         end
         it 'should contain the section header' do
-          should contain_concat__fragment('puppet.conf_main').with_content("\n\n[main]")
+          should contain_concat__fragment('puppet.conf_main').with_content("\n[main]")
           should contain_concat__fragment('puppet.conf_main').with_order("1_main ")
         end
+        it 'should contain the section end' do
+          should contain_concat__fragment('puppet.conf_main_end').with_content("\n")
+          should contain_concat__fragment('puppet.conf_main_end').with_order("1_main~end")
+        end
         it 'should contain the keyvalue pair' do
           should contain_concat__fragment('puppet.conf_main_foo').with_content(/^\s+foo = bar:baz$/)
           should contain_concat__fragment('puppet.conf_main_foo').with_order("1_main_foo ")