From 3cff22c493a803b407f7dfd4277d33624877c69f Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 21 Apr 2023 13:49:22 +0100
Subject: [PATCH] (CONT-773) Rubocop Auto Fixes 16-17

- Style/RescueStandardError
- Style/TrailingCommaInHashLiteral
---
 .rubocop_todo.yml                         |  30 ------
 lib/puppet/provider/apt_key/apt_key.rb    |   2 +-
 spec/classes/apt_backports_spec.rb        |  76 ++++++-------
 spec/classes/apt_spec.rb                  | 126 +++++++++++-----------
 spec/classes/apt_update_spec.rb           |  68 ++++++------
 spec/defines/conf_spec.rb                 |  14 +--
 spec/defines/key_compat_spec.rb           |  48 ++++-----
 spec/defines/key_spec.rb                  |  50 ++++-----
 spec/defines/mark_spec.rb                 |  16 +--
 spec/defines/pin_spec.rb                  |  26 ++---
 spec/defines/ppa_spec.rb                  | 116 ++++++++++----------
 spec/defines/setting_spec.rb              |  16 +--
 spec/defines/source_compat_spec.rb        |  28 ++---
 spec/defines/source_spec.rb               |  86 +++++++--------
 spec/spec_helper.rb                       |   4 +-
 spec/unit/puppet/provider/apt_key_spec.rb |   2 +-
 16 files changed, 339 insertions(+), 369 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a088dce..6da3067 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -167,38 +167,8 @@ Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/SlicingWithRange:
   Exclude:
     - 'lib/puppet/provider/apt_key/apt_key.rb'
-
-# Offense count: 338
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/puppet/provider/apt_key/apt_key.rb'
-    - 'spec/classes/apt_backports_spec.rb'
-    - 'spec/classes/apt_spec.rb'
-    - 'spec/classes/apt_update_spec.rb'
-    - 'spec/defines/conf_spec.rb'
-    - 'spec/defines/key_compat_spec.rb'
-    - 'spec/defines/key_spec.rb'
-    - 'spec/defines/mark_spec.rb'
-    - 'spec/defines/pin_spec.rb'
-    - 'spec/defines/ppa_spec.rb'
-    - 'spec/defines/setting_spec.rb'
-    - 'spec/defines/source_compat_spec.rb'
-    - 'spec/defines/source_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/unit/puppet/provider/apt_key_spec.rb'
diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
index c91e26e..c15d826 100644
--- a/lib/puppet/provider/apt_key/apt_key.rb
+++ b/lib/puppet/provider/apt_key/apt_key.rb
@@ -96,7 +96,7 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
       key_size: pub_split[2],
       key_type: nil,
       key_created: Time.at(pub_split[5].to_i),
-      key_expiry: pub_split[6].empty? ? nil : Time.at(pub_split[6].to_i),
+      key_expiry: pub_split[6].empty? ? nil : Time.at(pub_split[6].to_i)
     }
 
     # set key type based on types defined in /usr/share/doc/gnupg/DETAILS.gz
diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
index bfe4a25..e7a951a 100644
--- a/spec/classes/apt_backports_spec.rb
+++ b/spec/classes/apt_backports_spec.rb
@@ -14,13 +14,13 @@ describe 'apt::backports', type: :class do
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
 
@@ -40,13 +40,13 @@ describe 'apt::backports', type: :class do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'bionac',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
@@ -67,13 +67,13 @@ describe 'apt::backports', type: :class do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'bionac',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
       let(:params) do
@@ -82,7 +82,7 @@ describe 'apt::backports', type: :class do
           release: 'vivid',
           repos: 'main',
           key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-          pin: '90',
+          pin: '90'
         }
       end
 
@@ -103,23 +103,23 @@ describe 'apt::backports', type: :class do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'bionac',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
       let(:params) do
         {
           key: {
-            'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+            'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553'
           },
           pin: {
-            'priority' => '90',
-          },
+            'priority' => '90'
+          }
         }
       end
 
@@ -138,13 +138,13 @@ describe 'apt::backports', type: :class do
           name: 'LinuxMint',
           release: {
             major: '17',
-            full: '17',
+            full: '17'
           },
           distro: {
             codename: 'qiana',
-            id: 'LinuxMint',
-          },
-        },
+            id: 'LinuxMint'
+          }
+        }
       }
     end
 
