Correct Style/TrailingCommaInHashLiteral

Author: LukasAud

.rubocop_todo.yml

@@ -77,13 +77,3 @@ RSpec/NestedGroups:
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
-
-# Offense count: 50
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'spec/acceptance/accounts_spec.rb'
-    - 'spec/defines/accounts_user_spec.rb'
-    - 'spec/spec_helper.rb'

spec/acceptance/accounts_spec.rb

@@ -11,27 +11,27 @@
 
 hd_defaults = {
   'accounts::user_defaults' => {
-    'home_mode' => '0700',
-  },
+    'home_mode' => '0700'
+  }
 }
 
 hd_group = {
   'accounts::group_defaults' => {
     'ensure' => 'present',
-    'system' => true,
+    'system' => true
   },
   'accounts::group_list' => {
     'staff' => {
-      'gid' => 1234,
-    },
-  },
+      'gid' => 1234
+    }
+  }
 }
 
 hd_group_change = hd_group.merge(
   'accounts::group_list' => {
     'staff' => {
-      'gid' => 1235,
-    },
+      'gid' => 1235
+    }
   },
 )
 
@@ -50,8 +50,8 @@
         "ssh-rsa #{test_key} vagrant",
         'command="/bin/echo Hello",from="myhost.exapmle.com,192.168.1.1" ' \
         "ssh-rsa #{test_key} vagrant2",
-      ],
-    },
+      ]
+    }
   },
 )
 
@@ -73,8 +73,8 @@
         "ssh-rsa #{test_key} vagrant",
         'command="/bin/echo Hello",from="myhost.exapmle.com,192.168.1.1" ' \
         "ssh-rsa #{test_key} vagrant2",
-      ],
-    },
+      ]
+    }
   },
 )
 
@@ -84,8 +84,8 @@
       'managehome' => false,
       'sshkeys' => [
         "ssh-rsa #{test_key} vagrant",
-      ],
-    },
+      ]
+    }
   },
 )
 
@@ -104,16 +104,16 @@
         "ssh-rsa #{test_key} vagrant",
         'from="myhost.example.com,192.168.1.1" ' \
         "ssh-rsa #{test_key} vagrant2",
-      ],
-    },
+      ]
+    }
   },
 )
 
 hd_locked_user = hd_defaults.merge(
   'accounts::user_list' => {
     'hunner' => {
-      'locked' => true,
-    },
+      'locked' => true
+    }
   },
 )
 
@@ -122,8 +122,8 @@
     'first.last' => {
       'group' => 'staff',
       'password' => '!!',
-      'home' => '/test/first.last',
-    },
+      'home' => '/test/first.last'
+    }
   },
 )
 
@@ -132,8 +132,8 @@
     'grp_flse' => {
       'group' => 'newgrp_1',
       'create_group' => false,
-      'home' => '/test/grp_flse',
-    },
+      'home' => '/test/grp_flse'
+    }
   },
 )
 
@@ -142,17 +142,17 @@
     'grp_true' => {
       'group' => 'newgrp_2',
       'create_group' => true,
-      'home' => '/test/grp_true',
-    },
+      'home' => '/test/grp_true'
+    }
   },
 )
 
 hd_ignore_user_first_run = hd_defaults.merge(
   'accounts::user_list' => {
     'ignore_user' => {
       'group' => 'staff',
-      'password' => 'foo',
-    },
+      'password' => 'foo'
+    }
   },
 )
 
@@ -161,17 +161,17 @@
     'ignore_user' => {
       'group' => 'staff',
       'password' => '',
-      'ignore_password_if_empty' => true,
-    },
+      'ignore_password_if_empty' => true
+    }
   },
 )
 
 hd_no_ignore_user_first_run = hd_defaults.merge(
   'accounts::user_list' => {
     'no_ignore_user' => {
       'group' => 'staff',
-      'password' => 'foo',
-    },
+      'password' => 'foo'
+    }
   },
 )
 
@@ -180,17 +180,17 @@
     'no_ignore_user' => {
       'group' => 'staff',
       'password' => '',
-      'ignore_password_if_empty' => false,
-    },
+      'ignore_password_if_empty' => false
+    }
   },
 )
 
 hd_specd_user_first_run = hd_defaults.merge(
   'accounts::user_list' => {
     'specd_user' => {
       'group' => 'staff',
-      'password' => 'foo',
-    },
+      'password' => 'foo'
+    }
   },
 )
 
@@ -199,8 +199,8 @@
     'specd_user' => {
       'group' => 'staff',
       'password' => 'bar',
-      'ignore_password_if_empty' => true,
-    },
+      'ignore_password_if_empty' => true
+    }
   },
 )
 
@@ -209,29 +209,29 @@
     'duplicate_user1' => {
       'allowdupe' => true,
       'uid' => '1234',
-      'sshkey_owner' => 'duplicate_user1',
+      'sshkey_owner' => 'duplicate_user1'
     },
     'duplicate_user2' => {
       'allowdupe' => true,
       'uid' => 1234,
-      'sshkey_owner' => 'duplicate_user1',
-    },
+      'sshkey_owner' => 'duplicate_user1'
+    }
   },
 )
 
 hd_delete_accounts = {
   'accounts::group_defaults' => {
-    'ensure' => 'absent',
+    'ensure' => 'absent'
   },
   'accounts::group_list' => {
     'newgrp_1' => {},
     'newgrp_2' => {},
-    'staff' => {},
+    'staff' => {}
   },
   'accounts::user_defaults' => {
     'ensure' => 'absent',
     'create_group' => true,
-    'purge_user_home' => true,
+    'purge_user_home' => true
   },
   'accounts::user_list' => {
     'hunner' => {
@@ -242,23 +242,23 @@
       'sshkeys' => [
         "ssh-rsa #{test_key} vagrant",
         "ssh-rsa #{test_key} vagrant2",
-      ],
+      ]
     },
     'first.last' => {
-      'home' => '/test/first.last',
+      'home' => '/test/first.last'
     },
     'grp_flse' => {
-      'home' => '/test/grp_flse',
+      'home' => '/test/grp_flse'
     },
     'grp_true' => {
-      'home' => '/test/grp_true',
+      'home' => '/test/grp_true'
     },
     'ignore_user' => {},
     'no_ignore_user' => {},
     'specd_user' => {},
     'duplicate_user1' => {},
-    'duplicate_user2' => {},
-  },
+    'duplicate_user2' => {}
+  }
 }
 
 pp_manifest = <<-PUPPETCODE

spec/defines/accounts_user_spec.rb

@@ -66,7 +66,7 @@
               sshkeys: ['ssh-rsa AAAAB3Nza...LiPk== [email protected]',
                         'permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-dss AAAAB5...21S== dan key2',
                         'command="/bin/echo Hello World",from="myhost.exapmle.com,192.168.1.1" ecdsa-sha2-nistp521 test_key vagrant2'],
-              uid: 123,
+              uid: 123
             }
           end
 

spec/spec_helper.rb

@@ -13,7 +13,7 @@
 
 default_facts = {
   puppetversion: Puppet.version,
-  facterversion: Facter.version,
+  facterversion: Facter.version
 }
 
 default_fact_files = [