Merge pull request #120 from dev-sec/newlint

Change linting to Cookstyle

Author: schurzi

.rubocop.yml

@@ -2,35 +2,3 @@
 AllCops:
   Exclude:
   - vendor/**/*
-Documentation:
-  Enabled: false
-Layout/ParameterAlignment:
-  Enabled: true
-HashSyntax:
-  Enabled: true
-LineLength:
-  Enabled: false
-EmptyLinesAroundBlockBody:
-  Enabled: false
-Style/Encoding:
-  Enabled: false
-MethodLength:
-  Max: 40
-NumericLiterals:
-  MinDigits: 10
-Metrics/BlockLength:
-  Max: 45 # needed for 6.1.1
-Metrics/CyclomaticComplexity:
-  Max: 10
-Metrics/PerceivedComplexity:
-  Max: 10
-Metrics/AbcSize:
-  Max: 30
-# Lint/AmbiguousBlockAssociation is incompatible with RSpec
-# https://github.com/rubocop-hq/rubocop/issues/4222
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-Style/NumericPredicate:
-  Enabled: false

Gemfile

@@ -2,6 +2,7 @@
 
 source 'https://rubygems.org'
 
+gem 'cookstyle'
 gem 'highline'
 gem 'rack'
 gem 'rake'

Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'cookstyle'
 require 'rake/testtask'
 require 'rubocop/rake_task'
 
@@ -9,6 +10,10 @@ task :rubocop do
   RuboCop::RakeTask.new
 end
 
+RuboCop::RakeTask.new(:cookstyle) do |task|
+  task.options << '--display-cop-names'
+end
+
 # lint the project
 desc 'Run robocop linter'
 task lint: [:rubocop]

controls/1_1_filesystem_configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2017, Schuberg Philis B.V.
+# Copyright:: 2017, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -230,7 +230,6 @@
   describe mount('/var/tmp') do
     its('options') { should include 'nodev' }
   end
-
 end
 
 control 'cis-dil-benchmark-1.1.9' do
@@ -248,7 +247,6 @@
   describe mount('/var/tmp') do
     its('options') { should include 'nosuid' }
   end
-
 end
 
 control 'cis-dil-benchmark-1.1.10' do
@@ -266,7 +264,6 @@
   describe mount('/var/tmp') do
     its('options') { should include 'noexec' }
   end
-
 end
 
 control 'cis-dil-benchmark-1.1.11' do

controls/1_2_configure_software_updates.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2017, Schuberg Philis B.V.
+# Copyright:: 2017, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

controls/1_3_filesystem_integrity_checking.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2017, Schuberg Philis B.V.
+# Copyright:: 2017, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,13 +48,13 @@
   tag level: 1
 
   describe.one do
-    %w[/var/spool/cron/crontabs/root /var/spool/cron/root /etc/crontab].each do |f|
+    %w(/var/spool/cron/crontabs/root /var/spool/cron/root /etc/crontab).each do |f|
       describe file(f) do
         its('content') { should match(/aide (--check|-C)/) }
       end
     end
 
-    %w[cron.d cron.hourly cron.daily cron.weekly cron.monthly].each do |f|
+    %w(cron.d cron.hourly cron.daily cron.weekly cron.monthly).each do |f|
       command("find /etc/#{f} -type f").stdout.split.each do |entry|
         describe file(entry) do
           its('content') { should match(/aide (--check|-C)/) }

controls/1_4_secure_boot_settings.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2017, Schuberg Philis B.V.
+# Copyright:: 2017, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

controls/1_5_additional_process_hardening.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2017, Schuberg Philis B.V.
+# Copyright:: 2017, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

controls/1_6_mandatory_access_control.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2017, Schuberg Philis B.V.
+# Copyright:: 2017, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
   tag level: 2
 
   describe.one do
-    %w[libselinux libselinux1 apparmor].each do |p|
+    %w(libselinux libselinux1 apparmor).each do |p|
       describe package(p) do
         it { should be_installed }
       end
@@ -49,7 +49,7 @@
   tag level: 2
 
   describe.one do
-    %w[/boot/grub2/grub.cfg /boot/grub/menu.lst].each do |f|
+    %w(/boot/grub2/grub.cfg /boot/grub/menu.lst).each do |f|
       describe file(f) do
         its('content') { should_not match /selinux=0/ }
         its('content') { should_not match /enforcing=0/ }

controls/1_7_warning_banners.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2017, Schuberg Philis B.V.
+# Copyright:: 2017, Schuberg Philis B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.