Merge pull request #5 from jps-help/deb822_source

Update documentation and testing

Author: jps-help

README.md

@@ -225,6 +225,27 @@ apt::source { 'puppetlabs':
 
 <a id="configure-apt-from-hiera"></a>
 
+### Generating a DEB822 .sources file
+
+You  can also generate a DEB822 format .sources file. This example covers most of the available options.
+
+Use the `source_format` parameter to choose between 'list' and 'sources' (DEB822) formats.
+```puppet
+apt::source { 'debian':
+  source_format => 'sources'
+  comment        => 'Official Debian Repository',
+  enabled        => true,
+  types          => ['deb', 'deb-src'],
+  location       => ['http://fr.debian.org/debian', 'http://de.debian.org/debian']
+  release        => ['stable', 'stable-updates', 'stable-backports'],
+  repos          => ['main', 'contrib', 'non-free'],
+  architecture   => ['amd64', 'i386'],
+  allow_unsigned => true,
+  keyring        => '/etc/apt/keyrings/debian.gpg'
+  notify_update  => false
+}
+```
+
 ### Configure Apt from Hiera
 
 Instead of specifying your sources directly as resources, you can instead just include the `apt` class, which will pick up the values automatically from hiera.

spec/defines/source_spec.rb

@@ -416,4 +416,69 @@
       it { is_expected.to contain_apt__setting("list-#{title}").with_notify_update(false) }
     end
   end
+
+  describe 'deb822 sources' do
+    let :params do
+      {
+        source_format: 'sources',
+      }
+    end
+
+    context 'basic deb822 source' do
+      let :params do
+        super().merge(
+          {
+            location: ['http://debian.mirror.iweb.ca/debian/'],
+            repos: ['main', 'contrib', 'non-free']
+          },
+        )
+      end
+
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_notify_update(true) }
+    end
+
+    context 'complex deb822 source' do
+      let :params do
+        super().merge(
+          {
+            types: ['deb', 'deb-src'],
+            location: ['http://fr.debian.org/debian', 'http://de.debian.org/debian'],
+            release: ['stable', 'stable-updates', 'stable-backports'],
+            repos: ['main', 'contrib', 'non-free'],
+            architecture: ['amd64', 'i386'],
+            allow_unsigned: true,
+            notify_update: false
+          },
+        )
+      end
+
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_notify_update(false) }
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_content(%r{Enabled: yes}) }
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_content(%r{Types: deb deb-src}) }
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_content(%r{URIs: http://fr.debian.org/debian http://de.debian.org/debian}) }
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_content(%r{Suites: stable stable-updates stable-backports}) }
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_content(%r{Components: main contrib non-free}) }
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_content(%r{Architectures: amd64 i386}) }
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_content(%r{Trusted: yes}) }
+    end
+
+    context '.list backwards compatibility' do
+      let :params do
+        super().merge(
+          {
+            location: 'http://debian.mirror.iweb.ca/debian/',
+            release: 'unstable',
+            repos: 'main contrib non-free',
+            key: {
+              id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+              server: 'keyserver.ubuntu.com',
+            },
+            pin: '-10'
+          },
+        )
+      end
+
+      it { is_expected.to contain_apt__setting("sources-#{title}").with_notify_update(true) }
+    end
+  end
 end