@@ -154,7 +154,7 @@ describe 'apt::backports', type: :class do
           location: 'http://archive.ubuntu.com/ubuntu',
           release: 'trusty-backports',
           repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -172,7 +172,7 @@ describe 'apt::backports', type: :class do
         {
           release: 'trusty-backports',
           repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -186,7 +186,7 @@ describe 'apt::backports', type: :class do
         {
           location: 'http://archive.ubuntu.com/ubuntu',
           repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -200,7 +200,7 @@ describe 'apt::backports', type: :class do
         {
           location: 'http://archive.ubuntu.com/ubuntu',
           release: 'trusty-backports',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -214,7 +214,7 @@ describe 'apt::backports', type: :class do
         {
           location: 'http://archive.ubuntu.com/ubuntu',
           release: 'trusty-backports',
-          repos: 'main universe multiverse restricted',
+          repos: 'main universe multiverse restricted'
         }
       end
 
@@ -232,20 +232,20 @@ describe 'apt::backports', type: :class do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionac',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
 
     context 'with invalid location' do
       let(:params) do
         {
-          location: true,
+          location: true
         }
       end
 
@@ -257,7 +257,7 @@ describe 'apt::backports', type: :class do
     context 'with invalid release' do
       let(:params) do
         {
-          release: true,
+          release: true
         }
       end
 
@@ -269,7 +269,7 @@ describe 'apt::backports', type: :class do
     context 'with invalid repos' do
       let(:params) do
         {
-          repos: true,
+          repos: true
         }
       end
 
@@ -281,7 +281,7 @@ describe 'apt::backports', type: :class do
     context 'with invalid key' do
       let(:params) do
         {
-          key: true,
+          key: true
         }
       end
 
@@ -293,7 +293,7 @@ describe 'apt::backports', type: :class do
     context 'with invalid pin' do
       let(:params) do
         {
-          pin: true,
+          pin: true
         }
       end
 
diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 65ae50b..0e6b6b0 100644
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -46,13 +46,13 @@ describe 'apt' do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
@@ -240,7 +240,7 @@ describe 'apt' do
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => false, 'sources.list.d' => false,
                  'preferences' => false, 'preferences.d' => false,
-                 'apt.conf.d' => false },
+                 'apt.conf.d' => false }
       }
     end
 
@@ -280,7 +280,7 @@ describe 'apt' do
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true, 'sources.list.d' => true,
                  'preferences' => true, 'preferences.d' => true,
-                 'apt.conf.d' => true },
+                 'apt.conf.d' => true }
       }
     end
 
@@ -319,7 +319,7 @@ describe 'apt' do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true },
-        sources_list_force: false,
+        sources_list_force: false
       }
     end
 
@@ -333,7 +333,7 @@ describe 'apt' do
       {
         update: { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
         purge: { 'sources.list' => true },
-        sources_list_force: true,
+        sources_list_force: true
       }
     end
 
@@ -350,13 +350,13 @@ describe 'apt' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       },
       'Debian 9.0' => {
         os: {
@@ -364,13 +364,13 @@ describe 'apt' do
           name: 'Debian',
           release: {
             major: '9',
-            full: '9.0',
+            full: '9.0'
           },
           distro: {
             codename: 'stretch',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       },
       'Debian 10.0' => {
         os: {
@@ -378,14 +378,14 @@ describe 'apt' do
           name: 'Debian',
           release: {
             major: '10',
-            full: '10.0',
+            full: '10.0'
           },
           distro: {
             codename: 'buster',
-            id: 'Debian',
-          },
-        },
-      },
+            id: 'Debian'
+          }
+        }
+      }
     }
 
     facts_hash.each do |os, facts|
@@ -399,14 +399,14 @@ describe 'apt' do
               {
                 machine: 'deb.example.net',
                 login: 'foologin',
-                password: 'secret',
+                password: 'secret'
               },
               {
                 machine: 'apt.example.com',
                 login: 'aptlogin',
-                password: 'supersecret',
+                password: 'supersecret'
               },
-            ],
+            ]
           }
         end
 
@@ -448,14 +448,14 @@ machine apt.example.com login aptlogin password supersecret
               {
                 machinn: 'deb.example.net',
                 username: 'foologin',
-                password: 'secret',
+                password: 'secret'
               },
               {
                 machine: 'apt.example.com',
                 login: 'aptlogin',
-                password: 'supersecret',
+                password: 'supersecret'
               },
-            ],
+            ]
           }
         end
 
@@ -472,13 +472,13 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
@@ -489,13 +489,13 @@ machine apt.example.com login aptlogin password supersecret
           'repos' => 'main contrib non-free',
           'key' => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
           'pin' => '-10',
-          'include' => { 'src' => true },
+          'include' => { 'src' => true }
         },
         'puppetlabs' => {
           'location' => 'http://apt.puppetlabs.com',
           'repos' => 'main',
-          'key' => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' },
-        },
+          'key' => { 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu' }
+        }
       } }
     end
 
@@ -521,23 +521,23 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { confs: {
         'foo' => {
-          'content' => 'foo',
+          'content' => 'foo'
         },
         'bar' => {
-          'content' => 'bar',
-        },
+          'content' => 'bar'
+        }
       } }
     end
 
@@ -558,23 +558,23 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { keys: {
         '55BE302B' => {
-          'server' => 'subkeys.pgp.net',
+          'server' => 'subkeys.pgp.net'
         },
         'EF8D349F' => {
-          'server' => 'pgp.mit.edu',
-        },
+          'server' => 'pgp.mit.edu'
+        }
       } }
     end
 
