Testing updates

.kitchen.docker.yml

@@ -7,7 +7,14 @@ driver:
   privileged: true
 
 platforms:
-- name: centos-7.1
+- name: centos-6
+  driver:
+    image: centos:6
+    platform: rhel
+    run_command: /sbin/init
+    provision_command:
+      - /usr/bin/yum install -y initscripts net-tools wget
+- name: centos-7
   driver:
     image: centos:7
     platform: rhel

.kitchen.yml

@@ -5,20 +5,23 @@ provisioner:
   name: chef_zero
 
 platforms:
+  - name: centos-5.11
   - name: centos-6.7
-  - name: centos-7.1
-  - name: debian-7.8
+  - name: centos-7.2
+  - name: debian-7.10
     run_list: apt::default
-  - name: debian-8.1
+  - name: debian-8.4
     run_list: apt::default
-  - name: fedora-21
+  - name: fedora-22
+    run_list: yum::dnf_yum_compat
+  - name: fedora-23
+    run_list: yum::dnf_yum_compat
   - name: ubuntu-12.04
     run_list: apt::default
   - name: ubuntu-14.04
     run_list: apt::default
-  - name: ubuntu-15.04
-    run_list:
-      - recipe[apt::default]
+  - name: ubuntu-16.04
+    run_list: apt::default
 
 suites:
   - name: default

.rubocop.yml

@@ -16,17 +16,19 @@ Encoding:
   Enabled: false
 Style/FileName:
   Enabled: false
+Style/Alias:
+  Enabled: false
+Style/SpaceBeforeFirstArg:
+  Enabled: false
 LineLength:
   Enabled: false
 MethodLength:
   Enabled: false
 Metrics/AbcSize:
   Enabled: false
-PerceivedComplexity:
+Metrics/ModuleLength:
   Enabled: false
-Style/SpaceBeforeFirstArg:
+PerceivedComplexity:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
-Style/FileName:
-  Enabled: false

.travis.yml

@@ -16,16 +16,20 @@ env:
   matrix:
   - INSTANCE=default-ubuntu-1404
   - INSTANCE=default-ubuntu-1204
-  - INSTANCE=default-centos-71
+  - INSTANCE=default-centos-7
+  - INSTANCE=default-centos-6
   - INSTANCE=input-file-provider-ubuntu-1404
   - INSTANCE=input-file-provider-ubuntu-1204
-  - INSTANCE=input-file-provider-centos-71
+  - INSTANCE=input-file-provider-centos-7
+  - INSTANCE=input-file-provider-centos-6
   - INSTANCE=client-ubuntu-1404
   - INSTANCE=client-ubuntu-1204
-  - INSTANCE=client-centos-71
+  - INSTANCE=client-centos-7
+  - INSTANCE=client-centos-6
   - INSTANCE=server-ubuntu-1404
   - INSTANCE=server-ubuntu-1204
-  - INSTANCE=server-centos-71
+  - INSTANCE=server-centos-7
+  - INSTANCE=server-centos-6
 
 # Don't `bundle install`
 install: echo "skip bundle install"
@@ -41,6 +45,6 @@ script:
   - /opt/chefdk/embedded/bin/rubocop --version
   - /opt/chefdk/embedded/bin/rubocop
   - /opt/chefdk/embedded/bin/foodcritic --version
-  - /opt/chefdk/embedded/bin/foodcritic . --exclude spec
+  - /opt/chefdk/embedded/bin/foodcritic . --exclude spec -f any
   - /opt/chefdk/embedded/bin/rspec
   - KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}

Berksfile

@@ -3,6 +3,7 @@ source 'https://supermarket.chef.io'
 metadata
 
 group :integration do
+  cookbook 'yum'
   cookbook 'apt'
   cookbook 'rsyslog_test', path: 'test/fixtures/rsyslog_test'
 end

Gemfile

@@ -6,30 +6,19 @@ group :rake do
 end
 
 group :lint do
