Merge branch 'release/0.0.12'

Author: ju5t

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.0.12
+
+### Summary
+
+We have dropped Ruby 1.9.3 from our tests and added Rubocop coverage to
+ensure we write decent code where possible.
+
+### Features
+- Rubocop coverage for all Ruby code in this module.
+
+### Bugfixes
+- The README wrongly mentioned listen-address instead of local-address
+
 ## 0.0.11
 
 ### Summary

README.md

@@ -28,14 +28,14 @@ example below needs to be adjusted to use the ip addresses of your server.
 This may fail the first time on Debian-based distro's.
 
 ```
-powerdns::config { 'authoritative-listen-address':
+powerdns::config { 'authoritative-local-address':
 	type => 'authoritative',
-	setting => 'listen-address',
+	setting => 'local-address',
 	value => '127.0.0.1',
 }
-powerdns::config { 'recursor-listen-address':
+powerdns::config { 'recursor-local-address':
 	type => 'recursor',
-	setting => 'listen-address',
+	setting => 'local-address',
 	value => '127.0.0.2',
 }
 class { 'powerdns':

Rakefile

@@ -35,9 +35,7 @@ end
 
 desc 'Run metadata_lint, lint, validate, and spec tests.'
 task :test do
-  # This should be changed once we drop support for 1.9.3 to
-  # %i[metadata_lint lint validate rubocop spec].each
-  [:metadata_lint, :lint, :validate, :spec].each do |test|
+  %i[metadata_lint lint validate rubocop spec].each do |test|
     Rake::Task[test].invoke
   end
 end

Vagrantfile

@@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = 'ubuntu/trusty64'
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -26,32 +26,32 @@ Vagrant.configure(2) do |config|
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
-  config.vm.network "private_network", ip: "192.168.33.10"
+  config.vm.network 'private_network', ip: '192.168.33.10'
 
   # Create a public network, which generally matched to bridged network.
   # Bridged networks make the machine appear as another physical device on
   # your network.
   # config.vm.network "public_network"
 
   # Set up the hostname
-  config.vm.hostname = "powerdns"
+  config.vm.hostname = 'powerdns'
 
   # Share an additional folder to the guest VM. The first argument is
   # the path on the host to the actual folder. The second argument is
   # the path on the guest to mount the folder. And the optional third
   # argument is a set of non-required options.
-  config.vm.synced_folder ".", "/vagrant", nfs: true
+  config.vm.synced_folder '.', '/vagrant', nfs: true
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:
   #
-  config.vm.provider "virtualbox" do |vb|
+  config.vm.provider 'virtualbox' do |vb|
     # Display the VirtualBox GUI when booting the machine
     vb.gui = false
-  
+
     # Customize the amount of memory on the VM:
-    vb.memory = "2048"
+    vb.memory = '2048'
   end
   #
   # View the documentation for the provider you are using for more
@@ -67,7 +67,7 @@ Vagrant.configure(2) do |config|
   # Enable provisioning with a shell script. Additional provisioners such as
   # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
   # documentation for more information about their specific syntax and use.
-  config.vm.provision "shell", inline: <<-SHELL
+  config.vm.provision 'shell', inline: <<-SHELL
     sudo apt-get update
     sudo apt-get install -y bundler git zlib1g-dev
     cd /vagrant

metadata.json

@@ -1,6 +1,6 @@
 {
     "name": "sensson-powerdns",
-    "version": "0.0.11",
+    "version": "0.0.12",
     "author": "sensson",
     "license": "Apache-2.0",
     "summary": "A module to install and configure PowerDNS 4.x authoritative server and recursor",

spec/acceptance/class_spec.rb

@@ -4,7 +4,7 @@
   context 'authoritative server' do
     # Using puppet_apply as a helper
     it 'should work idempotently with no errors' do
-      pp = <<-EOS
+      pp = <<-PUPPET
       class { 'powerdns':
         db_password => 's0m4r4nd0mp4ssw0rd',
         db_root_password => 'v3rys3c4r3',
@@ -18,26 +18,26 @@ class { 'powerdns':
         setting => 'local-port',
         value => 54,
       }
-      EOS
+      PUPPET
 
       # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes  => true)
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
   end
 
   context 'recursor server' do
     it 'should work idempotently with no errors' do
-      pp = <<-EOS
+      pp = <<-PUPPET
       class { 'powerdns':
         authoritative => false,
         recursor => true,
       }
-      EOS
+      PUPPET
 
       # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes  => true)
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
     end
   end
 end

spec/classes/coverage_spec.rb

@@ -1 +1 @@
-at_exit { RSpec::Puppet::Coverage.report! }
+at_exit { RSpec::Puppet::Coverage.report! }

spec/classes/powerdns_init_spec.rb

@@ -1,14 +1,14 @@
+override_facts = {
+  root_home: '/root'
+}
+
 require 'spec_helper'
-describe 'powerdns', :type => :class do
+describe 'powerdns', type: :class do
   context 'supported operating systems' do
     on_supported_os.each do |os, facts|
       context "on #{os}" do
         let(:facts) do
-          facts
-
-          facts.merge({
-            :root_home => '/root',
-          })
+          facts.merge(override_facts)
         end
 
         case facts[:osfamily]
@@ -18,28 +18,28 @@
           authoritative_config = '/etc/pdns/pdns.conf'
           recursor_package_name = 'pdns-recursor'
           recursor_service_name = 'pdns-recursor'
-          recursor_config = '/etc/pdns-recursor/recursor.conf'
         when 'Debian'
           authoritative_package_name = 'pdns-server'
           authoritative_service_name = 'pdns'
           authoritative_config = '/etc/powerdns/pdns.conf'
           recursor_package_name = 'pdns-recursor'
           recursor_service_name = 'pdns-recursor'
-          recursor_config = '/etc/powerdns/recursor.conf'
         end
 
-        context "powerdns class without parameters" do
+        context 'powerdns class without parameters' do
           it 'fails' do
             expect { subject.call } .to raise_error(/Database root password can't be empty/)
           end
         end
 
-        context "powerdns class with parameters" do
-          let(:params) {{
-            :db_root_password => 'foobar',
-            :db_username => 'foo',
-            :db_password => 'bar'
-          }}
+        context 'powerdns class with parameters' do
+          let(:params) do
+            {
+              db_root_password: 'foobar',
+              db_username: 'foo',
+              db_password: 'bar'
+            }
+          end
 
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_class('powerdns::params') }
@@ -65,24 +65,22 @@
           it { is_expected.to contain_package(authoritative_package_name).with('ensure' => 'installed') }
           it { is_expected.to contain_service(authoritative_service_name).with('ensure' => 'running') }
           it { is_expected.to contain_service(authoritative_service_name).with('enable' => 'true') }
-          it { is_expected.to contain_service(authoritative_service_name).that_requires('Package[%s]' % [authoritative_package_name]) }
+          it { is_expected.to contain_service(authoritative_service_name).that_requires(format('Package[%s]', authoritative_package_name)) }
         end
 
-        context "powerdns class with mysql backend" do
-          let(:params) {{
-            :db_root_password => 'foobar',
-            :db_username => 'foo',
-            :db_password => 'bar',
-            :backend => 'mysql'
-          }}
+        context 'powerdns class with mysql backend' do
+          let(:params) do
+            {
+              db_root_password: 'foobar',
+              db_username: 'foo',
+              db_password: 'bar',
+              backend: 'mysql'
+            }
+          end
 
           it { is_expected.to contain_class('powerdns::backends::mysql') }
           it { is_expected.to contain_package('pdns-backend-mysql').with('ensure' => 'installed') }
-          it { is_expected.to contain_mysql__db('powerdns').with(
-              'user' => 'foo',
-              'password' => 'bar',
-              'host' => 'localhost'
-            ) }
+          it { is_expected.to contain_mysql__db('powerdns').with('user' => 'foo', 'password' => 'bar', 'host' => 'localhost') }
 
           # We expect the following tables to be created
           it { is_expected.to contain_powerdns__backends__mysql__create_table('comments') }
@@ -116,22 +114,23 @@
           it { is_expected.to contain_powerdns__config('gmysql-user').with('value' => 'foo') }
           it { is_expected.to contain_powerdns__config('launch').with('value' => 'gmysql') }
 
-          it { is_expected.to contain_file_line('powerdns-config-gmysql-dbname-%s' % [ authoritative_config ]) }
-          it { is_expected.to contain_file_line('powerdns-config-gmysql-password-%s' % [ authoritative_config ]) }
-          it { is_expected.to contain_file_line('powerdns-config-gmysql-user-%s' % [ authoritative_config ]) }
-          it { is_expected.to contain_file_line('powerdns-config-launch-%s' % [ authoritative_config ]) }
-
+          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-dbname-%s', authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-password-%s', authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-gmysql-user-%s', authoritative_config)) }
+          it { is_expected.to contain_file_line(format('powerdns-config-launch-%s', authoritative_config)) }
         end
 
         # Test the recursor
-        context "powerdns class with the recursor enabled and the authoritative server disabled" do
-          let(:params) {{
-            :db_root_password => 'foobar',
-            :db_username => 'foo',
-            :db_password => 'bar',
-            :recursor => true,
-            :authoritative => false,
-          }}
+        context 'powerdns class with the recursor enabled and the authoritative server disabled' do
+          let(:params) do
+            {
+              db_root_password: 'foobar',
+              db_username: 'foo',
+              db_password: 'bar',
+              recursor: true,
+              authoritative: false
+            }
+          end
 
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_class('powerdns::params') }
@@ -141,40 +140,46 @@
           it { is_expected.to contain_package(recursor_package_name).with('ensure' => 'installed') }
           it { is_expected.to contain_service(recursor_service_name).with('ensure' => 'running') }
           it { is_expected.to contain_service(recursor_service_name).with('enable' => 'true') }
-          it { is_expected.to contain_service(recursor_service_name).that_requires('Package[%s]' % [recursor_package_name]) }
+          it { is_expected.to contain_service(recursor_service_name).that_requires(format('Package[%s]', recursor_package_name)) }
         end
 
         # Test errors
-        context "powerdns class with an empty database username" do
-          let(:params) {{
-            :db_root_password => 'foobar',
-            :db_username => '',
-            :db_password => 'bar'
-          }}
+        context 'powerdns class with an empty database username' do
+          let(:params) do
+            {
+              db_root_password: 'foobar',
+              db_username: '',
+              db_password: 'bar'
+            }
+          end
 
           it 'fails' do
             expect { subject.call } .to raise_error(/Database username can't be empty/)
           end
         end
 
-        context "powerdns class without database password" do
-          let(:params) {{
-            :db_root_password => 'foobar',
-            :db_username => 'foo'
-          }}
+        context 'powerdns class without database password' do
+          let(:params) do
+            {
+              db_root_password: 'foobar',
+              db_username: 'foo'
+            }
+          end
 
           it 'fails' do
             expect { subject.call } .to raise_error(/Database password can't be empty/)
           end
         end
 
-        context "powerdns class with an unsupported backend" do
-          let(:params) {{
-            :db_root_password => 'foobar',
-            :db_username => 'foo',
-            :db_password => 'bar',
-            :backend => 'awesomedb'
-          }}
+        context 'powerdns class with an unsupported backend' do
+          let(:params) do
+            {
+              db_root_password: 'foobar',
+              db_username: 'foo',
+              db_password: 'bar',
+              backend: 'awesomedb'
+            }
+          end
 
           it 'fails' do
             expect { subject.call } .to raise_error(/is not supported/)