@@ -595,19 +595,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { ppas: {
         'ppa:drizzle-developers/ppa' => {},
-        'ppa:nginx/stable' => {},
+        'ppa:nginx/stable' => {}
       } }
     end
 
@@ -623,19 +623,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { settings: {
         'conf-banana' => { 'content' => 'banana' },
-        'pref-banana' => { 'content' => 'banana' },
+        'pref-banana' => { 'content' => 'banana' }
       } }
     end
 
@@ -651,19 +651,19 @@ machine apt.example.com login aptlogin password supersecret
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'bionic',
-            id: 'Ubuntu',
-          },
-        },
+            id: 'Ubuntu'
+          }
+        }
       }
     end
     let(:params) do
       { pins: {
         'stable' => { 'priority' => 600, 'order' => 50 },
-        'testing' => { 'priority' => 700, 'order' => 100 },
+        'testing' => { 'priority' => 700, 'order' => 100 }
       } }
     end
 
diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
index 61335fd..ada31b1 100644
--- a/spec/classes/apt_update_spec.rb
+++ b/spec/classes/apt_update_spec.rb
@@ -7,7 +7,7 @@ describe 'apt::update', type: :class do
     {
       'a recent run' => Time.now.to_i,
       'we are due for a run' => 1_406_660_561,
-      'the update-success-stamp file does not exist' => -1,
+      'the update-success-stamp file does not exist' => -1
     }.each_pair do |desc, factval|
       context "when $apt_update_last_success indicates #{desc}" do
         let(:facts) do
@@ -17,14 +17,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: factval,
+            apt_update_last_success: factval
           }
         end
         let(:pre_condition) do
@@ -45,13 +45,13 @@ describe 'apt::update', type: :class do
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" }
@@ -70,14 +70,14 @@ describe 'apt::update', type: :class do
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
+              id: 'Debian'
+            }
           },
-          apt_update_last_success: Time.now.to_i,
+          apt_update_last_success: Time.now.to_i
         }
       end
       let(:pre_condition) do
@@ -98,7 +98,7 @@ describe 'apt::update', type: :class do
     {
       'a recent run' => Time.now.to_i,
       'we are due for a run' => 1_406_660_561,
-      'the update-success-stamp file does not exist' => -1,
+      'the update-success-stamp file does not exist' => -1
     }.each_pair do |desc, factval|
       context "when $apt_update_last_success indicates #{desc}" do
         let(:facts) do
@@ -108,14 +108,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: factval,
+            apt_update_last_success: factval
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -134,13 +134,13 @@ describe 'apt::update', type: :class do
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
       let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -163,14 +163,14 @@ describe 'apt::update', type: :class do
                 name: 'Debian',
                 release: {
                   major: '9',
-                  full: '9.0',
+                  full: '9.0'
                 },
                 distro: {
                   codename: 'stretch',
-                  id: 'Debian',
-                },
+                  id: 'Debian'
+                }
               },
-              apt_update_last_success: factval,
+              apt_update_last_success: factval
             }
           end
           let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -189,14 +189,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: Time.now.to_i,
+            apt_update_last_success: Time.now.to_i
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -215,14 +215,14 @@ describe 'apt::update', type: :class do
               name: 'Debian',
               release: {
                 major: '9',
-                full: '9.0',
+                full: '9.0'
               },
               distro: {
                 codename: 'stretch',
-                id: 'Debian',
-              },
+                id: 'Debian'
+              }
             },
-            apt_update_last_success: nil,
+            apt_update_last_success: nil
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
index b08cc0f..26638e3 100644
--- a/spec/defines/conf_spec.rb
+++ b/spec/defines/conf_spec.rb
@@ -12,13 +12,13 @@ describe 'apt::conf', type: :define do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
   let :title do
@@ -29,7 +29,7 @@ describe 'apt::conf', type: :define do
     let :default_params do
       {
         priority: '00',
-        content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
+        content: "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
       }
     end
     let :params do
@@ -67,7 +67,7 @@ describe 'apt::conf', type: :define do
   describe 'when creating a preference without content' do
     let :params do
       {
-        priority: '00',
+        priority: '00'
       }
     end
 
@@ -80,7 +80,7 @@ describe 'apt::conf', type: :define do
     let :params do
       {
         ensure: 'absent',
-        priority: '00',
+        priority: '00'
       }
     end
 
diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
index f414503..4420337 100644
--- a/spec/defines/key_compat_spec.rb
+++ b/spec/defines/key_compat_spec.rb
@@ -30,13 +30,13 @@ describe 'apt::key', type: :define do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
@@ -70,7 +70,7 @@ describe 'apt::key', type: :define do
 
       let :params do
         {
-          id: GPG_KEY_ID,
+          id: GPG_KEY_ID
         }
       end
 
