comply with latest rubocop rules

Signed-off-by: Christoph Hartmann <[email protected]>

Author: chris-rock

.rubocop.yml

@@ -1,32 +1,32 @@
 ---
 AllCops:
+  DisplayCopNames: true
   Exclude:
   - vendor/**/*
   - test/**/*
-  - metadata.rb
-  - Berksfile
-Documentation:
-  Enabled: false
-AlignParameters:
-  Enabled: true
-Encoding:
-  Enabled: true
-HashSyntax:
-  Enabled: true
-LineLength:
-  Enabled: false
-EmptyLinesAroundBlockBody:
-  Enabled: false
-MethodLength:
-  Max: 40
-NumericLiterals:
-  MinDigits: 10
+Metrics/AbcSize:
+  Max: 29
 Metrics/CyclomaticComplexity:
   Max: 10
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 40
 Metrics/PerceivedComplexity:
   Max: 10
-Metrics/AbcSize:
-  Max: 29
+Style/Documentation:
+  Enabled: false
 Style/DotPosition:
   EnforcedStyle: trailing
   Enabled: true
+Style/Encoding:
+  EnforcedStyle: always
+  Enabled: true
+Style/ExtraSpacing:
+  Exclude:
+    - attributes/default.rb
+Style/RegexpLiteral:
+  AllowInnerSlashes: true
+Style/SpaceAroundOperators:
+  Exclude:
+    - attributes/default.rb

Guardfile

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-# Guardfile
-
 guard :rubocop do
   watch(/.+\.rb$/)
   watch(/(?:.+\/)?\.rubocop\.yml$/) { |m| File.dirname(m[0]) }
@@ -17,8 +15,8 @@ end
 
 guard :rspec do
   watch(/^spec\/.+_spec\.rb$/)
-  watch(/^(recipes)\/(.+)\.rb$/)     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { 'spec' }
+  watch(/^(recipes)\/(.+)\.rb$/) { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { 'spec' }
 end
 
 guard :kitchen, all_on_start: false do

metadata.rb

@@ -1,10 +1,11 @@
-name             "postgres-hardening"
-maintainer       "Christoph Hartmann"
-maintainer_email "[email protected]"
-license          "Apache v2.0"
-description      "Installs and configures a secure posgres server"
+# encoding: utf-8
+name             'postgres-hardening'
+maintainer       'Christoph Hartmann'
+maintainer_email '[email protected]'
+license          'Apache v2.0'
+description      'Installs and configures a secure posgres server'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "1.1.0"
+version          '1.1.0'
 
 depends 'postgresql', '>= 3.4.0'
 
@@ -17,3 +18,6 @@
 supports 'fedora'
 supports 'debian'
 supports 'ubuntu'
+
+source_url 'https://github.com/dev-sec/chef-postgres-hardening'
+issues_url 'https://github.com/dev-sec/chef-postgres-hardening/issues'

recipes/hardening.rb

@@ -21,9 +21,7 @@
 # ensure, that you have postgresql::server in your runlist
 case node['platform_family']
 when 'debian'
-
   ['', node['postgresql']['version']].each do |dir|
-
     directory File.join('/var/lib/postgresql/', dir) do
       mode '0700'
     end
@@ -42,5 +40,4 @@
     only_if "ls -l /var/lib/postgresql/#{node['postgresql']['version']}/main/server.key |grep /etc/ssl/private/ssl-cert-snakeoil.key"
     notifies change_notify, 'service[postgresql]'
   end
-
 end

spec/default_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe 'postgres-hardening::default' do
-
   let(:chef_run) do
     ChefSpec::SoloRunner.new do |node|
       node.set['postgresql']['version'] = '9.3'
@@ -35,5 +34,4 @@
   it 'includes postgres-hardening::hardening recipe' do
     expect(chef_run).to include_recipe('postgres-hardening::hardening')
   end
-
 end

spec/hardening_spec.rb

@@ -18,9 +18,7 @@
 require 'spec_helper'
 
 describe 'postgres-hardening::hardening' do
-
   context 'with platform_family debian' do
-
     platforms = [
       { os_name: 'ubuntu', os_version: '12.04', postgres_version: '9.3' },
       { os_name: 'ubuntu', os_version: '14.04', postgres_version: '9.3' },
@@ -29,9 +27,7 @@
     ]
 
     platforms.each do |platform|
-
       context "operating system #{platform[:os_name]} #{platform[:os_version]}" do
-
         let(:chef_run) do
           ChefSpec::ServerRunner.new(
             platform: platform[:os_name], version: platform[:os_version]
@@ -46,7 +42,6 @@
         end
 
         it 'creates necessary directories with correct mode' do
-
           stub_command("ls -l /var/lib/postgresql/#{@postgres_version}/main/server.crt |grep /etc/ssl/certs/ssl-cert-snakeoil.pem").and_return(true)
           stub_command("ls -l /var/lib/postgresql/#{@postgres_version}/main/server.key |grep /etc/ssl/private/ssl-cert-snakeoil.key").and_return(true)
 
@@ -55,33 +50,24 @@
 
           expect(chef_run).to create_directory("/var/lib/postgresql/#{@postgres_version}").
             with(mode: '0700')
-
         end
 
         it 'deletes links if commands return true' do
-
           stub_command("ls -l /var/lib/postgresql/#{@postgres_version}/main/server.crt |grep /etc/ssl/certs/ssl-cert-snakeoil.pem").and_return(true)
           stub_command("ls -l /var/lib/postgresql/#{@postgres_version}/main/server.key |grep /etc/ssl/private/ssl-cert-snakeoil.key").and_return(true)
 
           expect(chef_run).to delete_link("/var/lib/postgresql/#{@postgres_version}/main/server.crt")
           expect(chef_run).to delete_link("/var/lib/postgresql/#{@postgres_version}/main/server.key")
-
         end
 
         it 'does not delete links if commands return false' do
-
           stub_command("ls -l /var/lib/postgresql/#{@postgres_version}/main/server.crt |grep /etc/ssl/certs/ssl-cert-snakeoil.pem").and_return(false)
           stub_command("ls -l /var/lib/postgresql/#{@postgres_version}/main/server.key |grep /etc/ssl/private/ssl-cert-snakeoil.key").and_return(false)
 
           expect(chef_run).to_not delete_link("/var/lib/postgresql/#{@postgres_version}/main/server.crt")
           expect(chef_run).to_not delete_link("/var/lib/postgresql/#{@postgres_version}/main/server.key")
-
         end
-
       end
-
     end
-
   end
-
 end