Skip to content

Commit

Permalink
Merge pull request #321 from traylenator/rubo
Browse files Browse the repository at this point in the history
Comply to rubocop 1.22.3
  • Loading branch information
bastelfreak authored Feb 10, 2022
2 parents 125d35c + d1fe9fc commit fd27305
Show file tree
Hide file tree
Showing 23 changed files with 554 additions and 599 deletions.
41 changes: 0 additions & 41 deletions .gitlab-ci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '4.2.0'
modulesync_config_version: '5.1.0'
42 changes: 0 additions & 42 deletions .pdkignore

This file was deleted.

4 changes: 3 additions & 1 deletion .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
--relative
--fail-on-warnings
--no-parameter_documentation-check
--no-parameter_types-check
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :test do
gem 'voxpupuli-test', '~> 2.5', :require => false
gem 'voxpupuli-test', '~> 5.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 1.0', :require => false
Expand All @@ -22,7 +22,7 @@ end

group :release do
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
gem 'voxpupuli-release', '>= 1.0.2', :require => false
gem 'voxpupuli-release', '>= 1.2.0', :require => false
gem 'puppet-strings', '>= 2.2', :require => false
end

Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper),
# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper),
# otherwise attempt to load it directly.
begin
require 'voxpupuli/test/rake'
Expand Down
56 changes: 0 additions & 56 deletions appveyor.yml

This file was deleted.

6 changes: 4 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,12 @@
String $service_ensure = 'running',
Boolean $service_enabled = true,
) inherits postfix::params {
if (($mastercf_source and $mastercf_content) or
if (
($mastercf_source and $mastercf_content) or
($mastercf_source and $mastercf_template) or
($mastercf_content and $mastercf_template) or
($mastercf_source and $mastercf_content and $mastercf_template)) {
($mastercf_source and $mastercf_content and $mastercf_template)
) {
fail('mastercf_source, mastercf_content and mastercf_template are mutually exclusive')
}

Expand Down
2 changes: 2 additions & 0 deletions spec/acceptance/postfix_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'spec_helper_acceptance'

describe 'postfix class' do
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/postfix_augeas_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'spec_helper'

describe 'postfix::augeas' do
Expand All @@ -20,6 +22,7 @@
test_content: %r{Provides unit tests and examples for the <Postfix_Transport> lens.},
stock_since: '1.0.0')
}

it {
is_expected.to contain_augeas__lens('postfix_virtual').with(ensure: 'present',
lens_content: %r{Parses /etc/postfix/virtual},
Expand Down
2 changes: 2 additions & 0 deletions spec/classes/postfix_mailman_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'spec_helper'

describe 'postfix::mailman' do
Expand Down
2 changes: 2 additions & 0 deletions spec/classes/postfix_mta_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'spec_helper'

describe 'postfix::mta' do
Expand Down
3 changes: 3 additions & 0 deletions spec/classes/postfix_satellite_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

require 'spec_helper'

describe 'postfix::satellite' do
Expand All @@ -19,6 +21,7 @@ class { 'postfix':

it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_class('postfix::mta') }

it {
is_expected.to contain_postfix__virtual('@foo.example.com').with(
ensure: 'present',
Expand Down
Loading

0 comments on commit fd27305

Please sign in to comment.