@@ -90,7 +90,7 @@ describe 'apt::key', type: :define do
     describe 'ensure => absent' do
       let :params do
         {
-          ensure: 'absent',
+          ensure: 'absent'
         }
       end
 
@@ -113,7 +113,7 @@ describe 'apt::key', type: :define do
           content: 'GPG key content',
           source: 'http://apt.puppetlabs.com/pubkey.gpg',
           server: 'pgp.mit.edu',
-          options: 'debug',
+          options: 'debug'
         }
       end
 
@@ -129,7 +129,7 @@ describe 'apt::key', type: :define do
     context 'when domain has dash' do
       let(:params) do
         {
-          server: 'p-gp.m-it.edu',
+          server: 'p-gp.m-it.edu'
         }
       end
 
@@ -142,7 +142,7 @@ describe 'apt::key', type: :define do
     context 'with url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu',
+          server: 'hkp://pgp.mit.edu'
         }
       end
 
@@ -155,7 +155,7 @@ describe 'apt::key', type: :define do
     context 'with url and port number' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:80',
+          server: 'hkp://pgp.mit.edu:80'
         }
       end
 
@@ -170,7 +170,7 @@ describe 'apt::key', type: :define do
     context 'when domain begins with a dash' do
       let(:params) do
         {
-          server: '-pgp.mit.edu',
+          server: '-pgp.mit.edu'
         }
       end
 
@@ -182,7 +182,7 @@ describe 'apt::key', type: :define do
     context 'when domain begins with dot' do
       let(:params) do
         {
-          server: '.pgp.mit.edu',
+          server: '.pgp.mit.edu'
         }
       end
 
@@ -194,7 +194,7 @@ describe 'apt::key', type: :define do
     context 'when domain ends with dot' do
       let(:params) do
         {
-          server: 'pgp.mit.edu.',
+          server: 'pgp.mit.edu.'
         }
       end
 
@@ -206,7 +206,7 @@ describe 'apt::key', type: :define do
     context 'when url character limit is exceeded' do
       let :params do
         {
-          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
+          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
         }
       end
 
@@ -218,7 +218,7 @@ describe 'apt::key', type: :define do
     context 'with incorrect port number url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:8008080',
+          server: 'hkp://pgp.mit.edu:8008080'
         }
       end
 
@@ -230,7 +230,7 @@ describe 'apt::key', type: :define do
     context 'with incorrect protocol for url' do
       let :params do
         {
-          server: 'abc://pgp.mit.edu:80',
+          server: 'abc://pgp.mit.edu:80'
         }
       end
 
@@ -242,7 +242,7 @@ describe 'apt::key', type: :define do
     context 'with missing port number url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:',
+          server: 'hkp://pgp.mit.edu:'
         }
       end
 
@@ -254,7 +254,7 @@ describe 'apt::key', type: :define do
     context 'with url ending with a dot' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu.',
+          server: 'hkp://pgp.mit.edu.'
         }
       end
 
@@ -266,7 +266,7 @@ describe 'apt::key', type: :define do
     context 'with url begin with a dash' do
       let(:params) do
         {
-          server: 'hkp://-pgp.mit.edu',
+          server: 'hkp://-pgp.mit.edu'
         }
       end
 
@@ -288,7 +288,7 @@ describe 'apt::key', type: :define do
     context 'with invalid source' do
       let :params do
         {
-          source: 'afp://puppetlabs.com/key.gpg',
+          source: 'afp://puppetlabs.com/key.gpg'
         }
       end
 
@@ -300,7 +300,7 @@ describe 'apt::key', type: :define do
     context 'with invalid content' do
       let :params do
         {
-          content: [],
+          content: []
         }
       end
 
@@ -312,7 +312,7 @@ describe 'apt::key', type: :define do
     context 'with invalid server' do
       let :params do
         {
-          server: 'two bottles of rum',
+          server: 'two bottles of rum'
         }
       end
 
@@ -324,7 +324,7 @@ describe 'apt::key', type: :define do
     context 'with invalid keyserver_options' do
       let :params do
         {
-          options: {},
+          options: {}
         }
       end
 
@@ -336,7 +336,7 @@ describe 'apt::key', type: :define do
     context 'with invalid ensure' do
       let :params do
         {
-          ensure: 'foo',
+          ensure: 'foo'
         }
       end
 
diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
index 948833a..5969500 100644
--- a/spec/defines/key_spec.rb
+++ b/spec/defines/key_spec.rb
@@ -51,13 +51,13 @@ describe 'apt::key' do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
@@ -83,7 +83,7 @@ describe 'apt::key' do
 
       let :params do
         {
-          id: GPG_KEY_ID,
+          id: GPG_KEY_ID
         }
       end
 
@@ -99,7 +99,7 @@ describe 'apt::key' do
     describe 'ensure => absent' do
       let :params do
         {
-          ensure: 'absent',
+          ensure: 'absent'
         }
       end
 