-  gem 'foodcritic', '~> 5.0'
-  gem 'rubocop', '~> 0.34'
+  gem 'foodcritic', '~> 6.2'
+  gem 'rubocop', '~> 0.38'
 end
 
 group :unit do
-  gem 'berkshelf',  '~> 4.0'
-  gem 'chefspec',   '~> 4.4'
+  gem 'berkshelf', '~> 4.3'
+  gem 'chefspec', '~> 4.6'
 end
 
 group :kitchen_common do
-  gem 'test-kitchen', '~> 1.4'
+  gem 'test-kitchen', '~> 1.7'
 end
 
 group :kitchen_vagrant do
-  gem 'kitchen-vagrant', '~> 0.19'
-end
-
-group :development do
-  gem 'ruby_gntp'
-  gem 'growl'
-  gem 'rb-fsevent'
-  gem 'guard', '~> 2.4'
-  gem 'guard-kitchen'
-  gem 'guard-foodcritic'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
+  gem 'kitchen-vagrant', '~> 0.20'
 end

Guardfile

-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-# guard 'kitchen' do
-#   watch(%r{test/.+})
-#   watch(%r{^recipes/(.+)\.rb$})
-#   watch(%r{^attributes/(.+)\.rb$})
-#   watch(%r{^files/(.+)})
-#   watch(%r{^templates/(.+)})
-#   watch(%r{^providers/(.+)\.rb})
-#   watch(%r{^resources/(.+)\.rb})
-# end
-
-guard 'foodcritic', cookbook_paths: '.', all_on_start: false do
-  watch(%r{attributes/.+\.rb$})
-  watch(%r{providers/.+\.rb$})
-  watch(%r{recipes/.+\.rb$})
-  watch(%r{resources/.+\.rb$})
-  watch('metadata.rb')
-end
-
-guard 'rubocop', all_on_start: false do
-  watch(%r{attributes/.+\.rb$})
-  watch(%r{providers/.+\.rb$})
-  watch(%r{recipes/.+\.rb$})
-  watch(%r{resources/.+\.rb$})
-  watch('metadata.rb')
-end
-
-guard :rspec, cmd: 'bundle exec rspec', all_on_start: false, notification: false do
-  watch(%r{^libraries/(.+)\.rb$})
-  watch(%r{^spec/(.+)_spec\.rb$})
-  watch(%r{^(recipes)/(.+)\.rb$})   { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')      { 'spec' }
-end

MAINTAINERS.md

@@ -14,6 +14,5 @@ for details on the process and how to become a maintainer or the project lead.
 
 # Maintainers
 * [Jennifer Davis](https://github.com/sigje)
-* [Sean OMeara](https://github.com/someara)
 * [Tim Smith](https://github.com/tas50)
 * [Thom May](https://github.com/thommay)

MAINTAINERS.toml

@@ -23,7 +23,6 @@ for details on the process and how to become a maintainer or the project lead.
     
       maintainers = [
         'sigje',
-        'someara',
         'tas50',
         'thommay'
       ]
@@ -33,10 +32,6 @@ for details on the process and how to become a maintainer or the project lead.
     name = "Jennifer Davis"
     github = "sigje"
 
-  [people.someara]
-    name = "Sean OMeara"
-    github = "someara"
-
   [people.tas50]
     name = "Tim Smith"
     github = "tas50"

Rakefile

@@ -13,8 +13,7 @@ namespace :style do
   desc 'Run Chef style checks'
   FoodCritic::Rake::LintTask.new(:chef) do |t|
     t.options = {
-      fail_tags: ['any'],
-      tags: ['~FC005']
+      fail_tags: ['any']
     }
   end
 end
@@ -41,4 +40,4 @@ desc 'Run all tests on Travis'
 task travis: ['style', 'spec', 'integration:cloud']
 
 # Default
-task default: ['style', 'spec', 'integration:vagrant']
+task default: %w(style spec)