Merge pull request #62 from eole/bugfix/make-rubycop-happy

fix(rubocop): make the cop happy

Author: myii

.rubocop.yml

@@ -7,4 +7,10 @@ Metrics/LineLength:
   # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
   Max: 88
 
+# libvirt-formula overredies
+Lint/AmbiguousRegexpLiteral:
+  # Exclude { should match /<REGEX>/ }
+  Exclude:
+    - 'test/integration/default/controls/config_spec.rb'
+
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`

.travis.yml

@@ -21,17 +21,14 @@ stages:
   - name: release
     if: branch = master AND type != pull_request
 jobs:
-  allow_failures:
-    - env: Lint_rubocop
-  fast_finish: true
   include:
     ## Define the test stage that runs the linters (and testing matrix, if applicable)
 
-    # Run all of the linters in a single job (except `rubocop`)
+    # Run all of the linters in a single job
     - language: node_js
       node_js: lts/*
       env: Lint
-      name: 'Lint: salt-lint, yamllint & commitlint'
+      name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
       before_install: skip
       script:
         # Install and run `salt-lint`
@@ -42,21 +39,13 @@ jobs:
         # Need at least `v1.17.0` for the `yaml-files` setting
         - pip install --user yamllint>=1.17.0
         - yamllint -s .
+        # Install and run `rubocop`
+        - gem install rubocop
+        - rubocop -d
         # Install and run `commitlint`
         - npm install @commitlint/config-conventional -D
         - npm install @commitlint/travis-cli -D
         - commitlint-travis
-    # Run the `rubocop` linter in a separate job that is allowed to fail
-    # Once these lint errors are fixed, this can be merged into a single job
-    - language: node_js
-      node_js: lts/*
-      env: Lint_rubocop
-      name: 'Lint: rubocop'
-      before_install: skip
-      script:
-        # Install and run `rubocop`
-        - gem install rubocop
-        - rubocop -d
 
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with

test/integration/clean/controls/config_spec.rb

@@ -1,9 +1,8 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # config_spec.rb -- Libvirt configuration InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
 
 control 'Libvirt configuration' do
   title 'the configuration files must not exist'
@@ -15,5 +14,4 @@
   describe file('/etc/libvirt/libvirtd.conf') do
     it { should_not exist }
   end
-
 end

test/integration/clean/controls/pkgs_spec.rb

@@ -1,20 +1,17 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # pkgs_spec.rb -- Libvirt packages InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
+
 packages = libvirt.packages
 
 control 'Libvirt packages' do
   title 'must be uninstalled'
 
-  packages.each do |service, pkgs|
-    pkgs.each do |pkg|
-      describe package(pkg) do
-        it { should_not be_installed }
-      end
+  packages.values.flatten.each do |pkg|
+    describe package(pkg) do
+      it { should_not be_installed }
     end
   end
-
 end

test/integration/clean/controls/service_spec.rb

@@ -1,9 +1,9 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # service_spec.rb -- Libvirt service InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
+
 control 'Libvirt service' do
   title 'must be stopped and disabled'
 

test/integration/clean/controls/socket_admin_spec.rb

@@ -1,9 +1,9 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # sockets_admin_spec.rb -- Libvirt sockets InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
+
 control 'Libvirt admin socket' do
   title 'must not exist'
 

test/integration/clean/controls/socket_ro_spec.rb

@@ -1,14 +1,13 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # sockets_ro_spec.rb -- Libvirt read only socket InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
+
 control 'Libvirt read only socket' do
   title 'must not exist'
 
   describe libvirt_socket_ro do
     it { should_not exist }
   end
-
 end

test/integration/clean/controls/socket_rw_spec.rb

@@ -1,14 +1,13 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # sockets_rw_spec.rb -- Libvirt read/write socket InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
+
 control 'Libvirt read/write socket' do
   title 'must not exist'
 
   describe libvirt_socket_rw do
     it { should_not exist }
   end
-
 end

test/integration/default/controls/config_spec.rb

@@ -1,9 +1,8 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # config_spec.rb -- Libvirt configuration InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
 
 params = {
   'listen_tls' => '0',
@@ -16,31 +15,30 @@
   'unix_sock_rw_perms' => '0770',
   'auth_unix_ro' => 'none',
   'auth_unix_rw' => 'none',
-  'auth_tcp' => 'none',
+  'auth_tcp' => 'none'
 }
 
 control 'Libvirt configuration' do
   title 'verify applied configuration'
 
   describe libvirt.daemon_config_file do
     it { should exist }
-    its('content') { should match %r{This\sfile\sis\smanaged\sby\sSalt} }
+    its('content') { should match /This\sfile\sis\smanaged\sby\sSalt/ }
   end
 
   describe file('/etc/libvirt/libvirtd.conf') do
     it { should exist }
-    its('content') { should match %r{This\sfile\sis\smanaged\sby\sSalt} }
+    its('content') { should match /This\sfile\sis\smanaged\sby\sSalt/ }
   end
 
   parse_options = {
     # Value can be surrounded by quotes, or not
-    assignment_regex: /^\s*([^=]*?)\s*=\s*['"]?(.*?)['"]?\s*$/,
+    assignment_regex: /^\s*([^=]*?)\s*=\s*['"]?(.*?)['"]?\s*$/
   }
 
   describe parse_config_file('/etc/libvirt/libvirtd.conf', parse_options) do
     params.each do |param, value|
       its(param) { should eq value }
     end
   end
-
 end

test/integration/default/controls/pkgs_spec.rb

@@ -1,20 +1,17 @@
-# coding: utf-8
-#
+# frozen_string_literal: true
+
 # pkgs_spec.rb -- Libvirt packages InSpec control
 # Author: Daniel Dehennin <[email protected]>
-# Copyright © 2019 Pôle de Compétences Logiciels Libres <[email protected]>
-#
+# Copyright (C) 2019 Pole de Competences Logiciels Libres <[email protected]>
+
 packages = libvirt.packages
 
 control 'Libvirt packages' do
   title 'verify installed packages'
 
-  packages.each do |service, pkgs|
-    pkgs.each do |pkg|
-      describe package(pkg) do
-        it { should be_installed }
-      end
+  packages.values.flatten.each do |pkg|
+    describe package(pkg) do
+      it { should be_installed }
     end
   end
-
 end