@@ -115,7 +115,7 @@ describe 'apt::key' do
     describe 'ensure => refreshed' do
       let :params do
         {
-          ensure: 'refreshed',
+          ensure: 'refreshed'
         }
       end
 
@@ -133,7 +133,7 @@ describe 'apt::key' do
           content: 'GPG key content',
           source: 'http://apt.puppetlabs.com/pubkey.gpg',
           server: 'pgp.mit.edu',
-          options: 'debug',
+          options: 'debug'
         }
       end
 
@@ -149,7 +149,7 @@ describe 'apt::key' do
     context 'when domain with dash' do
       let(:params) do
         {
-          server: 'p-gp.m-it.edu',
+          server: 'p-gp.m-it.edu'
         }
       end
 
@@ -162,7 +162,7 @@ describe 'apt::key' do
     context 'with url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu',
+          server: 'hkp://pgp.mit.edu'
         }
       end
 
@@ -175,7 +175,7 @@ describe 'apt::key' do
     context 'when url with port number' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:80',
+          server: 'hkp://pgp.mit.edu:80'
         }
       end
 
@@ -190,7 +190,7 @@ describe 'apt::key' do
     context 'when domain begin with dash' do
       let(:params) do
         {
-          server: '-pgp.mit.edu',
+          server: '-pgp.mit.edu'
         }
       end
 
@@ -202,7 +202,7 @@ describe 'apt::key' do
     context 'when domain begin with dot' do
       let(:params) do
         {
-          server: '.pgp.mit.edu',
+          server: '.pgp.mit.edu'
         }
       end
 
@@ -214,7 +214,7 @@ describe 'apt::key' do
     context 'when domain end with dot' do
       let(:params) do
         {
-          server: 'pgp.mit.edu.',
+          server: 'pgp.mit.edu.'
         }
       end
 
@@ -226,7 +226,7 @@ describe 'apt::key' do
     context 'when character url exceeded' do
       let :params do
         {
-          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu',
+          server: 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
         }
       end
 
@@ -238,7 +238,7 @@ describe 'apt::key' do
     context 'with incorrect port number url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:8008080',
+          server: 'hkp://pgp.mit.edu:8008080'
         }
       end
 
@@ -250,7 +250,7 @@ describe 'apt::key' do
     context 'with incorrect protocol for url' do
       let :params do
         {
-          server: 'abc://pgp.mit.edu:80',
+          server: 'abc://pgp.mit.edu:80'
         }
       end
 
@@ -262,7 +262,7 @@ describe 'apt::key' do
     context 'with missing port number url' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu:',
+          server: 'hkp://pgp.mit.edu:'
         }
       end
 
@@ -274,7 +274,7 @@ describe 'apt::key' do
     context 'with url ending with a dot' do
       let :params do
         {
-          server: 'hkp://pgp.mit.edu.',
+          server: 'hkp://pgp.mit.edu.'
         }
       end
 
@@ -286,7 +286,7 @@ describe 'apt::key' do
     context 'when url begins with a dash' do
       let(:params) do
         {
-          server: 'hkp://-pgp.mit.edu',
+          server: 'hkp://-pgp.mit.edu'
         }
       end
 
@@ -308,7 +308,7 @@ describe 'apt::key' do
     context 'with invalid source' do
       let :params do
         {
-          source: 'afp://puppetlabs.com/key.gpg',
+          source: 'afp://puppetlabs.com/key.gpg'
         }
       end
 
@@ -320,7 +320,7 @@ describe 'apt::key' do
     context 'with invalid content' do
       let :params do
         {
-          content: [],
+          content: []
         }
       end
 
@@ -332,7 +332,7 @@ describe 'apt::key' do
     context 'with invalid server' do
       let :params do
         {
-          server: 'two bottles of rum',
+          server: 'two bottles of rum'
         }
       end
 
@@ -344,7 +344,7 @@ describe 'apt::key' do
     context 'with invalid options' do
       let :params do
         {
-          options: {},
+          options: {}
         }
       end
 
@@ -357,7 +357,7 @@ describe 'apt::key' do
       ['foo', 'aabsent', 'absenta', 'apresent', 'presenta', 'refresh', 'arefreshed', 'refresheda'].each do |param|
         let :params do
           {
-            ensure: param,
+            ensure: param
           }
         end
 
diff --git a/spec/defines/mark_spec.rb b/spec/defines/mark_spec.rb
index cdff673..e73901e 100644
--- a/spec/defines/mark_spec.rb
+++ b/spec/defines/mark_spec.rb
@@ -14,20 +14,20 @@ describe 'apt::mark', type: :define do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
   context 'with correct seting' do
     let :params do
       {
-        'setting' => 'manual',
+        'setting' => 'manual'
       }
     end
 
@@ -39,7 +39,7 @@ describe 'apt::mark', type: :define do
   describe 'with wrong setting' do
     let :params do
       {
-        'setting' => 'foobar',
+        'setting' => 'foobar'
       }
     end
 
