(CONT-773) Rubocop Auto Fixes 16-17

- Style/RescueStandardError
- Style/TrailingCommaInHashLiteral

Author: david22swan

.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'

lib/puppet/provider/apt_key/apt_key.rb

@@ -96,7 +96,7 @@ def self.key_line_hash(pub_line, fpr_line)
       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

spec/classes/apt_backports_spec.rb

@@ -14,13 +14,13 @@
             name: 'Debian',
             release: {
               major: '9',
-              full: '9.0',
+              full: '9.0'
             },
             distro: {
               codename: 'stretch',
-              id: 'Debian',
-            },
-          },
+              id: 'Debian'
+            }
+          }
         }
       end
 
@@ -40,13 +40,13 @@
             name: 'Ubuntu',
             release: {
               major: '18',
-              full: '18.04',
+              full: '18.04'
             },
             distro: {
               codename: 'bionac',
-              id: 'Ubuntu',
-            },
-          },
+              id: 'Ubuntu'
+            }
+          }
         }
       end
 
@@ -67,13 +67,13 @@
             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 @@
           release: 'vivid',
           repos: 'main',
           key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-          pin: '90',
+          pin: '90'
         }
       end
 
@@ -103,23 +103,23 @@
             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 @@
           name: 'LinuxMint',
           release: {
             major: '17',
-            full: '17',
+            full: '17'
           },
           distro: {
             codename: 'qiana',
-            id: 'LinuxMint',
-          },
-        },
+            id: 'LinuxMint'
+          }
+        }
       }
     end
 
@@ -154,7 +154,7 @@
           location: 'http://archive.ubuntu.com/ubuntu',
           release: 'trusty-backports',
           repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -172,7 +172,7 @@
         {
           release: 'trusty-backports',
           repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -186,7 +186,7 @@
         {
           location: 'http://archive.ubuntu.com/ubuntu',
           repos: 'main universe multiverse restricted',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -200,7 +200,7 @@
         {
           location: 'http://archive.ubuntu.com/ubuntu',
           release: 'trusty-backports',
-          key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
+          key: '630239CC130E1A7FD81A27B140976EAF437D05B5'
         }
       end
 
@@ -214,7 +214,7 @@
         {
           location: 'http://archive.ubuntu.com/ubuntu',
           release: 'trusty-backports',
-          repos: 'main universe multiverse restricted',
+          repos: 'main universe multiverse restricted'
         }
       end
 
@@ -232,20 +232,20 @@
           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 @@
     context 'with invalid release' do
       let(:params) do
         {
-          release: true,
+          release: true
         }
       end
 
@@ -269,7 +269,7 @@
     context 'with invalid repos' do
       let(:params) do
         {
-          repos: true,
+          repos: true
         }
       end
 
@@ -281,7 +281,7 @@
     context 'with invalid key' do
       let(:params) do
         {
-          key: true,
+          key: true
         }
       end
 
@@ -293,7 +293,7 @@
     context 'with invalid pin' do
       let(:params) do
         {
-          pin: true,
+          pin: true
         }
       end