From 652c350785c05d7c27f66dccda668b24471238a4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:31:38 +0100 Subject: [PATCH 1/3] fix(rubocop): add fixes using `rubocop --safe-auto-correct` --- test/integration/default/controls/config.rb | 4 ++-- test/integration/default/controls/package.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 54770b1..2af5bee 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + control 'Sudoers configuration' do title 'should match desired lines' @@ -17,7 +19,6 @@ control 'Sudoers configuration' do its('content') { should include '%sudo ALL=(nodejs) NOPASSWD: ALL' } its('content') { should include '+sysadmins ALL=(ALL) ALL' } its('content') { should include '#includedir /etc/sudoers.d' } - end describe file('/etc/sudoers.d/extra-file') do @@ -43,5 +44,4 @@ control 'Sudoers configuration' do its('mode') { should cmp '0440' } its('content') { should include '+other_netgroup ALL=(ALL) ALL' } end - end diff --git a/test/integration/default/controls/package.rb b/test/integration/default/controls/package.rb index 016eec0..e83d035 100644 --- a/test/integration/default/controls/package.rb +++ b/test/integration/default/controls/package.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true control 'Sudo package' do title 'should be installed' From a10ea35efa217535cdba3684c4f2ff066b4d01d3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:33:11 +0100 Subject: [PATCH 2/3] fix(rubocop): fix remaining errors manually --- test/integration/default/controls/config.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 2af5bee..baac9c4 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -10,7 +10,9 @@ control 'Sudoers configuration' do its('mode') { should cmp '0440' } its('content') { should include 'Defaults:ADMINS !lecture' } its('content') { should include 'Defaults:johndoe !requiretty' } - its('content') { should include 'Defaults@www1 log_year, logfile=/var/log/sudo.log' } + its('content') do + should include 'Defaults@www1 log_year, logfile=/var/log/sudo.log' + end its('content') { should include 'Host_Alias WEBSERVERS = www1,www2,www3' } its('content') { should include 'User_Alias ADMINS = millert,dowdy,mikef' } its('content') { should include 'johndoe ALL=(ALL) ALL' } From 9df9a48754a1eadf33fb8b8c285a31162f25eae1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:35:13 +0100 Subject: [PATCH 3/3] ci(travis): merge `rubocop` linter into main `lint` job * Semi-automated using https://github.com/myii/ssf-formula/pull/65 --- .rubocop.yml | 2 ++ .travis.yml | 21 +++++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index bdae9aa..283b759 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,3 +8,5 @@ Metrics/LineLength: Max: 88 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` +Metrics/BlockLength: + Max: 41 diff --git a/.travis.yml b/.travis.yml index 05c1d8e..55c36b0 100644 --- a/.travis.yml +++ b/.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