@@ -65,7 +65,7 @@ describe 'apt::mark', type: :define do
 
       let :params do
         {
-          'setting' => 'manual',
+          'setting' => 'manual'
         }
       end
 
@@ -94,7 +94,7 @@ describe 'apt::mark', type: :define do
 
       let :params do
         {
-          'setting' => 'manual',
+          'setting' => 'manual'
         }
       end
 
diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb
index bd2c262..1dd0298 100644
--- a/spec/defines/pin_spec.rb
+++ b/spec/defines/pin_spec.rb
@@ -12,13 +12,13 @@ describe 'apt::pin', type: :define do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
   let(:title) { 'my_pin' }
@@ -31,7 +31,7 @@ describe 'apt::pin', type: :define do
     let :params do
       {
         'packages' => 'vim',
-        'version' => '1',
+        'version' => '1'
       }
     end
 
@@ -42,7 +42,7 @@ describe 'apt::pin', type: :define do
     let :params do
       {
         'packages' => 'vim',
-        'origin' => 'test',
+        'origin' => 'test'
       }
     end
 
@@ -60,7 +60,7 @@ describe 'apt::pin', type: :define do
         'component' => 'baz',
         'originator' => 'foobar',
         'label' => 'foobaz',
-        'priority' => 10,
+        'priority' => 10
       }
     end
 
@@ -74,7 +74,7 @@ describe 'apt::pin', type: :define do
   context 'with ensure absent' do
     let :params do
       {
-        'ensure' => 'absent',
+        'ensure' => 'absent'
       }
     end
 
@@ -93,7 +93,7 @@ describe 'apt::pin', type: :define do
     context 'with invalid order' do
       let :params do
         {
-          'order' => 'foo',
+          'order' => 'foo'
         }
       end
 
@@ -105,7 +105,7 @@ describe 'apt::pin', type: :define do
     context 'with packages == * and version' do
       let :params do
         {
-          'version' => '1',
+          'version' => '1'
         }
       end
 
@@ -118,7 +118,7 @@ describe 'apt::pin', type: :define do
       let :params do
         {
           'origin' => 'test',
-          'release' => 'foo',
+          'release' => 'foo'
         }
       end
 
@@ -132,7 +132,7 @@ describe 'apt::pin', type: :define do
         {
           'release' => 'foo',
           'origin' => 'test',
-          'packages' => 'vim',
+          'packages' => 'vim'
         }
       end
 
@@ -146,7 +146,7 @@ describe 'apt::pin', type: :define do
         {
           'version' => '1',
           'origin' => 'test',
-          'packages' => 'vim',
+          'packages' => 'vim'
         }
       end
 
diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index 3d109ae..05718eb 100644
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -23,12 +23,12 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
         puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
@@ -59,13 +59,13 @@ describe 'apt::ppa' do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'trusty',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
@@ -92,13 +92,13 @@ describe 'apt::ppa' do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'trusty',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
@@ -116,14 +116,14 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '15',
-            full: '15.10',
+            full: '15.10'
           },
           distro: {
             codename: 'wily',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
@@ -144,7 +144,7 @@ describe 'apt::ppa' do
     let :params do
       {
         package_name: 'software-properties-common',
-        package_manage: true,
+        package_manage: true
       }
     end
 
@@ -155,14 +155,14 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
@@ -189,20 +189,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        package_manage: false,
+        package_manage: false
       }
     end
 
@@ -231,21 +231,21 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
         package_manage: true,
-        require: 'Apt::Ppa[ppa:user/foo2]',
+        require: 'Apt::Ppa[ppa:user/foo2]'
       }
     end
 
@@ -275,20 +275,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        'package_manage' => true,
+        'package_manage' => true
       }
     end
 
@@ -317,20 +317,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        package_manage: true,
+        package_manage: true
       }
     end
 
@@ -359,20 +359,20 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
     let :params do
       {
-        package_manage: true,
+        package_manage: true
       }
     end
 
@@ -399,14 +399,14 @@ describe 'apt::ppa' do
           name: 'Ubuntu',
           release: {
             major: '18',
-            full: '18.04',
+            full: '18.04'
           },
           distro: {
             codename: 'trusty',
-            id: 'Ubuntu',
-          },
+            id: 'Ubuntu'
+          }
         },
-        puppet_vardir: '/opt/puppetlabs/puppet/cache',
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
@@ -414,7 +414,7 @@ describe 'apt::ppa' do
 
     let :params do
       {
-        ensure: 'absent',
+        ensure: 'absent'
       }
     end
 
