Test Cleanups

.gitignore

@@ -34,16 +34,18 @@ _yardoc
 doc/
 .idea
 
-#chef stuff
+# chef stuff
 Berksfile.lock
 .kitchen
 .kitchen.local.yml
 vendor/
 .coverage/
 .zero-knife.rb
 Policyfile.lock.json
+Cheffile.lock
+.librarian/
 
-#vagrant stuff
+# vagrant stuff
 .vagrant/
 .vagrant.d/
 .kitchen/

.kitchen.yml

@@ -7,6 +7,7 @@ driver:
 provisioner:
   name: chef_zero
   data_bags_path: test/fixtures/data_bags
+  deprecations_as_errors: true
 
 platforms:
   - name: centos-6.8
@@ -33,7 +34,7 @@ default: &default
 suites:
   - name: default
     <<: *default
-    includes: [ 'ubuntu-12.04', 'ubuntu-14.04', 'centos-6.8', 'centos-7.3' ]
+    excludes: [ 'macosx-10.10', 'windows-server-2012r2-standard' ]
     run_list:
       <% if ENV['MIXLIB_INSTALL_GIT_REF'] %>
       - recipe[test::install_git]
@@ -43,14 +44,14 @@ suites:
 
   - name: local_package_install
     <<: *default
-    includes: [ 'ubuntu-12.04', 'ubuntu-14.04', 'centos-6.8', 'centos-7.3' ]
+    excludes: [ 'macosx-10.10', 'windows-server-2012r2-standard' ]
     run_list:
       - recipe[test]
       - recipe[test::local]
 
   - name: chefdk
     <<: *default
-    includes: [ 'ubuntu-12.04', 'ubuntu-14.04', 'centos-6.8', 'centos-7.3', 'macosx-10.10', 'windows-server-2012r2-standard' ]
+    includes: [ 'ubuntu-12.04', 'ubuntu-14.04', ubuntu-16.04', 'centos-6.8', 'centos-7.3', 'macosx-10.10', 'windows-server-2012r2-standard' ]
     run_list:
       <% if ENV['MIXLIB_INSTALL_GIT_REF'] %>
       - recipe[test::install_git]

.travis.yml

@@ -1,15 +1,20 @@
-language: ruby
+# Use Travis's cointainer based infrastructure
 sudo: false
+
 addons:
   apt:
     sources:
       - chef-stable-precise
     packages:
       - chefdk
 
-# Don't `bundle install`
+# Don't `bundle install` which takes about 1.5 mins
 install: echo "skip bundle install"
 
+branches:
+  only:
+    - master
+
 # Ensure we make ChefDK's Ruby the default
 before_script:
   - eval "$(/opt/chefdk/bin/chef shell-init bash)"

Rakefile

@@ -11,7 +11,7 @@ namespace :style do
     desc 'Run Ruby style checks'
     RuboCop::RakeTask.new(:ruby)
   rescue LoadError => e
-    puts ">>> Gem load error: #{e}, omitting style:ruby" unless ENV['CI']
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
   end
 
   begin
@@ -24,8 +24,8 @@ namespace :style do
         progress: true,
       }
     end
-  rescue LoadError
-    puts ">>> Gem load error: #{e}, omitting style:chef" unless ENV['CI']
+  rescue LoadError => e
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
   end
 end
 
@@ -39,7 +39,7 @@ begin
   desc 'Run ChefSpec examples'
   RSpec::Core::RakeTask.new(:spec)
 rescue LoadError => e
-  puts ">>> Gem load error: #{e}, omitting spec" unless ENV['CI']
+  puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
 end
 
 # Integration tests. Kitchen.ci
@@ -49,8 +49,8 @@ namespace :integration do
 
     desc 'Run kitchen integration tests'
     Kitchen::RakeTasks.new
-  rescue StandardError => e
-    puts ">>> Kitchen error: #{e}, omitting #{task.name}" unless ENV['CI']
+  rescue LoadError, StandardError => e
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
   end
 end
 

recipes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2016, Chef Software, Inc. <[email protected]>
+# Copyright:: 2015-2016, Chef Software, Inc. <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

resources/ingredient_config.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Joshua Timberman <[email protected]
-# Copyright (c) 2015-2016, Chef Software, Inc. <[email protected]>
+# Copyright:: 2015-2016, Chef Software, Inc. <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

resources/omnibus_service.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Joshua Timberman <[email protected]
-# Copyright (c) 2015-2016, Chef Software, Inc. <[email protected]>
+# Copyright:: 2015-2016, Chef Software, Inc. <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

tasks/maintainers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
+# Copyright:: 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

test/fixtures/cookbooks/test/attributes/default.rb

@@ -1,5 +1,3 @@
-default['test']['push-client']['version'] = nil
-default['test']['chef-server-core']['version'] = nil
 default['test']['source_url'] = case node['platform_family']
                                 when 'debian'
                                   "https://packages.chef.io/stable/ubuntu/#{node['platform_version']}/chef-server-core_12.8.0-1_amd64.deb"

test/fixtures/cookbooks/test/recipes/config.rb

@@ -1,6 +1,5 @@
 # Chef Server Core
 chef_ingredient 'chef-server' do
-  version node['test']['chef-server-core']['version']
   config <<-EOS
 api_fqdn "#{node['fqdn']}"
 ip_version "ipv6"

test/fixtures/cookbooks/test/recipes/default.rb

@@ -4,4 +4,4 @@
   sensitive true
 end if platform_family?('rhel')
 
-apt_update 'update' if node['platform_family'] == 'debian'
+apt_update 'update'

test/fixtures/cookbooks/test/recipes/install_git.rb

@@ -1,3 +1,3 @@
-apt_update 'update' if node['platform_family'] == 'debian'
+apt_update 'update'
 
 include_recipe 'git'

test/fixtures/cookbooks/test/recipes/push.rb

@@ -1,4 +1,3 @@
 chef_ingredient 'push-jobs-client' do
-  version node['test']['push-client']['version']
   action :install
 end

test/fixtures/cookbooks/test/recipes/repo.rb

@@ -1,6 +1,5 @@
 # Chef Server Core
 chef_ingredient 'chef-server' do
-  version node['test']['chef-server-core']['version']
   config <<-EOS
 api_fqdn "#{node['fqdn']}"
 ip_version "ipv6"