Add Puppet4 + update common

.kitchen.yml

@@ -21,10 +21,10 @@ platforms:
   driver_config:
     box: opscode-centos-6.5
     box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
-# - name: oracle-6.4
-#   driver_config:
-#     box: oracle-6.4
-#     box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
+- name: oracle-6.4
+  driver_config:
+    box: oracle-6.4
+    box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel64-64.box
 - name: oracle-6.5
   driver_config:
     box: oracle-6.5
@@ -37,6 +37,10 @@ platforms:
   driver_config:
     box: debian-7
     box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-7.7.0-amd64_virtualbox.box
+- name: debian-8
+  driver_config:
+    box: debian-8
+    box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-8.0.0-amd64_virtualbox.box
 suites:
 - name: default
   manifest: site.pp

.travis.yml

@@ -2,19 +2,26 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 language: ruby
 bundler_args: --without development integration openstack
 env:
+  - PUPPET_VERSION="~> 4.0.0"
+  - PUPPET_VERSION="~> 3.7.5"
+  - PUPPET_VERSION="~> 3.6.2"
   - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.5.0"
-  - PUPPET_VERSION="~> 3.6.0"
 matrix:
   fast_finish: true
   exclude:
     - rvm: 1.9.3
       env: PUPPET_VERSION="~> 2.7.0"
     - rvm: 2.0.0
       env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 2.7.0"
+    - rvm: 1.8.7
+      env: PUPPET_VERSION="~> 4.0.0"
+    - rvm: 1.9.3
+      env: PUPPET_VERSION="~> 4.0.0"
     - rvm: 2.0.0
-      env: PUPPET_VERSION="~> 3.0.0"
+      env: PUPPET_VERSION="~> 4.0.0"

Gemfile

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 source 'https://rubygems.org'
 
 puppetversion = ENV['PUPPET_VERSION']
@@ -10,11 +11,16 @@ end
 
 group :test do
   gem 'rake'
+  # bugfix for ruby 1.8, puppet+rspec interplay
+  # https://github.com/rspec/rspec-core/issues/1864
+  if RUBY_VERSION.start_with? '1.8'
+    gem 'rspec', '~> 3.1.0',     :require => false
+  end
   gem 'rspec-puppet'
   # avoid NoMethodError: private method `clone' called for #<RuboCop::Cop::CopStore:0x00000104e286c8>
   gem 'puppetlabs_spec_helper', :git => 'https://github.com/ehaselwanter/puppetlabs_spec_helper'
   gem 'puppet-lint'
-  gem 'rubocop',    '~> 0.23' if RUBY_VERSION > '1.9.2'
+  gem 'rubocop',    '~> 0.31' if RUBY_VERSION > '1.9.2'
 end
 
 group :development do
@@ -24,7 +30,7 @@ end
 group :integration do
   gem 'test-kitchen'
   gem 'kitchen-vagrant'
-  gem 'kitchen-puppet', '~> 0.0.11'
+  gem 'kitchen-puppet'
   gem 'librarian-puppet'
   gem 'kitchen-sharedtests', '~> 0.2.0'
 end

Guardfile

@@ -1,5 +1,16 @@
 # encoding: utf-8
 
+# Guardfile
+
 guard 'rake', :task => 'lint' do
-  watch(/^.*$/)
+  watch(%r{^manifests/.*$})
+  watch(%r{^templates/.*$})
+end
+
+guard 'rake', :task => 'spec' do
+  watch(%r{^spec/(classes|defines)/.+_spec\.rb$})
+  watch('spec/spec_helper.rb')
+  watch(%r{^lib/.*$})
+  watch(%r{^manifests/.*$})
+  watch(%r{^templates/.*$})
 end