@@ -437,13 +437,13 @@ describe 'apt::ppa' do
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: nil,
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
@@ -462,13 +462,13 @@ describe 'apt::ppa' do
             name: 'Debian',
             release: {
               major: '6',
-              full: '6.0.7',
+              full: '6.0.7'
             },
             distro: {
               codename: 'wheezy',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
 
diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
index a142667..7a71896 100644
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -11,13 +11,13 @@ describe 'apt::setting' do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
   let(:title) { 'conf-teddybear' }
@@ -87,13 +87,13 @@ describe 'apt::setting' do
           name: 'Debian',
           release: {
             major: '9',
-            full: '9.0',
+            full: '9.0'
           },
           distro: {
             codename: 'stretch',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       }
     end
     let(:title) { 'conf-teddybear' }
diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb
index dc261fb..a414c49 100644
--- a/spec/defines/source_compat_spec.rb
+++ b/spec/defines/source_compat_spec.rb
@@ -16,13 +16,13 @@ describe 'apt::source', type: :define do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
@@ -30,7 +30,7 @@ describe 'apt::source', type: :define do
     let :params do
       {
         'include' => { 'deb' => false, 'src' => true },
-        'location' => 'http://debian.mirror.iweb.ca/debian/',
+        'location' => 'http://debian.mirror.iweb.ca/debian/'
       }
     end
 
@@ -50,7 +50,7 @@ describe 'apt::source', type: :define do
         'key' => GPG_KEY_ID,
         'pin' => '10',
         'architecture' => 'x86_64',
-        'allow_unsigned' => true,
+        'allow_unsigned' => true
       }
     end
 
@@ -76,7 +76,7 @@ describe 'apt::source', type: :define do
       {
         'include' => { 'src' => false },
         'location' => 'http://debian.mirror.iweb.ca/debian/',
-        'allow_insecure' => true,
+        'allow_insecure' => true
       }
     end
 
@@ -88,7 +88,7 @@ describe 'apt::source', type: :define do
       {
         'include' => { 'src' => false },
         'location' => 'http://debian.mirror.iweb.ca/debian/',
-        'allow_unsigned' => true,
+        'allow_unsigned' => true
       }
     end
 
@@ -99,7 +99,7 @@ describe 'apt::source', type: :define do
     let :params do
       {
         'location' => 'http://debian.mirror.iweb.ca/debian/',
-        'architecture' => 'x86_64',
+        'architecture' => 'x86_64'
       }
     end
 
@@ -111,7 +111,7 @@ describe 'apt::source', type: :define do
   context 'with ensure => absent' do
     let :params do
       {
-        'ensure' => 'absent',
+        'ensure' => 'absent'
       }
     end
 
@@ -129,12 +129,12 @@ describe 'apt::source', type: :define do
             name: 'Debian',
             release: {
               major: '8',
-              full: '8.0',
+              full: '8.0'
             },
             distro: {
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
 
diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
index 798279e..8cf9a45 100644
--- a/spec/defines/source_spec.rb
+++ b/spec/defines/source_spec.rb
@@ -20,13 +20,13 @@ describe 'apt::source' do
         name: 'Debian',
         release: {
           major: '9',
-          full: '9.0',
+          full: '9.0'
         },
         distro: {
           codename: 'stretch',
-          id: 'Debian',
-        },
-      },
+          id: 'Debian'
+        }
+      }
     }
   end
 
@@ -54,7 +54,7 @@ describe 'apt::source' do
           location: 'hello.there',
           pin: { 'release' => 'wishwash',
                  'explanation' => 'wishwash',
-                 'priority' => 1001 },
+                 'priority' => 1001 }
         }
       end
 
@@ -82,7 +82,7 @@ describe 'apt::source' do
           key: GPG_KEY_ID,
           pin: '10',
           architecture: 'x86_64',
-          allow_unsigned: true,
+          allow_unsigned: true
         }
       end
 
@@ -116,11 +116,11 @@ describe 'apt::source' do
             'server' => 'pgp.mit.edu',
             'content' => 'GPG key content',
             'source' => 'http://apt.puppetlabs.com/pubkey.gpg',
-            'weak_ssl' => true,
+            'weak_ssl' => true
           },
           pin: '10',
           architecture: 'x86_64',
-          allow_unsigned: true,
+          allow_unsigned: true
         }
       end
 
@@ -150,7 +150,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        allow_insecure: true,
+        allow_insecure: true
       }
     end
 
@@ -163,7 +163,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        allow_unsigned: true,
+        allow_unsigned: true
       }
     end
 
@@ -176,7 +176,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        check_valid_until: false,
+        check_valid_until: false
       }
     end
 
@@ -189,7 +189,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        check_valid_until: true,
+        check_valid_until: true
       }
     end
 
@@ -202,7 +202,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg',
+        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg'
       }
     end
 
@@ -219,7 +219,7 @@ describe 'apt::source' do
         location: 'hello.there',
         architecture: 'amd64',
         allow_unsigned: true,
-        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg',
+        keyring: '/usr/share/keyrings/foo-archive-keyring.gpg'
       }
     end
 
@@ -234,7 +234,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'HTTPS://foo.bar',
-        allow_unsigned: false,
+        allow_unsigned: false
       }
     end
 
@@ -251,21 +251,21 @@ describe 'apt::source' do
           name: 'Debian',
           release: {
             major: '9',
-            full: '9.0',
+            full: '9.0'
           },
           distro: {
             codename: 'stretch',
-            id: 'Debian',
-          },
+            id: 'Debian'
+          }
         },
-        puppetversion: Puppet.version,
+        puppetversion: Puppet.version
       }
     end
     let :params do
       {
         location: 'HTTPS://foo.bar',
         allow_unsigned: false,
-        release: 'customrelease',
+        release: 'customrelease'
       }
     end
 
@@ -282,19 +282,19 @@ describe 'apt::source' do
           name: 'Debian',
           release: {
             major: '10',
-            full: '10.0',
+            full: '10.0'
           },
           distro: {
             codename: 'buster',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       }
     end
     let :params do
       {
         location: 'https://foo.bar',
-        allow_unsigned: false,
+        allow_unsigned: false
       }
     end
 
@@ -311,20 +311,20 @@ describe 'apt::source' do
           name: 'Debian',
           release: {
             major: '7',
-            full: '7.0',
+            full: '7.0'
           },
           distro: {
             codename: 'wheezy',
-            id: 'Debian',
-          },
-        },
+            id: 'Debian'
+          }
+        }
       }
     end
     let :params do
       {
         location: 'hello.there',
         include: { 'deb' => false, 'src' => true },
-        architecture: 'x86_64',
+        architecture: 'x86_64'
       }
     end
 
@@ -340,7 +340,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        include: { 'deb' => false, 'src' => true },
+        include: { 'deb' => false, 'src' => true }
       }
     end
 
@@ -353,7 +353,7 @@ describe 'apt::source' do
     let :params do
       {
         location: 'hello.there',
-        include: { 'src' => true },
+        include: { 'src' => true }
       }
     end
 
@@ -366,7 +366,7 @@ describe 'apt::source' do
     let :params do
       {
         include: { 'deb' => false },
-        location: 'hello.there',
+        location: 'hello.there'
       }
     end
 
@@ -381,7 +381,7 @@ describe 'apt::source' do
     let :params do
       {
         include: { 'deb' => false, 'src' => true },
-        location: 'hello.there',
+        location: 'hello.there'
       }
     end
 
@@ -395,7 +395,7 @@ describe 'apt::source' do
   context 'with ensure => absent' do
     let :params do
       {
-        ensure: 'absent',
+        ensure: 'absent'
       }
     end
 
@@ -413,12 +413,12 @@ describe 'apt::source' do
             name: 'Debian',
             release: {
               major: '8',
-              full: '8.0',
+              full: '8.0'
             },
             distro: {
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
       let(:params) { { location: 'hello.there' } }
@@ -438,7 +438,7 @@ describe 'apt::source' do
       let :params do
         {
           location: 'hello.there',
-          pin: true,
+          pin: true
         }
       end
 
@@ -450,7 +450,7 @@ describe 'apt::source' do
     context 'with notify_update = undef (default)' do
       let :params do
         {
-          location: 'hello.there',
+          location: 'hello.there'
         }
       end
 
@@ -461,7 +461,7 @@ describe 'apt::source' do
       let :params do
         {
           location: 'hello.there',
-          notify_update: true,
+          notify_update: true
         }
       end
 
@@ -472,7 +472,7 @@ describe 'apt::source' do
       let :params do
         {
           location: 'hello.there',
-          notify_update: false,
+          notify_update: false
         }
       end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07db734..c6e5525 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,7 +13,7 @@ include RspecPuppetFacts
 
 default_facts = {
   puppetversion: Puppet.version,
-  facterversion: Facter.version,
+  facterversion: Facter.version
 }
 
 default_fact_files = [
@@ -26,7 +26,7 @@ default_fact_files.each do |f|
 
   begin
     default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
-  rescue => e
+  rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end
diff --git a/spec/unit/puppet/provider/apt_key_spec.rb b/spec/unit/puppet/provider/apt_key_spec.rb
index 6da7016..7cab6ce 100644
--- a/spec/unit/puppet/provider/apt_key_spec.rb
+++ b/spec/unit/puppet/provider/apt_key_spec.rb
@@ -143,7 +143,7 @@ describe Puppet::Type.type(:apt_key).provider(:apt_key) do
         '160bit key fingerprint lowercase' => '6F6B15509CF8E59E6E469F327F438280EF8D349F'.downcase,
         '32bit key id 0x formatted' => '0xEF8D349F',
         '64bit key id 0x formatted' => '0x7F438280EF8D349F',
-        '160bit key fingerprint 0x formatted' => '0x6F6B15509CF8E59E6E469F327F438280EF8D349F',
+        '160bit key fingerprint 0x formatted' => '0x6F6B15509CF8E59E6E469F327F438280EF8D349F'
       }
       hash_of_keys.each do |key_type, value|
         it "#{key_type} #{value} is valid" do
-- 
2.32.3